diff options
| author | plegall <plg@piwigo.org> | 2013-02-04 11:28:03 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2013-02-04 11:28:03 +0000 |
| commit | b267aea0e2821cd411530511bbb2698bc5e9b121 (patch) | |
| tree | 2e952ed810d4219abd9f14c9111196d796e28f25 /admin | |
| parent | b39b4e0f398c205676004352bb1c7316f809bea2 (diff) | |
bug 2825: add maintenance action to clean the database and avoid integrity errors
git-svn-id: http://piwigo.org/svn/trunk@20544 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions.php | 28 | ||||
| -rw-r--r-- | admin/maintenance.php | 9 | ||||
| -rw-r--r-- | admin/themes/default/template/maintenance.tpl | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index c1a3db22c..03bce26cc 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -485,6 +485,34 @@ SELECT DISTINCT id } /** + * check and repair images integrity + * + * TODO see delete_elements function to check all linked tables + */ +function images_integrity() +{ + $query = ' +SELECT + image_id + FROM '.IMAGE_CATEGORY_TABLE.' + LEFT JOIN '.IMAGES_TABLE.' ON id = image_id + WHERE id IS NULL +;'; + $result = pwg_query($query); + $orphan_image_ids = array_from_query($query, 'image_id'); + + if (count($orphan_image_ids) > 0) + { + $query = ' +DELETE + FROM '.IMAGE_CATEGORY_TABLE.' + WHERE image_id IN ('.implode(',', $orphan_image_ids).') +;'; + pwg_query($query); + } +} + +/** * returns an array containing sub-directories which can be a category, * recursive by default * diff --git a/admin/maintenance.php b/admin/maintenance.php index 22561c39c..5b99bf969 100644 --- a/admin/maintenance.php +++ b/admin/maintenance.php @@ -62,6 +62,7 @@ switch ($action) } case 'categories' : { + images_integrity(); update_uppercats(); update_category('all'); update_global_rank(); @@ -70,9 +71,11 @@ switch ($action) } case 'images' : { + images_integrity(); update_path(); include_once(PHPWG_ROOT_PATH.'include/functions_rate.inc.php'); update_rating_score(); + invalidate_user_cache(); break; } case 'delete_orphan_tags' : @@ -80,6 +83,11 @@ switch ($action) delete_orphan_tags(); break; } + case 'user_cache' : + { + invalidate_user_cache(); + break; + } case 'history_detail' : { $query = ' @@ -171,6 +179,7 @@ $template->assign( 'U_MAINT_CATEGORIES' => sprintf($url_format, 'categories'), 'U_MAINT_IMAGES' => sprintf($url_format, 'images'), 'U_MAINT_ORPHAN_TAGS' => sprintf($url_format, 'delete_orphan_tags'), + 'U_MAINT_USER_CACHE' => sprintf($url_format, 'user_cache'), 'U_MAINT_HISTORY_DETAIL' => sprintf($url_format, 'history_detail'), 'U_MAINT_HISTORY_SUMMARY' => sprintf($url_format, 'history_summary'), 'U_MAINT_SESSIONS' => sprintf($url_format, 'sessions'), diff --git a/admin/themes/default/template/maintenance.tpl b/admin/themes/default/template/maintenance.tpl index c17b2dccf..257adae01 100644 --- a/admin/themes/default/template/maintenance.tpl +++ b/admin/themes/default/template/maintenance.tpl @@ -27,6 +27,7 @@ </ul> <ul> + <li><a href="{$U_MAINT_USER_CACHE}">{'Purge user cache'|@translate}</a></li> <li><a href="{$U_MAINT_ORPHAN_TAGS}">{'Delete orphan tags'|@translate}</a></li> <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate|@escape:'javascript'}');">{'Purge history detail'|@translate}</a></li> <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate|@escape:'javascript'}');">{'Purge history summary'|@translate}</a></li> |