Browse Source

Remove resourceid parameter from Photo::exists()

tags/2019.03^2
fabrixxm 1 year ago
committed by Hypolite Petovan
parent
commit
55292c954b
3 changed files with 6 additions and 14 deletions
  1. +3
    -3
      include/api.php
  2. +2
    -2
      mod/item.php
  3. +1
    -9
      src/Model/Photo.php

+ 3
- 3
include/api.php View File

@@ -3995,7 +3995,7 @@ function api_fr_photoalbum_update($type)
throw new BadRequestException("no new albumname specified");
}
// 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");
}
// now let's update all photos to the albumname
@@ -4100,7 +4100,7 @@ function api_fr_photo_create_update($type)
$mode = "update";

// 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");
}
}
@@ -4211,7 +4211,7 @@ function api_fr_photo_delete($type)
throw new BadRequestException("no photo_id specified");
}
// 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) {
throw new BadRequestException("photo not available");
}


+ 2
- 2
mod/item.php View File

@@ -459,9 +459,9 @@ function item_post(App $a) {

$condition = [
'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;
}



+ 1
- 9
src/Model/Photo.php View File

@@ -147,20 +147,12 @@ class Photo extends BaseObject
/**
* @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
*
* @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;
}



Loading…
Cancel
Save