From d87f76019fc231ec20d95126a7fee0487e7be5f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 14 Aug 2012 10:56:20 -0400
Subject: [PATCH] - Added new web folder named private to web folder layout. The folder is intended to store data that shall not be visible in the web directory, it is owned by the user of the web. - Changed ownership of web root directory to root user in all security modes to prevent symlink attacks. - Apache log files are now owned by user root. - Improved functions in system library.
---
interface/web/sites/lib/module.conf.php | 253 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 171 insertions(+), 82 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index a36f049..fdce4de 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -1,83 +1,172 @@
-<?php
-$module = array (
- 'name' => 'sites',
- 'title' => 'Sites & Email',
- 'template' => 'module.tpl.htm',
- 'navframe_page' => '',
- 'startpage' => 'sites/index.php',
- 'tab_width' => '',
- 'nav' =>
- array (
- 0 =>
- array (
- 'title' => 'Email Accounts',
- 'open' => 1,
- 'items' =>
- array (
- 0 =>
- array (
- 'title' => 'Domain',
- 'target' => 'content',
- 'link' => 'sites/mail_domain_list.php',
- ),
- 1 =>
- array (
- 'title' => 'Domain Alias',
- 'target' => 'content',
- 'link' => 'sites/mail_domain_alias_list.php',
- ),
- 2 =>
- array (
- 'title' => 'Domain Relay',
- 'target' => 'content',
- 'link' => 'sites/mail_domain_relay_list.php',
- ),
- 3 =>
- array (
- 'title' => 'Email Mailbox',
- 'target' => 'content',
- 'link' => 'sites/mail_box_list.php',
- ),
- 4 =>
- array (
- 'title' => 'Email Alias',
- 'target' => 'content',
- 'link' => 'sites/mail_alias_list.php',
- ),
- 5 =>
- array (
- 'title' => 'Email Forward',
- 'target' => 'content',
- 'link' => 'sites/mail_forward_list.php',
- ),
- 6 =>
- array (
- 'title' => 'Email Catchall',
- 'target' => 'content',
- 'link' => 'sites/mail_catchall_list.php',
- ),
- ),
- ),
- 1 =>
- array (
- 'title' => 'Email Filter',
- 'open' => 1,
- 'items' =>
- array (
- 0 =>
- array (
- 'title' => 'Email Whitelist',
- 'target' => 'content',
- 'link' => 'sites/mail_whitelist_list.php',
- ),
- 1 =>
- array (
- 'title' => 'Email Blacklist',
- 'target' => 'content',
- 'link' => 'sites/mail_blacklist_list.php',
- ),
- ),
- ),
- ),
-)
+<?php
+
+$userid=$app->auth->get_user_id();
+
+$module["name"] = "sites";
+$module["title"] = "top_menu_sites";
+$module["template"] = "module.tpl.htm";
+$module["startpage"] = "sites/web_domain_list.php";
+$module["tab_width"] = '';
+
+// Websites menu
+$items=array();
+
+if($app->auth->get_client_limit($userid,'web_domain') != 0)
+{
+$items[] = array( 'title' => "Website",
+ 'target' => 'content',
+ 'link' => 'sites/web_domain_list.php',
+ 'html_id' => 'domain_list');
+}
+
+if($app->auth->get_client_limit($userid,'web_subdomain') != 0)
+{
+$items[] = array( 'title' => "Subdomain",
+ 'target' => 'content',
+ 'link' => 'sites/web_subdomain_list.php',
+ 'html_id' => 'subdomain_list');
+}
+
+if($app->auth->get_client_limit($userid,'web_aliasdomain') != 0)
+{
+$items[] = array( 'title' => "Aliasdomain",
+ 'target' => 'content',
+ 'link' => 'sites/web_aliasdomain_list.php',
+ 'html_id' => 'aliasdomain_list');
+}
+
+if(count($items))
+{
+$module["nav"][] = array( 'title' => 'Websites',
+ 'open' => 1,
+ 'items' => $items);
+}
+
+// Databases menu
+if($app->auth->get_client_limit($userid,'database') != 0)
+{
+$items=array();
+
+$items[] = array( 'title' => "Database",
+ 'target' => 'content',
+ 'link' => 'sites/database_list.php',
+ 'html_id' => 'database_list');
+
+/*
+Database User (for future development)
+
+$items[] = array( 'title' => "Database User",
+ 'target' => 'content',
+ 'link' => 'sites/database_user_list.php',
+ 'html_id' => 'database_user_list'
+);
+*/
+
+$module["nav"][] = array( 'title' => 'Database',
+ 'open' => 1,
+ 'items' => $items);
+}
+
+// Web menu
+$items=array();
+if($app->auth->get_client_limit($userid,'ftp_user') != 0)
+{
+$items[] = array( 'title' => "FTP-User",
+ 'target' => 'content',
+ 'link' => 'sites/ftp_user_list.php',
+ 'html_id' => 'ftp_user_list');
+}
+
+if($app->auth->get_client_limit($userid,'webdav_user') != 0)
+{
+$items[] = array( 'title' => "Webdav-User",
+ 'target' => 'content',
+ 'link' => 'sites/webdav_user_list.php',
+ 'html_id' => 'webdav_user_list');
+}
+
+$items[] = array( 'title' => "Folder",
+ 'target' => 'content',
+ 'link' => 'sites/web_folder_list.php',
+ 'html_id' => 'web_folder_list');
+
+$items[] = array( 'title' => "Folder users",
+ 'target' => 'content',
+ 'link' => 'sites/web_folder_user_list.php',
+ 'html_id' => 'web_folder_user_list');
+
+$module["nav"][] = array( 'title' => 'Web Access',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// CMD menu
+$items=array();
+
+if($app->auth->get_client_limit($userid,'shell_user') != 0)
+{
+$items[] = array( 'title' => "Shell-User",
+ 'target' => 'content',
+ 'link' => 'sites/shell_user_list.php',
+ 'html_id' => 'shell_user_list');
+}
+if($app->auth->get_client_limit($userid,'cron') != 0)
+{
+$items[] = array( 'title' => "Cron Jobs",
+ 'target' => 'content',
+ 'link' => 'sites/cron_list.php',
+ 'html_id' => 'cron_list');
+}
+$module["nav"][] = array( 'title' => 'Command Line',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// APS menu
+$items = array();
+
+$items[] = array( 'title' => 'Available packages',
+ 'target' => 'content',
+ 'link' => 'sites/aps_availablepackages_list.php',
+ 'html_id' => 'aps_availablepackages_list');
+
+$items[] = array( 'title' => 'Installed packages',
+ 'target' => 'content',
+ 'link' => 'sites/aps_installedpackages_list.php',
+ 'html_id' => 'aps_installedpackages_list');
+
+
+// Second menu group, available only for admins
+if($_SESSION['s']['user']['typ'] == 'admin')
+{
+$items[] = array( 'title' => 'Update Packagelist',
+ 'target' => 'content',
+ 'link' => 'sites/aps_cron_apscrawler_if.php',
+ 'html_id' => 'aps_packagedetails_show');
+}
+
+$module['nav'][] = array( 'title' => 'APS Installer',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// Statistics menu
+$items = array();
+
+$items[] = array( 'title' => 'Web traffic',
+ 'target' => 'content',
+ 'link' => 'sites/web_sites_stats.php',
+ 'html_id' => 'websites_stats');
+
+$items[] = array( 'title' => 'Website quota (Harddisk)',
+ 'target' => 'content',
+ 'link' => 'sites/user_quota_stats.php',
+ 'html_id' => 'user_quota_stats');
+
+$module['nav'][] = array( 'title' => 'Statistics',
+ 'open' => 1,
+ 'items' => $items);
+
+// clean up
+unset($items);
?>
\ No newline at end of file
--
Gitblit v1.9.1