From aa370627b211a51dc46891cfa4b6e3d2ef3e52db Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 16 Jul 2013 10:45:17 -0400
Subject: [PATCH] - Fixed FS#2924 - the month will not set automatically in the autoresponder by click now Along with this fixed some display problems with the combo boxes introduced in 3.0.5. Some fields were not correctly displayed with the predefined values if value and text of the underlying option element differ.
---
interface/web/sites/lib/module.conf.php | 261 +++++++++++++++++++++++++++-------------------------
1 files changed, 136 insertions(+), 125 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index 8802b27..1f7067e 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -2,171 +2,182 @@
$userid=$app->auth->get_user_id();
-$module["name"] = "sites";
-$module["title"] = "top_menu_sites";
+$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
-*/
+// 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');
+$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');
+$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');
+ if($sys_config['vhost_subdomains'] == 'y') {
+$items[] = array( 'title' => "Subdomain (Vhost)",
+ 'target' => 'content',
+ 'link' => 'sites/web_vhost_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');
+$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);
+$module["nav"][] = array( 'title' => 'Websites',
+ 'open' => 1,
+ 'items' => $items);
}
-
-/*
- FTP User menu
-*/
-if($app->auth->get_client_limit($userid,'ftp_user') != 0)
-{
- $items=array();
-
- $items[] = array( 'title' => "FTP-User",
- 'target' => 'content',
- 'link' => 'sites/ftp_user_list.php',
- 'html_id' => 'ftp_user_list');
-
-
- $module["nav"][] = array( 'title' => 'FTP',
- 'open' => 1,
- 'items' => $items);
-}
-
-/*
- Shell User menu
-*/
-if($app->auth->get_client_limit($userid,'shell_user') != 0)
-{
- $items=array();
-
- $items[] = array( 'title' => "Shell-User",
- 'target' => 'content',
- 'link' => 'sites/shell_user_list.php',
- 'html_id' => 'shell_user_list');
-
- $module["nav"][] = array( 'title' => 'Shell',
- 'open' => 1,
- 'items' => $items);
-}
-
-/*
- Databases menu
-*/
+// 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'
- );
-
- $module["nav"][] = array( 'title' => 'Database',
- 'open' => 1,
- 'items' => $items);
+$items=array();
+
+$items[] = array( 'title' => "Database",
+ 'target' => 'content',
+ 'link' => 'sites/database_list.php',
+ 'html_id' => 'database_list');
+
+
+$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);
}
-/*
- * Webdav User menu
- */
+// 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();
-
- $items[] = array( 'title' => "Webdav-User",
- 'target' => 'content',
- 'link' => 'sites/webdav_user_list.php',
- 'html_id' => 'webdav_user_list');
-
-
- $module["nav"][] = array( 'title' => 'Webdav',
- 'open' => 1,
- 'items' => $items);
+$items[] = array( 'title' => "Webdav-User",
+ 'target' => 'content',
+ 'link' => 'sites/webdav_user_list.php',
+ 'html_id' => 'webdav_user_list');
}
-/*
- Cron menu
-*/
-if($app->auth->get_client_limit($userid,'cron') != 0)
+$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
+if($app->auth->get_client_limit($userid,'shell_user') != 0 OR $app->auth->get_client_limit($userid,'cron') != 0)
{
- $items = array();
-
- $items[] = array( 'title' => "Cron Jobs",
- 'target' => 'content',
- 'link' => 'sites/cron_list.php',
- 'html_id' => 'cron_list');
-
- $module["nav"][] = array( 'title' => 'Cron',
- 'open' => 1,
- 'items' => $items);
+$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);
}
-//**** Statistics menu
+// APS menu
+if($app->auth->get_client_limit($userid,'aps') != 0)
+{
$items = array();
-$items[] = array( 'title' => 'Web traffic',
- 'target' => 'content',
- 'link' => 'sites/web_sites_stats.php',
- 'html_id' => 'websites_stats');
+$items[] = array( 'title' => 'Available packages',
+ 'target' => 'content',
+ 'link' => 'sites/aps_availablepackages_list.php',
+ 'html_id' => 'aps_availablepackages_list');
-$items[] = array( 'title' => 'Website quota (Harddisk)',
- 'target' => 'content',
- 'link' => 'sites/user_quota_stats.php',
- 'html_id' => 'user_quota_stats');
+$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_update_packagelist.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);
-
-
+ 'open' => 1,
+ 'items' => $items);
// clean up
unset($items);
-
-$items[] = array( 'title' => "Rewrite Rules",
- 'target' => 'content',
- 'link' => 'sites/proxy_reverse_list.php');
-
-
-$module["nav"][] = array( 'title' => 'Reverse Proxy',
- 'open' => 1,
- 'items' => $items);
-
-// clean up
-unset($items);
-
-
?>
\ No newline at end of file
--
Gitblit v1.9.1