Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -70,6 +70,19 @@
                     'width'      => "",
                     'value'      => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>",'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));

$liste["item"][] = array(   'field'      => "type",
                     'datatype'   => "VARCHAR",
                     'formtype'   => "SELECT",
                     'op'      => "=",
                     'prefix'   => "",
                     'suffix'   => "",
                     'width'      => "",
                     'value'      => array(
                                       'mongo' => "MongoDB",
                                       'mysql' => "MySQL"
                                    )
                  );

if($_SESSION['s']['user']['typ'] == 'admin') {
$liste["item"][] = array(   'field'      => "sys_groupid",
                     'datatype'   => "INTEGER",
@@ -99,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",
@@ -123,4 +153,4 @@
                            'width'        => "",
                            'value'        => "");

?>
?>