From 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 03 Feb 2015 04:10:04 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/dashboard/ajax_get_json.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/interface/web/dashboard/ajax_get_json.php b/interface/web/dashboard/ajax_get_json.php
index 4829418..c5384ca 100644
--- a/interface/web/dashboard/ajax_get_json.php
+++ b/interface/web/dashboard/ajax_get_json.php
@@ -66,6 +66,9 @@
// vhostsubdomains
$result[] = _search('sites', 'web_vhost_subdomain', "AND type = 'vhostsubdomain'");
+ // vhostaliasdomains
+ $result[] = _search('sites', 'web_vhost_aliasdomain', "AND type = 'vhostalias'");
+
// FTP users
$result[] = _search('sites', 'ftp_user');
@@ -88,7 +91,7 @@
$description = 'Database User: '.$result['database_user'].' - Remote IPs: '.$result['remote_ips'];
$result_databases['cdata'][] = array('title' => $result['database_name'],
'description' => $description,
- 'onclick' => 'capp(\'sites\',\'sites/database_edit.php?id='.$result['database_id'].'\');',
+ 'onclick' => 'ISPConfig.capp(\'sites\',\'sites/database_edit.php?id='.$result['database_id'].'\');',
'fill_text' => strtolower($result['database_name'])
);
}
@@ -224,7 +227,7 @@
$result_array['cdata'][] = array('title' => $wb[$title_key.'_txt'].': '.$result[$title_key],
'description' => $description,
- 'onclick' => "capp('".$module."','".$module."/".$form_file."?id=".$result[$db_table_idx]."');",
+ 'onclick' => "ISPConfig.capp('".$module."','".$module."/".$form_file."?id=".$result[$db_table_idx]."');",
'fill_text' => strtolower($result[$title_key])
);
}
--
Gitblit v1.9.1