From 9100936bfe5c1aadd167f9179a2af01882c59c1d Mon Sep 17 00:00:00 2001 From: tbrehm Date: Wed, 4 Jun 2008 17:35:17 +0000 Subject: [PATCH] - Modified pages to use a global module aurhentification function - Changed shell of website linux user to /bin/false --- interface/lib/classes/auth.inc.php | 10 + interface/web/admin/dbsync_del.php | 6 +- interface/web/admin/dbsync_edit.php | 7 +- interface/web/admin/dbsync_list.php | 7 +- interface/web/admin/filesync_del.php | 7 +- interface/web/admin/filesync_edit.php | 7 +- interface/web/admin/filesync_list.php | 7 +- interface/web/admin/groups_del.php | 7 +- interface/web/admin/groups_edit.php | 7 +- interface/web/admin/groups_list.php | 7 +- interface/web/admin/language_add.php | 7 +- interface/web/admin/language_edit.php | 7 +- interface/web/admin/language_export.php | 7 +- interface/web/admin/language_import.php | 7 +- interface/web/admin/language_list.php | 7 +- interface/web/admin/server_del.php | 103 +++--- interface/web/admin/server_edit.php | 107 +++--- interface/web/admin/server_ip_del.php | 7 +- interface/web/admin/server_ip_edit.php | 7 +- interface/web/admin/server_ip_list.php | 7 +- interface/web/admin/server_list.php | 103 +++--- interface/web/admin/users_del.php | 7 +- interface/web/admin/users_edit.php | 7 +- interface/web/admin/users_list.php | 7 +- interface/web/client/client_del.php | 7 +- interface/web/client/client_edit.php | 7 +- interface/web/client/client_list.php | 7 +- interface/web/designer/form_edit.php | 305 +++++++++--------- interface/web/designer/form_list.php | 7 +- interface/web/designer/form_show.php | 239 +++++++------- interface/web/designer/module_edit.php | 7 +- interface/web/designer/module_list.php | 7 +- interface/web/designer/module_nav_del.php | 7 +- interface/web/designer/module_nav_edit.php | 5 +- interface/web/designer/module_nav_flip.php | 7 +- .../web/designer/module_nav_item_del.php | 7 +- .../web/designer/module_nav_item_edit.php | 7 +- .../web/designer/module_nav_item_flip.php | 7 +- interface/web/designer/module_show.php | 7 +- interface/web/dns/dns_a_edit.php | 7 +- interface/web/dns/dns_a_list.php | 7 +- interface/web/dns/dns_alias_edit.php | 7 +- interface/web/dns/dns_cname_edit.php | 7 +- interface/web/dns/dns_hinfo_edit.php | 7 +- interface/web/dns/dns_mx_edit.php | 7 +- interface/web/dns/dns_ns_edit.php | 7 +- interface/web/dns/dns_ptr_edit.php | 7 +- interface/web/dns/dns_rp_edit.php | 7 +- interface/web/dns/dns_rr_del.php | 7 +- interface/web/dns/dns_soa_del.php | 7 +- interface/web/dns/dns_soa_edit.php | 7 +- interface/web/dns/dns_soa_list.php | 7 +- interface/web/dns/dns_srv_edit.php | 7 +- interface/web/dns/dns_txt_edit.php | 7 +- interface/web/help/support_message_del.php | 7 +- interface/web/help/support_message_edit.php | 7 +- interface/web/help/support_message_list.php | 7 +- interface/web/mail/mail_alias_del.php | 103 +++--- interface/web/mail/mail_alias_edit.php | 7 +- interface/web/mail/mail_alias_list.php | 53 ++- interface/web/mail/mail_blacklist_del.php | 103 +++--- interface/web/mail/mail_blacklist_edit.php | 7 +- interface/web/mail/mail_blacklist_list.php | 7 +- .../web/mail/mail_content_filter_del.php | 7 +- .../web/mail/mail_content_filter_edit.php | 7 +- .../web/mail/mail_content_filter_list.php | 7 +- .../web/mail/mail_domain_catchall_del.php | 103 +++--- .../web/mail/mail_domain_catchall_edit.php | 7 +- .../web/mail/mail_domain_catchall_list.php | 7 +- interface/web/mail/mail_domain_del.php | 7 +- interface/web/mail/mail_domain_edit.php | 7 +- interface/web/mail/mail_domain_list.php | 7 +- interface/web/mail/mail_forward_del.php | 103 +++--- interface/web/mail/mail_forward_edit.php | 7 +- interface/web/mail/mail_forward_list.php | 53 ++- interface/web/mail/mail_get_del.php | 7 +- interface/web/mail/mail_get_edit.php | 7 +- interface/web/mail/mail_get_list.php | 7 +- interface/web/mail/mail_spamfilter_del.php | 7 +- interface/web/mail/mail_spamfilter_edit.php | 7 +- interface/web/mail/mail_spamfilter_list.php | 7 +- interface/web/mail/mail_transport_del.php | 7 +- interface/web/mail/mail_transport_edit.php | 7 +- interface/web/mail/mail_transport_list.php | 7 +- interface/web/mail/mail_user_del.php | 7 +- interface/web/mail/mail_user_edit.php | 7 +- interface/web/mail/mail_user_list.php | 7 +- interface/web/mail/mail_user_stats.php | 7 +- interface/web/mail/mail_whitelist_del.php | 103 +++--- interface/web/mail/mail_whitelist_edit.php | 7 +- interface/web/mail/mail_whitelist_list.php | 7 +- .../web/mail/spamfilter_blacklist_del.php | 7 +- .../web/mail/spamfilter_blacklist_edit.php | 7 +- .../web/mail/spamfilter_blacklist_list.php | 7 +- interface/web/mail/spamfilter_config_del.php | 7 +- interface/web/mail/spamfilter_config_edit.php | 7 +- interface/web/mail/spamfilter_config_list.php | 7 +- interface/web/mail/spamfilter_policy_del.php | 7 +- interface/web/mail/spamfilter_policy_edit.php | 7 +- interface/web/mail/spamfilter_policy_list.php | 7 +- interface/web/mail/spamfilter_users_del.php | 7 +- interface/web/mail/spamfilter_users_edit.php | 7 +- interface/web/mail/spamfilter_users_list.php | 7 +- .../web/mail/spamfilter_whitelist_del.php | 7 +- .../web/mail/spamfilter_whitelist_edit.php | 7 +- .../web/mail/spamfilter_whitelist_list.php | 7 +- interface/web/monitor/logview.php | 7 +- interface/web/monitor/system.php | 7 +- interface/web/sites/ajax_get_ip.php | 7 +- interface/web/sites/ftp_user_del.php | 7 +- interface/web/sites/ftp_user_edit.php | 7 +- interface/web/sites/ftp_user_list.php | 7 +- interface/web/sites/shell_user_del.php | 7 +- interface/web/sites/shell_user_edit.php | 7 +- interface/web/sites/shell_user_list.php | 7 +- interface/web/sites/web_aliasdomain_del.php | 7 +- interface/web/sites/web_aliasdomain_edit.php | 7 +- interface/web/sites/web_aliasdomain_list.php | 7 +- interface/web/sites/web_domain_del.php | 7 +- interface/web/sites/web_domain_edit.php | 7 +- interface/web/sites/web_domain_list.php | 7 +- interface/web/sites/web_subdomain_del.php | 7 +- interface/web/sites/web_subdomain_edit.php | 7 +- interface/web/sites/web_subdomain_list.php | 7 +- .../plugins-available/apache2_plugin.inc.php | 2 +- 125 files changed, 952 insertions(+), 1312 deletions(-) diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php index d3ed6e9c8..ef9b4fc63 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 c1860b3d7..bcbe62aa1 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 2c0b85953..fe3a56f56 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 6370e38fb..05b5fdf91 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 0b3da2237..33cb3e6c6 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 c11307282..bf7b64893 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 87f4685cf..30a473c82 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 49588c2ce..3303154f2 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 d649f4045..d2acf2b85 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 3545f04a6..f75f5de69 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 5d1d34cba..dc03f8616 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 f2b7be5e1..6edfb0d0f 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 c2c63437c..d252073d3 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 130fbc18d..09f11e726 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 47368c58f..cbfa619fb 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 b0ae30d45..78a078570 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 d02dc2242..ea8dd8917 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 532e97005..1229958e3 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 48d42c05e..8b6160b9e 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 f70195344..a6bd3b839 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 bfae8779f..985dac677 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 cd3b2792f..b4f3e7223 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 8dab85828..16e6f0a07 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 105922dfb..b113e4064 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 38bcd67fb..3a04f4623 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 4852047d9..11b20a729 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 6f5a06f2c..044c502eb 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 703eb0bd5..4ea74c2e0 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 5103216d5..249b5e880 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 3b9e7e1e0..77bb080a1 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 .= " - - - - - - "; - //$content .= "\r\n"; - foreach($tab["fields"] as $field_id => $field) { - //$content .= "\r\n"; - //$content .= "\r\n"; - //$content .= "\r\n"; - $content .= " - - - "; - $n2++; - } - $content .= " -
$tab[title] - - - - - -
Bereich:
Titel:
Ziel:       
Link:       
$field_id - - - - -
 
