@@ -2,14 +2,11 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

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

+Written 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/

+This code is published under a 0BSD license.

 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.

 */

@@ -31,10 +31,10 @@ $term = $_GET['term'];

 $allentries = build_results($term);

-$out = array();

+$out = [];

 foreach ($allentries as $entry) {

-    $out[] = array('id' => $entry['id'], 'value' => $entry['value']);

+    $out[] = ['id' => $entry['id'], 'value' => $entry['value']];

 }

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

@@ -34,12 +34,10 @@ $allentries = build_results($term);

 $out = array();

 foreach ($allentries as $entry) {

-  $out[] = array('id' => $entry['id'], 'value' => $entry['value']);

+    $out[] = array('id' => $entry['id'], 'value' => $entry['value']);

 }

 header("Content-Type: application/json");

 echo json_encode($out);

 die();

-

-

@@ -31,18 +31,15 @@ $term = $_GET['term'];

 $allentries = build_results($term);

-$lines = array();

+$out = array();

+

 foreach ($allentries as $entry) {

-  $lines[] = "  { \"id\": \"".filter_input_general($entry['id'])."\", \"value\": \"".filter_input_general($entry['value'])."\" }";

+  $out[] = array('id' => $entry['id'], 'value' => $entry['value']);

 }

-

 header("Content-Type: application/json");

-echo "[\n";

-echo implode(",\n", $lines);

-echo '

-]';

+echo json_encode($out);

 die();

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

@@ -38,7 +38,7 @@ foreach ($allentries as $entry) {

-header("Content-Type: text/javascript");

+header("Content-Type: application/json");

 echo "[\n";

 echo implode(",\n", $lines);

 echo '

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

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

 */

 require_once('inc/base.php');

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

 require_once('inc/debug.php');

 require_once('session/start.php');

 require_once('su.php');

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

 require_role(ROLE_SYSADMIN);

@@ -28,55 +28,12 @@ require_role(ROLE_SYSADMIN);

 $_SESSION['su_ajax_timestamp'] = time();

 $term = $_GET['term'];

-$ret = array();

-

-function add($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 = build_results($term);

 $lines = array();

-foreach ($ret as $group) {

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

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

-  });

-  foreach ($group as $entry) {

-    $lines[] = "  { \"id\": \"".filter_input_general($entry['id'])."\", \"value\": \"".filter_input_general($entry['value'])."\" }";

-  }

+foreach ($allentries as $entry) {

+  $lines[] = "  { \"id\": \"".filter_input_general($entry['id'])."\", \"value\": \"".filter_input_general($entry['value'])."\" }";

 }

@@ -71,6 +71,9 @@ ksort($ret);

 $lines = array();

 foreach ($ret as $group) {

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

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

+  });

   foreach ($group as $entry) {

     $lines[] = "  { \"id\": \"".filter_input_general($entry['id'])."\", \"value\": \"".filter_input_general($entry['value'])."\" }";

   }

@@ -59,7 +59,7 @@ foreach ($result as $val) {

       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 (strstr($u['name'], $term)) {

+    } 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})");

@@ -50,13 +50,19 @@ foreach ($result as $val) {

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

   }

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

-  foreach ($users as $uid => $username) {

-    if ($uid == $term || $username == $term) {

-      add(15, "u{$uid}", "User {$uid}: {$username}");

-    } elseif (strstr($username, $term)) {

-      add(20, "u{$uid}", "User {$uid}: {$username}");

+  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 (strstr($u['name'], $term)) {

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

     } else {

-      add(85, "u{$uid}", "User {$uid}: {$username}");

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

     }

   }

 }

@@ -66,7 +66,7 @@ ksort($ret);

 $lines = array();

 foreach ($ret as $group) {

   foreach ($group as $entry) {

-    $lines[] = "  { \"id\": \"{$entry['id']}\", \"value\": \"{$entry['value']}\" }";

+    $lines[] = "  { \"id\": \"".filter_input_general($entry['id'])."\", \"value\": \"".filter_input_general($entry['value'])."\" }";

   }

 }

