adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 09:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug:1791 update webservices upload methods

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@10160 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2011-04-08 10:51:54 +00:00
parent 758fe845f8
commit c9ec229a5a
2 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_functions.inc.php
+4
View File
@@ -1246,6 +1246,8 @@ SELECT
if ('high' == $params['type'])
{
$update['high_filesize'] = $infos['filesize'];
$update['high_width'] = $infos['width'];
$update['high_height'] = $infos['height'];
$update['has_high'] = 'true';
}
@@ -1374,6 +1376,8 @@ SELECT
{
$insert['has_high'] = 'true';
$insert['high_filesize'] = $high_infos['filesize'];
$insert['high_width'] = $high_infos['width'];
$insert['high_height'] = $high_infos['height'];
}
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
picture.php
+25 -33
View File
@@ -903,7 +903,26 @@ $url = make_index_url(
$infos['INFO_POSTED_DATE'] = '<a href="'.$url.'" rel="nofollow">'.$val.'</a>';
// size in pixels
if ($picture['current']['is_picture'] and isset($picture['current']['width']) )
if ($picture['current']['is_picture'] AND $picture['current']['has_high'])
{
if (!empty($picture['current']['high_width']))
{
$infos['INFO_DIMENSIONS'] = $picture['current']['high_width'].'*'.$picture['current']['high_height'];
}
else if ($hi_size = @getimagesize($hi_url))
{
pwg_query('
UPDATE ' . IMAGES_TABLE . '
SET
high_width = \'' . $hi_size[0].'\',
high_height = \''.$hi_size[1] .'\'
WHERE id = ' . $picture['current']['id'] . ';
');
$infos['INFO_DIMENSIONS'] = $hi_size[0].'*'.$hi_size[1];
}
}
else if ($picture['current']['is_picture'] and isset($picture['current']['width']) )
{
if ($picture['current']['scaled_width'] !== $picture['current']['width'] )
{
@@ -919,44 +938,17 @@ if ($picture['current']['is_picture'] and isset($picture['current']['width']) )
}
}
// hd size in pixels
if ($picture['current']['is_picture'] AND $picture['current']['has_high'])
{
if (!empty($picture['current']['high_width']))
{
$infos['INFO_DIMENSIONS'] = $picture['current']['high_width'].'*'.$picture['current']['high_height'];
}
else
{
$hi_size = @getimagesize($hi_url);
if ($hi_size !== false)
{
pwg_query('
UPDATE ' . IMAGES_TABLE . '
SET
high_width = \'' . $hi_size[0].'\',
high_height = \''.$hi_size[1] .'\'
WHERE id = ' . $picture['current']['id'] . ';
');
$infos['INFO_DIMENSIONS'] = $hi_size[0].'*'.$hi_size[1];
}
}
}
// filesize
if (!empty($picture['current']['filesize']))
{
$infos['INFO_FILESIZE'] =
sprintf(l10n('%d Kb'), $picture['current']['filesize']);
}
// hd filesize
if ($picture['current']['has_high'] and !empty($picture['current']['high_filesize']))
{
$infos['INFO_FILESIZE'] =
sprintf(l10n('%d Kb'), $picture['current']['high_filesize']);
}
else if (!empty($picture['current']['filesize']))
{
$infos['INFO_FILESIZE'] =
sprintf(l10n('%d Kb'), $picture['current']['filesize']);
}
// number of visits
$infos['INFO_VISITS'] = $picture['current']['hit'];