From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/lib/module.conf.php | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index 0a61e06..94c5ba0 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -5,8 +5,9 @@
$module["name"] = "sites";
$module["title"] = "top_menu_sites";
$module["template"] = "module.tpl.htm";
-$module["startpage"] = "sites/web_domain_list.php";
+$module["startpage"] = "sites/web_vhost_domain_list.php";
$module["tab_width"] = '';
+$module['order'] = '30';
// Websites menu
$items=array();
@@ -96,10 +97,24 @@
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');
+ $apache_in_use = false;
+ $servers = $app->db->queryAllRecords("SELECT * FROM server WHERE web_server = 1 AND active = 1");
+ if(is_array($servers) && !empty($servers)){
+ foreach($servers as $server){
+ $tmp_web_config = $app->getconf->get_server_config($server['server_id'], 'web');
+ if(strtolower($tmp_web_config['server_type']) == 'apache'){
+ $apache_in_use = true;
+ break;
+ }
+ }
+ }
+
+ if($apache_in_use == true){
+ $items[] = array( 'title' => "Webdav-User",
+ 'target' => 'content',
+ 'link' => 'sites/webdav_user_list.php',
+ 'html_id' => 'webdav_user_list');
+ }
}
$items[] = array( 'title' => "Folder",
@@ -179,11 +194,28 @@
'link' => 'sites/web_sites_stats.php',
'html_id' => 'websites_stats');
+$items[] = array( 'title' => 'FTP traffic',
+ 'target' => 'content',
+ 'link' => 'sites/ftp_sites_stats.php',
+ 'html_id' => 'ftpsites_stats');
+
$items[] = array( 'title' => 'Website quota (Harddisk)',
'target' => 'content',
'link' => 'sites/user_quota_stats.php',
'html_id' => 'user_quota_stats');
+$items[] = array( 'title' => 'Database quota',
+ 'target' => 'content',
+ 'link' => 'sites/database_quota_stats.php',
+ 'html_id' => 'databse_quota_stats');
+
+$items[] = array (
+ 'title' => 'Backup Stats',
+ 'target' => 'content',
+ 'link' => 'sites/backup_stats.php',
+ 'html_id' => 'backup_stats'
+);
+
$module['nav'][] = array( 'title' => 'Statistics',
'open' => 1,
'items' => $items);
--
Gitblit v1.9.1