archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge -r4512 from branch 2.0 to trunk

Browse source 
web method images.setPrivacyLevel (ws_images_setPrivacyLevel) is POST only

git-svn-id: http://piwigo.org/svn/trunk@4513 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2009-12-18 21:12:41 +00:00
commit 8c051ea526
5 changed files with 46 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

37
include/ws_functions.inc.php
View file

@ -855,6 +855,10 @@ function ws_images_setPrivacyLevel($params, &$service)
{
return new PwgError(401, 'Access denied');
}
if (!$service->isPost())
{
return new PwgError(405, "This method requires HTTP POST");
}
$params['image_id'] = array_map( 'intval',$params['image_id'] );
if ( empty($params['image_id']) )
{
@ -865,6 +869,7 @@ function ws_images_setPrivacyLevel($params, &$service)
{
return new PwgError(WS_ERR_INVALID_PARAM, "Invalid level");
}
$query = '
UPDATE '.IMAGES_TABLE.'
SET level='.(int)$params['level'].'
@ -950,14 +955,14 @@ function merge_chunks($output_filepath, $original_sum, $type)
if (is_file($output_filepath))
{
unlink($output_filepath);
if (is_file($output_filepath))
{
new PwgError(500, '[merge_chunks] error while trying to remove existing '.$output_filepath);
exit();
}
}
$upload_dir = PHPWG_ROOT_PATH.'upload/buffer';
$pattern = '/'.$original_sum.'-'.$type.'/';
$chunks = array();
@ -982,7 +987,7 @@ function merge_chunks($output_filepath, $original_sum, $type)
}
$i = 0;
foreach ($chunks as $chunk)
{
$string = file_get_contents($chunk);
@ -1014,7 +1019,7 @@ function add_file($file_path, $type, $original_sum, $file_sum)
$file_path = file_path_for_type($file_path, $type);
$upload_dir = dirname($file_path);
if (!is_dir($upload_dir)) {
umask(0000);
$recursive = true;
@ -1101,7 +1106,7 @@ SELECT
// update basic metadata from file
//
$update = array();
if ('high' == $params['type'])
{
$update['high_filesize'] = $infos['filesize'];
@ -1120,7 +1125,7 @@ SELECT
if (count($update) > 0)
{
$update['id'] = $params['image_id'];
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
mass_updates(
IMAGES_TABLE,
@ -1839,7 +1844,7 @@ function ws_add_image_category_relations($image_id, $categories_string, $replace
);
exit();
}
$query = '
SELECT
id
@ -1857,9 +1862,9 @@ SELECT
);
exit();
}
$to_update_cat_ids = array();
// in case of replace mode, we first check the existing associations
$query = '
SELECT
@ -1884,13 +1889,13 @@ DELETE
update_category($to_remove_cat_ids);
}
}
$new_cat_ids = array_diff($cat_ids, $existing_cat_ids);
if (count($new_cat_ids) == 0)
{
return true;
}
if ($search_current_ranks)
{
$query = '
@ -1914,16 +1919,16 @@ SELECT
{
$current_rank_of[$cat_id] = 0;
}
if ('auto' == $rank_on_category[$cat_id])
{
$rank_on_category[$cat_id] = $current_rank_of[$cat_id] + 1;
}
}
}
$inserts = array();
foreach ($new_cat_ids as $cat_id)
{
array_push(
@ -1935,14 +1940,14 @@ SELECT
)
);
}
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
mass_inserts(
IMAGE_CATEGORY_TABLE,
array_keys($inserts[0]),
$inserts
);
update_category($new_cat_ids);
}