Pull linebreak out of if construct

[misc/kostenrechnung] / lib / mask.php

diff --git a/lib/mask.php b/lib/mask.php
index 0325e7a..72d3b67 100644 (file)
--- a/lib/mask.php
+++ b/lib/mask.php
@@ -33,10 +33,10 @@ function build_form($name, $fields)
       $v[] = 'size="'.(empty($info['size'])?'10':$info['size']).'"';
       $v[] = 'type="'.($info['type']=='passwd'?'password':'text').'"';
       $ret[] = sprintf('<label for="edit_%s">%s</label><br>', $id, $info['name']);
-      $ret[] = sprintf('<input %s><br>', implode(' ', $v));
+      $ret[] = sprintf('<input %s>', implode(' ', $v));
     } elseif ($info['type'] == 'boolean') {
       $ret[] = sprintf('<label for="edit_%s">%s</label><br>', $id, $info['name']);
-      $ret[] = sprintf('<input type="checkbox" id="edit_%s" name="%s"><br>', $id, $id);
+      $ret[] = sprintf('<input type="checkbox" id="edit_%s" name="%s">', $id, $id);
     } elseif ($info['type'] == 'select') {
       $ret[] = sprintf('<label for="edit_%s">%s</label><br>', $id, $info['name']);
       $ret[] = sprintf('<select id="edit_%s" name="%s">', $id, $id);
@@ -44,10 +44,11 @@ function build_form($name, $fields)
       else $options = query_db($info['options']);
       foreach ($options as $row)
        $ret[] = sprintf('<option value="%s">%s</option>', $row['id'], $row['text']);
-      $ret[] = '</select><br>';
+      $ret[] = '</select>';
     } elseif ($info['type'] == 'date') {
       error_log('type = date');
     }
+    $ret[] = '<br>';
   }
 
   $ret[] = '<span id="form_status"></span>';
@@ -95,6 +96,7 @@ function build_grid($name, $mask)
     if ($data['width'] > 0) $s[] = 'width: ' . $data['width'];
     if (array_key_exists('type', $data)) $s[] = "type: '" . $data['type'] . "'";
     if (array_key_exists('specs', $data)) $s[] = $data['specs'];
+    if (array_key_exists('control', $data)) $s[] = 'control: ' . $data['control'];
     $specs[] = '{' . implode(', ', $s) . '}';
 
     if (array_key_exists('sql', $data))