diff --git a/manifest.json b/manifest.json index e2f14bb..d90a6ee 100644 --- a/manifest.json +++ b/manifest.json @@ -1,4 +1,4 @@ { - "version": "160.0.33", + "version": "160.0.34", "name": "DLE API" } diff --git a/upload/engine/inc/dleapi.php b/upload/engine/inc/dleapi.php index 36f0269..930b4cd 100644 --- a/upload/engine/inc/dleapi.php +++ b/upload/engine/inc/dleapi.php @@ -22,8 +22,11 @@ $version = [ 'name' => 'DLE-API', 'descr' => 'Неофициальное API', - 'version' => '160.0.33', + 'version' => '160.0.34', 'changelog' => [ + '160.0.34' => [ + '[FIX] Исправлена заявленная ошибка', + ], '160.0.33' => [ '[FIX] Исправлена заявленная ошибка', '[FIX] Исправлено подключение встроенного DLE API', @@ -291,7 +294,7 @@ function pbkdf2(int $algorithm = 2, int $user_id, string $salt, int $key_length, $key['user'] = (int) $key['user']; try { - $key_api = $db->super_query('SELECT api FROM ' . PREFIX . "_api_keys WHERE api = '{$key['api']}' or user_id = {$key['user']}"); + $key_api = $db->super_query('SELECT api FROM ' . PREFIX . "_api_keys WHERE (api = '{$key['api']}' or user_id = {$key['user']}) and user_id <> 0"); try { if (is_null($key_api) || count($key_api) === 0) { @@ -1143,9 +1146,12 @@ function pbkdf2(int $algorithm = 2, int $user_id, string $salt, int $key_length, $entries = ""; - $db->query("SELECT * FROM " . PREFIX . "_api_keys api, " . USERPREFIX . "_users users WHERE api.user_id = users.user_id ORDER BY api.id DESC LIMIT {$start_from},{$api_per_page}"); + $users = getUsers(); + + $db->query("SELECT * FROM " . PREFIX . "_api_keys api ORDER BY api.id DESC LIMIT {$start_from},{$api_per_page}"); while ($row = $db->get_row()) { + $user_name = $users[$row['user_id']]; $menu_link = << @@ -1170,7 +1176,7 @@ function pbkdf2(int $algorithm = 2, int $user_id, string $salt, int $key_length,
{$row['id']}
{$row['api']}
{$row['created']}
-
{$row['name']}
+
{$user_name}
{$status}
{$own}
{$admin}