webinterface.git

@@ -80,8 +80,16 @@ function get_server_by_id($id) {

 function redirect($target)

 {

   global $debugmode;

-  if (! $debugmode)

+  if (! $debugmode) {

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

+  } else {

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

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

+      } else {

+          list($file, $qs) = explode('?', $target, 2);

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

+      }

+  }

   die();

 }

@@ -308,7 +316,6 @@ function encode_querystring($querystring)

   global $debugmode;

   if ($debugmode)

     $querystring = 'debug&'.$querystring;

-  DEBUG($querystring);

   $query = explode('&', $querystring);

   $new_query = array();

   foreach ($query AS $item)

@@ -323,7 +330,6 @@ function encode_querystring($querystring)

   $querystring = implode('&', $new_query);

   if ($querystring)

     $querystring = '?'.$querystring;

-  DEBUG($querystring);

   return $querystring;

 }

@@ -60,16 +60,6 @@ if (isset($_REQUEST['domain'])) {

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

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

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

-        $users = list_useraccounts();

-        if (count($users) > 1) {

-            $userselect = array();

-            foreach ($users as $u) {

-                $userselect[$u['uid']] = $u['username'].' / '.$u['name'];

-            }

-

-

-            $form .= '<tr><td>Benutzeraccount:</td><td>'.html_select('uid', $userselect).'</td></tr>';

-        }

         $form .='</table>';

@@ -15,10 +15,16 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 */

 if (isset($_GET['type'])) {

+    $caller = 'detail';

+    if (isset($_REQUEST['backto'])) {

+        $caller = $_REQUEST['backto'];

+    }

+    $_SESSION['domains_choose_redirect'] = $caller;

+

     $function = 'owner';

     if ($_GET['type'] == 'admin_c') {

         if (isset($_GET['detach'])) {

-            $_SESSION['domains_update_detach'] = $_GET['detach'];

+            $_SESSION['domains_'.$caller.'_detach'] = $_GET['detach'];

         }

         $function = 'admin_c';

     }

@@ -26,15 +32,17 @@ if (isset($_GET['type'])) {

     if ($function == 'admin_c') {

         $t = 'Verwalter';

     }

-    $_SESSION['contacts_choose_header'] = 'Wählen Sie einen neuen '.$t.' für die Domain '.$_SESSION['domains_update_domainname'];

-    $_SESSION['contacts_choose_key'] = 'domains_update_'.$function;

-    $_SESSION['contacts_choose_redirect'] = '../domains/detail';

+    $_SESSION['contacts_choose_header'] = 'Wählen Sie einen neuen '.$t.' für die Domain '.$_SESSION['domains_'.$caller.'_domainname'];

+    $_SESSION['contacts_choose_key'] = 'domains_'.$caller.'_'.$function;

+    $_SESSION['contacts_choose_redirect'] = '../domains/choose';

     redirect('../contacts/choose');

 } else {

     unset($_SESSION['contacts_choose_key']);

     unset($_SESSION['contacts_choose_header']);

     unset($_SESSION['contacts_choose_redirect']);

-    redirect("detail");

+    $backto = $_SESSION['domains_choose_redirect'];

+    unset($_SESSION['domains_choose_redirect']);

+    redirect($backto);

 }

@@ -26,9 +26,9 @@ require_role(ROLE_CUSTOMER);

 $dom = NULL;

 if (isset($_REQUEST['id'])) {

     $dom = new Domain( (int) $_REQUEST['id']);

-    $_SESSION['domains_update_domainname'] = $dom->fqdn;

-} elseif (isset($_SESSION['domains_update_domainname'])) {

-    $dom = new Domain($_SESSION['domains_update_domainname']);

+    $_SESSION['domains_detail_domainname'] = $dom->fqdn;

+} elseif (isset($_SESSION['domains_detail_domainname'])) {

+    $dom = new Domain($_SESSION['domains_detail_domainname']);

 } else {

     system_failure("Keine Domain angegeben");

 }

@@ -69,29 +69,29 @@ if ($dom->provider == 'terions' && ($dom->cancel_date === NULL || $dom->cancel_d

     if (isset($_REQUEST['id'])) {

         api_download_domain($_REQUEST['id']);

-        $_SESSION['domains_update_domainname'] = $dom->fqdn;

-        $_SESSION['domains_update_owner'] = $dom->owner;

-        $_SESSION['domains_update_admin_c'] = $dom->admin_c;

+        $_SESSION['domains_detail_domainname'] = $dom->fqdn;

+        $_SESSION['domains_detail_owner'] = $dom->owner;

+        $_SESSION['domains_detail_admin_c'] = $dom->admin_c;

     }

     if (!update_possible($dom->id)) {

         warning("Diese Domain verwendet eine unübliche Endung. Daher kann der Inhaber nicht auf diesem Weg verändert werden. Bitte kontaktieren Sie den Support.");

     } else {

-        if ($_SESSION['domains_update_admin_c'] == $dom->admin_c && 

-                $_SESSION['domains_update_owner'] != $dom->owner && 

-                (!isset($_SESSION['domains_update_detach']) || $_SESSION['domains_update_detach'] == 0)) {

+        if ($_SESSION['domains_detail_admin_c'] == $dom->admin_c && 

+                $_SESSION['domains_detail_owner'] != $dom->owner && 

+                (!isset($_SESSION['domains_detail_detach']) || $_SESSION['domains_detail_detach'] == 0)) {

             // Wenn der Owner geändert wurde, der Admin aber nicht und das detach-Flag 

             // nicht gesetzt ist, dann wird der Admin gleich dem Owner gesetzt

-            $_SESSION['domains_update_admin_c'] = $_SESSION['domains_update_owner'];

+            $_SESSION['domains_detail_admin_c'] = $_SESSION['domains_detail_owner'];

         }

         if (isset($_GET['admin_c']) && $_GET['admin_c'] == 'none') {

-            $_SESSION['domains_update_admin_c'] = $_SESSION['domains_update_owner'];

-            unset($_SESSION['domains_update_detach']);

+            $_SESSION['domains_detail_admin_c'] = $_SESSION['domains_detail_owner'];

+            unset($_SESSION['domains_detail_detach']);

         }

-        $owner = get_contact($_SESSION['domains_update_owner']);

-        $admin_c = get_contact($_SESSION['domains_update_admin_c']);

+        $owner = get_contact($_SESSION['domains_detail_owner']);

+        $admin_c = get_contact($_SESSION['domains_detail_admin_c']);

         $function = 'Inhaber';

         if ($owner['id'] == $admin_c['id']) {

             $function .= ' und Verwalter';

@@ -109,7 +109,7 @@ if ($dom->provider == 'terions' && ($dom->cancel_date === NULL || $dom->cancel_d

             }

             output('<p><strong>Verwalter:</strong></p>'.display_contact($admin_c, '', $cssclass));

             addnew('choose', 'Neuen Verwalter wählen', "type=admin_c");

-            output('<p class="delete">'.internal_link('update', 'Keinen separaten Verwalter festlegen', 'admin_c=none').'</p>');

+            output('<p class="delete">'.internal_link('', 'Keinen separaten Verwalter festlegen', 'admin_c=none').'</p>');

         } else {

             addnew('choose', 'Einen separaten Verwalter wählen', "type=admin_c&detach=1");

         }

@@ -131,14 +131,20 @@ if ($dom->provider == 'terions' && ($dom->cancel_date === NULL || $dom->cancel_d

 // Block Externe Domain umziehen

-if ($dom->provider != 'terions') {

+if ($dom->status == 'prereg') {

+    output('<h4>Domain-Registrierung abschließen</h4>

+            <p>'.internal_link('domainreg', 'Domain registrieren', "domain={$dom->fqdn}").'</p>');

+} elseif ($dom->status == 'pretransfer') {

+    output('<h4>Domain-Umzug ausführen</h4>

+            <p>'.internal_link('domainreg', 'Umzugsautrag (ggf. nochmals) erteilen', "domain={$dom->fqdn}").'</p>');

+} elseif ($dom->provider != 'terions') {

     output('<h4>Domain-Transfer ausführen</h4>

             <p>'.internal_link('domainreg', 'Domain-Transfer ausführen', "domain={$dom->fqdn}").'</p>');

 }

 // Block Domain bestätigen

-if ($dom->mailserver_lock == 1) {

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

     if (has_own_ns($dom->domainname, $dom->tld)) {

         unset_mailserver_lock($dom);

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

@@ -0,0 +1,122 @@

+<?php

+/*

+This file belongs to the Webinterface of schokokeks.org Hosting

+

+Written 2008-2018 by schokokeks.org Hosting, namely

+  Bernd Wurst <bernd@schokokeks.org>

+  Hanno Böck <hanno@schokokeks.org>

+

+To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

+

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+http://creativecommons.org/publicdomain/zero/1.0/

+

+Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

+*/

+

+require_once('inc/security.php');

+require_once('inc/icons.php');

+require_once('class/domain.php');

+

+require_once('domains.php');

+require_once('domainapi.php');

+require_role(ROLE_CUSTOMER);

+use_module('contacts');

+require_once('contacts.php');

+

+

+$dom = NULL;

+if (isset($_REQUEST['domain'])) {

+    $domain = $_REQUEST['domain'];

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

+        system_failure('Leerzeichen sind in Domainnamen nicht erlaubt.');

+    }

+    $dom = new Domain();

+    if ($dom->loadByName($domain) === false) {

+        // Eintragen mit DNS und Mail

+        $id = insert_domain_external($domain, true, true);

+        $dom->loadByName($domain);

+    } 

+    $dom->ensure_customerdomain();

+    if ($dom->provider == 'terions') {

+        system_failure("Diese Domain ist bereits auf Ihr Kundenkonto registriert.");

+    }

+    

+    // An diesem Punkt ist die Domain eingetragen als extern und ggf. mit Mailserver-Lock

+    // Bei der Reg-Bestätigung wird das Lock entfernt und die Daten entsprechend gesetzt, inklusive Preise.

+

+    $_SESSION['domains_domainreg_owner'] = NULL;

+    $_SESSION['domains_domainreg_admin_c'] = NULL;

+    $_SESSION['domains_domainreg_domainname'] = $domain;

+    $_SESSION['domains_domainreg_detach'] = 0;

+    

+} elseif (isset($_SESSION['domains_domainreg_domainname'])) {

+    $domain = $_SESSION['domains_domainreg_domainname'];

+    $dom = new Domain($domain);

+    $dom->ensure_customerdomain();

+}

+

+if (!$dom) {

+    system_failure("Keine Domain");

+}

+

+$mode=NULL;

+

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

+if ($avail == 'available') {

+    set_domain_prereg($dom->id);

+    $mode = 'reg';

+    title("Domain registrieren");

+} elseif ($avail == 'registered' || $avail == 'alreadyRegistered') {

+    // FIXME: alreadyRegistered bedeutet, dass die Domain bereits über uns verwaltet wird. Das wird dann hier nicht funktionieren

+    set_domain_pretransfer($dom->id);

+    $mode = 'transfer';

+    title("Domain-Transfer vornehmen");

+}

+

+

+output("<p>Domainname: <strong>".$dom->fqdn."</strong></p>");

+

+$section='domains_domains';

+

+

+output('<h4>Inhaber der Domain</h4>');

+output('<p>Legen Sie hier einen neuen Inhaber für diese Domain fest.</p>');

+

+if ($_SESSION['domains_domainreg_detach'] == 0) {

+    $_SESSION['domains_domainreg_admin_c'] = $_SESSION['domains_domainreg_owner'];

+} 

+

+// Behandlung für "keinen extra Verwalter"

+if (isset($_GET['admin_c']) && $_GET['admin_c'] == 'none') {

+    $_SESSION['domains_domainreg_admin_c'] = $_SESSION['domains_domainreg_owner'];

+    $_SESSION['domains_domainreg_detach'] = 0;

+}

+

+if ($_SESSION['domains_domainreg_owner']) {

+    $owner = get_contact($_SESSION['domains_domainreg_owner']);

+

+    $function = 'Inhaber';

+    if ($_SESSION['domains_domainreg_admin_c'] == $_SESSION['domains_domainreg_owner']) {

+        $function .= ' und Verwalter';

+    }

+    output('<p><strong>'.$function.':</strong></p>'.display_contact($owner, ''));

+} else {

+    output('<p><strong>Inhaber und Verwalter:</strong></p><p><em>Bisher kein Inhaber ausgewählt</em>');

+}

+addnew('choose', 'Neuen Inhaber wählen', "type=owner&backto=domainreg");

+if ($_SESSION['domains_domainreg_admin_c'] != $_SESSION['domains_domainreg_owner']) {

+    $admin_c = get_contact($_SESSION['domains_domainreg_admin_c']);

+    output('<p><strong>Verwalter:</strong></p>'.display_contact($admin_c, ''));

+    addnew('choose', 'Neuen Verwalter wählen', "type=admin_c&backto=domainreg");

+    output('<p class="delete">'.internal_link('', 'Keinen separaten Verwalter festlegen', 'admin_c=none').'</p>');

+} else {

+    addnew('choose', 'Einen separaten Verwalter wählen', "type=admin_c&detach=1&backto=domainreg");

+}

+

+

+

+

+

+

+

@@ -43,7 +43,10 @@ foreach ($user_domains as $domain)

       $mailserver_lock = '<br><strong>Mail-Verarbeitung eingeschränkt!</strong>'.footnote('Diese Domain ist extern registriert und wurde noch nicht bestätigt. Momentan ist daher der Mail-Empfang auf dieser Domain nicht möglich.');

   }

   $regdate = $domain->reg_date;

-  if ($domain->provider != 'terions') {

+  if ($domain->status == 'prereg') {

+      $status = 'prereg';

+      $regdate = '<em>Registrierung nicht abgeschlossen</em>';

+  } elseif ($domain->provider != 'terions') {

     $status = 'external';

     $regdate = '<em>Extern registriert</em>';

   } elseif ($domain->reg_date == NULL) {

@@ -266,30 +266,24 @@ function get_domain_offer($domainname)

   return $data;

 }

-

-function insert_domain_prereg($domain, $transfer=false)

+function set_domain_pretransfer($domain)

 {

     $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");

-    }

-    $domainname = $parts[0];

-    $tld = $parts[1];

-    $status = 'prereg';

-    if ($transfer) {

-        $status = 'pretransfer';

+    $domain = (int) $domain;

+    db_query("UPDATE kundendaten.domains SET status='pretransfer', dns=1 WHERE id=? AND kunde=?", 

+            array($domain, $cid));

 }

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

-        (?, ?, ?, ?, ?, 'regular', 'other', 1, 'auto', 1)", array($status, $cid, $uid, $domainname, $tld));

-    $id = db_insert_id();

-    $vmailserver = (int) $_SESSION['userinfo']['server'];

-    db_query("INSERT INTO mail.virtual_mail_domains (domain, server) VALUES (?, ?)", array($id, $vmailserver));

-    return $id;

+

+

+

+function set_domain_prereg($domain)

+{

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

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

+    $domain = (int) $domain;

+    db_query("UPDATE kundendaten.domains SET status='prereg', dns=1 WHERE id=? AND kunde=?", 

+            array($domain, $cid));

 }

@@ -36,6 +36,7 @@ if ($_REQUEST['action'] == 'ownerchange') {

     if (!(isset($_POST['accept']) && $_POST['accept'] == '1')) {

         redirect('detail?error=1');

     }

+    check_form_token('domains_update');

     $dom = new Domain($_SESSION['domains_update_domainname']);

     if (!$dom) {

         system_failure("Keine Domain gewählt!");

@@ -29,6 +29,6 @@ if (!isset($_REQUEST['domain'])) {

 $id = insert_domain_external($_REQUEST['domain'], ($_REQUEST['dns'] === 'enable'), ($_REQUEST['email'] === 'enable'));

-redirect('verify?id='.$id);

+redirect('detail?id='.$id);