webinterface.git

@@ -30,6 +30,8 @@ class Domain extends KeksData

   {

     $name = mysql_real_escape_string($name);

     $res = $this->getData("*", "CONCAT_WS('.', domainname, tld)='{$name}' LIMIT 1");

+    if (count($res) < 1)

+      return false;

     $this->parse($res[0]);

   }

@@ -39,6 +39,7 @@ abstract class KeksData

       $fields[$f->Field] = $f->Default;

     }

     $this->data = $fields;

+    $this->data['id'] = NULL;

   }

@@ -64,6 +65,8 @@ abstract class KeksData

   {

     $id = (int) $id;

     $res = $this->getData('*', "id={$id} LIMIT 1");

+    if (count($res) < 1)

+      return false;

     $this->parse($res[0]);

   }

@@ -4,18 +4,18 @@ require_once('inc/debug.php');

 require_once('session/start.php');

-require_once('domains.php');

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

 require_role(array(ROLE_SYSTEMUSER, ROLE_CUSTOMER));

 switch ($_SESSION['role'])

 {

   case ROLE_SYSTEMUSER:

-    $user_domains = get_domain_names($_SESSION['userinfo']['customerno'], $_SESSION['userinfo']['uid']);

+    $user_domains = get_domain_list($_SESSION['userinfo']['customerno'], $_SESSION['userinfo']['uid']);

     $info = 'userinfo';

     break;

   case ROLE_CUSTOMER:

-    $user_domains = get_domain_names($_SESSION['customerinfo']['customerno']);

+    $user_domains = get_domain_list($_SESSION['customerinfo']['customerno']);

     break;

   default:

     $info = NULL;

@@ -31,8 +31,7 @@ output('<h3>Domains</h3>

 ');

 foreach ($user_domains as $domain)

 {

-  $canc = $domain['cancel_date'];

-  output("  <tr><td><a href=\"http://www.{$domain['domainname']}\">{$domain['domainname']}</a></td><td>{$domain['reg_date']}</td><td>{$canc}</td></tr>\n");

+  output("  <tr><td><a href=\"http://www.{$domain->fqdn}\">{$domain->fqdn}</a></td><td>{$domain->reg_date}</td><td>{$domain->cancel_date}</td></tr>\n");

 }

 output('</table>');

 output("<br />");

@@ -1,66 +0,0 @@

-<?php

-

-require_once('inc/db_connect.php');

-require_once('inc/debug.php');

-

-function get_domain_names($customerno, $uid = NULL)

-{

-  $customerno = (int) $customerno;

-  $query = "SELECT id,CONCAT_WS('.', domainname, tld) AS domainname, registrierungsdatum, kuendigungsdatum FROM kundendaten.domains WHERE";

-  if ($uid !== NULL)

-  {

-    $uid = (int) $uid;

-    $query .= " useraccount={$uid};";

-  }

-  else

-  {

-    $query .= " kunde={$customerno};";

-  }

-  $result = db_query($query);

-  $domains = array();

-  DEBUG('Result set is '.mysql_num_rows($result)." rows.<br />\n");

-  if (mysql_num_rows($result) > 0)

-    while ($domain = mysql_fetch_object($result))

-      array_push($domains, array('id' => $domain->id,

-                              'domainname'  => $domain->domainname,

-                              'reg_date' => $domain->registrierungsdatum,

-                              'cancel_date' => $domain->kuendigungsdatum));

-

-	return $domains;	

-}

-

-

-

-function get_domain_name($domid)

-{

-  if ($domid === NULL)

-    return 'schokokeks.org';

-  $domid = (int) $domid;

-  static $domainlist = array();

-

-  $result = db_query("SELECT CONCAT_WS('.', domainname, tld) AS domainname FROM kundendaten.domains WHERE id=$domid;");

-  if (@mysql_num_rows($result) > 0)

-    return mysql_fetch_object($result)->domainname;

-  else

-    return NULL;

-

-}

-

-

-function get_jabberable_domains()

-{

-  require_role(ROLE_CUSTOMER);

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

-  $result = db_query("SELECT id, CONCAT_WS('.', domainname, tld) AS name FROM kundendaten.domains WHERE jabber=1 AND kunde={$customerno}");

-  

-  $domains = array(array('id' => 0, 'name' => 'schokokeks.org'));

-  if (mysql_num_rows($result) > 0)

-    while ($domain = mysql_fetch_object($result))

-      array_push($domains, array('id' => $domain->id,

-                                'name' => $domain->name));

-

-  return $domains;

-

-}

-

-?>

@@ -2,7 +2,7 @@

 require_once('session/start.php');

-require_once('domains.php');

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

 require_once('mailaccounts.php');

 require_role(ROLE_SYSTEMUSER);

@@ -85,12 +85,11 @@ elseif (isset($_GET['action']) && $_GET['action'] == 'create')

     <td><input type="text" id="user" name="user" />@<select name="domain" size="1">

     <option value="schokokeks.org">schokokeks.org</option>

     ');

-    require_once('domains.php');

-    $domains = get_domain_names($user['customerno'], $user['uid']);

+    $domains = get_domain_list($user['customerno'], $user['uid']);

     if (count($domains) > 0)

       output('<option>----------------------------</option>');

     foreach ($domains as $dom)

-      output('<option value="'.$dom['domainname'].'">'.$dom['domainname'].'</option>');

+      output('<option value="'.$dom->fqdn.'">'.$dom->fqdn.'</option>');

     output('</select></td>

   </tr>

@@ -165,15 +164,14 @@ elseif (isset($_GET['edit']))

           <td><input type="text" id="user" name="user" value="'.$username.'" />@<select name="domain" id="domain" size="1">

     <option value="schokokeks.org">schokokeks.org</option>

     ');

-    require_once('domains.php');

-    $domains = get_domain_names($user['customerno'], $user['uid']);

+    $domains = get_domain_list($user['customerno'], $user['uid']);

     if (count($domains) > 0)

       output('<option>----------------------------</option>');

     foreach ($domains as $dom)

-      if ($domain == $dom['domainname'])

-        output('<option value="'.$dom['domainname'].'" selected="selected">'.$dom['domainname'].'</option>');

+      if ($domain == $dom->fqdn)

+        output('<option value="'.$dom->fqdn.'" selected="selected">'.$dom->fqdn.'</option>');

       else

-        output('<option value="'.$dom['domainname'].'">'.$dom['domainname'].'</option>');

+        output('<option value="'.$dom->fqdn.'">'.$dom->fqdn.'</option>');

     output('</select></td>

           <td><input type="button" onclick="document.getElementById(\'user\').value = \''.$username.'\' ; document.getElementById(\'domain\').value = \''.$domain.'\'" value="Zeile zur&uuml;cksetzen" /></td></tr>

@@ -1 +0,0 @@

-../../domains/include/domains.php

\ No newline at end of file

@@ -4,6 +4,8 @@ require_once('inc/debug.php');

 require_once('inc/db_connect.php');

 require_once('inc/base.php');

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

+

 function mailaccounts($uid)

 {

   $uid = (int) $uid;

@@ -38,16 +40,6 @@ function encrypt_mail_password($pw)

 }

-function get_domain_id($domain) 

-{

-  $domain = mysql_real_escape_string($domain);

-  $result = db_query("SELECT id FROM mail.v_domains WHERE domainname = '{$domain}';");

-  if (mysql_num_rows($result) == 0)

-    return NULL;

-  return mysql_fetch_object($result)->id;

-}

-

-

 function change_mailaccount($id, $arr)

 {

   $id = (int) $id;

@@ -56,10 +48,13 @@ function change_mailaccount($id, $arr)

   if (isset($arr['account']))

   {

     list($local, $domain) = explode('@', $arr['account'], 2);

-    $domainid = get_domain_id($domain);

-    if ($domainid == NULL)

-      $domainid='NULL';

-    array_push($conditions, "local='".mysql_real_escape_string($local)."', domain=$domainid");

+    $domain = new Domain( (string) $domain);

+    if ($domain->id == NULL)

+      array_push($conditions, "domain=NULL");

+    else

+      array_push($conditions, "domain={$domain->id}");

+

+    array_push($conditions, "local='".mysql_real_escape_string($local)."'");

   }

   if (isset($arr['mailbox']))

     if ($arr['mailbox'] == '')

@@ -92,11 +87,13 @@ function create_mailaccount($arr)

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

   list($local, $domain) = explode('@', $arr['account'], 2);

-  $domainid = get_domain_id($domain);

-  if ($domainid == NULL)

-    $domainid='NULL';

+  $domain = new Domain( (string) $domain);

+  if ($domain->id == NULL)

+    $values['domain'] = "NULL";

+  else

+    $values['domain'] = $domain->id;

+

   $values['local'] = "'".mysql_real_escape_string($local)."'";

-  $values['domain'] = $domainid;

   if (isset($arr['mailbox']))

     if ($arr['mailbox'] == '')

@@ -147,11 +144,10 @@ function check_valid($acc)

     return "Es wurde kein Domain-Teil im Account-Name angegeben. Account-Namen müssen einen Domain-Teil enthalten. Im Zweifel versuchen Sie "@schokokeks.org".";

   list($local, $domain) = explode('@', $acc['account'], 2);

-  require_once('domains.php');

-  $tmpdomains = get_domain_names($user['customerno'], $user['uid']);

+  $tmpdomains = get_domain_list($user['customerno'], $user['uid']);

   $domains = array();

   foreach ($tmpdomains as $dom)

-    array_push($domains, $dom['domainname']);

+    $domains[] = $dom->fqdn;

   if (array_search($domain, $domains) === false)

   {

@@ -2,7 +2,7 @@

 require_once('session/start.php');

-require_once('domains.php');

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

 require_once('jabberaccounts.php');

 require_once('inc/security.php');

@@ -22,8 +22,13 @@ output("<h3>Jabber-Accounts</h3>

 foreach ($jabberaccounts as $acc)

 {

   $local = filter_input_general($acc['local']);

-  $domain = filter_input_general( get_domain_name($acc['domain']) );

-  output("<tr><td>{$local}@$domain</td><td>".internal_link('chpass.php', 'Passwort ändern', 'account='.$acc['id'])."&nbsp;&nbsp;&nbsp;".internal_link('save.php', 'Löschen', 'action=delete&account='.$acc['id']).'</td></tr>');

+  $domain = new Domain( (int) $acc['domain']  );

+  if ($domain->id == NULL)

+  {

+    $domain = new Domain();

+    $domain->fqdn='schokokeks.org';

+  }

+  output("<tr><td>{$local}@{$domain->fqdn}</td><td>".internal_link('chpass.php', 'Passwort ändern', 'account='.$acc['id'])."&nbsp;&nbsp;&nbsp;".internal_link('save.php', 'Löschen', 'action=delete&account='.$acc['id']).'</td></tr>');

 }

 output('</table>

@@ -2,7 +2,6 @@

 require_once('session/start.php');

-require_once('domains.php');

 require_once('jabberaccounts.php');

 require_role(ROLE_CUSTOMER);

@@ -1 +0,0 @@

-../../domains/include/domains.php

\ No newline at end of file

@@ -2,7 +2,7 @@

 require_once('session/start.php');

-require_once('domains.php');

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

 require_once('jabberaccounts.php');

 require_role(ROLE_CUSTOMER);

@@ -16,7 +16,7 @@ $jabberdomains = get_jabberable_domains();

 $options = '';

 foreach ($jabberdomains as $dom)

 {

-  $options .= '<option value="'.$dom['id'].'">'.$dom['name'].'</option>'."\n";

+  $options .= '<option value="'.$dom->id.'">'.$dom->fqdn.'</option>'."\n";

 }