webinterface.git

@@ -158,9 +158,12 @@ function maybe_null($value)

 function logger($severity, $scriptname, $scope, $message)

 {

-  if (config('logging') <= $severity)

+  if (config('logging') < $severity) {

+    DEBUG("NOT LOGGING $scriptname:$scope:$message");

     return;

+  }

+  DEBUG("LOGGING $scriptname:$scope:$message");

   $user = NULL;

   if ($_SESSION['role'] & ROLE_SYSTEMUSER)

     $user = $_SESSION['userinfo']['username'];

@@ -97,8 +97,13 @@ function api_upload_domain($fqdn)

     }

     $args = array("domain" => $apidomain);

     logger(LOG_INFO, "modules/domains/include/domainapi", "domains", "uploading domain »{$fqdn}«");

-    api_request('domainUpdate', $args);

-

+    $result = api_request('domainUpdate', $args);

+    if ($result['status'] == 'error') {

+        $msg = $result['errors'][0]['text'];

+        logger(LOG_ERR, "modules/domains/include/domainapi", "domains", "ERROR uploading domain »{$fqdn}«: {$msg}");

+        system_failure("Es trat ein interner Fehler auf. Bitte dem Support Bescheid geben!");

+    }

+    return $result;

 }

@@ -155,7 +160,7 @@ function api_register_domain($domainname, $authinfo=NULL)

     }

     if ($result['status'] == 'error') {

         $errstr = $result['errors'][0]['text'];

-        logger(LOG_ERR, "modules/domains/include/domainapi", "domains", "error registering domain: {$errstr}");

+        logger(LOG_ERR, "modules/domains/include/domainapi", "domains", "error registering domain $domainname: {$errstr}");

         system_failure("Es trat ein interner Fehler auf. Bitte dem Support Bescheid geben!");

     }

     return $result;    

@@ -185,8 +190,11 @@ function api_cancel_domain($domainname)

     logger(LOG_WARNING, "modules/domains/include/domainapi", "domains", "cancel domain »{$newdomainname}« at time {$apidomain['latestDeletionDateWithoutRenew']}");

     $result = api_request('domainDelete', $args);

     if ($result['status'] == 'error') {

-        //system_failure(print_r($result['errors'], true));

+        $errstr = $result['errors'][0]['text'];

+        logger(LOG_ERR, "modules/domains/include/domainapi", "domains", "error canceling domain $domainname: {$errstr}");

+        system_failure("Es trat ein interner Fehler auf. Bitte dem Support Bescheid geben!");

     }

+    return $result;

  }

@@ -201,7 +209,13 @@ function api_unlock_domain($domainname)

     $apidomain['transferLockEnabled'] = false;

     $args = array("domain" => $apidomain);

     logger(LOG_WARNING, "modules/domains/include/domainapi", "domains", "allow transfer for domain »{$domainname}«");

-    api_request('domainUpdate', $args);

+    $result = api_request('domainUpdate', $args);

+    if ($result['status'] == 'error') {

+        $errstr = $result['errors'][0]['text'];

+        logger(LOG_ERR, "modules/domains/include/domainapi", "domains", "error unlocking domain $domainname: {$errstr}");

+        system_failure("Es trat ein interner Fehler auf. Bitte dem Support Bescheid geben!");

+    }

+    return $result;

 }

@@ -88,10 +88,12 @@ function web_in_use($domain)

 function domain_ownerchange($fqdn, $owner, $admin_c) 

 {

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

-    db_query("UPDATE kundendaten.domains SET owner=?, admin_c=? WHERE CONCAT_WS('.', domainname, tld)=? AND kunde=?", array($owner, $admin_c, $fqdn, $cid));

-    if (update_possible($fqdn)) {

+    $dom = new Domain( $fqdn );

+    db_query("UPDATE kundendaten.domains SET owner=?, admin_c=? WHERE id=? AND kunde=?", array($owner, $admin_c, $dom->id, $cid));

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

         require_once('domainapi.php');

-        api_upload_domain($fqdn);

+        DEBUG("Rufe Domain-API auf!");

+        api_upload_domain($dom->fqdn);

     }

 }

@@ -100,18 +102,22 @@ function update_possible($domain) {

     $dom = new Domain((int) $domain);

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

         // Domain nicht über uns verwaltet

+        DEBUG("Domain nicht über uns verwaltet!");

         return false;

     }

     $result = db_query("SELECT aenderung_eigentuemer, ruecksprache FROM misc.domainpreise WHERE tld=?", array($dom->tld));

     if ($result->rowCount() < 1) {

         // Endung nicht bei uns in der Liste erfasst

+        DEBUG("Endung nicht in der Preisliste!");

         return false;

     }

     $data = $result->fetch();

     if ($data['aenderung_eigentuemer'] != NULL || $data['ruecksprache'] == 'Y') {

+        DEBUG("Endung hat Eigenheiten (ruecksprache=Y)");

         // Endung mit speziellen Eigenheiten

         return false;

     }

+    DEBUG("Änderungen sollten möglich sein: {$dom->fqdn}");

     return true;

 }