Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be mer...

tbrehm

2013-01-17 43b345cabb3e8743a91c39e8d6367c1aa594ebd2

 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();