From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
interface/web/sites/lib/module.conf.php | 275 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 158 insertions(+), 117 deletions(-)
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index d79d3f4..979aa63 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -2,178 +2,219 @@
$userid=$app->auth->get_user_id();
-$module["name"] = "sites";
-$module["title"] = "top_menu_sites";
-$module["template"] = "module.tpl.htm";
-$module["startpage"] = "sites/web_domain_list.php";
+$module["name"] = "sites";
+$module["title"] = "top_menu_sites";
+$module["template"] = "module.tpl.htm";
+$module["startpage"] = "sites/web_vhost_domain_list.php";
$module["tab_width"] = '';
+$module['order'] = '30';
// Websites menu
$items=array();
-if($app->auth->get_client_limit($userid,'web_domain') != 0)
+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_vhost_domain_list.php?type=domain',
+ 'html_id' => 'domain_list');
}
-if($app->auth->get_client_limit($userid,'web_subdomain') != 0)
+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_childdomain_list.php?type=subdomain',
+ 'html_id' => 'childdomain_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');
- }
+ // 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_domain_list.php?type=subdomain',
+ 'html_id' => 'childdomain_list');
+ }
}
-if($app->auth->get_client_limit($userid,'web_aliasdomain') != 0)
+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_childdomain_list.php?type=aliasdomain',
+ 'html_id' => 'childdomain_list');
+
+ // read web config
+ $app->uses('getconf');
+ $sys_config = $app->getconf->get_global_config('sites');
+ if($sys_config['vhost_aliasdomains'] == 'y') {
+ $items[] = array( 'title' => "Aliasdomain (Vhost)",
+ 'target' => 'content',
+ 'link' => 'sites/web_vhost_domain_list.php?type=aliasdomain',
+ 'html_id' => 'childdomain_list');
+ }
}
if(count($items))
{
-$module["nav"][] = array( 'title' => 'Websites',
- 'open' => 1,
- 'items' => $items);
+ $module["nav"][] = array( 'title' => 'Websites',
+ 'open' => 1,
+ 'items' => $items);
}
// Databases menu
-if($app->auth->get_client_limit($userid,'database') != 0)
+if($app->auth->get_client_limit($userid, 'database') != 0)
{
-$items=array();
+ $items=array();
-$items[] = array( 'title' => "Database",
- 'target' => 'content',
- 'link' => 'sites/database_list.php',
- 'html_id' => 'database_list');
+ $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'
-);
+ $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);
+ $module["nav"][] = array( 'title' => 'Database',
+ 'open' => 1,
+ 'items' => $items);
}
// Web menu
$items=array();
-if($app->auth->get_client_limit($userid,'ftp_user') != 0)
+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');
+ $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)
+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",
- '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');
-
+ '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);
+ 'open' => 1,
+ 'items' => $items);
// CMD menu
-$items=array();
-
-if($app->auth->get_client_limit($userid,'shell_user') != 0)
+if($app->auth->get_client_limit($userid, 'shell_user') != 0 or $app->auth->get_client_limit($userid, 'cron') != 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);
+ $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);
+}
// APS menu
-$items = array();
-
-$items[] = array( 'title' => 'Available packages',
- 'target' => 'content',
- 'link' => 'sites/aps_availablepackages_list.php',
- 'html_id' => 'aps_availablepackages_list');
-
-$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')
+if($app->auth->get_client_limit($userid, 'aps') != 0)
{
-$items[] = array( 'title' => 'Update Packagelist',
- 'target' => 'content',
- 'link' => 'sites/aps_cron_apscrawler_if.php',
- 'html_id' => 'aps_packagedetails_show');
+ $items = array();
+
+ $items[] = array( 'title' => 'Available packages',
+ 'target' => 'content',
+ 'link' => 'sites/aps_availablepackages_list.php',
+ 'html_id' => 'aps_availablepackages_list');
+
+ $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);
}
-
-$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');
+ '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');
+ '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);
+ 'open' => 1,
+ 'items' => $items);
// clean up
unset($items);
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1