From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import

---
 interface/web/sites/lib/module.conf.php |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index aa0cb67..1f7067e 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,9 +129,11 @@
 $module["nav"][] = array(   'title' => 'Command Line',
                             'open'  => 1,
                             'items' => $items);
-
+}
 
 // APS menu
+if($app->auth->get_client_limit($userid,'aps') != 0)
+{
 $items = array();
 
 $items[] = array(   'title'   => 'Available packages',
@@ -144,14 +152,14 @@
 {
 $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');
 }
 
 $module['nav'][] = array(   'title' => 'APS Installer',
                             'open'  => 1,
                             'items' => $items);
-
+}
 
 // Statistics menu
 $items = array();

--
Gitblit v1.9.1