diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
index d3ed6e9c8bfe629d67fdd6870430c61175232bc6..ef9b4fc63cec0711116487d963eb4af39f54146e 100644
--- a/interface/lib/classes/auth.inc.php
+++ b/interface/lib/classes/auth.inc.php
@@ -90,6 +90,16 @@ class auth {
return false;
}
}
+
+ public function check_module_permissions($module) {
+ // Check if the current user has the permissions to access this module
+ if(!stristr($_SESSION["s"]["user"]["modules"],$module)) {
+ header("Location: ../index.php");
+ exit;
+ }
+ }
+
+
}
?>
\ No newline at end of file
diff --git a/interface/web/admin/dbsync_del.php b/interface/web/admin/dbsync_del.php
index c1860b3d7aa7b80b683aedae30214722e45af204..bcbe62aa11bde345caa75f4f63b1f30965ed693c 100644
--- a/interface/web/admin/dbsync_del.php
+++ b/interface/web/admin/dbsync_del.php
@@ -39,11 +39,7 @@ $list_def_file = "list/dbsync.list.php";
* End Form configuration
******************************************/
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+$app->auth->check_module_permissions('admin');
include_once($list_def_file);
diff --git a/interface/web/admin/dbsync_edit.php b/interface/web/admin/dbsync_edit.php
index 2c0b859537f379b285c99630b22b2bd17c078d35..fe3a56f56ca22402fa92eb9d8a5bc62a04b46604 100644
--- a/interface/web/admin/dbsync_edit.php
+++ b/interface/web/admin/dbsync_edit.php
@@ -39,11 +39,8 @@ $tform_def_file = "form/dbsync.tform.php";
* End Form configuration
******************************************/
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
// Lade Template
$app->uses('tpl,tform');
diff --git a/interface/web/admin/dbsync_list.php b/interface/web/admin/dbsync_list.php
index 6370e38fbd04e4dbf1655248577416f3c6c1bf4f..05b5fdf91ca34cafd32eafe46210ea62747719b9 100644
--- a/interface/web/admin/dbsync_list.php
+++ b/interface/web/admin/dbsync_list.php
@@ -39,11 +39,8 @@ $list_def_file = "list/dbsync.list.php";
* End Form configuration
******************************************/
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
$app->uses('tpl,listform');
diff --git a/interface/web/admin/filesync_del.php b/interface/web/admin/filesync_del.php
index 0b3da2237f3dd4b63f944ff2c1512fb1aec0965c..33cb3e6c689a648c240ae7000b7f00e0a1b153c8 100644
--- a/interface/web/admin/filesync_del.php
+++ b/interface/web/admin/filesync_del.php
@@ -39,11 +39,8 @@ $list_def_file = "list/filesync.list.php";
* End Form configuration
******************************************/
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
include_once($list_def_file);
diff --git a/interface/web/admin/filesync_edit.php b/interface/web/admin/filesync_edit.php
index c11307282df5ccd06c28586be980371829dea44e..bf7b64893a71ac99f04bbdeaa2c2a13f98317552 100644
--- a/interface/web/admin/filesync_edit.php
+++ b/interface/web/admin/filesync_edit.php
@@ -39,11 +39,8 @@ $tform_def_file = "form/filesync.tform.php";
* End Form configuration
******************************************/
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
// Lade Template
$app->uses('tpl,tform');
diff --git a/interface/web/admin/filesync_list.php b/interface/web/admin/filesync_list.php
index 87f4685cfb38b7c45a85d9ac10051c1920e88510..30a473c82be4854cc5961ff33286b36514f419b1 100644
--- a/interface/web/admin/filesync_list.php
+++ b/interface/web/admin/filesync_list.php
@@ -39,11 +39,8 @@ $list_def_file = "list/filesync.list.php";
* End Form configuration
******************************************/
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
$app->uses('tpl,listform');
diff --git a/interface/web/admin/groups_del.php b/interface/web/admin/groups_del.php
index 49588c2ce181a696912a00cfc73b45f4a69ea899..3303154f275c2f5914a92fbdddb4fe5a10165d68 100644
--- a/interface/web/admin/groups_del.php
+++ b/interface/web/admin/groups_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/groups.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/admin/groups_edit.php b/interface/web/admin/groups_edit.php
index d649f404553e51c0e6dc3d70e54c09a37459af80..d2acf2b8544d69f417edc5daa339fb1131c5327b 100644
--- a/interface/web/admin/groups_edit.php
+++ b/interface/web/admin/groups_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/groups.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/admin/groups_list.php b/interface/web/admin/groups_list.php
index 3545f04a622728b77aa74b2a939e3680ba4950e2..f75f5de698890d36d71bb7b95faa1436795d5352 100644
--- a/interface/web/admin/groups_list.php
+++ b/interface/web/admin/groups_list.php
@@ -41,11 +41,8 @@ $list_def_file = "list/groups.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
$app->uses('listform_actions');
$app->listform_actions->onLoad();
diff --git a/interface/web/admin/language_add.php b/interface/web/admin/language_add.php
index 5d1d34cba3faba872695a3fbc093480b6fb1c0c1..dc03f8616d5e2153b63bd2ec41b9662b7d570a84 100644
--- a/interface/web/admin/language_add.php
+++ b/interface/web/admin/language_add.php
@@ -30,11 +30,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION['s']['user']['modules'],'admin')) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
//* This is only allowed for administrators
if(!$app->auth->is_admin()) die('only allowed for administrators.');
diff --git a/interface/web/admin/language_edit.php b/interface/web/admin/language_edit.php
index f2b7be5e1c439d98ac1b2be8fcd8473da85ccf36..6edfb0d0f9b0511d6b4637c8a675352b777454f1 100644
--- a/interface/web/admin/language_edit.php
+++ b/interface/web/admin/language_edit.php
@@ -30,11 +30,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION['s']['user']['modules'],'admin')) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
//* This is only allowed for administrators
if(!$app->auth->is_admin()) die('only allowed for administrators.');
diff --git a/interface/web/admin/language_export.php b/interface/web/admin/language_export.php
index c2c63437c0548c54bae647e1da3da4666f827acb..d252073d399915e47d6ff3f94979c783344b65c8 100644
--- a/interface/web/admin/language_export.php
+++ b/interface/web/admin/language_export.php
@@ -30,11 +30,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION['s']['user']['modules'],'admin')) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
//* This is only allowed for administrators
if(!$app->auth->is_admin()) die('only allowed for administrators.');
diff --git a/interface/web/admin/language_import.php b/interface/web/admin/language_import.php
index 130fbc18d7450ef5e1c7ccc6d2d68187e147056e..09f11e726853377c5c1c51d20bde1556862f6c60 100644
--- a/interface/web/admin/language_import.php
+++ b/interface/web/admin/language_import.php
@@ -30,11 +30,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION['s']['user']['modules'],'admin')) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
//* This is only allowed for administrators
if(!$app->auth->is_admin()) die('only allowed for administrators.');
diff --git a/interface/web/admin/language_list.php b/interface/web/admin/language_list.php
index 47368c58f7ed477d86349b94d5d6b5b34f0969bc..cbfa619fb4dc69a737eff5f3bd9455d9a2c48b2c 100644
--- a/interface/web/admin/language_list.php
+++ b/interface/web/admin/language_list.php
@@ -30,11 +30,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION['s']['user']['modules'],'admin')) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
//* This is only allowed for administrators
if(!$app->auth->is_admin()) die('only allowed for administrators.');
diff --git a/interface/web/admin/server_del.php b/interface/web/admin/server_del.php
index b0ae30d4553482024da5c72e6f2b2dd6d45f4d05..78a0785702107b561d5bfee741bc21cf07e80eb2 100644
--- a/interface/web/admin/server_del.php
+++ b/interface/web/admin/server_del.php
@@ -1,54 +1,51 @@
-uses("tform_actions");
-$app->tform_actions->onDelete();
-
+auth->check_module_permissions('admin');
+
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
+
?>
\ No newline at end of file
diff --git a/interface/web/admin/server_edit.php b/interface/web/admin/server_edit.php
index d02dc2242eed7dfc1afe94193898642d64e3e09c..ea8dd8917199fe93fab7d2a8455fb9d3242ad140 100644
--- a/interface/web/admin/server_edit.php
+++ b/interface/web/admin/server_edit.php
@@ -1,56 +1,53 @@
-uses('tpl,tform,tform_actions');
-
-// let tform_actions handle the page
-$app->tform_actions->onLoad();
-
+auth->check_module_permissions('admin');
+
+// Loading classes
+$app->uses('tpl,tform,tform_actions');
+
+// let tform_actions handle the page
+$app->tform_actions->onLoad();
+
?>
\ No newline at end of file
diff --git a/interface/web/admin/server_ip_del.php b/interface/web/admin/server_ip_del.php
index 532e970051aa3ff9c6fa0398c6ba3164e84fd915..1229958e3916847dd824adaeb14d4225e9e42adb 100644
--- a/interface/web/admin/server_ip_del.php
+++ b/interface/web/admin/server_ip_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/server_ip.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'admin')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/admin/server_ip_edit.php b/interface/web/admin/server_ip_edit.php
index 48d42c05ec5ebd8a1dc864b64a8889ab741bd530..8b6160b9e31c63f3050c9f1481bf75ed2c4f2593 100644
--- a/interface/web/admin/server_ip_edit.php
+++ b/interface/web/admin/server_ip_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/server_ip.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'admin')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/admin/server_ip_list.php b/interface/web/admin/server_ip_list.php
index f70195344c7a162492eb2ac596387de439720876..a6bd3b83991e819bf875ab881e60260d673d82d0 100644
--- a/interface/web/admin/server_ip_list.php
+++ b/interface/web/admin/server_ip_list.php
@@ -41,11 +41,8 @@ $list_def_file = "list/server_ip.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'admin')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
$app->uses('listform_actions');
$app->listform_actions->onLoad();
diff --git a/interface/web/admin/server_list.php b/interface/web/admin/server_list.php
index bfae8779f71d5ea5c387390ee56babc1c2beebfa..985dac6771e7d352d8ccce6889fb6b324a0bfbfc 100644
--- a/interface/web/admin/server_list.php
+++ b/interface/web/admin/server_list.php
@@ -1,54 +1,51 @@
-uses('listform_actions');
-$app->listform_actions->onLoad();
-
-
+auth->check_module_permissions('admin');
+
+$app->uses('listform_actions');
+$app->listform_actions->onLoad();
+
+
?>
\ No newline at end of file
diff --git a/interface/web/admin/users_del.php b/interface/web/admin/users_del.php
index cd3b2792f713e3e8fce4ce7eaea527bc34403210..b4f3e722397989b01b22d55e31f915bced4ea5ae 100644
--- a/interface/web/admin/users_del.php
+++ b/interface/web/admin/users_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/users.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/admin/users_edit.php b/interface/web/admin/users_edit.php
index 8dab85828172f4ed70ade103faa5e0b9fac38d3b..16e6f0a07ac775c9261805af3d4c4534c27b2dda 100644
--- a/interface/web/admin/users_edit.php
+++ b/interface/web/admin/users_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/users.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/admin/users_list.php b/interface/web/admin/users_list.php
index 105922dfb55e52b17c5f697a2a2cfd8802d3241e..b113e40649e69ce4c74b54249a3635285cb448f1 100644
--- a/interface/web/admin/users_list.php
+++ b/interface/web/admin/users_list.php
@@ -41,11 +41,8 @@ $list_def_file = "list/users.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
$app->uses('listform_actions');
$app->listform_actions->onLoad();
diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
index 38bcd67fb80f1b1114a4dbe3ca3e822013922452..3a04f4623676b8943d1de0bbf91c64b0bfa534fa 100644
--- a/interface/web/client/client_del.php
+++ b/interface/web/client/client_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/client.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('client');
$app->uses('tpl,tform');
$app->load('tform_actions');
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 4852047d97544b743ff0642ae55556f41c574251..11b20a7298a14da5bc6ec2382bf18040522c02fd 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/client.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('client');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/client/client_list.php b/interface/web/client/client_list.php
index 6f5a06f2c1a2cd76434f5562a02c5ad561206f98..044c502eb4a84bb4ba23ebf55c610a1e6db16454 100644
--- a/interface/web/client/client_list.php
+++ b/interface/web/client/client_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/client.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('client');
$app->uses('listform_actions');
$app->listform_actions->onLoad();
diff --git a/interface/web/designer/form_edit.php b/interface/web/designer/form_edit.php
index 703eb0bd5ab9f46200620f217ace46bece5c63e0..4ea74c2e0cca4c5cc072704285104440f3d91186 100644
--- a/interface/web/designer/form_edit.php
+++ b/interface/web/designer/form_edit.php
@@ -1,155 +1,152 @@
-uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl','templates/form_edit.htm');
-
-// Importing variables
-$module_name = $_REQUEST["module_name"];
-$form_name = $_REQUEST["form_name"];
-
-// Checking imported variables
-if(!preg_match('/^[A-Za-z0-9_]{1,50}$/',$module_name)) die("module_name contains invalid chars.");
-if(!preg_match('/^[A-Za-z0-9_]{0,50}$/',$form_name)) die("form_name contains invalid chars.");
-
-$id = $form_name;
-
-if(count($_POST) > 1) {
- // Bestimme aktion
- if($id != '') {
- $action = 'UPDATE';
- } else {
- $action = 'INSERT';
- }
-
-
- if($error == '') {
-
- $filename = "../".$module_name."/form/".$form_name.".tform.php";
- $form_new = $_POST["form"];
-
- if(@is_file($filename)) {
- include_once($filename);
- $tabs = $form["tabs"];
- unset($form["tabs"]);
- $form_new["tabs"] = $tabs;
- }
-
- $file_content = "";
-
- die($file_content);
-
- // writing module.conf
- if (!$handle = fopen($filename, 'w')) {
- print "Cannot open file ($filename)";
- exit;
- }
-
- if (!fwrite($handle, $file_content)) {
- print "Cannot write to file ($filename)";
- exit;
- }
-
- fclose($handle);
-
- // zu Liste springen
- header("Location: form_list.php");
- exit;
-
- } else {
- $app->tpl->setVar("error","Fehler:
".$error);
- $app->tpl->setVar($_POST);
- }
-}
-
-if($id != '') {
-// Datensatz besteht bereits
- // bestehenden Datensatz anzeigen
- if($error == '') {
- // es liegt ein Fehler vor
- include_once("../".$module_name."/form/".$form_name.".tform.php");
- //$tabs = $form["tabs"];
- unset($form["tabs"]);
- $record = $form;
- $record["form_name"] = $form_name;
- $record["module_name"] = $module_name;
- $record["auth_preset_userid"] = $form["auth_preset"]["userid"];
- $record["auth_preset_groupid"] = $form["auth_preset"]["groupid"];
- $record["auth_preset_perm_user"] = $form["auth_preset"]["perm_user"];
- $record["auth_preset_perm_group"] = $form["auth_preset"]["perm_group"];
- $record["auth_preset_perm_other"] = $form["auth_preset"]["perm_other"];
- } else {
- // ein Fehler
- $record = $_POST;
- //$navi = $_POST["nav"];
- unset($_POST["tabs"]);
- }
- $record["readonly"] = 'style="background-color: #EEEEEE;" readonly';
-} else {
-// neuer datensatz
- if($error == '') {
- // es liegt kein Fehler vor
- // Pewsets
- $record["template"] = "module.tpl.htm";
- } else {
- // ein Fehler
- $record = $_POST;
- unset($_POST["tabs"]);
-
- }
- $record["readonly"] = '';
-}
-
-$record["id"] = $form_name;
-
-$app->tpl->setVar($record);
-
-include_once("lib/lang/".$_SESSION["s"]["language"]."_form_edit.lng");
-$app->tpl->setVar($wb);
-
-// Defaultwerte setzen
-$app->tpl_defaults();
-
-// Template parsen
-$app->tpl->pparse();
-
+auth->check_module_permissions('designer');
+
+// Lade Template
+$app->uses('tpl');
+$app->tpl->newTemplate("form.tpl.htm");
+$app->tpl->setInclude('content_tpl','templates/form_edit.htm');
+
+// Importing variables
+$module_name = $_REQUEST["module_name"];
+$form_name = $_REQUEST["form_name"];
+
+// Checking imported variables
+if(!preg_match('/^[A-Za-z0-9_]{1,50}$/',$module_name)) die("module_name contains invalid chars.");
+if(!preg_match('/^[A-Za-z0-9_]{0,50}$/',$form_name)) die("form_name contains invalid chars.");
+
+$id = $form_name;
+
+if(count($_POST) > 1) {
+ // Bestimme aktion
+ if($id != '') {
+ $action = 'UPDATE';
+ } else {
+ $action = 'INSERT';
+ }
+
+
+ if($error == '') {
+
+ $filename = "../".$module_name."/form/".$form_name.".tform.php";
+ $form_new = $_POST["form"];
+
+ if(@is_file($filename)) {
+ include_once($filename);
+ $tabs = $form["tabs"];
+ unset($form["tabs"]);
+ $form_new["tabs"] = $tabs;
+ }
+
+ $file_content = "";
+
+ die($file_content);
+
+ // writing module.conf
+ if (!$handle = fopen($filename, 'w')) {
+ print "Cannot open file ($filename)";
+ exit;
+ }
+
+ if (!fwrite($handle, $file_content)) {
+ print "Cannot write to file ($filename)";
+ exit;
+ }
+
+ fclose($handle);
+
+ // zu Liste springen
+ header("Location: form_list.php");
+ exit;
+
+ } else {
+ $app->tpl->setVar("error","Fehler:
".$error);
+ $app->tpl->setVar($_POST);
+ }
+}
+
+if($id != '') {
+// Datensatz besteht bereits
+ // bestehenden Datensatz anzeigen
+ if($error == '') {
+ // es liegt ein Fehler vor
+ include_once("../".$module_name."/form/".$form_name.".tform.php");
+ //$tabs = $form["tabs"];
+ unset($form["tabs"]);
+ $record = $form;
+ $record["form_name"] = $form_name;
+ $record["module_name"] = $module_name;
+ $record["auth_preset_userid"] = $form["auth_preset"]["userid"];
+ $record["auth_preset_groupid"] = $form["auth_preset"]["groupid"];
+ $record["auth_preset_perm_user"] = $form["auth_preset"]["perm_user"];
+ $record["auth_preset_perm_group"] = $form["auth_preset"]["perm_group"];
+ $record["auth_preset_perm_other"] = $form["auth_preset"]["perm_other"];
+ } else {
+ // ein Fehler
+ $record = $_POST;
+ //$navi = $_POST["nav"];
+ unset($_POST["tabs"]);
+ }
+ $record["readonly"] = 'style="background-color: #EEEEEE;" readonly';
+} else {
+// neuer datensatz
+ if($error == '') {
+ // es liegt kein Fehler vor
+ // Pewsets
+ $record["template"] = "module.tpl.htm";
+ } else {
+ // ein Fehler
+ $record = $_POST;
+ unset($_POST["tabs"]);
+
+ }
+ $record["readonly"] = '';
+}
+
+$record["id"] = $form_name;
+
+$app->tpl->setVar($record);
+
+include_once("lib/lang/".$_SESSION["s"]["language"]."_form_edit.lng");
+$app->tpl->setVar($wb);
+
+// Defaultwerte setzen
+$app->tpl_defaults();
+
+// Template parsen
+$app->tpl->pparse();
+
?>
\ No newline at end of file
diff --git a/interface/web/designer/form_list.php b/interface/web/designer/form_list.php
index 5103216d5eed9071c8c784a138cf8e8f774db51a..249b5e8807ba43a5b9b81a65e97ebff8235213f6 100644
--- a/interface/web/designer/form_list.php
+++ b/interface/web/designer/form_list.php
@@ -30,11 +30,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION['s']['user']['modules'],$_SESSION['s']['module']['name'])) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
$app->uses('tpl');
diff --git a/interface/web/designer/form_show.php b/interface/web/designer/form_show.php
index 3b9e7e1e035462c9b5bb0a99446c2cb162b7ab00..77bb080a1ea894d514023477190c298ac010c5d6 100644
--- a/interface/web/designer/form_show.php
+++ b/interface/web/designer/form_show.php
@@ -1,122 +1,119 @@
-uses('tpl');
-
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl','templates/form_show.htm');
-
-
-// TODO: Check ID for malicius chars
-$module_name = $_REQUEST["module_name"];
-$form_name = $_REQUEST["form_name"];
-
-if(!preg_match('/^[A-Za-z0-9_]{1,50}$/',$module_name)) die("module_name contains invalid chars.");
-if(!preg_match('/^[A-Za-z0-9_]{1,50}$/',$form_name)) die("form_name contains invalid chars.");
-
-include_once("../".$module_name."/form/".$form_name.".tform.php");
-$tabs = $form["tabs"];
-unset($form["tabs"]);
-$record = $form;
-$record["form_name"] = $form_name;
-$record["module_name"] = $module_name;
-
-// loading language file
-$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_form_show.lng";
-include($lng_file);
-$app->tpl->setVar($wb);
-
-// baue Tabs navi
-$content = "";
-$n1 = 0;
-$n2 = 0;
-if(is_array($tabs)) {
-foreach($tabs as $tab_id => $tab) {
- $content .= "
-
-
- |
-
";
- $n1++;
-}
-}
-
-$record["nav"] = $content;
-
-
-$app->tpl->setVar($record);
-
-
-$app->tpl->setLoop('records',$modules_list);
-
-$app->tpl_defaults();
-$app->tpl->pparse();
-
-
-
+auth->check_module_permissions('designer');
+
+if($_SESSION["s"]["user"]["typ"] != "admin") die("Admin permissions required.");
+
+$app->uses('tpl');
+
+$app->tpl->newTemplate("form.tpl.htm");
+$app->tpl->setInclude('content_tpl','templates/form_show.htm');
+
+
+// TODO: Check ID for malicius chars
+$module_name = $_REQUEST["module_name"];
+$form_name = $_REQUEST["form_name"];
+
+if(!preg_match('/^[A-Za-z0-9_]{1,50}$/',$module_name)) die("module_name contains invalid chars.");
+if(!preg_match('/^[A-Za-z0-9_]{1,50}$/',$form_name)) die("form_name contains invalid chars.");
+
+include_once("../".$module_name."/form/".$form_name.".tform.php");
+$tabs = $form["tabs"];
+unset($form["tabs"]);
+$record = $form;
+$record["form_name"] = $form_name;
+$record["module_name"] = $module_name;
+
+// loading language file
+$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_form_show.lng";
+include($lng_file);
+$app->tpl->setVar($wb);
+
+// baue Tabs navi
+$content = "";
+$n1 = 0;
+$n2 = 0;
+if(is_array($tabs)) {
+foreach($tabs as $tab_id => $tab) {
+ $content .= "
+
+
+ |
+
";
+ $n1++;
+}
+}
+
+$record["nav"] = $content;
+
+
+$app->tpl->setVar($record);
+
+
+$app->tpl->setLoop('records',$modules_list);
+
+$app->tpl_defaults();
+$app->tpl->pparse();
+
+
+
?>
\ No newline at end of file
diff --git a/interface/web/designer/module_edit.php b/interface/web/designer/module_edit.php
index f1a9ad70b0f47da02463ee6b54ae55f882c0befb..9a8df309e901efeb2da1092114d02a19cd27c122 100644
--- a/interface/web/designer/module_edit.php
+++ b/interface/web/designer/module_edit.php
@@ -32,11 +32,8 @@ require_once('../../lib/app.inc.php');
if($_SESSION["s"]["user"]["typ"] != "admin") die("Admin permissions required.");
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
// Lade Template
$app->uses('tpl');
diff --git a/interface/web/designer/module_list.php b/interface/web/designer/module_list.php
index 61509971f9246cc8df268cbe85ef1208c8363818..92aa4f0e8d79941ccfede22cb0cb57ec170de24e 100644
--- a/interface/web/designer/module_list.php
+++ b/interface/web/designer/module_list.php
@@ -30,11 +30,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-//* Check permissions for the module
-if(!stristr($_SESSION['s']['user']['modules'],$_SESSION['s']['module']['name'])) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
$app->uses('tpl');
diff --git a/interface/web/designer/module_nav_del.php b/interface/web/designer/module_nav_del.php
index f0a6b5683a041c58e2b8036cbf7318aae90cac83..18c5bf4d14c09f3968446e6c14d95a9cfd4d7e40 100644
--- a/interface/web/designer/module_nav_del.php
+++ b/interface/web/designer/module_nav_del.php
@@ -32,11 +32,8 @@ require_once('../../lib/app.inc.php');
if($_SESSION["s"]["user"]["typ"] != "admin") die("Admin permissions required.");
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
// Lade Template
$app->uses('tpl');
diff --git a/interface/web/designer/module_nav_edit.php b/interface/web/designer/module_nav_edit.php
index 27fbb78e75fe1a8fbc5c8f419e89cb75ff97c49d..73c010e821457c4f4165811932dbe5fbf6fed61e 100644
--- a/interface/web/designer/module_nav_edit.php
+++ b/interface/web/designer/module_nav_edit.php
@@ -36,10 +36,7 @@ if($_SESSION['s']['user']['typ'] != 'admin'){
}
//* Check permissions for module
-if(!stristr($_SESSION['s']['user']['modules'],$_SESSION['s']['module']['name'])) {
- header('Location: ../index.php');
- exit;
-}
+$app->auth->check_module_permissions('designer');
//* Load template
$app->uses('tpl');
diff --git a/interface/web/designer/module_nav_flip.php b/interface/web/designer/module_nav_flip.php
index 2218402f5d66623d994e6110638d87d7f1798464..f3fc164d94c0068f0ade0e18834ff779f8f6f7e8 100644
--- a/interface/web/designer/module_nav_flip.php
+++ b/interface/web/designer/module_nav_flip.php
@@ -32,11 +32,8 @@ require_once('../../lib/app.inc.php');
if($_SESSION["s"]["user"]["typ"] != "admin") die("Admin permissions required.");
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
// Lade Template
$app->uses('tpl');
diff --git a/interface/web/designer/module_nav_item_del.php b/interface/web/designer/module_nav_item_del.php
index aa537a1d147ab02f4f6b8d35909fde112b69fa0e..cd458cd21e0d930628a6262778b6270dbb830c51 100644
--- a/interface/web/designer/module_nav_item_del.php
+++ b/interface/web/designer/module_nav_item_del.php
@@ -32,11 +32,8 @@ require_once('../../lib/app.inc.php');
if($_SESSION["s"]["user"]["typ"] != "admin") die("Admin permissions required.");
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
// Lade Template
$app->uses('tpl');
diff --git a/interface/web/designer/module_nav_item_edit.php b/interface/web/designer/module_nav_item_edit.php
index 44b176886af8e85ec6146661446d23c8da968647..5948aba5b87d6df4c172a09fbd6d44d463b07591 100644
--- a/interface/web/designer/module_nav_item_edit.php
+++ b/interface/web/designer/module_nav_item_edit.php
@@ -32,11 +32,8 @@ require_once('../../lib/app.inc.php');
if($_SESSION["s"]["user"]["typ"] != "admin") die("Admin permissions required.");
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
// Lade Template
$app->uses('tpl');
diff --git a/interface/web/designer/module_nav_item_flip.php b/interface/web/designer/module_nav_item_flip.php
index d21f491dce58215a2e49ae169f410b6af0e95459..2ec0566af4db9ea6d51f2a06ac4befc93cdc978f 100644
--- a/interface/web/designer/module_nav_item_flip.php
+++ b/interface/web/designer/module_nav_item_flip.php
@@ -32,11 +32,8 @@ require_once('../../lib/app.inc.php');
if($_SESSION["s"]["user"]["typ"] != "admin") die("Admin permissions required.");
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
// Lade Template
$app->uses('tpl');
diff --git a/interface/web/designer/module_show.php b/interface/web/designer/module_show.php
index 8ad943509905b661084d9b71e04fa34bf6ffb9c9..44548784d36d3d2588ebeba54a2e3fc6e87c782e 100644
--- a/interface/web/designer/module_show.php
+++ b/interface/web/designer/module_show.php
@@ -30,11 +30,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('designer');
if($_SESSION["s"]["user"]["typ"] != "admin") die("Admin permissions required.");
diff --git a/interface/web/dns/dns_a_edit.php b/interface/web/dns/dns_a_edit.php
index c5a24d1e322e441b83f1f015fdec44de5f2980b7..5fcb4008ca7875f11a27b8f6791311db426bdc30 100644
--- a/interface/web/dns/dns_a_edit.php
+++ b/interface/web/dns/dns_a_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_a.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_a_list.php b/interface/web/dns/dns_a_list.php
index 6899b3ad937da3a9511ddaf3c31742f4d7b00b8a..c01aec69436fde760b710d4c61563552eccaea8a 100644
--- a/interface/web/dns/dns_a_list.php
+++ b/interface/web/dns/dns_a_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/dns_a.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
$app->uses('listform_actions');
$app->listform_actions->SQLExtWhere = "type = 'A'";
diff --git a/interface/web/dns/dns_alias_edit.php b/interface/web/dns/dns_alias_edit.php
index f359fec69ab8522ad1991076ab46a3239ae2ab37..e952f56d0b87ac3bb14efb47cf8382bc0cfc8fb1 100644
--- a/interface/web/dns/dns_alias_edit.php
+++ b/interface/web/dns/dns_alias_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_alias.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_cname_edit.php b/interface/web/dns/dns_cname_edit.php
index 8ad00dcbaf01e7649f7749fff9497bd68d8bb1fb..5123d10e737aa6a7841e7955b5ee20dd882db2ef 100644
--- a/interface/web/dns/dns_cname_edit.php
+++ b/interface/web/dns/dns_cname_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_cname.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_hinfo_edit.php b/interface/web/dns/dns_hinfo_edit.php
index fd9341ec63fe543332bd5af549a7c209688f7f66..950d74eca1edb393f7a5f7095b0675643be1bbc7 100644
--- a/interface/web/dns/dns_hinfo_edit.php
+++ b/interface/web/dns/dns_hinfo_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_hinfo.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_mx_edit.php b/interface/web/dns/dns_mx_edit.php
index 90544da3498ffc741436e808c8bb5ab5cdd84bf7..112a4daf7ea3b93ca6a7c059b05b7b7dda75df74 100644
--- a/interface/web/dns/dns_mx_edit.php
+++ b/interface/web/dns/dns_mx_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_mx.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_ns_edit.php b/interface/web/dns/dns_ns_edit.php
index 6e777087ea9fe4ec37467c35ef620fd82a6eb5f5..74ce119b954419b1952590eed890c3365a76bdb4 100644
--- a/interface/web/dns/dns_ns_edit.php
+++ b/interface/web/dns/dns_ns_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_ns.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_ptr_edit.php b/interface/web/dns/dns_ptr_edit.php
index 43356482fe2a06ce322c05a9a64ce7071b2746ca..3828aa01e946603ca0f0d40f97f3ef736e052330 100644
--- a/interface/web/dns/dns_ptr_edit.php
+++ b/interface/web/dns/dns_ptr_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_ptr.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_rp_edit.php b/interface/web/dns/dns_rp_edit.php
index e8cb6847ecf6aaaf53336fb420ff7727f44fce70..ef70c1e85620f3a0cc8ec15afe99abd44aa746ba 100644
--- a/interface/web/dns/dns_rp_edit.php
+++ b/interface/web/dns/dns_rp_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_rp.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_rr_del.php b/interface/web/dns/dns_rr_del.php
index d996c915be561ab305e320191b1427ef3aa087c3..e0088d2fc94c7798a565a565095518895f1141fc 100644
--- a/interface/web/dns/dns_rr_del.php
+++ b/interface/web/dns/dns_rr_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/dns_a.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/dns/dns_soa_del.php b/interface/web/dns/dns_soa_del.php
index 5cbb77f79c9424538a94afeba61894f6fc3b8040..de223fa970746e7031f42b5246a0a514577a8151 100644
--- a/interface/web/dns/dns_soa_del.php
+++ b/interface/web/dns/dns_soa_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/dns_soa.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index 0526e5e3cd72f4f682af137dbe93ab2803471b82..6c10b06b71295ebc35638251c9514f625d4e497b 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_soa.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_soa_list.php b/interface/web/dns/dns_soa_list.php
index 3f608a4d9baf9cebc623b2d277126c59ba1f4b97..0f467820d5688b5c20e26c53737d63f16e92c4fa 100644
--- a/interface/web/dns/dns_soa_list.php
+++ b/interface/web/dns/dns_soa_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/dns_soa.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
$app->uses('listform_actions');
// $app->listform_actions->SQLExtWhere = "access = 'REJECT'";
diff --git a/interface/web/dns/dns_srv_edit.php b/interface/web/dns/dns_srv_edit.php
index f6d362ffa4a02cf165b143b783ca7fed9df19b88..74177666fcd1caa740ef2af83c01e7530c634080 100644
--- a/interface/web/dns/dns_srv_edit.php
+++ b/interface/web/dns/dns_srv_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_srv.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/dns/dns_txt_edit.php b/interface/web/dns/dns_txt_edit.php
index ab923ebfb5171860afa303e89bf0ae40268f17c3..1fda14cce3fe0a2027da9c19965150c9dd388fcd 100644
--- a/interface/web/dns/dns_txt_edit.php
+++ b/interface/web/dns/dns_txt_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/dns_txt.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'dns')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('dns');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/help/support_message_del.php b/interface/web/help/support_message_del.php
index 721197c2b0eb6a08e39fffea3db76ac4594c8626..63c23a0aa3036c157a9c5da186846fbf118bacc9 100644
--- a/interface/web/help/support_message_del.php
+++ b/interface/web/help/support_message_del.php
@@ -38,11 +38,8 @@ $tform_def_file = 'form/support_message.tform.php';
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Check module permissions
-if(!stristr($_SESSION['s']['user']['modules'], 'help')) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('help');
//* Load the form
$app->uses('tform_actions');
diff --git a/interface/web/help/support_message_edit.php b/interface/web/help/support_message_edit.php
index a36b5dbffaaa5cf7290d25f31c305ba14d993552..bef1e9b177aea648dbb177671209466e19e8d6bd 100644
--- a/interface/web/help/support_message_edit.php
+++ b/interface/web/help/support_message_edit.php
@@ -7,11 +7,8 @@ $tform_def_file = 'form/support_message.tform.php';
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-//* Checking module permissions
-if(!stristr($_SESSION['s']['user']['modules'],'help')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('help');
//* Loading the templating and form classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/help/support_message_list.php b/interface/web/help/support_message_list.php
index ce990e4df73439420f9df89052c31de6d823adc3..a4d9fdcd52ebbb988ee417e9aca11c114364a35e 100644
--- a/interface/web/help/support_message_list.php
+++ b/interface/web/help/support_message_list.php
@@ -5,11 +5,8 @@ require_once('../../lib/app.inc.php');
//* Path to the list definition file
$list_def_file = "list/support_message.list.php";
-//* Check the module permissions
-if(!stristr($_SESSION['s']['user']["modules"], 'help')) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('help');
//* Loading the class
$app->uses('listform_actions');
diff --git a/interface/web/mail/mail_alias_del.php b/interface/web/mail/mail_alias_del.php
index 03b95ca7ed9ee5d713d0659404ca781b57e2a38c..6457f6d86c9da18a809f3c9b8d912d93151317bf 100644
--- a/interface/web/mail/mail_alias_del.php
+++ b/interface/web/mail/mail_alias_del.php
@@ -1,54 +1,51 @@
-uses("tform_actions");
-$app->tform_actions->onDelete();
-
+auth->check_module_permissions('mail');
+
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
+
?>
\ No newline at end of file
diff --git a/interface/web/mail/mail_alias_edit.php b/interface/web/mail/mail_alias_edit.php
index 3344feb430d7c1e21eb0418b9abed3daadefdeed..9ef53c61311289bc5ae4980d5adcf474b94056b2 100644
--- a/interface/web/mail/mail_alias_edit.php
+++ b/interface/web/mail/mail_alias_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_alias.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_alias_list.php b/interface/web/mail/mail_alias_list.php
index d1fce3b46edd28cc253c918ac3d5c4ba138d80b9..1ee6ad6f5587d286e7d4e9b19531924d5c901109 100644
--- a/interface/web/mail/mail_alias_list.php
+++ b/interface/web/mail/mail_alias_list.php
@@ -1,29 +1,26 @@
-uses('listform_actions');
-
-// Limit the results to alias domains
-$app->listform_actions->SQLExtWhere = "type = 'alias'";
-
-$app->listform_actions->onLoad();
-
-
+auth->check_module_permissions('mail');
+
+$app->uses('listform_actions');
+
+// Limit the results to alias domains
+$app->listform_actions->SQLExtWhere = "type = 'alias'";
+
+$app->listform_actions->onLoad();
+
+
?>
\ No newline at end of file
diff --git a/interface/web/mail/mail_blacklist_del.php b/interface/web/mail/mail_blacklist_del.php
index 5a453db09893ae9cb2ac865354b31021fc77426d..52308e615921b311499f7548e19c2f9effa7ae11 100644
--- a/interface/web/mail/mail_blacklist_del.php
+++ b/interface/web/mail/mail_blacklist_del.php
@@ -1,54 +1,51 @@
-uses("tform_actions");
-$app->tform_actions->onDelete();
-
+auth->check_module_permissions('mail');
+
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
+
?>
\ No newline at end of file
diff --git a/interface/web/mail/mail_blacklist_edit.php b/interface/web/mail/mail_blacklist_edit.php
index 31dded5623e4b7f65ccdb53bf405339df3731548..1e8629b2c4ce6cb4393a7fc510ed567e6f166e0f 100644
--- a/interface/web/mail/mail_blacklist_edit.php
+++ b/interface/web/mail/mail_blacklist_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_blacklist.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_blacklist_list.php b/interface/web/mail/mail_blacklist_list.php
index d6b2700708a4a80f48a97f42c2a649ca9b64f742..000afd1a361a7e089d15f8e8e6eb9fb13f5962c3 100644
--- a/interface/web/mail/mail_blacklist_list.php
+++ b/interface/web/mail/mail_blacklist_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_blacklist.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
$app->listform_actions->SQLExtWhere = "access = 'REJECT'";
diff --git a/interface/web/mail/mail_content_filter_del.php b/interface/web/mail/mail_content_filter_del.php
index 7cede6c93a0ec2c8429c54c3415249bc38c15dec..1cf9246dfc5d2a623f670fdbe5e4c79ea21cb343 100644
--- a/interface/web/mail/mail_content_filter_del.php
+++ b/interface/web/mail/mail_content_filter_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/mail_content_filter.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/mail_content_filter_edit.php b/interface/web/mail/mail_content_filter_edit.php
index d02bc5d43cd30901150afd9c3ecc8c97e4d6fb0a..2913e8d7adb261fb8aee20903aae4e005a20c503 100644
--- a/interface/web/mail/mail_content_filter_edit.php
+++ b/interface/web/mail/mail_content_filter_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_content_filter.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
if(!$_SESSION["s"]["user"]["typ"] == 'admin') die('These Filters are only for Admins.');
diff --git a/interface/web/mail/mail_content_filter_list.php b/interface/web/mail/mail_content_filter_list.php
index 59ddb1eccc820ddead3053d0f28ff26f0a0e581a..c2eb5e1382d3b057b21d00afa8c3f75bad79fdac 100644
--- a/interface/web/mail/mail_content_filter_list.php
+++ b/interface/web/mail/mail_content_filter_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_content_filter.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
diff --git a/interface/web/mail/mail_domain_catchall_del.php b/interface/web/mail/mail_domain_catchall_del.php
index 83024d8cbca8e37f223e685d38b91663e6bf1448..7eb21c7416651a5ccbbe219c3b483e21b6f48704 100644
--- a/interface/web/mail/mail_domain_catchall_del.php
+++ b/interface/web/mail/mail_domain_catchall_del.php
@@ -1,54 +1,51 @@
-uses("tform_actions");
-$app->tform_actions->onDelete();
-
+auth->check_module_permissions('mail');
+
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
+
?>
\ No newline at end of file
diff --git a/interface/web/mail/mail_domain_catchall_edit.php b/interface/web/mail/mail_domain_catchall_edit.php
index 5cded1ae703c612e4f971955787c4bd99aac2238..f6c27fcb5b031907c034f6424a35de77f0e90709 100644
--- a/interface/web/mail/mail_domain_catchall_edit.php
+++ b/interface/web/mail/mail_domain_catchall_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_domain_catchall.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_domain_catchall_list.php b/interface/web/mail/mail_domain_catchall_list.php
index 412bb43f7501844cdd6c1e2b906b9aba8ca63b52..e07495fd86e0488f82910f828fa3591af0ffbd50 100644
--- a/interface/web/mail/mail_domain_catchall_list.php
+++ b/interface/web/mail/mail_domain_catchall_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_domain_catchall.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
diff --git a/interface/web/mail/mail_domain_del.php b/interface/web/mail/mail_domain_del.php
index c2c32ad8ec43d83e74ab3f785a0895bd93d6d061..f9fbc097384706031a96818fbafdd0630d73ca71 100644
--- a/interface/web/mail/mail_domain_del.php
+++ b/interface/web/mail/mail_domain_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/mail_domain.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index a96e2a3c664df1de2b146a3ce52a521650729b4c..a9377c6d9019e8789754f4ace678587288fd6453 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_domain.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_domain_list.php b/interface/web/mail/mail_domain_list.php
index ee8d88c70cc4901e4ca0487f6137528298e6ca81..5bdfb69044981fb8286d9ab60a827bcad9c3baa4 100644
--- a/interface/web/mail/mail_domain_list.php
+++ b/interface/web/mail/mail_domain_list.php
@@ -13,11 +13,8 @@ $list_def_file = "list/mail_domain.list.php";
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
diff --git a/interface/web/mail/mail_forward_del.php b/interface/web/mail/mail_forward_del.php
index e9b179b43b4ada70da297d4ab408d592106b160f..716a780b7095076a8a52ee47d5083431a9849f8a 100644
--- a/interface/web/mail/mail_forward_del.php
+++ b/interface/web/mail/mail_forward_del.php
@@ -1,54 +1,51 @@
-uses("tform_actions");
-$app->tform_actions->onDelete();
-
+auth->check_module_permissions('mail');
+
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
+
?>
\ No newline at end of file
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
index 9a7b2e9a7c9564269340ce0d053ed1b7ea8f1e05..a8cfd0306a4b1be59783c934679aa6236a217368 100644
--- a/interface/web/mail/mail_forward_edit.php
+++ b/interface/web/mail/mail_forward_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_forward.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_forward_list.php b/interface/web/mail/mail_forward_list.php
index 77330c44bc224c62b7ccfae3c73269505d27d66e..40c824433485b065f26edd1cc3961ef84d02db7f 100644
--- a/interface/web/mail/mail_forward_list.php
+++ b/interface/web/mail/mail_forward_list.php
@@ -1,29 +1,26 @@
-uses('listform_actions');
-
-// Limit the results to alias domains
-$app->listform_actions->SQLExtWhere = "type = 'forward'";
-
-$app->listform_actions->onLoad();
-
-
+auth->check_module_permissions('mail');
+
+$app->uses('listform_actions');
+
+// Limit the results to alias domains
+$app->listform_actions->SQLExtWhere = "type = 'forward'";
+
+$app->listform_actions->onLoad();
+
+
?>
\ No newline at end of file
diff --git a/interface/web/mail/mail_get_del.php b/interface/web/mail/mail_get_del.php
index b8eae9aeafa47e383c26908dacb56405b062bd55..5a528a8b0c63b556059b49a0c99e8af279644547 100644
--- a/interface/web/mail/mail_get_del.php
+++ b/interface/web/mail/mail_get_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/mail_get.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/mail_get_edit.php b/interface/web/mail/mail_get_edit.php
index 1da67355e1bfa69f51d7ee4a9613288990e6d28a..de97422f45497efdd7b189fc132ba84e98a4ca79 100644
--- a/interface/web/mail/mail_get_edit.php
+++ b/interface/web/mail/mail_get_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_get.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_get_list.php b/interface/web/mail/mail_get_list.php
index 55300d36098ab534cbc0c9dcd865ea885b475d77..f4850583f31ad0c372946329413ce6e64ed244f4 100644
--- a/interface/web/mail/mail_get_list.php
+++ b/interface/web/mail/mail_get_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_get.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
diff --git a/interface/web/mail/mail_spamfilter_del.php b/interface/web/mail/mail_spamfilter_del.php
index a6985ef46bbbed579671ddd776506ff8b54d337f..6d922b50839549a3140fda1296f68d7bde991378 100644
--- a/interface/web/mail/mail_spamfilter_del.php
+++ b/interface/web/mail/mail_spamfilter_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/mail_spamfilter.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/mail_spamfilter_edit.php b/interface/web/mail/mail_spamfilter_edit.php
index 2c3766a99af37480f63540f80496112508e4057b..5009f4981c72be99dbdb499fcd560a3ecc45d7d2 100644
--- a/interface/web/mail/mail_spamfilter_edit.php
+++ b/interface/web/mail/mail_spamfilter_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_spamfilter.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_spamfilter_list.php b/interface/web/mail/mail_spamfilter_list.php
index e510589ee12a193392d129454d35b8aa76fedcaf..8979a4696c42e687d25c34c5212f071122c630aa 100644
--- a/interface/web/mail/mail_spamfilter_list.php
+++ b/interface/web/mail/mail_spamfilter_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_spamfilter.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
diff --git a/interface/web/mail/mail_transport_del.php b/interface/web/mail/mail_transport_del.php
index fd0fcee7ee6eaec4454a752f5303b73b8f112345..1c2ec67e2aaa38a95896dd4a0e9f1747b375d371 100644
--- a/interface/web/mail/mail_transport_del.php
+++ b/interface/web/mail/mail_transport_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/mail_transport.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php
index 6ee7f056c16467607817de72b8590de2f23b866d..8075a1d1e5df8557803e2b01ec6ac2aa37f8203b 100644
--- a/interface/web/mail/mail_transport_edit.php
+++ b/interface/web/mail/mail_transport_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_transport.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
diff --git a/interface/web/mail/mail_transport_list.php b/interface/web/mail/mail_transport_list.php
index aa43090444819dc99a447e4f3bfd98a1e99d678f..9d87728e6b6ed995885d7ae9f6fb08929542ef1b 100644
--- a/interface/web/mail/mail_transport_list.php
+++ b/interface/web/mail/mail_transport_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_transport.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
diff --git a/interface/web/mail/mail_user_del.php b/interface/web/mail/mail_user_del.php
index af6e6db412df5d67e518d4bdce5ff2748d95bfba..26215cf09f96c972fc66f958eefe66c51d7482dc 100644
--- a/interface/web/mail/mail_user_del.php
+++ b/interface/web/mail/mail_user_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/mail_user.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 9d08bd7a45bce8c9ef483f8c77b5932d13f0948f..2c666b0044f11200ab6fb7fcc6567538cc537b47 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_user.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_user_list.php b/interface/web/mail/mail_user_list.php
index c2b7bcc26ee76d44ef8a0c1ec2ab95d47d4e79a8..7e728afe942acd001e7a1ca7c016269a90dd0a72 100644
--- a/interface/web/mail/mail_user_list.php
+++ b/interface/web/mail/mail_user_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_user.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
diff --git a/interface/web/mail/mail_user_stats.php b/interface/web/mail/mail_user_stats.php
index ad431e91fd9a6735167ac1e6404c1682ee5b3e9b..f7858aa29fb934c64a77e5ca1c1a5c5c1a317353 100644
--- a/interface/web/mail/mail_user_stats.php
+++ b/interface/web/mail/mail_user_stats.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_user_stats.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->load('listform_actions');
diff --git a/interface/web/mail/mail_whitelist_del.php b/interface/web/mail/mail_whitelist_del.php
index 47c01892c41b2defc8e6ed0b90e6e2e94cf4221a..bb083e652fc4f4592284dfd82077df2d76731262 100644
--- a/interface/web/mail/mail_whitelist_del.php
+++ b/interface/web/mail/mail_whitelist_del.php
@@ -1,54 +1,51 @@
-uses("tform_actions");
-$app->tform_actions->onDelete();
-
+auth->check_module_permissions('mail');
+
+$app->uses("tform_actions");
+$app->tform_actions->onDelete();
+
?>
\ No newline at end of file
diff --git a/interface/web/mail/mail_whitelist_edit.php b/interface/web/mail/mail_whitelist_edit.php
index 32518e8aa52c5ecfc7ff2ccf6a0d7c306f7278d3..2a6134e43d20212ca25960397b4b8f9bd9d8decf 100644
--- a/interface/web/mail/mail_whitelist_edit.php
+++ b/interface/web/mail/mail_whitelist_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/mail_whitelist.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/mail_whitelist_list.php b/interface/web/mail/mail_whitelist_list.php
index 68443334413082060dfaf4c2ac525f455664e2c6..6a5358e26f2456674d2bba5b0f3fa9a8c8d8456f 100644
--- a/interface/web/mail/mail_whitelist_list.php
+++ b/interface/web/mail/mail_whitelist_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/mail_whitelist.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
$app->listform_actions->SQLExtWhere = "access = 'OK'";
diff --git a/interface/web/mail/spamfilter_blacklist_del.php b/interface/web/mail/spamfilter_blacklist_del.php
index 5c87c2ca445b9270da0580a239bdb249db5ecc8b..479d6fd18f804c301185337307083eaa408ae502 100644
--- a/interface/web/mail/spamfilter_blacklist_del.php
+++ b/interface/web/mail/spamfilter_blacklist_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/spamfilter_blacklist.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/spamfilter_blacklist_edit.php b/interface/web/mail/spamfilter_blacklist_edit.php
index 729c23ebd97c7762363713c015508f5bbd101fe6..f33f96418920d12776acab75cbef7c3df7fe415f 100644
--- a/interface/web/mail/spamfilter_blacklist_edit.php
+++ b/interface/web/mail/spamfilter_blacklist_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/spamfilter_blacklist.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/spamfilter_blacklist_list.php b/interface/web/mail/spamfilter_blacklist_list.php
index 2b8b322dab4c6ed9152b42459e598dbee4549705..c2cc411092fcf058764dddc6b288c0c5c8ca22f3 100644
--- a/interface/web/mail/spamfilter_blacklist_list.php
+++ b/interface/web/mail/spamfilter_blacklist_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/spamfilter_blacklist.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
$app->listform_actions->SQLExtWhere = "wb = 'B'";
diff --git a/interface/web/mail/spamfilter_config_del.php b/interface/web/mail/spamfilter_config_del.php
index 8ca69b1d3b66d6940914985350472ef1f3db2041..8da9f45defc8347c4770bebfa7131e5ca56e005b 100644
--- a/interface/web/mail/spamfilter_config_del.php
+++ b/interface/web/mail/spamfilter_config_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/spamfilter_config.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/spamfilter_config_edit.php b/interface/web/mail/spamfilter_config_edit.php
index 480e24988f2d265c1ef292ea2ef240e76afb9027..ad9d2b561f250d91b84deff400fda7f10332a7ea 100644
--- a/interface/web/mail/spamfilter_config_edit.php
+++ b/interface/web/mail/spamfilter_config_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/spamfilter_config.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/spamfilter_config_list.php b/interface/web/mail/spamfilter_config_list.php
index 4457171b6590d2c9e4a0dc1d6cf0435d7a1292ea..b61472b307ccc57ad6deb26767dfbf9d292007b0 100644
--- a/interface/web/mail/spamfilter_config_list.php
+++ b/interface/web/mail/spamfilter_config_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/spamfilter_config.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'mail')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
//$app->listform_actions->SQLExtWhere = "wb = 'W'";
diff --git a/interface/web/mail/spamfilter_policy_del.php b/interface/web/mail/spamfilter_policy_del.php
index 46c69ed3f53a55a31af733823a3f013af3a4d4ae..12b6a199268b4e9b2ae2b5c739553e476019e5e7 100644
--- a/interface/web/mail/spamfilter_policy_del.php
+++ b/interface/web/mail/spamfilter_policy_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/spamfilter_policy.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/spamfilter_policy_edit.php b/interface/web/mail/spamfilter_policy_edit.php
index d5d52d5fc79d81d60893ca0a2625ace10284aaf0..03b569bd0a633234240e137f2be8a07ad4dc1c79 100644
--- a/interface/web/mail/spamfilter_policy_edit.php
+++ b/interface/web/mail/spamfilter_policy_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/spamfilter_policy.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/spamfilter_policy_list.php b/interface/web/mail/spamfilter_policy_list.php
index 539f8a16f5c6bd850ca2c49cc3dba01706252a73..504a2bd54de04811ede1c975b98f81c0e43b6c68 100644
--- a/interface/web/mail/spamfilter_policy_list.php
+++ b/interface/web/mail/spamfilter_policy_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/spamfilter_policy.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
//$app->listform_actions->SQLExtWhere = "wb = 'W'";
diff --git a/interface/web/mail/spamfilter_users_del.php b/interface/web/mail/spamfilter_users_del.php
index 059376eb23751add73badf3a414606cf68c85af5..83418c8888dbf17bdecbdba1ac86e88a1e3ad15a 100644
--- a/interface/web/mail/spamfilter_users_del.php
+++ b/interface/web/mail/spamfilter_users_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/spamfilter_users.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/spamfilter_users_edit.php b/interface/web/mail/spamfilter_users_edit.php
index 77050b5de260f4dbd3aaa6d277fb73a905f5039d..503ff4412df077c0452a2da6bd26edb8eb85ce14 100644
--- a/interface/web/mail/spamfilter_users_edit.php
+++ b/interface/web/mail/spamfilter_users_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/spamfilter_users.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/spamfilter_users_list.php b/interface/web/mail/spamfilter_users_list.php
index cc33aaecebbb240bb4b41ca3271ec90defc2c775..af17f134f5f5a9cc9cff7b870e29d69aa60305bc 100644
--- a/interface/web/mail/spamfilter_users_list.php
+++ b/interface/web/mail/spamfilter_users_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/spamfilter_users.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
//$app->listform_actions->SQLExtWhere = "wb = 'W'";
diff --git a/interface/web/mail/spamfilter_whitelist_del.php b/interface/web/mail/spamfilter_whitelist_del.php
index 19803db94237355c968b11d54327384a2e987cb9..2f27d02ea67e14741fe67f063fe927e078bb9e4e 100644
--- a/interface/web/mail/spamfilter_whitelist_del.php
+++ b/interface/web/mail/spamfilter_whitelist_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/spamfilter_whitelist.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/mail/spamfilter_whitelist_edit.php b/interface/web/mail/spamfilter_whitelist_edit.php
index 3630986afaf904d8647e1e9d8990455da10438dd..44d10edb115c3feba8242b921971fcad97c748a7 100644
--- a/interface/web/mail/spamfilter_whitelist_edit.php
+++ b/interface/web/mail/spamfilter_whitelist_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/spamfilter_whitelist.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/mail/spamfilter_whitelist_list.php b/interface/web/mail/spamfilter_whitelist_list.php
index 2ca0064ae25436ff9ab3db2d55eb5645644e38a5..12c622a8e5ef8bd4c809074d2092a8b56dee4383 100644
--- a/interface/web/mail/spamfilter_whitelist_list.php
+++ b/interface/web/mail/spamfilter_whitelist_list.php
@@ -12,11 +12,8 @@ $list_def_file = "list/spamfilter_whitelist.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
$app->uses('listform_actions');
$app->listform_actions->SQLExtWhere = "wb = 'W'";
diff --git a/interface/web/monitor/logview.php b/interface/web/monitor/logview.php
index 2630e11714184d94199bb0bc1b38502a792b4be2..84387ef6c0907ee81a6102150f91e3149bdc7267 100644
--- a/interface/web/monitor/logview.php
+++ b/interface/web/monitor/logview.php
@@ -31,11 +31,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'monitor')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('monitor');
// Loading the template
$app->uses('tpl');
diff --git a/interface/web/monitor/system.php b/interface/web/monitor/system.php
index 8286e2cb2f4f15916703ad9365db2f31cf65776f..430a351f32d3c9d6c85ed06ca1f2c93e7b10da02 100644
--- a/interface/web/monitor/system.php
+++ b/interface/web/monitor/system.php
@@ -31,11 +31,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'monitor')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('monitor');
$mod = $_GET["mod"];
$output = '';
diff --git a/interface/web/sites/ajax_get_ip.php b/interface/web/sites/ajax_get_ip.php
index 57e5b7737a3ff1300292bc3c68dc6256fd13853a..7c11bcb9d5902b511fa877997e6b55993be78171 100644
--- a/interface/web/sites/ajax_get_ip.php
+++ b/interface/web/sites/ajax_get_ip.php
@@ -31,11 +31,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$server_id = intval($_GET["server_id"]);
diff --git a/interface/web/sites/ftp_user_del.php b/interface/web/sites/ftp_user_del.php
index e9b536ff96f91813bf601300e531b916ad0c1e91..7663f4036c3fa5220a1e4811ef02290dbaf4bc9e 100644
--- a/interface/web/sites/ftp_user_del.php
+++ b/interface/web/sites/ftp_user_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/ftp_user.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/sites/ftp_user_edit.php b/interface/web/sites/ftp_user_edit.php
index 61f549c8e938daef98d39aeb576da896ade907d0..ecfeb4a6edd7b59ca717f1b17797cdccb1f5d1d5 100644
--- a/interface/web/sites/ftp_user_edit.php
+++ b/interface/web/sites/ftp_user_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/ftp_user.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/sites/ftp_user_list.php b/interface/web/sites/ftp_user_list.php
index 516739fc8dc97d27b634c3b7c00cadb00cf79e9c..f16f5f2664374670ce3a8f4b194a3a3036199306 100644
--- a/interface/web/sites/ftp_user_list.php
+++ b/interface/web/sites/ftp_user_list.php
@@ -41,11 +41,8 @@ $list_def_file = "list/ftp_user.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses('listform_actions');
diff --git a/interface/web/sites/shell_user_del.php b/interface/web/sites/shell_user_del.php
index c834408ecf98e8b8cb85c44d8339bf08ab2989e7..c6c0cdd4cb564654c2c575c6e2b60434d68a9ace 100644
--- a/interface/web/sites/shell_user_del.php
+++ b/interface/web/sites/shell_user_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/shell_user.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index a6d45a45b303d5e4843dfb5b460bb032812bbb32..633ef46da55092d2b994a7cedf9f90e2203e7f56 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/shell_user.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/sites/shell_user_list.php b/interface/web/sites/shell_user_list.php
index 3909b84237e54e10ba7551c1218b3b10be6f9e45..a9c95fdf9269cda588b5a7c35e5f39f4ce67ccca 100644
--- a/interface/web/sites/shell_user_list.php
+++ b/interface/web/sites/shell_user_list.php
@@ -41,11 +41,8 @@ $list_def_file = "list/shell_user.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses('listform_actions');
diff --git a/interface/web/sites/web_aliasdomain_del.php b/interface/web/sites/web_aliasdomain_del.php
index c4a600d92cc06a8154c5f398c13d2b55828a6a1a..bb3973694b3f33c1c3ac49fb1f21782448606b34 100644
--- a/interface/web/sites/web_aliasdomain_del.php
+++ b/interface/web/sites/web_aliasdomain_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/web_aliasdomain.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index 2aefe5218579601d38e58847e8a5974cce2b0f15..b9f6e2e4667f55c0b5af49c55e65f655c4c098da 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/web_aliasdomain.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/sites/web_aliasdomain_list.php b/interface/web/sites/web_aliasdomain_list.php
index 1cf1b6605e27022fd6daef3774758fa0c142abe9..9417bb3bdb9817ffe16227314fa0598b1ca659d7 100644
--- a/interface/web/sites/web_aliasdomain_list.php
+++ b/interface/web/sites/web_aliasdomain_list.php
@@ -41,11 +41,8 @@ $list_def_file = "list/web_aliasdomain.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses('listform_actions');
diff --git a/interface/web/sites/web_domain_del.php b/interface/web/sites/web_domain_del.php
index 27c64e662b29d4a02624fd573c9a4fce5eb5cea4..46dd2b9c96efdef086c814b75facfcd5df1cfd0e 100644
--- a/interface/web/sites/web_domain_del.php
+++ b/interface/web/sites/web_domain_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/web_domain.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 5c571c20af75d09a1787ef2dd23afe1d3b6c5caa..2670de726a3e86d08f8c112400a5d5ca60254e9b 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/web_domain.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/sites/web_domain_list.php b/interface/web/sites/web_domain_list.php
index 03a3cb2769e2395180b8001504dd09270b91494d..3520c287c33c2075ae32212255c4a40e71d7ec7b 100644
--- a/interface/web/sites/web_domain_list.php
+++ b/interface/web/sites/web_domain_list.php
@@ -41,11 +41,8 @@ $list_def_file = "list/web_domain.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses('listform_actions');
diff --git a/interface/web/sites/web_subdomain_del.php b/interface/web/sites/web_subdomain_del.php
index 6c00c95da889461cf8ac062db2e917b33cdd76d9..be43b38a6d67a8d73f69604cbd3d9e07d7d7eee4 100644
--- a/interface/web/sites/web_subdomain_del.php
+++ b/interface/web/sites/web_subdomain_del.php
@@ -42,11 +42,8 @@ $tform_def_file = "form/web_subdomain.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checke Berechtigungen für Modul
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/sites/web_subdomain_edit.php b/interface/web/sites/web_subdomain_edit.php
index 91a84d1d3cf80b06f0f0fcbf1ac511ea90c8c8ce..49001a36136a1647af4dd409587798658e409c7a 100644
--- a/interface/web/sites/web_subdomain_edit.php
+++ b/interface/web/sites/web_subdomain_edit.php
@@ -41,11 +41,8 @@ $tform_def_file = "form/web_subdomain.tform.php";
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
// Loading classes
$app->uses('tpl,tform,tform_actions');
diff --git a/interface/web/sites/web_subdomain_list.php b/interface/web/sites/web_subdomain_list.php
index e104ace5c2bc38401162d8a8732904d81d72ec37..78855cab7f61b8b49234cb637d8186ad63c9e6c8 100644
--- a/interface/web/sites/web_subdomain_list.php
+++ b/interface/web/sites/web_subdomain_list.php
@@ -41,11 +41,8 @@ $list_def_file = "list/web_subdomain.list.php";
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],'sites')) {
- header("Location: ../index.php");
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('sites');
$app->uses('listform_actions');
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index c0b04a4856783b03c531dba3515b8fdb32084543..d084d7b6065243f6bdb362d65a68f050005d061a 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -292,7 +292,7 @@ class apache2_plugin {
$username = escapeshellcmd($data["new"]["system_user"]);
if($data["new"]["system_user"] != '' && !$app->system->is_user($data["new"]["system_user"])) {
- exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname $username");
+ exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname $username -s /bin/false");
$app->log("Adding the user: $username",LOGLEVEL_DEBUG);
}