diff --git a/interface/web/dashboard/ajax_get_json.php b/interface/web/dashboard/ajax_get_json.php index 9aa22ff3bc4608fc0b7fdc75edab2dc80d874ea0..e761f3e832ba87fff8b1fd9c12b30f7642da9ba6 100644 --- a/interface/web/dashboard/ajax_get_json.php +++ b/interface/web/dashboard/ajax_get_json.php @@ -55,7 +55,16 @@ $type = $_GET["type"]; $result[] = _search('client', 'reseller', "AND limit_client != 0"); // web sites - $result[] = _search('sites', 'web_domain'); + $result[] = _search('sites', 'web_domain', "AND type = 'vhost'"); + + // subdomains + $result[] = _search('sites', 'web_subdomain', "AND type = 'subdomain'"); + + // web site aliases + $result[] = _search('sites', 'web_aliasdomain', "AND type = 'alias'"); + + // vhostsubdomains + $result[] = _search('sites', 'web_vhost_subdomain', "AND type = 'vhostsubdomain'"); // FTP users $result[] = _search('sites', 'ftp_user'); diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php index 9c5489c248ba198afdc3a20b39e2ce3622b8d7b1..eb7a8f1b952b07f2e0fd43c6b76075c39a44b6d1 100644 --- a/interface/web/sites/form/web_aliasdomain.tform.php +++ b/interface/web/sites/form/web_aliasdomain.tform.php @@ -29,6 +29,11 @@ Hint: The ID field of the database table is not part of the datafield definition. The ID field must be always auto incement (int or bigint). + + Search: + - searchable = 1 or searchable = 2 include the field in the search + - searchable = 1: this field will be the title of the search result + - searchable = 2: this field will be included in the description of the search result */ @@ -87,7 +92,8 @@ $form["tabs"]['domain'] = array ( 'default' => '', 'value' => '', 'width' => '30', - 'maxlength' => '255' + 'maxlength' => '255', + 'searchable' => 1 ), 'type' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php index e8d26262ac5a0946690d02fdcec35b32f27d9f3b..cc03eb91b3175d8ab2690b174b55d49ee7b1b6c9 100644 --- a/interface/web/sites/form/web_subdomain.tform.php +++ b/interface/web/sites/form/web_subdomain.tform.php @@ -29,6 +29,11 @@ Hint: The ID field of the database table is not part of the datafield definition. The ID field must be always auto incement (int or bigint). + + Search: + - searchable = 1 or searchable = 2 include the field in the search + - searchable = 1: this field will be the title of the search result + - searchable = 2: this field will be included in the description of the search result */ @@ -87,7 +92,8 @@ $form["tabs"]['domain'] = array ( 'default' => '', 'value' => '', 'width' => '30', - 'maxlength' => '255' + 'maxlength' => '255', + 'searchable' => 1 ), 'type' => array ( 'datatype' => 'VARCHAR', @@ -104,7 +110,8 @@ $form["tabs"]['domain'] = array ( 'keyfield'=> 'domain_id', 'valuefield'=> 'domain' ), - 'value' => '' + 'value' => '', + 'searchable' => 2 ), 'redirect_type' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain.lng b/interface/web/sites/lib/lang/de_web_aliasdomain.lng new file mode 100644 index 0000000000000000000000000000000000000000..0060ecaeab61c8be5bbe1f3402f47138e63e2667 --- /dev/null +++ b/interface/web/sites/lib/lang/de_web_aliasdomain.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_aliasdomain.lng new file mode 100644 index 0000000000000000000000000000000000000000..0060ecaeab61c8be5bbe1f3402f47138e63e2667 --- /dev/null +++ b/interface/web/sites/lib/lang/en_web_aliasdomain.lng @@ -0,0 +1,3 @@ +