From: Jon Langseth Date: Fri, 20 Jan 2012 23:06:37 +0000 (+0100) Subject: Testing uncovered bug, duplicate function name. X-Git-Url: https://git.defcon.no/?p=hermes;a=commitdiff_plain;h=35d61a3bc82ba46a3dc574c3165e9afc05ef7c0f Testing uncovered bug, duplicate function name. --- diff --git a/api/auth.php b/api/auth.php index 336c6c3..9fcd6e2 100644 --- a/api/auth.php +++ b/api/auth.php @@ -254,7 +254,7 @@ else // but should only return users with authorization. if ( ! can_write() ) simple_authfail(); - $list = list_users(); + $list = list_authusers(); print json_encode( array( 'response' => 'ok', 'list' => $list ) ); break; diff --git a/api/lib/auth_base.php b/api/lib/auth_base.php index a2ce62c..bb3c26f 100644 --- a/api/lib/auth_base.php +++ b/api/lib/auth_base.php @@ -320,7 +320,7 @@ function list_apikeys () } -function list_users () +function list_authusers () { global $config; $query = sprintf("SELECT authid, access_level