Merged revisions 4069-4117 from stable branch.

tbrehm

2013-08-21 7b47c0aa0aeee6f059f00008e36cc210ca89ecb9

 interface/web/sites/list/database.list.php

@@ -112,6 +112,23 @@
                                          ),
                     'width'      => "",
                     'value'      => "");
							
$liste["item"][] = array(   'field'      => "parent_domain_id",
                     'datatype'   => "VARCHAR",
                            'filters'   => array( 0 => array( 'event' => 'SHOW',
                                                              'type' => 'IDNTOUTF8')
                                                ),
                     'formtype'   => "SELECT",
                     'op'      => "=",
                     'prefix'   => "",
                     'suffix'   => "",
                     'datasource'   => array (    'type'   => 'SQL',
                              'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                              'keyfield'=> 'domain_id',
                              'valuefield'=> 'domain'
                            ),
                     'width'      => "",
                     'value'      => "");

$liste["item"][] = array(   'field'      => "database_user_id",
                     'datatype'   => "INTEGER",