Merge pull request #10962 from annando/db-doc

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index b6869a2b132053682e60a72fa2a6d12b9193e2cb..68723a0f428c598b8f2a175536fd839dd142fe90 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -237,9 +237,11 @@ function api_login(App $a)
        if ($addon_auth['authenticated'] && !empty($addon_auth['user_record'])) {
                $record = $addon_auth['user_record'];
        } else {
-               $user_id = User::authenticate(trim($user), trim($password), true);
-               if ($user_id !== false) {
+               try {
+                       $user_id = User::getIdFromPasswordAuthentication(trim($user), trim($password), true);
                        $record = DBA::selectFirst('user', [], ['uid' => $user_id]);
+               } catch (Exception $ex) {
+                       $record = [];
                }
        }
 
@@ -386,11 +388,11 @@ function api_call(App $a, App\Arguments $args = null)
  */
 function api_error($type, $e, App\Arguments $args)
 {
-       $error = ($e->getMessage() !== "" ? $e->getMessage() : $e->httpdesc);
+       $error = ($e->getMessage() !== "" ? $e->getMessage() : $e->getDescription());
        /// @TODO:  https://dev.twitter.com/overview/api/response-codes
 
        $error = ["error" => $error,
-                       "code" => $e->getCode() . " " . $e->httpdesc,
+                       "code" => $e->getCode() . " " . $e->getDescription(),
                        "request" => $args->getQueryString()];
 
        $return = api_format_data('status', $type, ['status' => $error]);
@@ -4604,9 +4606,6 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 
        // check max length of images on server
        $max_length = DI::config()->get('system', 'max_image_length');
-       if (!$max_length) {
-               $max_length = MAX_IMAGE_LENGTH;
-       }
        if ($max_length > 0) {
                $Image->scaleDown($max_length);
                logger::info("File upload: Scaling picture to new size " . $max_length);
@@ -5140,7 +5139,13 @@ function api_friendica_group_delete($type)
        }
 
        // delete group
-       $ret = Group::removeByName($uid, $name);
+       $gid = Group::getIdByName($uid, $name);
+       if (empty($gid)) {
+               throw new BadRequestException('other API error');
+       }
+
+       $ret = Group::remove($gid);
+
        if ($ret) {
                // return success
                $success = ['success' => $ret, 'gid' => $gid, 'name' => $name, 'status' => 'deleted', 'wrong users' => []];
@@ -5375,7 +5380,8 @@ function api_friendica_group_update($type)
                        $found = ($user['cid'] == $cid ? true : false);
                }
                if (!isset($found) || !$found) {
-                       Group::removeMemberByName($uid, $name, $cid);
+                       $gid = Group::getIdByName($uid, $name);
+                       Group::removeMember($gid, $cid);
                }
        }