@@ -20,7 +20,7 @@ function list_system_users()

     $result = db_query("SELECT uid,username FROM system.v_useraccounts ORDER BY username");

-    $ret = array();

+    $ret = [];

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

         array_push($ret, $item);

     }

@@ -34,7 +34,7 @@ function list_customers()

     $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden");

-    $ret = array();

+    $ret = [];

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

         array_push($ret, $item);

     }

@@ -44,7 +44,7 @@ function list_customers()

 function customer_details($id)

 {

     $id = (int) $id;

-    $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden WHERE id=?", array($id));

+    $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden WHERE id=?", [$id]);

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

         return null;

     }

@@ -55,8 +55,8 @@ function customer_details($id)

 function find_customers($string)

 {

-    $args = array(":string" => '%'.chop($string).'%', ":number" => $string);

-    $return = array();

+    $args = [":string" => '%'.chop($string).'%', ":number" => $string];

+    $return = [];

     $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE ".

                      "firma LIKE :string OR firma2 LIKE :string OR ".

                      "nachname LIKE :string OR vorname LIKE :string OR ".

@@ -85,9 +85,9 @@ function find_customers($string)

 function find_users_for_customer($id)

 {

     $id = (int) $id;

-    $return = array();

+    $return = [];

     $result = db_query("SELECT uid, username, name FROM system.useraccounts WHERE ".

-                     "kunde=?", array($id));

+                     "kunde=?", [$id]);

     while ($entry = $result->fetch()) {

         $return[] = $entry;

     }

@@ -101,14 +101,14 @@ function find_users_for_customer($id)

 function build_results($term)

 {

     global $ret;

-    $ret = array();

+    $ret = [];

     $add = function ($val, $id, $value) {

         global $ret;

         if (isset($ret[$val]) && is_array($ret[$val])) {

-            array_push($ret[$val], array("id" => $id, "value" => $value));

+            array_push($ret[$val], ["id" => $id, "value" => $value]);

         } else {

-            $ret[$val] = array( array("id" => $id, "value" => $value) );

+            $ret[$val] = [ ["id" => $id, "value" => $value] ];

         }

     };

@@ -142,7 +142,7 @@ function build_results($term)

     ksort($ret);

-    $allentries = array();

+    $allentries = [];

     foreach ($ret as $group) {

         usort($group, function ($a, $b) {

             return strnatcmp($a['value'], $b['value']);

@@ -19,7 +19,7 @@ function list_system_users()

     require_role(ROLE_SYSADMIN);

     $result = db_query("SELECT uid,username FROM system.v_useraccounts ORDER BY username");

-  

+

     $ret = array();

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

         array_push($ret, $item);

@@ -33,7 +33,7 @@ function list_customers()

     require_role(ROLE_SYSADMIN);

     $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden");

-  

+

     $ret = array();

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

         array_push($ret, $item);

@@ -102,7 +102,7 @@ function build_results($term)

 {

     global $ret;

     $ret = array();

-  

+

     $add = function ($val, $id, $value) {

         global $ret;

         if (isset($ret[$val]) && is_array($ret[$val])) {

@@ -141,7 +141,7 @@ function build_results($term)

     }

     ksort($ret);

-  

+

     $allentries = array();

     foreach ($ret as $group) {

         usort($group, function ($a, $b) {

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

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

 function list_system_users()

 {

-  require_role(ROLE_SYSADMIN);

+    require_role(ROLE_SYSADMIN);

-  $result = db_query("SELECT uid,username FROM system.v_useraccounts ORDER BY username");

+    $result = db_query("SELECT uid,username FROM system.v_useraccounts ORDER BY username");

-  $ret = array();

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

-    array_push($ret, $item);

-  return $ret;

+    $ret = array();

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

+        array_push($ret, $item);

+    }

+    return $ret;

 }

 function list_customers()

 {

-  require_role(ROLE_SYSADMIN);

+    require_role(ROLE_SYSADMIN);

-  $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden");

+    $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden");

-  $ret = array();

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

-    array_push($ret, $item);

-  return $ret;

+    $ret = array();

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

+        array_push($ret, $item);

+    }

+    return $ret;

 }

-function customer_details($id) 

+function customer_details($id)

 {

-    $id = (int) $id; 

+    $id = (int) $id;

     $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden WHERE id=?", array($id));

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

-        return NULL;

+        return null;

     }

     $kunde = $result->fetch();

     return $kunde;

 }

-function find_customers($string) 

+function find_customers($string)

 {

-  $args = array(":string" => '%'.chop($string).'%', ":number" => $string);

-  $return = array();

-  $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE ".

+    $args = array(":string" => '%'.chop($string).'%', ":number" => $string);

+    $return = array();

+    $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE ".

                      "firma LIKE :string OR firma2 LIKE :string OR ".

                      "nachname LIKE :string OR vorname LIKE :string OR ".

                      "adresse LIKE :string OR adresse2 LIKE :string OR ".

@@ -63,118 +65,123 @@ function find_customers($string)

                      "notizen LIKE :string OR email_rechnung LIKE :string OR ".

                      "email LIKE :string OR email_extern LIKE :string OR u.name LIKE :string OR ".

                      "u.username LIKE :string OR k.id=:number OR u.uid=:number", $args);

-  while ($entry = $result->fetch())

-    $return[] = $entry['id'];

+    while ($entry = $result->fetch()) {

+        $return[] = $entry['id'];

+    }

-  unset($args[':number']);

-  $result = db_query("SELECT kunde FROM kundendaten.domains WHERE kunde IS NOT NULL AND (

+    unset($args[':number']);

+    $result = db_query("SELECT kunde FROM kundendaten.domains WHERE kunde IS NOT NULL AND (

                       domainname LIKE :string OR CONCAT_WS('.', domainname, tld) LIKE :string

                       )", $args);

-  while ($entry = $result->fetch())

-    $return[] = $entry['kunde'];

+    while ($entry = $result->fetch()) {

+        $return[] = $entry['kunde'];

+    }

-  return $return;

+    return $return;

 }

 function find_users_for_customer($id)

 {

-  $id = (int) $id;

-  $return = array();

-  $result = db_query("SELECT uid, username, name FROM system.useraccounts WHERE ".

+    $id = (int) $id;

+    $return = array();

+    $result = db_query("SELECT uid, username, name FROM system.useraccounts WHERE ".

                      "kunde=?", array($id));

-  while ($entry = $result->fetch())

-    $return[] = $entry;

+    while ($entry = $result->fetch()) {

+        $return[] = $entry;

+    }

-  return $return;

+    return $return;

 }

-function build_results($term) {

-  global $ret;

-  $ret = array();

-  

-  $add = function($val, $id, $value) {

+function build_results($term)

+{

     global $ret;

-    if (isset($ret[$val]) && is_array($ret[$val])) {

-      array_push($ret[$val], array("id" => $id, "value" => $value));

-    } else {

-      $ret[$val] = array( array("id" => $id, "value" => $value) );

-    }

-  };

-

-

-  $result = array_unique(find_customers($term));

-  sort($result);

-  foreach ($result as $val) {

-    $c = customer_details($val);

-    if ($c['id'] == $term) {

-      $add(10, "c{$c['id']}", "Kunde {$c['id']}: {$c['name']}");

-    } else {

-      $add(90, "c{$c['id']}", "Kunde {$c['id']}: {$c['name']}");

-    }

-    $users = find_users_for_customer($c['id']);

-    foreach ($users as $u) {

-      $realname = $c['name'];

-      if ($u['name']) {

-        $realname = $u['name'];

-      }

-      if ($u['uid'] == $term || $u['username'] == $term) {

-        $add(15, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

-      } elseif (strstr($u['username'], $term)) {

-        $add(20, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

-      } elseif (stristr($u['name'], $term)) {

-        $add(25, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

-      } else {

-        $add(85, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

-      }

+    $ret = array();

+  

+    $add = function ($val, $id, $value) {

+        global $ret;

+        if (isset($ret[$val]) && is_array($ret[$val])) {

+            array_push($ret[$val], array("id" => $id, "value" => $value));

+        } else {

+            $ret[$val] = array( array("id" => $id, "value" => $value) );

+        }

+    };

+

+

+    $result = array_unique(find_customers($term));

+    sort($result);

+    foreach ($result as $val) {

+        $c = customer_details($val);

+        if ($c['id'] == $term) {

+            $add(10, "c{$c['id']}", "Kunde {$c['id']}: {$c['name']}");

+        } else {

+            $add(90, "c{$c['id']}", "Kunde {$c['id']}: {$c['name']}");

+        }

+        $users = find_users_for_customer($c['id']);

+        foreach ($users as $u) {

+            $realname = $c['name'];

+            if ($u['name']) {

+                $realname = $u['name'];

+            }

+            if ($u['uid'] == $term || $u['username'] == $term) {

+                $add(15, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

+            } elseif (strstr($u['username'], $term)) {

+                $add(20, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

+            } elseif (stristr($u['name'], $term)) {

+                $add(25, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

+            } else {

+                $add(85, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

+            }

+        }

     }

-  }

-  ksort($ret);

+    ksort($ret);

-  $allentries = array();

-  foreach ($ret as $group) {

-    usort($group, function ($a, $b) {

-      return strnatcmp($a['value'], $b['value']); 

-    });

-    foreach ($group as $entry) {

-      $allentries[] = $entry;

+    $allentries = array();

+    foreach ($ret as $group) {

+        usort($group, function ($a, $b) {

+            return strnatcmp($a['value'], $b['value']);

+        });

+        foreach ($group as $entry) {

+            $allentries[] = $entry;

+        }

     }

-  }

-  unset($ret);

-  return $allentries;

+    unset($ret);

+    return $allentries;

 }

-function su($type, $id) {

-  $role = NULL;

-  $admin_user = $_SESSION['userinfo']['username'];

-  $_SESSION['admin_user'] = $admin_user;

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

-  if (!$role) {

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

-    return False;

-  }

-  setup_session($role, $id);

-  if ($type == 'c') {

-    if (! (ROLE_CUSTOMER & $_SESSION['role'])) {

-      session_destroy();

-      system_failure('Es wurde ein "su" zu einem Kundenaccount angefordert, das war aber kein Kundenaccount!');

+function su($type, $id)

+{

+    $role = null;

+    $admin_user = $_SESSION['userinfo']['username'];

+    $_SESSION['admin_user'] = $admin_user;

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

+    if (!$role) {

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

+        return false;

     }

-  } elseif ($type == 'u') {

-    if (! (ROLE_SYSTEMUSER & $_SESSION['role'])) {

-      session_destroy();

-      system_failure('Es wurde ein "su" zu einem Benutzeraccount angefordert, das war aber kein Benutzeraccount!');

+    setup_session($role, $id);

+    if ($type == 'c') {

+        if (! (ROLE_CUSTOMER & $_SESSION['role'])) {

+            session_destroy();

+            system_failure('Es wurde ein "su" zu einem Kundenaccount angefordert, das war aber kein Kundenaccount!');

+        }

+    } elseif ($type == 'u') {

+        if (! (ROLE_SYSTEMUSER & $_SESSION['role'])) {

+            session_destroy();

+            system_failure('Es wurde ein "su" zu einem Benutzeraccount angefordert, das war aber kein Benutzeraccount!');

+        }

+    } elseif ($type) {

+        // wenn type leer ist, dann ist es auch egal

+        system_failure('unknown type');

     }

-  } elseif ($type) {

-    // wenn type leer ist, dann ist es auch egal

-    system_failure('unknown type');

-  }

-  redirect('../../go/index/index');

-  die();

+    redirect('../../go/index/index');

+    die();

 }

@@ -14,9 +14,6 @@ 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/base.php');

-require_once('class/customer.php');

-

 function list_system_users()

 {

   require_role(ROLE_SYSADMIN);

@@ -42,6 +39,17 @@ function list_customers()

   return $ret;

 }

+function customer_details($id) 

+{

+    $id = (int) $id; 

+    $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden WHERE id=?", array($id));

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

+        return NULL;

+    }

+    $kunde = $result->fetch();

+    return $kunde;

+}

+

 function find_customers($string) 

 {

@@ -102,15 +110,15 @@ function build_results($term) {

   $result = array_unique(find_customers($term));

   sort($result);

   foreach ($result as $val) {

-    $c = new Customer((int) $val);

-    if ($c->id == $term) {

-      $add(10, "c{$c->id}", "Kunde {$c->id}: {$c->fullname}");

+    $c = customer_details($val);

+    if ($c['id'] == $term) {

+      $add(10, "c{$c['id']}", "Kunde {$c['id']}: {$c['name']}");

     } else {

-      $add(90, "c{$c->id}", "Kunde {$c->id}: {$c->fullname}");

+      $add(90, "c{$c['id']}", "Kunde {$c['id']}: {$c['name']}");

     }

-    $users = find_users_for_customer($c->id);

+    $users = find_users_for_customer($c['id']);

     foreach ($users as $u) {

-      $realname = $c->fullname;

+      $realname = $c['name'];

       if ($u['name']) {

         $realname = $u['name'];

       }

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

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2014 by schokokeks.org Hosting, namely

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

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -142,3 +142,31 @@ function build_results($term) {

 }

+function su($type, $id) {

+  $role = NULL;

+  $admin_user = $_SESSION['userinfo']['username'];

+  $_SESSION['admin_user'] = $admin_user;

+  $role = find_role($id, '', True);

+  if (!$role) {

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

+    return False;

+  }

+  setup_session($role, $id);

+  if ($type == 'c') {

+    if (! (ROLE_CUSTOMER & $_SESSION['role'])) {

+      session_destroy();

+      system_failure('Es wurde ein "su" zu einem Kundenaccount angefordert, das war aber kein Kundenaccount!');

+    }

+  } elseif ($type == 'u') {

+    if (! (ROLE_SYSTEMUSER & $_SESSION['role'])) {

+      session_destroy();

+      system_failure('Es wurde ein "su" zu einem Benutzeraccount angefordert, das war aber kein Benutzeraccount!');

+    }

+  } elseif ($type) {

+    // wenn type leer ist, dann ist es auch egal

+    system_failure('unknown type');

+  }

+

+  redirect('../../go/index/index');

+  die();

+}

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

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2013 by schokokeks.org Hosting, namely

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

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -45,22 +45,23 @@ function list_customers()

 function find_customers($string) 

 {

-  $string = db_escape_string(chop($string));

+  $args = array(":string" => '%'.chop($string).'%', ":number" => $string);

   $return = array();

   $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE ".

-                     "firma LIKE '%{$string}%' OR firma2 LIKE '%{$string}%' OR ".

-                     "nachname LIKE '%{$string}%' OR vorname LIKE '%{$string}%' OR ".

-                     "adresse LIKE '%{$string}%' OR adresse2 LIKE '%{$string}%' OR ".

-                     "ort LIKE '%{$string}%' OR pgp_id LIKE '%{$string}%' OR ".

-                     "notizen LIKE '%{$string}%' OR email_rechnung LIKE '%{$string}%' OR ".

-                     "email LIKE '%{$string}%' OR email_extern LIKE '%{$string}%' OR u.name LIKE '%{$string}%' OR ".

-                     "u.username LIKE '%{$string}%' OR k.id='{$string}' OR u.uid='{$string}';");

+                     "firma LIKE :string OR firma2 LIKE :string OR ".

+                     "nachname LIKE :string OR vorname LIKE :string OR ".

+                     "adresse LIKE :string OR adresse2 LIKE :string OR ".

+                     "ort LIKE :string OR pgp_id LIKE :string OR ".

+                     "notizen LIKE :string OR email_rechnung LIKE :string OR ".

+                     "email LIKE :string OR email_extern LIKE :string OR u.name LIKE :string OR ".

+                     "u.username LIKE :string OR k.id=:number OR u.uid=:number", $args);

   while ($entry = $result->fetch())

     $return[] = $entry['id'];

+  unset($args[':number']);

   $result = db_query("SELECT kunde FROM kundendaten.domains WHERE kunde IS NOT NULL AND (

-                      domainname LIKE '%{$string}%' OR CONCAT_WS('.', domainname, tld) LIKE '%{$string}%'

-                      )");

+                      domainname LIKE :string OR CONCAT_WS('.', domainname, tld) LIKE :string

+                      )", $args);

   while ($entry = $result->fetch())

     $return[] = $entry['kunde'];

@@ -74,7 +75,7 @@ function find_users_for_customer($id)

   $id = (int) $id;

   $return = array();

   $result = db_query("SELECT uid, username, name FROM system.useraccounts WHERE ".

-                     "kunde='{$id}';");

+                     "kunde=?", array($id));

   while ($entry = $result->fetch())

     $return[] = $entry;

@@ -24,7 +24,7 @@ function list_system_users()

   $result = db_query("SELECT uid,username FROM system.v_useraccounts ORDER BY username");

   $ret = array();

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

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

     array_push($ret, $item);

   return $ret;

 }

@@ -37,7 +37,7 @@ function list_customers()

   $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden");

   $ret = array();

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

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

     array_push($ret, $item);

   return $ret;

 }

@@ -45,7 +45,7 @@ function list_customers()

 function find_customers($string) 

 {

-  $string = mysql_real_escape_string(chop($string));

+  $string = db_escape_string(chop($string));

   $return = array();

   $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE ".

                      "firma LIKE '%{$string}%' OR firma2 LIKE '%{$string}%' OR ".

@@ -55,14 +55,14 @@ function find_customers($string)

                      "notizen LIKE '%{$string}%' OR email_rechnung LIKE '%{$string}%' OR ".

                      "email LIKE '%{$string}%' OR email_extern LIKE '%{$string}%' OR u.name LIKE '%{$string}%' OR ".

                      "u.username LIKE '%{$string}%' OR k.id='{$string}' OR u.uid='{$string}';");

-  while ($entry = mysql_fetch_assoc($result))

+  while ($entry = $result->fetch())

     $return[] = $entry['id'];

   $result = db_query("SELECT kunde FROM kundendaten.domains WHERE kunde IS NOT NULL AND (

                       domainname LIKE '%{$string}%' OR CONCAT_WS('.', domainname, tld) LIKE '%{$string}%'

                       )");

-  while ($entry = mysql_fetch_assoc($result))

+  while ($entry = $result->fetch())

     $return[] = $entry['kunde'];

   return $return;

@@ -75,7 +75,7 @@ function find_users_for_customer($id)

   $return = array();

   $result = db_query("SELECT uid, username, name FROM system.useraccounts WHERE ".

                      "kunde='{$id}';");

-  while ($entry = mysql_fetch_assoc($result))

+  while ($entry = $result->fetch())

     $return[] = $entry;

   return $return;

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

 */

 require_once('inc/base.php');

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

 function list_system_users()

 {

@@ -83,6 +83,60 @@ function find_users_for_customer($id)

-

+function build_results($term) {

+  global $ret;

+  $ret = array();

+  

+  $add = function($val, $id, $value) {

+    global $ret;

+    if (isset($ret[$val]) && is_array($ret[$val])) {

+      array_push($ret[$val], array("id" => $id, "value" => $value));

+    } else {

+      $ret[$val] = array( array("id" => $id, "value" => $value) );

+    }

+  };

+

+

+  $result = array_unique(find_customers($term));

+  sort($result);

+  foreach ($result as $val) {

+    $c = new Customer((int) $val);

+    if ($c->id == $term) {

+      $add(10, "c{$c->id}", "Kunde {$c->id}: {$c->fullname}");

+    } else {

+      $add(90, "c{$c->id}", "Kunde {$c->id}: {$c->fullname}");

+    }

+    $users = find_users_for_customer($c->id);

+    foreach ($users as $u) {

+      $realname = $c->fullname;

+      if ($u['name']) {

+        $realname = $u['name'];

+      }

+      if ($u['uid'] == $term || $u['username'] == $term) {

+        $add(15, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

+      } elseif (strstr($u['username'], $term)) {

+        $add(20, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

+      } elseif (stristr($u['name'], $term)) {

+        $add(25, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

+      } else {

+        $add(85, "u{$u['uid']}", "{$u['username']} (UID {$u['uid']}, {$realname})");

+      }

+    }

+  }

+

+  ksort($ret);

+  

+  $allentries = array();

+  foreach ($ret as $group) {

+    usort($group, function ($a, $b) {

+      return strnatcmp($a['value'], $b['value']); 

+    });

+    foreach ($group as $entry) {

+      $allentries[] = $entry;

+    }

+  }

+  unset($ret);

+  return $allentries;

+}

@@ -72,10 +72,10 @@ function find_users_for_customer($id)

 {

   $id = (int) $id;

   $return = array();

-  $result = db_query("SELECT uid, username FROM system.useraccounts WHERE ".

+  $result = db_query("SELECT uid, username, name FROM system.useraccounts WHERE ".

                      "kunde='{$id}';");

   while ($entry = mysql_fetch_assoc($result))

-    $return[$entry['uid']] = $entry['username'];

+    $return[] = $entry;

   return $return;

 }

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

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2012 by schokokeks.org Hosting, namely

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

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -1,4 +1,18 @@

 <?php

+/*

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

+

+Written 2008-2012 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/base.php');

@@ -32,14 +32,13 @@ function find_customers($string)

 {

   $string = mysql_real_escape_string(chop($string));

   $return = array();

-  $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN kundendaten.kundenkontakt AS kk ".

-                     "ON (kk.kundennr = k.id) LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE ".

+  $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE ".

                      "firma LIKE '%{$string}%' OR firma2 LIKE '%{$string}%' OR ".

                      "nachname LIKE '%{$string}%' OR vorname LIKE '%{$string}%' OR ".

                      "adresse LIKE '%{$string}%' OR adresse2 LIKE '%{$string}%' OR ".

                      "ort LIKE '%{$string}%' OR pgp_id LIKE '%{$string}%' OR ".

-                     "notizen LIKE '%{$string}%' OR kk.name LIKE '%{$string}%' OR ".

-                     "kk.wert LIKE '%{$string}%' OR u.name LIKE '%{$string}%' OR ".

+                     "notizen LIKE '%{$string}%' OR email_rechnung LIKE '%{$string}%' OR ".

+                     "email LIKE '%{$string}%' OR email_extern LIKE '%{$string}%' OR u.name LIKE '%{$string}%' OR ".

                      "u.username LIKE '%{$string}%' OR k.id='{$string}' OR u.uid='{$string}';");

   while ($entry = mysql_fetch_assoc($result))

     $return[] = $entry['id'];

@@ -44,6 +44,13 @@ function find_customers($string)

   while ($entry = mysql_fetch_assoc($result))

     $return[] = $entry['id'];

+  $result = db_query("SELECT kunde FROM kundendaten.domains WHERE kunde IS NOT NULL AND (

+                      domainname LIKE '%{$string}%' OR CONCAT_WS('.', domainname, tld) LIKE '%{$string}%'

+                      )");

+

+  while ($entry = mysql_fetch_assoc($result))

+    $return[] = $entry['kunde'];

+

   return $return;

 }

@@ -1,5 +1,6 @@

 <?php

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

 function list_system_users()

 {

@@ -27,4 +28,41 @@ function list_customers()

 }

-?>

+function find_customers($string) 

+{

+  $string = mysql_real_escape_string(chop($string));

+  $return = array();

+  $result = db_query("SELECT k.id FROM kundendaten.kunden AS k LEFT JOIN kundendaten.kundenkontakt AS kk ".

+                     "ON (kk.kundennr = k.id) LEFT JOIN system.useraccounts AS u ON (k.id=u.kunde) WHERE ".

+                     "firma LIKE '%{$string}%' OR firma2 LIKE '%{$string}%' OR ".

+                     "nachname LIKE '%{$string}%' OR vorname LIKE '%{$string}%' OR ".

+                     "adresse LIKE '%{$string}%' OR adresse2 LIKE '%{$string}%' OR ".

+                     "ort LIKE '%{$string}%' OR pgp_id LIKE '%{$string}%' OR ".

+                     "notizen LIKE '%{$string}%' OR kk.name LIKE '%{$string}%' OR ".

+                     "kk.wert LIKE '%{$string}%' OR u.name LIKE '%{$string}%' OR ".

+                     "u.username LIKE '%{$string}%' OR k.id='{$string}' OR u.uid='{$string}';");

+  while ($entry = mysql_fetch_assoc($result))

+    $return[] = $entry['id'];

+

+  return $return;

+}

+

+

+function find_users_for_customer($id)

+{

+  $id = (int) $id;

+  $return = array();

+  $result = db_query("SELECT uid, username FROM system.useraccounts WHERE ".

+                     "kunde='{$id}';");

+  while ($entry = mysql_fetch_assoc($result))

+    $return[$entry['uid']] = $entry['username'];

+

+  return $return;

+}

+

+

+

+

+

+

+

new file mode 100644

@@ -0,0 +1,30 @@

+<?php

+

+

+function list_system_users()

+{

+  require_role(ROLE_SYSADMIN);

+

+  $result = db_query("SELECT uid,username FROM system.v_useraccounts ORDER BY username");

+  

+  $ret = array();

+  while ($item = mysql_fetch_object($result))

+    array_push($ret, $item);

+  return $ret;

+}

+

+

+function list_customers()

+{

+  require_role(ROLE_SYSADMIN);

+

+  $result = db_query("SELECT id, IF(firma IS NULL, CONCAT_WS(' ', vorname, nachname), CONCAT(firma, ' (', CONCAT_WS(' ', vorname, nachname), ')')) AS name FROM kundendaten.kunden");

+  

+  $ret = array();

+  while ($item = mysql_fetch_object($result))

+    array_push($ret, $item);

+  return $ret;

+}

+

+

+?>