webinterface.git

@@ -83,6 +83,9 @@ function redirect($target)

   if (! $debugmode) {

     header("Location: {$target}");

   } else {

+      if ($target == '') {

+          $target = $_SERVER['REQUEST_URI'];

+      }

       if (strpos($target, '?') === false) {

         print 'REDIRECT: '.internal_link($target, $target);

       } else {

@@ -51,13 +51,13 @@ if (isset($_REQUEST['domain'])) {

     if ($avail['status'] == 'available') {

         output('<p class="domain-available">Die Domain '.filter_input_general($_REQUEST['domain']).' ist verfügbar!</p>');

         # Neue Domain eintragen

-        $data = get_domain_offer($_REQUEST['domain']);

+        $data = get_domain_offer($avail['domainSuffix']);

         if (!$data) {

             redirect('');

         }

         $form = '<p>Folgende Konditionen gelten bei Registrierung der Domain im nächsten Schritt:</p>

             <table>

-            <tr><td>Domainname:</td><td><strong>'.$data['domainname'].'</strong></td></tr>

+            <tr><td>Domainname:</td><td><strong>'.filter_input_general($_REQUEST['domain']).'</strong></td></tr>

             <tr><td>Jahresgebühr:</td><td style="text-align: right;">'.$data['gebuehr'].' €</td></tr>';

         if ($data['setup']) {

             $form .= '<tr><td>Setup-Gebühr (einmalig):</td><td style="text-align: right;">'.$data['setup'].' €</td></tr>';

@@ -76,7 +76,7 @@ if (isset($_REQUEST['domain'])) {

         if ($avail['status'] == 'registered' && $avail['transferMethod'] != 'authInfo') {

             output('<p>Diese Domainendung kann nicht automatisiert übertragen werden. Bitte wenden Sie sich an den Support.</p>');

         } else {

-            $data = get_domain_offer($_REQUEST['domain']);

+            $data = get_domain_offer($avail['domainSuffix']);

             if (! $data) {

                 // Die Include-Datei setzt eine passende Warning-Nachricht

@@ -85,7 +85,7 @@ if (isset($_REQUEST['domain'])) {

                 $form = '<p>Folgende Konditionen gelten beim Transfer der Domain im nächsten Schritt:</p>

                     <table>

-                    <tr><td>Domainname:</td><td><strong>'.$data['domainname'].'</strong></td></tr>

+                    <tr><td>Domainname:</td><td><strong>'.filter_input_general($avail['domainNameUnicode']).'</strong></td></tr>

                     <tr><td>Jahresgebühr:</td><td style="text-align: right;">'.$data['gebuehr'].' €</td></tr>';

                 if ($data['setup']) {

                     $form .= '<tr><td>Setup-Gebühr (einmalig):</td><td style="text-align: right;">'.$data['setup'].' €</td></tr>';

@@ -93,7 +93,7 @@ if (isset($_REQUEST['domain'])) {

                 $form .='</table>';

-                $form .= '<p><input type="hidden" name="domain" value="'.filter_input_general($_REQUEST['domain']).'">

+                $form .= '<p><input type="hidden" name="domain" value="'.filter_input_general($avail['domainNameUnicode']).'">

                     <input type="submit" name="submit" value="Ich möchte diese Domain zu '.config('company_name').' umziehen"></p>';

                 output(html_form('domains_transferin', 'domainreg', '', $form));

@@ -160,7 +160,7 @@ if ($dom->mailserver_lock == 1 && $dom->status != 'prereg') {

     if ($TXT == $dom->secret) {

         unset_mailserver_lock($dom);

         success_msg("Die Domain {$dom->fqdn} wurde erfolgreich bestätigt und kann nun in vollem Umfang verwendet werden.");

-        redirect("domains");

+        redirect("");

     }

     if ($dom->dns == 1 || have_module('dns')) {

@@ -60,13 +60,18 @@ if (!$dom) {

     system_failure("Keine Domain");

 }

-$pricedata = get_domain_offer($dom->fqdn);

+$avail = api_domain_available($dom->fqdn);

+$tld = $avail['extension'];

+if ($tld != $dom->tld) {

+    system_failure("Fehler in den Daten! Bitte Support informieren");

+}

+

+$pricedata = get_domain_offer($tld);

 if (!$pricedata) {

     redirect('adddomain');

 }

 $mode=NULL;

-$avail = api_domain_available($dom->fqdn);

 if ($avail['status'] == 'available') {

     set_domain_prereg($dom->id);

     $mode = 'reg';

@@ -233,18 +233,12 @@ function change_user($domain, $uid)

 }

-function get_domain_offer($domainname) 

+function get_domain_offer($tld) 

 {

-  $domainname = filter_input_hostname($domainname);

-  $domainname = preg_replace('/^www\./', '', $domainname);

-

-  $basename = preg_replace('/([^\.]+)\..*$/', '\1', $domainname);

-  DEBUG('Found Basename: '.$basename);

-  $tld = preg_replace('/^[^\.]*\./', '', $domainname);

-  DEBUG('Found TLD: '.$tld);

+  $tld = filter_input_hostname($tld);

   $cid = (int) $_SESSION['customerinfo']['customerno'];

-  $data = array("domainname" => $domainname, "basename" => $basename, "tld" => $tld);

+  $data = array("tld" => $tld);

   $result = db_query("SELECT tld, gebuehr, setup FROM misc.domainpreise_kunde WHERE kunde=:cid AND tld=:tld AND ruecksprache='N'", array(":cid" => $cid, ":tld" => $tld));

   if ($result->rowCount() != 1) {

@@ -286,15 +280,14 @@ function insert_domain_external($domain, $dns = false, $mail = true)

 {

     $cid = (int) $_SESSION['customerinfo']['customerno'];

     $uid = (int) $_SESSION['userinfo']['uid'];

-    if (strpos($domain, ' ') !== false) {

-        system_failure("Ungültige Zeichen im Domainname");

-    }

-    $parts = explode('.', $domain);

-    if (count($parts) !== 2) {

-        system_failure("Ungültiger Domainname");

+    require_once("domainapi.php");

+    $info = api_domain_available($domain);

+    if (in_array($info['status'], array('nameContainsForbiddenCharacter', 'suffixDoesNotExist'))) {

+        system_failure("Diese Domain scheint ungültig zu sein!");

     }

-    $domainname = $parts[0];

-    $tld = $parts[1];

+    $tld = $info['domainSuffix'];

+    $domainname = str_replace(".$tld", "", $info['domainNameUnicode']);

+    

     db_query("INSERT INTO kundendaten.domains (status, kunde, useraccount, domainname, tld, billing, provider, dns, mail, mailserver_lock) VALUES 

         ('external', ?, ?, ?, ?, 'external', 'other', 0, ?, 1)", array($cid, $uid, $domainname, $tld, ($mail ? 'auto' : 'none')));

     $id = db_insert_id();