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

 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 

+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.

@@ -37,111 +37,106 @@ DEBUG($_SERVER);

 $redirect = "";

 if (! isset($_SERVER['SSL_CLIENT_CERT']) && isset($_SERVER['REDIRECT_SSL_CLIENT_CERT'])) {

-  $redirect = "REDIRECT_";

+    $redirect = "REDIRECT_";

 }

-if ($_SESSION['role'] != ROLE_ANONYMOUS && isset($_REQUEST['record']) && isset($_REQUEST['backto']) && check_path($_REQUEST['backto']))

-{

-  DEBUG('recording client-cert');

-  if (isset($_SERVER[$redirect.'SSL_CLIENT_CERT']) && isset($_SERVER[$redirect.'SSL_CLIENT_S_DN']) && 

+if ($_SESSION['role'] != ROLE_ANONYMOUS && isset($_REQUEST['record']) && isset($_REQUEST['backto']) && check_path($_REQUEST['backto'])) {

+    DEBUG('recording client-cert');

+    if (isset($_SERVER[$redirect.'SSL_CLIENT_CERT']) && isset($_SERVER[$redirect.'SSL_CLIENT_S_DN']) &&

       isset($_SERVER[$redirect.'SSL_CLIENT_I_DN']) && isset($_SERVER[$redirect.'SSL_CLIENT_M_SERIAL']) &&

       isset($_SERVER[$redirect.'SSL_CLIENT_V_START']) && isset($_SERVER[$redirect.'SSL_CLIENT_V_END'])

-      )

-  {

-    $_SESSION['clientcert_cert'] = $_SERVER[$redirect.'SSL_CLIENT_CERT'];

-    $_SESSION['clientcert_dn'] = $_SERVER[$redirect.'SSL_CLIENT_S_DN'];

-    $_SESSION['clientcert_issuer'] = $_SERVER[$redirect.'SSL_CLIENT_I_DN'];

-    $_SESSION['clientcert_serial'] = $_SERVER[$redirect.'SSL_CLIENT_M_SERIAL'];

-    $vstart = new DateTime($_SERVER[$redirect.'SSL_CLIENT_V_START']);

-    $_SESSION['clientcert_valid_from'] = date_format($vstart, 'Y-m-d');

-    $vend = new DateTime($_SERVER[$redirect.'SSL_CLIENT_V_END']);

-    $_SESSION['clientcert_valid_until'] = date_format($vend, 'Y-m-d');

-    header('Location: '.$prefix.$_REQUEST['backto'].encode_querystring(''));

-    die();

-  }

-  else

-  {

-    warning('Ihr Browser hat kein Client-Zertifikat gesendet');

-    header('Location: '.$prefix.$_REQUEST['backto'].encode_querystring(''));

-    die();

-  }

-}

-elseif (isset($_REQUEST['type']) && isset($_REQUEST['username'])) {

-  if (!isset($_SERVER[$redirect.'SSL_CLIENT_CERT'])) 

-    system_failure('Ihr Browser hat kein Client-Zertifikat gesendet');

+      ) {

+        $_SESSION['clientcert_cert'] = $_SERVER[$redirect.'SSL_CLIENT_CERT'];

+        $_SESSION['clientcert_dn'] = $_SERVER[$redirect.'SSL_CLIENT_S_DN'];

+        $_SESSION['clientcert_issuer'] = $_SERVER[$redirect.'SSL_CLIENT_I_DN'];

+        $_SESSION['clientcert_serial'] = $_SERVER[$redirect.'SSL_CLIENT_M_SERIAL'];

+        $vstart = new DateTime($_SERVER[$redirect.'SSL_CLIENT_V_START']);

+        $_SESSION['clientcert_valid_from'] = date_format($vstart, 'Y-m-d');

+        $vend = new DateTime($_SERVER[$redirect.'SSL_CLIENT_V_END']);

+        $_SESSION['clientcert_valid_until'] = date_format($vend, 'Y-m-d');

+        header('Location: '.$prefix.$_REQUEST['backto'].encode_querystring(''));

+        die();

+    } else {

+        warning('Ihr Browser hat kein Client-Zertifikat gesendet');

+        header('Location: '.$prefix.$_REQUEST['backto'].encode_querystring(''));

+        die();

+    }

+} elseif (isset($_REQUEST['type']) && isset($_REQUEST['username'])) {

+    if (!isset($_SERVER[$redirect.'SSL_CLIENT_CERT'])) {

+        system_failure('Ihr Browser hat kein Client-Zertifikat gesendet');

+    }

-  $ret = get_logins_by_cert($_SERVER[$redirect.'SSL_CLIENT_CERT']);

-  DEBUG($ret);

-  foreach ($ret as $account) {

-    DEBUG('/'.$account['type'].'/'.$_REQUEST['type'].'/    /'.$account['username'].'/'.$_REQUEST['username'].'/    =>');

-    if (($account['type'] == urldecode($_REQUEST['type'])) && ($account['username'] == urldecode($_REQUEST['username']))) {

-      $uid = $account['username'];

-      $role = find_role($uid, '', True);

-      setup_session($role, $uid);

-      $destination = 'go/index/index';

-      if (check_path($account['startpage']))

-        $destination = $account['startpage'];

-      if (isset($_REQUEST['destination']) && check_path($_REQUEST['destination']))

-        $destination = $_REQUEST['destination'];

-      header('Location: ../'.$destination);

-      die();

+    $ret = get_logins_by_cert($_SERVER[$redirect.'SSL_CLIENT_CERT']);

+    DEBUG($ret);

+    foreach ($ret as $account) {

+        DEBUG('/'.$account['type'].'/'.$_REQUEST['type'].'/    /'.$account['username'].'/'.$_REQUEST['username'].'/    =>');

+        if (($account['type'] == urldecode($_REQUEST['type'])) && ($account['username'] == urldecode($_REQUEST['username']))) {

+            $uid = $account['username'];

+            $role = find_role($uid, '', true);

+            setup_session($role, $uid);

+            $destination = 'go/index/index';

+            if (check_path($account['startpage'])) {

+                $destination = $account['startpage'];

+            }

+            if (isset($_REQUEST['destination']) && check_path($_REQUEST['destination'])) {

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

+            }

+            header('Location: ../'.$destination);

+            die();

+        }

     }

-  }

-  system_failure('Der angegebene Account kann mit diesem Client-Zertifikat nicht eingeloggt werden.');

-}

-elseif ($_SESSION['role'] != ROLE_ANONYMOUS && $_REQUEST['destination'] != '') {

-  # User hat sich grade eingeloggt

-  header('Location: ../'.$destination);

-}

-else

-{

-  if (isset($_SERVER[$redirect.'SSL_CLIENT_CERT']) && 

-      isset($_SERVER[$redirect.'SSL_CLIENT_S_DN']) && $_SERVER[$redirect.'SSL_CLIENT_S_DN'] != '' && 

+    system_failure('Der angegebene Account kann mit diesem Client-Zertifikat nicht eingeloggt werden.');

+} elseif ($_SESSION['role'] != ROLE_ANONYMOUS && $_REQUEST['destination'] != '') {

+    # User hat sich grade eingeloggt

+    header('Location: ../'.$destination);

+} else {

+    if (isset($_SERVER[$redirect.'SSL_CLIENT_CERT']) &&

+      isset($_SERVER[$redirect.'SSL_CLIENT_S_DN']) && $_SERVER[$redirect.'SSL_CLIENT_S_DN'] != '' &&

       isset($_SERVER[$redirect.'SSL_CLIENT_I_DN']) && $_SERVER[$redirect.'SSL_CLIENT_I_DN'] != '' &&

       isset($_SERVER[$redirect.'SSL_CLIENT_M_SERIAL']) && $_SERVER[$redirect.'SSL_CLIENT_M_SERIAL'] != '') {

-    $ret = get_logins_by_cert($_SERVER[$redirect.'SSL_CLIENT_CERT']);

-    if ($ret === NULL) {

-      login_screen('Ihr Browser hat ein Client-Zertifikat gesendet, dieses ist aber noch nicht für den Zugang hinterlegt. Melden Sie sich bitte per Benutzername und Passwort an.');

-    }

-    if (count($ret) == 1) {

-      $uid = $ret[0]['username'];

-      $role = find_role($uid, '', True);

-      setup_session($role, $uid);

-      DEBUG("Set Cookie!");

-      setcookie('CLIENTCERT_AUTOLOGIN', '1', strtotime("+ 1 year"), '/', '', true, true);

-      $destination = 'go/index/index';

-      if (check_path($ret[0]['startpage']))

-        $destination = $ret[0]['startpage'];

-      if (isset($_REQUEST['destination']) && check_path($_REQUEST['destination']))

-        $destination = $_REQUEST['destination'];

-      header('Location: ../'.$destination);

-      die();

-    }

-    output('<p>Ihr Browser hat ein gültiges SSL-Client-Zertifikat gesendet, mit dem Sie sich auf dieser Seite einloggen können. Allerdings haben Sie dieses Client-Zertifikat für mehrere Zugänge hinterlegt. Wählen Sie bitte den Zugang aus, mit dem Sie sich anmelden möchten.</p>

+        $ret = get_logins_by_cert($_SERVER[$redirect.'SSL_CLIENT_CERT']);

+        if ($ret === null) {

+            login_screen('Ihr Browser hat ein Client-Zertifikat gesendet, dieses ist aber noch nicht für den Zugang hinterlegt. Melden Sie sich bitte per Benutzername und Passwort an.');

+        }

+        if (count($ret) == 1) {

+            $uid = $ret[0]['username'];

+            $role = find_role($uid, '', true);

+            setup_session($role, $uid);

+            DEBUG("Set Cookie!");

+            setcookie('CLIENTCERT_AUTOLOGIN', '1', strtotime("+ 1 year"), '/', '', true, true);

+            $destination = 'go/index/index';

+            if (check_path($ret[0]['startpage'])) {

+                $destination = $ret[0]['startpage'];

+            }

+            if (isset($_REQUEST['destination']) && check_path($_REQUEST['destination'])) {

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

+            }

+            header('Location: ../'.$destination);

+            die();

+        }

+        output('<p>Ihr Browser hat ein gültiges SSL-Client-Zertifikat gesendet, mit dem Sie sich auf dieser Seite einloggen können. Allerdings haben Sie dieses Client-Zertifikat für mehrere Zugänge hinterlegt. Wählen Sie bitte den Zugang aus, mit dem Sie sich anmelden möchten.</p>

       <ul>');

-    foreach ($ret as $account) {

-      $type = 'System-Account';

-      if ($account['type'] == 'email') {

-        $type = 'E-Mail-Konto';

-      }

-      elseif ($account['type'] == 'subuser') {

-        $type = 'Unter-Nutzer';

-      }

-      elseif ($account['type'] == 'customer') {

-        $type = 'Kundenaccount';

-      }

-      $destination = 'go/index/index';

-      if ($account['startpage'] && check_path($account['startpage']))

-        $destination = $account['startpage'];

-      output('<li>'.internal_link('', $type.': <strong>'.$account['username'].'</strong>', 'type='.$account['type'].'&username='.urlencode($account['username']).'&destination='.urlencode($destination)).'</li>');

+        foreach ($ret as $account) {

+            $type = 'System-Account';

+            if ($account['type'] == 'email') {

+                $type = 'E-Mail-Konto';

+            } elseif ($account['type'] == 'subuser') {

+                $type = 'Unter-Nutzer';

+            } elseif ($account['type'] == 'customer') {

+                $type = 'Kundenaccount';

+            }

+            $destination = 'go/index/index';

+            if ($account['startpage'] && check_path($account['startpage'])) {

+                $destination = $account['startpage'];

+            }

+            output('<li>'.internal_link('', $type.': <strong>'.$account['username'].'</strong>', 'type='.$account['type'].'&username='.urlencode($account['username']).'&destination='.urlencode($destination)).'</li>');

+        }

+        output('</ul>');

+    } else {

+        warning('Ihr Browser hat kein Client-Zertifikat gesendet. Eventuell müssen Sie in den Einstellungen des Browsers diese Funktion einschalten.');

+        redirect('/');

+        die();

     }

-    output('</ul>');

-  } else {

-    warning('Ihr Browser hat kein Client-Zertifikat gesendet. Eventuell müssen Sie in den Einstellungen des Browsers diese Funktion einschalten.');

-    redirect('/');

-    die();

-  }

 }

 show_page('certlogin');

-?>

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

 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 

+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.

@@ -19,126 +19,127 @@ require_once('inc/error.php');

 require_once('inc/debug.php');

-class DB extends PDO {

-  function __construct() {

-    $dsn = "mysql:host=".config('db_host', true);

-    if (config('db_port', true)) {

-      $dsn .= ';port='.config('db_port', true);

-    }

-    if (config('db_socket', true)) {

-      $dsn = "mysql:unix_socket=".config('db_socket', true);

-    }

-    $username = config('db_user', true);

-    $password = config('db_pass', true);

-    parent::__construct($dsn, $username, $password, array(PDO::ATTR_TIMEOUT => "30"));

-  }

-

-

-  /*

-    Wenn Parameter übergeben werden, werden Queries immer als Prepared statements übertragen

-  */

-  function query($stmt, $params = NULL) {

-    if (is_array($params)) {

-      if (config("enable_debug")) {

-        foreach (array_values($params) as $p) {

-          if ($p === '') {

-            DEBUG("Potential bug, empty string found in database parameters");

-            warning("Potential bug, empty string found in database parameters");

-          }

+class DB extends PDO

+{

+    public function __construct()

+    {

+        $dsn = "mysql:host=".config('db_host', true);

+        if (config('db_port', true)) {

+            $dsn .= ';port='.config('db_port', true);

         }

-      }

-      $response = parent::prepare($stmt);

-      $response->execute($params);

-      return $response;

-    } else {

-      if (strtoupper(substr($stmt, 0, 6)) == "INSERT" ||

+        if (config('db_socket', true)) {

+            $dsn = "mysql:unix_socket=".config('db_socket', true);

+        }

+        $username = config('db_user', true);

+        $password = config('db_pass', true);

+        parent::__construct($dsn, $username, $password, array(PDO::ATTR_TIMEOUT => "30"));

+    }

+

+

+    /*

+      Wenn Parameter übergeben werden, werden Queries immer als Prepared statements übertragen

+    */

+    public function query($stmt, $params = null)

+    {

+        if (is_array($params)) {

+            if (config("enable_debug")) {

+                foreach (array_values($params) as $p) {

+                    if ($p === '') {

+                        DEBUG("Potential bug, empty string found in database parameters");

+                        warning("Potential bug, empty string found in database parameters");

+                    }

+                }

+            }

+            $response = parent::prepare($stmt);

+            $response->execute($params);

+            return $response;

+        } else {

+            if (strtoupper(substr($stmt, 0, 6)) == "INSERT" ||

           strtoupper(substr($stmt, 0, 7)) == "REPLACE" ||

           strpos(strtoupper($stmt), "WHERE") > 0) { // Das steht nie am Anfang

-        $backtrace = debug_backtrace();

-        $wherepart = substr(strtoupper($stmt), strpos(strtoupper($stmt), "WHERE"));

-        if ((strpos($wherepart, '"') > 0 || strpos($wherepart, "'") > 0) && config("enable_debug")) {

-          warning("Possibly unsafe SQL statement in {$backtrace[1]['file']} line {$backtrace[1]['line']}:\n$stmt");

+                $backtrace = debug_backtrace();

+                $wherepart = substr(strtoupper($stmt), strpos(strtoupper($stmt), "WHERE"));

+                if ((strpos($wherepart, '"') > 0 || strpos($wherepart, "'") > 0) && config("enable_debug")) {

+                    warning("Possibly unsafe SQL statement in {$backtrace[1]['file']} line {$backtrace[1]['line']}:\n$stmt");

+                }

+            }

+            return parent::query($stmt);

         }

-      }

-      return parent::query($stmt);

     }

-  }

 }

-/* FIXME 

+/* FIXME

    Das ist etwas unelegant. Soll nur übergangsweise verwendet werden bis alles auf prepared statements umgestellt ist

 */

 function db_escape_string($string)

 {

-  if (config("enable_debug")) {

-    $backtrace = debug_backtrace();

-    warning("call to db_escape_string() in {$backtrace[0]['file']} line {$backtrace[0]['line']}");

-  }

-  global $_db;

-  __ensure_connected();

-  $quoted = $_db->quote($string);

-  // entferne die quotes, damit wird es drop-in-Kompatibel zu db_escape_string()

-  $ret = substr($quoted, 1, -1);

-  return $ret;

+    if (config("enable_debug")) {

+        $backtrace = debug_backtrace();

+        warning("call to db_escape_string() in {$backtrace[0]['file']} line {$backtrace[0]['line']}");

+    }

+    global $_db;

+    __ensure_connected();

+    $quoted = $_db->quote($string);

+    // entferne die quotes, damit wird es drop-in-Kompatibel zu db_escape_string()

+    $ret = substr($quoted, 1, -1);

+    return $ret;

 }

 function db_insert_id()

 {

-  global $_db;

-  __ensure_connected();

-  return $_db->lastInsertId();

+    global $_db;

+    __ensure_connected();

+    return $_db->lastInsertId();

 }

 function __ensure_connected()

 {

-  /*

-    Dieses Kontrukt ist vermultich noch schlimmer als ein normales singleton

-    aber es hilft uns in unserem prozeduralen Kontext

-  */

-  global $_db;

-  if (! isset($_db)) {

-    try {

-      DEBUG("Neue Datenbankverbindung!");

-      $_db = new DB();

-      $_db->query("SET NAMES utf8mb4");

-      $_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

-      $_db->setAttribute(PDO::ATTR_AUTOCOMMIT, true);

-    } catch (PDOException $e) {

-      global $debugmode;

-      if ($debugmode) {

-        die("MySQL-Fehler: ".$e->getMessage());

-      } else {

-        die("Fehler bei der Datenbankverbindung!");

-      }

+    /*

+      Dieses Kontrukt ist vermultich noch schlimmer als ein normales singleton

+      aber es hilft uns in unserem prozeduralen Kontext

+    */

+    global $_db;

+    if (! isset($_db)) {

+        try {

+            DEBUG("Neue Datenbankverbindung!");

+            $_db = new DB();

+            $_db->query("SET NAMES utf8mb4");

+            $_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

+            $_db->setAttribute(PDO::ATTR_AUTOCOMMIT, true);

+        } catch (PDOException $e) {

+            global $debugmode;

+            if ($debugmode) {

+                die("MySQL-Fehler: ".$e->getMessage());

+            } else {

+                die("Fehler bei der Datenbankverbindung!");

+            }

+        }

     }

-  }

 }

-function db_query($stmt, $params = NULL)

+function db_query($stmt, $params = null)

 {

-  global $_db;

-  __ensure_connected();

-  $backtrace = debug_backtrace();

-  DEBUG($backtrace[0]['file'].':'.$backtrace[0]['line'].': '.htmlspecialchars($stmt));

-  if ($params) {

-    DEBUG($params);

-  }

-  try {

-    $result = $_db->query($stmt, $params);

-    DEBUG('=> '.$result->rowCount().' rows');

-  } catch (PDOException $e) {

-    global $debugmode;

-    if ($debugmode) {

-      system_failure("MySQL-Fehler: ".$e->getMessage()."\nQuery:\n".$stmt."\nParameters:\n".print_r($params, true));

-    } else {

-      system_failure("Datenbankfehler");

+    global $_db;

+    __ensure_connected();

+    $backtrace = debug_backtrace();

+    DEBUG($backtrace[0]['file'].':'.$backtrace[0]['line'].': '.htmlspecialchars($stmt));

+    if ($params) {

+        DEBUG($params);

+    }

+    try {

+        $result = $_db->query($stmt, $params);

+        DEBUG('=> '.$result->rowCount().' rows');

+    } catch (PDOException $e) {

+        global $debugmode;

+        if ($debugmode) {

+            system_failure("MySQL-Fehler: ".$e->getMessage()."\nQuery:\n".$stmt."\nParameters:\n".print_r($params, true));

+        } else {

+            system_failure("Datenbankfehler");

+        }

     }

-  }

-  return $result;

+    return $result;

 }

-

-

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

 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 

+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.

@@ -21,11 +21,10 @@ require_once('inc/debug.php');

 class Domain

 {

     protected $data = array();

-  function __construct($init = NULL)

-  {

-    $this->setup();

-    switch (gettype($init))

+    public function __construct($init = null)

     {

+        $this->setup();

+        switch (gettype($init)) {

       case 'string':

         $this->loadByName($init);

         break;

@@ -35,105 +34,112 @@ class Domain

       case 'NULL':

         break;

     }

-  }

-

-  function __set($key, $value)

-  {

-    if (array_key_exists($key, $this->data)) {

-      $this->data[$key] = $value;

-    } elseif (isset($this->$key)) {

-      $this->$key = $value;

-    } else {

-      $this->data[$key] = $value;

     }

-  }

-

-

-  function __get($key)

-  {

-    if (array_key_exists($key, $this->data))

-      return $this->data[$key];

-    elseif (isset($this->$key))

-      return $this->$key;

-    // else werfe fehler

-  }

-

-

-  function loadByID($id)

-  {

-      $res = db_query("SELECT * FROM kundendaten.domains WHERE id=?", array($id));

-      if ($res->rowCount() < 1)

-         return false;

-      $data = $res->fetch();

-      $this->parse($data);

-  }

-

-   function loadByName($name)

-  {

-      $raw = $name;

-      $utf8 = idn_to_utf8($raw, 0, INTL_IDNA_VARIANT_UTS46);

-      $res = db_query("SELECT * FROM kundendaten.domains WHERE CONCAT_WS('.', domainname, tld)=? OR CONCAT_WS('.', domainname, tld)=?", array($raw, $utf8));

-      if ($res->rowCount() < 1)

-         return false;

-      $data = $res->fetch();

-      $this->parse($data);

-  }

-

-  function ensure_customerdomain()

-  {

-    if (! $this->is_customerdomain() )

-      system_failure('Diese Domain gehört nicht Ihrem Kundenaccount.');

-  }

-

-  function ensure_userdomain()

-  {

-    if (! $this->is_userdomain() )

-      system_failure('Diese Domain gehört nicht Ihrem Benutzeraccount.');

-  }

-

-  function is_customerdomain()

-  {

-    if (! isset($_SESSION['customerinfo']) )

-      return false;

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

-    return ($this->kunde == $customerno);

-  }

-

-  function is_userdomain()

-  {

-    if (! isset($_SESSION['userinfo']) )

-      return false;

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

-    return ($this->useraccount == $uid);

-  }

-

-  function setup()

-  {

-    $fields = array();

-    $res = db_query("DESCRIBE kundendaten.domains");

-    while ($f = $res->fetch(PDO::FETCH_OBJ))

+

+    public function __set($key, $value)

+    {

+        if (array_key_exists($key, $this->data)) {

+            $this->data[$key] = $value;

+        } elseif (isset($this->$key)) {

+            $this->$key = $value;

+        } else {

+            $this->data[$key] = $value;

+        }

+    }

+

+

+    public function __get($key)

+    {

+        if (array_key_exists($key, $this->data)) {

+            return $this->data[$key];

+        } elseif (isset($this->$key)) {

+            return $this->$key;

+        }

+        // else werfe fehler

+    }

+

+

+    public function loadByID($id)

+    {

+        $res = db_query("SELECT * FROM kundendaten.domains WHERE id=?", array($id));

+        if ($res->rowCount() < 1) {

+            return false;

+        }

+        $data = $res->fetch();

+        $this->parse($data);

+    }

+

+    public function loadByName($name)

+    {

+        $raw = $name;

+        $utf8 = idn_to_utf8($raw, 0, INTL_IDNA_VARIANT_UTS46);

+        $res = db_query("SELECT * FROM kundendaten.domains WHERE CONCAT_WS('.', domainname, tld)=? OR CONCAT_WS('.', domainname, tld)=?", array($raw, $utf8));

+        if ($res->rowCount() < 1) {

+            return false;

+        }

+        $data = $res->fetch();

+        $this->parse($data);

+    }

+

+    public function ensure_customerdomain()

+    {

+        if (! $this->is_customerdomain()) {

+            system_failure('Diese Domain gehört nicht Ihrem Kundenaccount.');

+        }

+    }

+

+    public function ensure_userdomain()

+    {

+        if (! $this->is_userdomain()) {

+            system_failure('Diese Domain gehört nicht Ihrem Benutzeraccount.');

+        }

+    }

+

+    public function is_customerdomain()

     {

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

+        if (! isset($_SESSION['customerinfo'])) {

+            return false;

+        }

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

+        return ($this->kunde == $customerno);

     }

-    $this->data = $fields;

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

-  }

+    public function is_userdomain()

+    {

+        if (! isset($_SESSION['userinfo'])) {

+            return false;

+        }

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

+        return ($this->useraccount == $uid);

+    }

+

+    public function setup()

+    {

+        $fields = array();

+        $res = db_query("DESCRIBE kundendaten.domains");

+        while ($f = $res->fetch(PDO::FETCH_OBJ)) {

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

+        }

+        $this->data = $fields;

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

+    }

-  function parse($data)

-  {

-    DEBUG($data);

-    foreach (array_keys($this->data) as $key)

-      if (array_key_exists($key, $data))

-        $this->data[$key] = $data[$key];

-    $this->data['fqdn'] = $data['domainname'].'.'.$data['tld'];

-    $this->data['punycode'] = idn_to_ascii($this->data['fqdn'], 0, INTL_IDNA_VARIANT_UTS46);

-    $this->data['is_idn'] = ($this->data['fqdn'] != $this->data['punycode']);

-    $this->data['reg_date'] = $data['registrierungsdatum'];

-    $this->data['cancel_date'] = $data['kuendigungsdatum'];

-  }

+    public function parse($data)

+    {

+        DEBUG($data);

+        foreach (array_keys($this->data) as $key) {

+            if (array_key_exists($key, $data)) {

+                $this->data[$key] = $data[$key];

+            }

+        }

+        $this->data['fqdn'] = $data['domainname'].'.'.$data['tld'];

+        $this->data['punycode'] = idn_to_ascii($this->data['fqdn'], 0, INTL_IDNA_VARIANT_UTS46);

+        $this->data['is_idn'] = ($this->data['fqdn'] != $this->data['punycode']);

+        $this->data['reg_date'] = $data['registrierungsdatum'];

+        $this->data['cancel_date'] = $data['kuendigungsdatum'];

+    }

 }

@@ -142,48 +148,45 @@ class Domain

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

+function get_domain_list($customerno, $uid = null)

 {

-  $customerno = (int) $customerno;

-  $query = "SELECT id FROM kundendaten.domains WHERE";

-  if ($uid !== NULL)

-  {

-    $uid = (int) $uid;

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

-  }

-  else

-  {

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

-  }

-  $query .= " ORDER BY domainname,tld";

-  $result = db_query($query, array()); // FIXME Übergebe leeren array um die Warnung zu unterdrücken

-  $domains = array();

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

-  if ($result->rowCount() > 0)

-    while ($domain = $result->fetch(PDO::FETCH_OBJ))

-      array_push($domains, new Domain((int) $domain->id));

-  DEBUG($domains);

-	return $domains;	

+    $customerno = (int) $customerno;

+    $query = "SELECT id FROM kundendaten.domains WHERE";

+    if ($uid !== null) {

+        $uid = (int) $uid;

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

+    } else {

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

+    }

+    $query .= " ORDER BY domainname,tld";

+    $result = db_query($query, array()); // FIXME Übergebe leeren array um die Warnung zu unterdrücken

+    $domains = array();

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

+    if ($result->rowCount() > 0) {

+        while ($domain = $result->fetch(PDO::FETCH_OBJ)) {

+            array_push($domains, new Domain((int) $domain->id));

+        }

+    }

+    DEBUG($domains);

+    return $domains;

 }

 function get_jabberable_domains()

 {

-  require_role(ROLE_CUSTOMER);

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

-

-  $domains = get_domain_list($customerno);

-  DEBUG($domains);

-  $result = array( new Domain() );

-  $result[0]->id = 0;

-  $result[0]->fqdn = config('masterdomain');

-  foreach ($domains as $dom)

-  {

-    if ($dom->jabber)

-      $result[] = $dom;

-  }

-  return $result;

+    require_role(ROLE_CUSTOMER);

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

+    $domains = get_domain_list($customerno);

+    DEBUG($domains);

+    $result = array( new Domain() );

+    $result[0]->id = 0;

+    $result[0]->fqdn = config('masterdomain');

+    foreach ($domains as $dom) {

+        if ($dom->jabber) {

+            $result[] = $dom;

+        }

+    }

+    return $result;

 }

-

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

 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 

+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.

@@ -40,6 +40,4 @@ $config['session_name'] = 'CONFIG_SCHOKOKEKS_ORG';

 $config['theme'] = 'default';

 $config['jquery_ui_path'] = '/external/jquery';

-ini_set('display_errors','On');

-

-?>

+ini_set('display_errors', 'On');

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

 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 

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

 https://creativecommons.org/publicdomain/zero/1.0/