improvement: ability to hide setup warnings for upload. Warnings will

automatically come back at next user session.


git-svn-id: http://piwigo.org/svn/branches/2.1@6628 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-06-29 20:15:18 +00:00
parent 64863a781f
commit b23cc71576
2 changed files with 39 additions and 21 deletions

View file

@ -487,11 +487,11 @@ $template->assign(
);
// +-----------------------------------------------------------------------+
// | setup errors |
// | setup errors/warnings |
// +-----------------------------------------------------------------------+
// Errors
$setup_errors = array();
$setup_warnings = array();
$error_message = ready_for_upload_message();
if (!empty($error_message))
@ -504,6 +504,22 @@ if (!function_exists('gd_info'))
array_push($setup_errors, l10n('GD library is missing'));
}
$template->assign(
array(
'setup_errors'=> $setup_errors,
)
);
// Warnings
if (isset($_GET['hide_warnings']))
{
$_SESSION['upload_hide_warnings'] = true;
}
if (!isset($_SESSION['upload_hide_warnings']))
{
$setup_warnings = array();
if ($conf['use_exif'] and !function_exists('read_exif_data'))
{
array_push(
@ -526,10 +542,11 @@ if (get_ini_size('upload_max_filesize') > get_ini_size('post_max_size'))
$template->assign(
array(
'setup_errors'=> $setup_errors,
'setup_warnings' => $setup_warnings,
'hide_warnings_link' => PHOTOS_ADD_BASE_URL.'&upload_mode='.$upload_mode.'&hide_warnings=1'
)
);
}
// +-----------------------------------------------------------------------+
// | sending html code |

View file

@ -250,6 +250,7 @@ var sizeLimit = {$upload_max_filesize};
<li>{$warning}</li>
{/foreach}
</ul>
<div class="hideButton" style="text-align:center"><a href="{$hide_warnings_link}">{'Hide'|@translate}</a></div>
</div>
{/if}