feature 1289 added: easy "delete orphan tags" function. On the "tags"

administration page, a warning message is displayed if you have at least
one orphan tag + direct action to delete them.


git-svn-id: http://piwigo.org/svn/trunk@8762 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-01-19 13:19:16 +00:00
parent e338363331
commit 1b7781c866
8 changed files with 116 additions and 7 deletions
+48
View File
@@ -363,6 +363,54 @@ DELETE FROM '.USERS_TABLE.'
trigger_action('delete_user', $user_id);
}
/**
* Deletes all tags linked to no photo
*/
function delete_orphan_tags()
{
$orphan_tags = get_orphan_tags();
if (count($orphan_tags) > 0)
{
$orphan_tag_ids = array();
foreach ($orphan_tags as $tag)
{
array_push($orphan_tag_ids, $tag['id']);
}
$query = '
DELETE
FROM '.TAGS_TABLE.'
WHERE id IN ('.implode(',', $orphan_tag_ids).')
;';
pwg_query($query);
}
}
/**
* Get all tags (id + name) linked to no photo
*/
function get_orphan_tags()
{
$orphan_tags = array();
$query = '
SELECT
id,
name
FROM '.TAGS_TABLE.'
LEFT JOIN '.IMAGE_TAG_TABLE.' ON id = tag_id
WHERE tag_id IS NULL
;';
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
array_push($orphan_tags, $row);
}
return $orphan_tags;
}
/**
* Verifies that the representative picture really exists in the db and
* picks up a random represantive if possible and based on config.
+7 -1
View File
@@ -55,6 +55,11 @@ switch ($action)
update_average_rate();
break;
}
case 'delete_orphan_tags' :
{
delete_orphan_tags();
break;
}
case 'history_detail' :
{
$query = '
@@ -133,13 +138,14 @@ $template->assign(
array(
'U_MAINT_CATEGORIES' => $start_url.'categories',
'U_MAINT_IMAGES' => $start_url.'images',
'U_MAINT_ORPHAN_TAGS' => $start_url.'delete_orphan_tags',
'U_MAINT_HISTORY_DETAIL' => $start_url.'history_detail',
'U_MAINT_HISTORY_SUMMARY' => $start_url.'history_summary',
'U_MAINT_SESSIONS' => $start_url.'sessions',
'U_MAINT_FEEDS' => $start_url.'feeds',
'U_MAINT_DATABASE' => $start_url.'database',
'U_MAINT_C13Y' => $start_url.'c13y',
'U_MAINT_SEARCH' => $start_url.'search',
'U_MAINT_SEARCH' => $start_url.'search',
'U_MAINT_COMPILED_TEMPLATES' => $start_url.'compiled-templates',
'U_HELP' => get_root_url().'admin/popuphelp.php?page=maintenance',
)
+38
View File
@@ -137,6 +137,19 @@ DELETE
);
}
// +-----------------------------------------------------------------------+
// | delete orphan tags |
// +-----------------------------------------------------------------------+
if (isset($_GET['action']) and 'delete_orphans' == $_GET['action'])
{
check_pwg_token();
delete_orphan_tags();
$_SESSION['page_infos'] = array(l10n('Orphan tags deleted'));
redirect(get_root_url().'admin.php?page=tags');
}
// +-----------------------------------------------------------------------+
// | add a tag |
// +-----------------------------------------------------------------------+
@@ -199,6 +212,31 @@ $template->assign(
)
);
// +-----------------------------------------------------------------------+
// | orphan tags |
// +-----------------------------------------------------------------------+
$orphan_tags = get_orphan_tags();
$orphan_tag_names = array();
foreach ($orphan_tags as $tag)
{
array_push($orphan_tag_names, $tag['name']);
}
if (count($orphan_tag_names) > 0)
{
array_push(
$page['warnings'],
sprintf(
l10n('You have %d orphan tags: %s.').' <a href="%s">'.l10n('Delete orphan tags').'</a>',
count($orphan_tag_names),
implode(', ', $orphan_tag_names),
get_root_url().'admin.php?page=tags&amp;action=delete_orphans&amp;pwg_token='.get_pwg_token()
)
);
}
// +-----------------------------------------------------------------------+
// | form creation |
// +-----------------------------------------------------------------------+
+10
View File
@@ -126,5 +126,15 @@ jQuery(document).ready(function(){ldelim}
</div>
{/if}
{if isset($warnings)}
<div class="warnings">
<ul>
{foreach from=$warnings item=warning}
<li>{$warning}</li>
{/foreach}
</ul>
</div>
{/if}
{$ADMIN_CONTENT}
</div>
@@ -11,18 +11,13 @@
<ul>
<li><a href="{$U_MAINT_CATEGORIES}">{'Update albums informations'|@translate}</a></li>
<li><a href="{$U_MAINT_IMAGES}">{'Update photos information'|@translate}</a></li>
<li><a href="{$U_MAINT_ORPHAN_TAGS}">{'Delete orphan tags'|@translate}</a></li>
<li><a href="{$U_MAINT_DATABASE}">{'Repair and optimize database'|@translate}</a></li>
</ul>
<ul>
<li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');">{'Purge history detail'|@translate}</a></li>
<li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');">{'Purge history summary'|@translate}</a></li>
<li><a href="{$U_MAINT_SESSIONS}">{'Purge sessions'|@translate}</a></li>
<li><a href="{$U_MAINT_FEEDS}">{'Purge never used notification feeds'|@translate}</a></li>
<li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');">{'Purge search history'|@translate}</a></li>
<li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li>
</ul>
<ul>
<li><a href="{$U_MAINT_C13Y}">{'Reinitialize check integrity'|@translate}</a></li>
</ul>