mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 19:59:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature 2548 multisize - small fixes

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@12958 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-01-26 21:15:16 +00:00
parent 4f216a5cac
commit 4a73d939e0
4 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
i.php
View file

@ -73,20 +73,20 @@ function ilog()
if (!mkgetdir($dir) or ! ($ilogfh=fopen($dir.'i.log', 'a')) ) if (!mkgetdir($dir) or ! ($ilogfh=fopen($dir.'i.log', 'a')) )
return; return;
} }
fwrite($ilogfh, date("c") ); $line = date("c");
foreach( func_get_args() as $arg) foreach( func_get_args() as $arg)
{ {
fwrite($ilogfh, ' ' ); $line .= ' ';
if (is_array($arg)) if (is_array($arg))
{ {
fwrite($ilogfh, implode(' ', $arg) ); $line .= implode(' ', $arg);
} }
else else
{ {
fwrite($ilogfh, $arg); $line .= $arg;
} }
} }
fwrite($ilogfh, "\n"); fwrite($ilogfh, $line."\n");
} }
function ierror($msg, $code) function ierror($msg, $code)
@ -396,6 +396,10 @@ if (!$changes)
ierror( $page['src_url'], 301); ierror( $page['src_url'], 301);
} }
if ($d_size[0]*$d_size[1] < 100000)
{// strip metadata for small images
$image->strip();
}
$image->set_compression_quality( $params->quality ); $image->set_compression_quality( $params->quality );
$image->write( $page['derivative_path'] ); $image->write( $page['derivative_path'] );
$image->destroy(); $image->destroy();

6
picture.php
View file

@ -155,9 +155,12 @@ function default_picture_content($content, $element_info)
} }
if (isset($_COOKIE['picture_deriv'])) if (isset($_COOKIE['picture_deriv']))
{
if ( array_key_exists($_COOKIE['picture_deriv'], ImageStdParams::get_defined_type_map()) )
{ {
pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']); pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
setcookie('picture_deriv', false, 0); }
setcookie('picture_deriv', false, 0, cookie_path() );
} }
$deriv_type = pwg_get_session_var('picture_deriv', IMG_LARGE); $deriv_type = pwg_get_session_var('picture_deriv', IMG_LARGE);
$selected_derivative = $element_info['derivatives'][$deriv_type]; $selected_derivative = $element_info['derivatives'][$deriv_type];
@ -194,6 +197,7 @@ function default_picture_content($content, $element_info)
$template->assign( array( $template->assign( array(
'ALT_IMG' => $element_info['file'], 'ALT_IMG' => $element_info['file'],
'COOKIE_PATH' => cookie_path(),
) )
); );
return $template->parse( 'default_content', true); return $template->parse( 'default_content', true);

2
themes/default/template/picture_content.tpl
View file

@ -15,7 +15,7 @@ function changeImgSrc(url,typeSave,typeMap,typeDisplay)
if (elt) elt.innerHTML = typeDisplay; if (elt) elt.innerHTML = typeDisplay;
theImg.useMap = "#map"+typeMap; theImg.useMap = "#map"+typeMap;
} }
document.cookie = 'picture_deriv=' + typeSave; document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
} }
function toggleDerivativeSwitchBox() function toggleDerivativeSwitchBox()

4
themes/default/template/thumbnails.tpl
View file

@ -5,11 +5,11 @@
.thumbnails SPAN, .thumbnails SPAN,
.thumbnails .wrap2 A, .thumbnails .wrap2 A,
.thumbnails LABEL{ldelim} .thumbnails LABEL{ldelim}
width: {$derivative_params->max_width()}px; width: {$derivative_params->max_width()+2}px;
} }
.thumbnails .wrap2{ldelim} .thumbnails .wrap2{ldelim}
height: {$derivative_params->max_height()+2}px; height: {$derivative_params->max_height()+3}px;
} }
{if $derivative_params->max_width() > 600} {if $derivative_params->max_width() > 600}
.thumbLegend {ldelim}font-size: 130%} .thumbLegend {ldelim}font-size: 130%}