merge

fix missing close input

registration-system/view/signups/form/index.php

@@ -55,63 +55,57 @@ class FormSignupMethod extends SignupMethod {
 
         $link_params = $this->getFormSubmitBaseParams();
 
+        echo '<div style="margin: 0 auto;width: 702px;">';
         if ($waitlist_mode)
             echo '<h1 style="color: red;">Warteliste</h1>
                   <p>Eintragen und hoffen...</p>';
         else
             echo '<h1>Anmeldeformular</h1>
                   <p>Bitte hier verbindlich anmelden.</p>';
+        echo '</div>';
 
 
         echo '<div id="stylized" class="myform">
                 <form id="form" name="form" method="post" action="index.php' . $link_params . '">';
-
         $this->show_formular_helper_hidden_input('signupstats', (isset($bachelorData['signupstats']) ? $bachelorData['signupstats'] : null));
 
-        $this->show_formular_helper_input('Vorname', 'forname', $bachelorData['forname'], '');
-        $this->show_formular_helper_input('Nachname', 'sirname', $bachelorData['sirname'], '');
-        $this->show_formular_helper_input('Anzeigename', 'pseudo', $bachelorData['pseudo'], '');
-        echo $soft_prot->add(array('forname', 'sirname', 'pseudo'), $this->environment->config['invalidChars'])->write();
-        $this->show_formular_helper_input('E-Mail-Adresse', 'mehl', $bachelorData['mehl'], 'regelmäßig lesen!');
-        $this->show_formular_helper_sel('Du bist', 'studityp', $this->environment->oconfig['studitypen'], $bachelorData['studityp'], '');
-        $this->show_formular_helper_sel('Alter 18+?', 'virgin', ['UNSET' => '', 'JA' => 'Ja', 'NEIN' => 'Nein'],
-            isset($bachelorData['virgin']) ? ($bachelorData['virgin'] == 0 ? 'JA' : 'NEIN') : 'UNSET', 'Bist du älter als 18 Jahre?');
-        $this->show_formular_helper_sel('Essenswunsch', 'essen', $this->environment->oconfig['essen'], $bachelorData['essen'], 'Info für den Koch.');
-        $this->show_formular_helper_sel2('Anreise', 'anday', array_slice($possible_dates, 0, -1), $bachelorData['anday'],
-            'antyp', $this->environment->oconfig['reisearten'], $bachelorData['antyp'], '');
-        $this->show_formular_helper_sel2('Abreise', 'abday', array_slice($possible_dates, 1), $bachelorData['abday'],
-            'abtyp', $this->environment->oconfig['reisearten'], $bachelorData['abtyp'], '');
-
+        $this->show_formular_helper_input('Vorname', 'forname', $bachelorData['forname'], '', 'width:47%; float:left;');
+        $this->show_formular_helper_input('Nachname', 'sirname', $bachelorData['sirname'], '',  'width:47%; float:right;');
+        echo '<div style="clear:both"></div>';
+        $this->show_formular_helper_input('Anzeigename', 'pseudo', $bachelorData['pseudo'], '', 'width:47%; float:left;');
+        $this->show_formular_helper_input('E-Mail-Adresse', 'mehl', $bachelorData['mehl'], 'regelmäßig lesen!', 'width:47%; float:right;');
+        echo '<div style="clear:both"></div>';
         $this->show_formular_helper_sel("Du bist", "studityp", $this->environment->oconfig['studitypen'], $bachelorData["studityp"],
-            "", 'width:45%; float:left;');
+            "", 'width:47%; float:left;');
         $this->show_formular_helper_sel("Alter 18+?", "virgin", ['UNSET'=>'', 'JA'=>'Ja', 'NEIN' => 'Nein'],
             isset($bachelorData['virgin']) ? ($bachelorData['virgin'] == 0 ? "JA" : "NEIN") : 'UNSET',
-            "Bist du älter als 18 Jahre?", 'width:45%; float:right;margin-right:-6px;');
+            "Bist du älter als 18 Jahre?", 'width:47%; float:right;margin-right:-6px;');
         echo '<div style="clear:both;"></div>';
