webinterface.git

@@ -256,14 +256,17 @@ function delete_account($id)

 function domainsettings($only_domain=NULL) {

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

-  if ($domain)

+  if ($only_domain)

     $only_domain = (int) $only_domain;

-  $result = db_query("SELECT d.id, CONCAT_WS('.',d.domainname,d.tld) AS name, d.mail, m.id AS m_id, v.id AS v_id, IF(ISNULL(v.hostname),m.subdomain,v.hostname) AS hostname FROM kundendaten.domains AS d LEFT JOIN mail.virtual_mail_domains AS v ON (d.id=v.domain) LEFT JOIN mail.custom_mappings AS m ON (d.id=m.domain) WHERE d.useraccount={$uid} OR m.uid={$uid};");

   $domains = array();

   $subdomains = array();

+

+  // Domains

+  $result = db_query("SELECT d.id, CONCAT_WS('.',d.domainname,d.tld) AS name, d.mail, m.id AS m_id, v.id AS v_id FROM kundendaten.domains AS d LEFT JOIN mail.virtual_mail_domains AS v ON (d.id=v.domain AND v.hostname IS NULL) LEFT JOIN mail.custom_mappings AS m ON (d.id=m.domain AND m.subdomain IS NULL) WHERE d.useraccount={$uid} OR m.uid={$uid};");

+

   while ($mydom = mysql_fetch_assoc($result)) {

     if (! array_key_exists($mydom['id'], $domains)) {

-      if ($mydom['v_id'] && ! $mydom['hostname'])

+      if ($mydom['v_id'])

         $mydom['mail'] = 'virtual';

       $domains[$mydom['id']] = array(

         "name" => $mydom['name'],

@@ -272,7 +275,11 @@ function domainsettings($only_domain=NULL) {

       if ($only_domain && $only_domain == $mydom['id'])

         return $domains[$only_domain];

     }

-    if ($mydom['hostname']) {

+  }      

+

+  // Subdomains

+  $result = db_query("SELECT d.id, CONCAT_WS('.',d.domainname,d.tld) AS name, d.mail, m.id AS m_id, v.id AS v_id, IF(ISNULL(v.hostname),m.subdomain,v.hostname) AS hostname FROM kundendaten.domains AS d LEFT JOIN mail.virtual_mail_domains AS v ON (d.id=v.domain AND v.hostname IS NOT NULL) LEFT JOIN mail.custom_mappings AS m ON (d.id=m.domain AND m.subdomain IS NOT NULL) WHERE d.useraccount={$uid} OR m.uid={$uid};");

+  while ($mydom = mysql_fetch_assoc($result)) {

     if (! array_key_exists($mydom['id'], $subdomains))

       $subdomains[$mydom['id']] = array();

@@ -284,7 +291,6 @@ function domainsettings($only_domain=NULL) {

       "type" => $type

       );

   }

-  }

   return array("domains" => $domains, "subdomains" => $subdomains);

 }