bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Remove resourceid parameter from Photo::exists()

Browse source
This commit is contained in:
fabrixxm 2018-12-12 08:12:34 +01:00 committed by Hypolite Petovan
parent e7fbe04b11
commit 55292c954b
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/api.php
View file

@ -3995,7 +3995,7 @@ function api_fr_photoalbum_update($type)
throw new BadRequestException("no new albumname specified"); throw new BadRequestException("no new albumname specified");
} }
// check if album is existing // check if album is existing
if (!Photo::exists(null, ['uid' => api_user(), 'album' => $album])) { if (!Photo::exists(['uid' => api_user(), 'album' => $album])) {
throw new BadRequestException("album not available"); throw new BadRequestException("album not available");
} }
// now let's update all photos to the albumname // now let's update all photos to the albumname
@ -4100,7 +4100,7 @@ function api_fr_photo_create_update($type)
$mode = "update"; $mode = "update";
// check if photo is existing in databasei // check if photo is existing in databasei
if (!Photo::exists($photo_id, ['uid' => api_user(), 'album' => $album])) { if (!Photo::exists(['resource-id' => $photo_id, 'uid' => api_user(), 'album' => $album])) {
throw new BadRequestException("photo not available"); throw new BadRequestException("photo not available");
} }
} }
@ -4211,7 +4211,7 @@ function api_fr_photo_delete($type)
throw new BadRequestException("no photo_id specified"); throw new BadRequestException("no photo_id specified");
} }
// check if photo is existing in database // check if photo is existing in database
$r = Photo::exists($photo_id, ['uid' => api_user()]); $r = Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()]);
if (!$r) { if (!$r) {
throw new BadRequestException("photo not available"); throw new BadRequestException("photo not available");
} }

4
mod/item.php
View file

@ -459,9 +459,9 @@ function item_post(App $a) {
$condition = [ $condition = [
'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
'uid' => $profile_uid 'resource-id' => $image_uri, 'uid' => $profile_uid
]; ];
if (!Photo::exists($image_uri, $condition)) { if (!Photo::exists($condition)) {
continue; continue;
} }

10
src/Model/Photo.php
View file

@ -147,20 +147,12 @@ class Photo extends BaseObject
/** /**
* @brief Check if photo with given resource id exists * @brief Check if photo with given resource id exists
* *
* @param string $resourceid Resource ID of the photo
* @param array $conditions Array of extra conditions. Optional * @param array $conditions Array of extra conditions. Optional
* *
* @return boolean * @return boolean
*/ */
public static function exists($resourceid, array $conditions = []) public static function exists(array $conditions = [])
{ {
if (!is_null($resourceid)) {
$conditions["resource-id"] = $resourceid;
}
if (count($conditions) == 0) {
// no conditions defined. return false
return false;
}
return DBA::count("photo", $conditions) > 0; return DBA::count("photo", $conditions) > 0;
} }