-
         $this->show_formular_helper_sel("Essenswunsch", "essen", $this->environment->oconfig['essen'], $bachelorData["essen"],
-            "Info für den Koch.", 'width:45%; float:left;');
+            "Info für den Koch.", 'width:47%; float:left;');
         echo '<div style="clear:both;"></div>';
-
         $this->show_formular_helper_sel2("Anreise", "anday", array_slice($possible_dates, 0, -1), $bachelorData["anday"],
-            "antyp", $this->environment->oconfig['reisearten'], $bachelorData["antyp"], "",'width:45%; float:left;');
+            "antyp", $this->environment->oconfig['reisearten'], $bachelorData["antyp"], "",'width:47%; float:left;');
         $this->show_formular_helper_sel2("Abreise", "abday", array_slice($possible_dates, 1), $bachelorData["abday"],
-            "abtyp", $this->environment->oconfig['reisearten'], $bachelorData["abtyp"], "",'width:45%; float:right;margin-right:-6px;');
+            "abtyp", $this->environment->oconfig['reisearten'], $bachelorData["abtyp"], "",'width:47%; float:right;margin-right:-6px;');
         echo '<div style="clear:both;"></div>
 
             <label>Anmerkung</label>
             <textarea id="comment" name ="comment" rows="3" cols="50">' . $bachelorData["comment"] . '</textarea>
-            <input type="checkbox" name="public" value="public" style="width:40px"><span style="float:left">Anmeldung verstecken</span><br/>
-            <input type="checkbox" name="disclaimer" value="disclaimer" style="width:40px">
-			<span style="float:left"><a style="text-decoration:underline;" target="_blank" href="'.$fahrt->get('disclaimlink').'">Disclaimer</a> gelesen und akzeptiert</span><br/> akzeptieren</span><br/>
-
+            <input type="checkbox" name="public" value="public" style="width:40px" /><span>Anmeldung verstecken</span><br/>
+            <input type="checkbox" name="disclaimer" value="disclaimer" style="width:40px" />
+			<span><a style="text-decoration:underline;" target="_blank" href="'.$fahrt->get('disclaimlink').'">Disclaimer</a> gelesen und akzeptiert</span><br/>
             <div style="clear:both"></div>';
 
         $this->show_formular_helper_input("Captcha eingeben", "captcha", "", "",'width:45%; float:left;');
-        echo '<img src="view/captcha.php" style="float:right; width: 45%;" /><div style="clear:both"></div>
+        echo '<img src="view/captcha.php" style="float:right; width: 45%;" />
+            <div style="clear:both"></div>
             <button type="submit" name="submit" id="submit" value="submit">Anmelden!</button>
             </form>
             </div>';
+
+
+        echo $soft_prot->add(array('forname', 'sirname', 'pseudo'), $this->environment->config['invalidChars'])->write();
     }
 
     /**
@@ -150,8 +144,9 @@ class FormSignupMethod extends SignupMethod {
      * @param $values2
      * @param $selected2
      * @param $subtext
+     * @param $style
      */
-    private function show_formular_helper_sel2($name, $id, $values, $selected, $id2, $values2, $selected2, $subtext, $style=null) {
+    private function show_formular_helper_sel2($name, $id, $values, $selected, $id2, $values2, $selected2, $subtext, $style = null) {
         $style = (empty($style) ? '' : 'style="'.$style.'"');
 
         echo '<div class="fieldbox" '.$style.'><label style="text-align:left">' . $name . '
@@ -177,7 +172,7 @@ class FormSignupMethod extends SignupMethod {
         echo '<div class="fieldbox" '.$style.'><label for="'.$id.'">' . $name . '
         <span class="small">' . $subtext . '</span>
         </label><br />
-        <input type="text" name="' . $id . '" id="' . $id . '" value="' . $value . '" />';
+        <input type="text" name="' . $id . '" id="' . $id . '" value="' . $value . '" /></div>';
     }
 
     private function show_formular_helper_hidden_input($id, $value) {