add disclaimerlink

registration-system/admin/pages_infos.php

@@ -21,8 +21,9 @@ class AdminInfosPage extends AdminPage {
                         'wikilink' => $_REQUEST['wikilink'],
                         'paydeadline' => $_REQUEST['paydeadline'],
                         'payinfo' => $_REQUEST['payinfo'],
-                        'opentime' => $_REQUEST['opentime']]
-                );
+                        'opentime' => $_REQUEST['opentime'],
+                        'disclaimlink' => $_REQUEST['disclaimlink']
+                    ]);
                 $saveResult = $this->fahrt->save();
                 if (empty($saveResult)) {
                     $this->message_err = 'Speichern fehlgeschlagen...';
@@ -117,6 +118,8 @@ class AdminInfosPage extends AdminPage {
                                 <input type="text" name="kontakt" id="kontakt" value="' . $data["kontakt"] . '" /></li>
                             <li><label>Wiki-Link</label>
                                 <input type="text" name="wikilink" id="wikilink" value="' . $data["wikilink"] . '" /></li>
+                            <li><label>Disclaimer-Link</label>
+                                <input type="text" name="wikilink" id="wikilink" value="\' . $data["wikilink"] . \'" /></li>
                             <li><label>Zahlung bis</label>
                                 <input type="text" name="paydeadline" id="paydeadline" value="' . $data["paydeadline"] . '" /></li>
                             <li><label>Zahlungsdetails</label>

registration-system/frameworks/Bachelor.php

@@ -359,11 +359,14 @@ class Bachelor {
         $this->validateField('abtyp', $oconf['reisearten'], 'Entwicklern Bier geben und: <a href="https://www.hu-berlin.de/studium/bewerbung/imma/exma">hier klicken!</a>');
         $this->validateField('essen', $oconf['essen'], 'Hat das wirklich nicht gereicht??');
         $this->validateField('studityp', $oconf['studitypen'], 'Das bist du ganz bestimmt nicht!');
-        $this->validateField('public', 'public', 'Trollololol');
+        $this->validateField('public', 'checkbox', 'Trollololol');
         $this->validateField('virgin', 'virgin', 'Bitte Altersbereich wählen!');
         $this->validateField('comment', 'comment', 'Trollololol');
-        if (!$admincheck)
+        if (!$admincheck) {
             $this->validateField('captcha', 'captcha', 'Captcha falsch eingegeben.');
+            if (!isset($_REQUEST['disclaimer']))
+                array_push($this->validationErrors, 'Disclaimer *muss* akzeptiert werden!');
+        }
 
         if ($this->data['anday'] == $this->data['abday'])
             array_push($this->validationErrors, 'Anreisetag = Abreisetag -> Bitte prüfen!');
@@ -373,6 +376,8 @@ class Bachelor {
             $this->data['signupstats'] = $_REQUEST['signupstats']; // TODO make checks for signupmethods?
         else
             $this->data['signupstats'] = null;
+
+        unset($_SESSION['captcha']);
     }
 
     /**
@@ -390,7 +395,7 @@ class Bachelor {
     private function validateField($index, $check, $errmess) {
         try {
             // check that first because if unchecked it doesnt exist
-            if ($check == "public") {
+            if ($check == 'checkbox') {
                 $this->set([$index => (isset($_REQUEST[$index])) ? 0 : 1]);
             } // if index is missing -> error!
             elseif (!isset($_REQUEST[$index])) {
@@ -421,7 +426,6 @@ class Bachelor {
                 elseif ($check == "captcha") {
                     if (!(isset($_SESSION['captcha']) && strtolower($tmp) == strtolower($_SESSION['captcha']))) {
                         array_push($this->validationErrors, $errmess);
-                        unset($_SESSION['captcha']);
                     }
                 } // check mail address
                 elseif ($check == "mail") {

registration-system/other/sqlDumps/update_20161021.sql

+ALTER TABLE `fahrten`
+ADD `disclaimlink` VARCHAR(255) NOT NULL DEFAULT '';
\ No newline at end of file