Commit 92122426 authored by Falko Timme's avatar Falko Timme
Browse files

- Added database users and directive snippets to global search.

parent a8014df4
...@@ -29,6 +29,11 @@ ...@@ -29,6 +29,11 @@
Hint: Hint:
The ID field of the database table is not part of the datafield definition. 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). 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
*/ */
...@@ -69,13 +74,15 @@ $form["tabs"]['directive_snippets'] = array ( ...@@ -69,13 +74,15 @@ $form["tabs"]['directive_snippets'] = array (
'default' => '', 'default' => '',
'value' => '', 'value' => '',
'width' => '30', 'width' => '30',
'maxlength' => '255' 'maxlength' => '255',
'searchable' => 1
), ),
'type' => array ( 'type' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'SELECT', 'formtype' => 'SELECT',
'default' => '', 'default' => '',
'value' => array('apache' => 'Apache','nginx' => 'nginx','php' => 'PHP'), 'value' => array('apache' => 'Apache','nginx' => 'nginx','php' => 'PHP'),
'searchable' => 2
), ),
'snippet' => array ( 'snippet' => array (
'datatype' => 'TEXT', 'datatype' => 'TEXT',
...@@ -83,7 +90,8 @@ $form["tabs"]['directive_snippets'] = array ( ...@@ -83,7 +90,8 @@ $form["tabs"]['directive_snippets'] = array (
'default' => '', 'default' => '',
'value' => '', 'value' => '',
'width' => '30', 'width' => '30',
'maxlength' => '255' 'maxlength' => '255',
'searchable' => 2
), ),
'active' => array ( 'active' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
......
...@@ -88,6 +88,9 @@ $type = $_GET["type"]; ...@@ -88,6 +88,9 @@ $type = $_GET["type"];
*/ */
$result[] = _search('sites', 'database'); $result[] = _search('sites', 'database');
// database users
$result[] = _search('sites', 'database_user');
// email domains // email domains
$result[] = _search('mail', 'mail_domain'); $result[] = _search('mail', 'mail_domain');
...@@ -132,6 +135,9 @@ $type = $_GET["type"]; ...@@ -132,6 +135,9 @@ $type = $_GET["type"];
// virtual machines ip addresses // virtual machines ip addresses
$result[] = _search('vm', 'openvz_ip'); $result[] = _search('vm', 'openvz_ip');
// directive snippets
$result[] = _search('admin', 'directive_snippets');
$json = $app->functions->json_encode($result); $json = $app->functions->json_encode($result);
} }
......
/* /*
Copyright (c) 2012, ISPConfig UG Copyright (c) 2012, ISPConfig UG (haftungsbeschränkt)
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
......
...@@ -89,7 +89,7 @@ $form["tabs"]['database_user'] = array ( ...@@ -89,7 +89,7 @@ $form["tabs"]['database_user'] = array (
'value' => '', 'value' => '',
'width' => '30', 'width' => '30',
'maxlength' => '255', 'maxlength' => '255',
'searchable' => 2 'searchable' => 1
), ),
'database_password' => array ( 'database_password' => array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment