- Added database users and directive snippets to global search.

interface/web/admin/form/directive_snippets.tform.php

@@ -30,6 +30,11 @@
 	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
+
 
 */
 
@@ -69,13 +74,15 @@ $form["tabs"]['directive_snippets'] = array (
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
-			'maxlength'	=> '255'
+			'maxlength'	=> '255',
+			'searchable' => 1
 		),
 		'type' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
 			'value'		=> array('apache' => 'Apache','nginx' => 'nginx','php' => 'PHP'),
+			'searchable' => 2
 		),
 		'snippet' => array (
 			'datatype'	=> 'TEXT',
@@ -83,7 +90,8 @@ $form["tabs"]['directive_snippets'] = array (
 			'default'	=> '',
 			'value'		=> '',
 			'width'		=> '30',
-			'maxlength'	=> '255'
+			'maxlength'	=> '255',
+			'searchable' => 2
 		),
 		'active' => array (
 			'datatype'	=> 'VARCHAR',

interface/web/dashboard/ajax_get_json.php

@@ -88,6 +88,9 @@ $type = $_GET["type"];
 		*/
 		$result[] = _search('sites', 'database');
 		
+		// database users
+		$result[] = _search('sites', 'database_user');
+		
 		// email domains
 		$result[] = _search('mail', 'mail_domain');
 		
@@ -133,6 +136,9 @@ $type = $_GET["type"];
 		// virtual machines ip addresses
 		$result[] = _search('vm', 'openvz_ip');
 		
+		// directive snippets
+		$result[] = _search('admin', 'directive_snippets');
+
 		$json = $app->functions->json_encode($result);
 	}
 

interface/web/js/jquery.ispconfigsearch.js

 /*
-Copyright (c) 2012, ISPConfig UG
+Copyright (c) 2012, ISPConfig UG (haftungsbeschränkt)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

interface/web/sites/form/database_user.tform.php

@@ -89,7 +89,7 @@ $form["tabs"]['database_user'] = array (
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255',
-			'searchable' => 2
+			'searchable' => 1
 		),
 		'database_password' => array (
 			'datatype'	=> 'VARCHAR',