From 71acf0c101aac65de71c0d2b45b38e55ecbffcf2 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 19 Feb 2013 09:09:12 -0500
Subject: [PATCH] - Fixed FS#2678 - Error message whith mailman while updating ispconfg.
---
interface/web/sites/lib/module.conf.php | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index aa0cb67..81d627e 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -21,13 +21,20 @@
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');
+
// read web config
$app->uses('getconf');
$sys_config = $app->getconf->get_global_config('sites');
-$items[] = array( 'title' => "Subdomain",
+ if($sys_config['vhost_subdomains'] == 'y') {
+$items[] = array( 'title' => "Subdomain (Vhost)",
'target' => 'content',
- 'link' => 'sites/' . ($sys_config['vhost_subdomains'] == 'y' ? 'web_vhost_subdomain_list.php' : 'web_subdomain_list.php'),
+ 'link' => 'sites/web_vhost_subdomain_list.php',
'html_id' => 'subdomain_list');
+ }
}
if($app->auth->get_client_limit($userid,'web_aliasdomain') != 0)
@@ -55,15 +62,12 @@
'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,
@@ -104,6 +108,8 @@
// CMD menu
+if($app->auth->get_client_limit($userid,'shell_user') != 0 OR $app->auth->get_client_limit($userid,'cron') != 0)
+{
$items=array();
if($app->auth->get_client_limit($userid,'shell_user') != 0)
@@ -123,7 +129,7 @@
$module["nav"][] = array( 'title' => 'Command Line',
'open' => 1,
'items' => $items);
-
+}
// APS menu
$items = array();
@@ -144,7 +150,7 @@
{
$items[] = array( 'title' => 'Update Packagelist',
'target' => 'content',
- 'link' => 'sites/aps_cron_apscrawler_if.php',
+ 'link' => 'sites/aps_update_packagelist.php',
'html_id' => 'aps_packagedetails_show');
}
--
Gitblit v1.9.1