@@ -27,20 +27,55 @@ require_role(ROLE_SYSADMIN);

 # Save the timestamp of this request to the session, so we accept only actions performed some seconds after this

 $_SESSION['su_ajax_timestamp'] = time();

-header("Content-Type: text/javascript");

-echo "[\n";

+$term = $_GET['term'];

+$ret = array();

+

+function add($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($_GET['term']));

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

 sort($result);

 foreach ($result as $val) {

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

-  echo " {\"id\": \"c{$c->id}\", \"value\": \"Kunde {$c->id}: {$c->fullname}\"},\n";

+  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 $uid => $username) {

-    echo " {\"id\": \"u{$uid}\", \"label\": \"User {$uid}: {$username}\"},\n";

+    if ($uid == $term || $username == $term) {

+      add(15, "u{$uid}", "User {$uid}: {$username}");

+    } elseif (strstr($username, $term)) {

+      add(20, "u{$uid}", "User {$uid}: {$username}");

+    } else {

+      add(85, "u{$uid}", "User {$uid}: {$username}");

+    }

+  }

+}

+

+ksort($ret);

+

+$lines = array();

+foreach ($ret as $group) {

+  foreach ($group as $entry) {

+    $lines[] = "  { \"id\": \"{$entry['id']}\", \"value\": \"{$entry['value']}\" }";

   }

 }

-echo ' {}

+

+

+

+header("Content-Type: text/javascript");

+echo "[\n";

+echo implode(",\n", $lines);

+echo '

 ]';

 die();

@@ -24,19 +24,24 @@ require_once('class/customer.php');

 require_role(ROLE_SYSADMIN);

-$ajax_formtoken = generate_form_token('su_su_ajax');

+# Save the timestamp of this request to the session, so we accept only actions performed some seconds after this

+$_SESSION['su_ajax_timestamp'] = time();

-$result = array_unique(find_customers($_GET['q']));

+header("Content-Type: text/javascript");

+echo "[\n";

+

+$result = array_unique(find_customers($_GET['term']));

 sort($result);

 foreach ($result as $val) {

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

-  echo '<div style="margin-bottom: 0.5em;">'.internal_link('su.php', 'Kunde '.$c->id.': <strong>'.$c->fullname.'</strong>', 'type=customer&id='.$c->id.'&formtoken='.$ajax_formtoken);

+  echo " {\"id\": \"c{$c->id}\", \"value\": \"Kunde {$c->id}: {$c->fullname}\"},\n";

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

   foreach ($users as $uid => $username) {

-    echo '<p style="padding:0; margin:0;margin-left: 2em;">'.internal_link('', 'User »'.$username.'« (UID '.$uid.')', 'type=systemuser&uid='.$uid.'&formtoken='.$ajax_formtoken).'</p>';

+    echo " {\"id\": \"u{$uid}\", \"label\": \"User {$uid}: {$username}\"},\n";

   }

-  echo '</div>';

 }

+echo ' {}

+]';

 die();

@@ -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');

 require_once('inc/debug.php');

new file mode 100644

@@ -0,0 +1,28 @@

+<?php

+

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

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

+

+require_once('session/start.php');

+require_once('su.php');

+

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

+

+require_role(ROLE_SYSADMIN);

+

+$ajax_formtoken = generate_form_token('su_su_ajax');

+

+$result = array_unique(find_customers($_GET['q']));

+sort($result);

+foreach ($result as $val) {

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

+  echo '<div style="margin-bottom: 0.5em;">'.internal_link('su.php', 'Kunde '.$c->id.': <strong>'.$c->fullname.'</strong>', 'type=customer&id='.$c->id.'&formtoken='.$ajax_formtoken);

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

+  foreach ($users as $uid => $username) {

+    echo '<p style="padding:0; margin:0;margin-left: 2em;">'.internal_link('', 'User »'.$username.'« (UID '.$uid.')', 'type=systemuser&uid='.$uid.'&formtoken='.$ajax_formtoken).'</p>';

+  }

+  echo '</div>';

+}

+die();

+

+