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

fixes #1090 move warning about missing checksums from dashboard to sync page

Browse source 
* avoid scaring users for a minor issue
* convert the warning message into a simple info
* simplify algorithm for detection and only search on relevant pages (batch manager + sync page)
This commit is contained in:
plegall 2019-10-14 14:14:54 +02:00
parent 9b695da86b
commit 72094c5f88
4 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
admin.php
View file

@ -238,15 +238,14 @@ if ($nb_photos_in_caddie > 0)
}
// any photos with no md5sum ?
$nb_no_md5sum = count(get_photos_no_md5sum());
if ($nb_no_md5sum > 0)
if (in_array($page['page'], array('site_update', 'batch_manager')))
{
$template->assign(
array(
'NB_NO_MD5SUM' => $nb_no_md5sum,
'U_NO_MD5SUM' => $link_start.'batch_manager&filter=prefilter-no_sync_md5sum',
)
);
$nb_no_md5sum = count(get_photos_no_md5sum());
if ($nb_no_md5sum > 0)
{
$page['no_md5sum_number'] = $nb_no_md5sum;
}
}
// any orphan photo?

9
admin/batch_manager_global.php
View file

@ -470,6 +470,15 @@ $template->assign(
)
);
if (isset($page['no_md5sum_number']))
{
$template->assign(
array(
'NB_NO_MD5SUM' => $page['no_md5sum_number'],
)
);
}
// +-----------------------------------------------------------------------+
// | caddie options |
// +-----------------------------------------------------------------------+

22
admin/intro.php
View file

@ -44,28 +44,6 @@ $tabsheet->assign();
// | actions |
// +-----------------------------------------------------------------------+
//check if images have no md5sum in database
$query = '
SELECT COUNT(*)
FROM '.CATEGORIES_TABLE.'
WHERE dir IS NOT NULL
;';
list($counter) = pwg_db_fetch_row(pwg_query($query));
if ($counter > 0)
{
$query = '
SELECT COUNT(*)
FROM '.IMAGES_TABLE.'
WHERE storage_category_id IS NOT NULL
AND md5sum IS NULL
;';
list($counter) = pwg_db_fetch_row(pwg_query($query));
if ($counter > 0)
{
$page['warnings'][] = '<a href="admin.php?page=batch_manager&amp;filter=prefilter-no_sync_md5sum">'.l10n('Some checksums are missing.').'<i class="icon-right"></i></a>';
}
}
if (isset($page['nb_pending_comments']))
{
$message = l10n('User comments').' <i class="icon-chat"></i> ';

5
admin/site_update.php
View file

@ -67,6 +67,11 @@ else
$site_reader = new LocalSiteReader($site_url);
}
if (isset($page['no_md5sum_number']))
{
$page['messages'][] = '<a href="admin.php?page=batch_manager&amp;filter=prefilter-no_sync_md5sum">'.l10n('Some checksums are missing.').'<i class="icon-right"></i></a>';
}
// +-----------------------------------------------------------------------+
// | Quick sync |
// +-----------------------------------------------------------------------+