- - "; - $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 .= " + + + + + + "; + //$content .= "\r\n"; + foreach($tab["fields"] as $field_id => $field) { + //$content .= "\r\n"; + //$content .= "\r\n"; + //$content .= "\r\n"; + $content .= " + + + "; + $n2++; + } + $content .= " +
$tab[title] + + + + + +
Bereich:
Titel:
Ziel:       
Link:       
$field_id + + + + +
 
+ + "; + $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 f1a9ad70b..9a8df309e 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 61509971f..92aa4f0e8 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 f0a6b5683..18c5bf4d1 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 27fbb78e7..73c010e82 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 2218402f5..f3fc164d9 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 aa537a1d1..cd458cd21 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 44b176886..5948aba5b 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 d21f491dc..2ec0566af 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 8ad943509..44548784d 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 c5a24d1e3..5fcb4008c 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 6899b3ad9..c01aec694 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 f359fec69..e952f56d0 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 8ad00dcba..5123d10e7 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 fd9341ec6..950d74eca 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 90544da34..112a4daf7 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 6e777087e..74ce119b9 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 43356482f..3828aa01e 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 e8cb6847e..ef70c1e85 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 d996c915b..e0088d2fc 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 5cbb77f79..de223fa97 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 0526e5e3c..6c10b06b7 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 3f608a4d9..0f467820d 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 f6d362ffa..74177666f 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 ab923ebfb..1fda14cce 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 721197c2b..63c23a0aa 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 a36b5dbff..bef1e9b17 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 ce990e4df..a4d9fdcd5 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 03b95ca7e..6457f6d86 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 3344feb43..9ef53c613 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 d1fce3b46..1ee6ad6f5 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 5a453db09..52308e615 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 31dded562..1e8629b2c 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 d6b270070..000afd1a3 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 7cede6c93..1cf9246df 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 d02bc5d43..2913e8d7a 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 59ddb1ecc..c2eb5e138 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 83024d8cb..7eb21c741 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 5cded1ae7..f6c27fcb5 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 412bb43f7..e07495fd8 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 c2c32ad8e..f9fbc0973 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 a96e2a3c6..a9377c6d9 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 ee8d88c70..5bdfb6904 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 e9b179b43..716a780b7 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 9a7b2e9a7..a8cfd0306 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 77330c44b..40c824433 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 b8eae9aea..5a528a8b0 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 1da67355e..de97422f4 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 55300d360..f4850583f 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 a6985ef46..6d922b508 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 2c3766a99..5009f4981 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 e510589ee..8979a4696 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 fd0fcee7e..1c2ec67e2 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 6ee7f056c..8075a1d1e 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 aa4309044..9d87728e6 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 af6e6db41..26215cf09 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 9d08bd7a4..2c666b004 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 c2b7bcc26..7e728afe9 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 ad431e91f..f7858aa29 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 47c01892c..bb083e652 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 32518e8aa..2a6134e43 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 684433344..6a5358e26 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 5c87c2ca4..479d6fd18 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 729c23ebd..f33f96418 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 2b8b322da..c2cc41109 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 8ca69b1d3..8da9f45de 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 480e24988..ad9d2b561 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 4457171b6..b61472b30 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 46c69ed3f..12b6a1992 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 d5d52d5fc..03b569bd0 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 539f8a16f..504a2bd54 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 059376eb2..83418c888 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 77050b5de..503ff4412 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 cc33aaece..af17f134f 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 19803db94..2f27d02ea 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 3630986af..44d10edb1 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 2ca0064ae..12c622a8e 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 2630e1171..84387ef6c 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 8286e2cb2..430a351f3 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 57e5b7737..7c11bcb9d 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 e9b536ff9..7663f4036 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 61f549c8e..ecfeb4a6e 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 516739fc8..f16f5f266 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 c834408ec..c6c0cdd4c 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 a6d45a45b..633ef46da 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 3909b8423..a9c95fdf9 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 c4a600d92..bb3973694 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 2aefe5218..b9f6e2e46 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 1cf1b6605..9417bb3bd 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 27c64e662..46dd2b9c9 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 5c571c20a..2670de726 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 03a3cb276..3520c287c 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 6c00c95da..be43b38a6 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 91a84d1d3..49001a361 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 e104ace5c..78855cab7 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 c0b04a485..d084d7b60 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); } -- GitLab