Merged revisions 2812-2883 from staböe branch.

tbrehm

2012-01-12 8cf78b31b28b9183579c7939b947e1f7e9f5c2fa

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

@@ -100,9 +100,9 @@
         'formtype'   => 'SELECT',
         'default'   => '',
         'datasource'   => array (    'type'   => 'SQL',
                              'querystring' => 'SELECT client_id,contact_name FROM client WHERE {AUTHSQL} ORDER BY contact_name',
                              'querystring' => "SELECT client_id,CONCAT(contact_name,' :: ',username) as name FROM client WHERE {AUTHSQL} ORDER BY contact_name",
                              'keyfield'=> 'client_id',
                              'valuefield'=> 'contact_name'
                              'valuefield'=> 'name'
                            ),
         'value'      => array(0 => ' ')
      ),