diff options
Diffstat (limited to '')
| -rw-r--r-- | admin.php | 1 | ||||
| -rw-r--r-- | admin/advanced_feature.php | 108 | ||||
| -rw-r--r-- | admin/include/functions.php | 1 | ||||
| -rw-r--r-- | admin/maintenance.php | 30 | ||||
| -rw-r--r-- | admin/themes/default/template/admin.tpl | 1 | ||||
| -rw-r--r-- | admin/themes/default/template/advanced_feature.tpl | 9 | ||||
| -rw-r--r-- | admin/themes/default/template/maintenance.tpl | 6 |
7 files changed, 36 insertions, 120 deletions
@@ -106,7 +106,6 @@ $template->assign( 'U_SITES'=> $link_start.'remote_site', 'U_MAINTENANCE'=> $link_start.'maintenance', 'U_NOTIFICATION_BY_MAIL'=> $link_start.'notification_by_mail', - 'U_ADVANCED_FEATURE'=> $link_start.'advanced_feature', 'U_CONFIG_GENERAL'=> $link_start.'configuration', 'U_CONFIG_DISPLAY'=> $conf_link.'default', 'U_CONFIG_EXTENTS'=> $link_start.'extend_for_templates', diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php deleted file mode 100644 index df88f970d..000000000 --- a/admin/advanced_feature.php +++ /dev/null @@ -1,108 +0,0 @@ -<?php -// +-----------------------------------------------------------------------+ -// | Piwigo - a PHP based picture gallery | -// +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2010 Piwigo Team http://piwigo.org | -// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | -// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | -// +-----------------------------------------------------------------------+ -// | This program is free software; you can redistribute it and/or modify | -// | it under the terms of the GNU General Public License as published by | -// | the Free Software Foundation | -// | | -// | This program is distributed in the hope that it will be useful, but | -// | WITHOUT ANY WARRANTY; without even the implied warranty of | -// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -// | General Public License for more details. | -// | | -// | You should have received a copy of the GNU General Public License | -// | along with this program; if not, write to the Free Software | -// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | -// | USA. | -// +-----------------------------------------------------------------------+ - -if (!defined('PHPWG_ROOT_PATH')) -{ - die ("Hacking attempt!"); -} - -// +-----------------------------------------------------------------------+ -// | Check Access and exit when user status is not ok | -// +-----------------------------------------------------------------------+ -check_status(ACCESS_ADMINISTRATOR); - -// +-----------------------------------------------------------------------+ -// | Actions | -// +-----------------------------------------------------------------------+ - -/*$action = (isset($_GET['action']) and !is_adviser()) ? $_GET['action'] : ''; - -switch ($action) -{ - case '???' : - { - break; - } - default : - { - break; - } -}*/ - -// +-----------------------------------------------------------------------+ -// | Define advanced features | -// +-----------------------------------------------------------------------+ - -$advanced_features = array(); - -// Add advanced features -/*array_push($advanced_features, - array - ( - 'CAPTION' => l10n('???'), - 'URL' => $start_url.'???' - ));*/ - -array_push($advanced_features, - array - ( - 'CAPTION' => l10n('Not linked elements'), - 'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked' - )); - -array_push($advanced_features, - array - ( - 'CAPTION' => l10n('Files with same name in more than one physical category'), - 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' - )); - -//$advanced_features is array of array composed of CAPTION & URL -$advanced_features = - trigger_event('get_admin_advanced_features_links', $advanced_features); - -// +-----------------------------------------------------------------------+ -// | Template init | -// +-----------------------------------------------------------------------+ - -$template->set_filename('advanced_feature', 'advanced_feature.tpl'); - -$start_url = get_root_url().'admin.php?page=advanced_feature&action='; - -$template->assign( - array - ( - 'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature', - 'U_ACTIVE_MENU' => 5 - )); - -// advanced_features -$template->assign('advanced_features', $advanced_features); - -// +-----------------------------------------------------------------------+ -// | Sending html code | -// +-----------------------------------------------------------------------+ - -$template->assign_var_from_handle('ADMIN_CONTENT', 'advanced_feature'); - -?> diff --git a/admin/include/functions.php b/admin/include/functions.php index 42ed056b6..618c65b99 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1940,7 +1940,6 @@ function get_active_menu($menu_page) case 'stats': case 'history': case 'maintenance': - case 'advanced_feature': case 'thumbnail': return 4; diff --git a/admin/maintenance.php b/admin/maintenance.php index 78ac844bd..06dc67474 100644 --- a/admin/maintenance.php +++ b/admin/maintenance.php @@ -145,6 +145,36 @@ $template->assign( ); // +-----------------------------------------------------------------------+ +// | Define advanced features | +// +-----------------------------------------------------------------------+ + +$advanced_features = array(); + +array_push( + $advanced_features, + array( + 'CAPTION' => l10n('Not linked elements'), + 'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked' + ) + ); + +array_push( + $advanced_features, + array( + 'CAPTION' => l10n('Files with same name in more than one physical category'), + 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' + ) + ); + +//$advanced_features is array of array composed of CAPTION & URL +$advanced_features = trigger_event( + 'get_admin_advanced_features_links', + $advanced_features + ); + +$template->assign('advanced_features', $advanced_features); + +// +-----------------------------------------------------------------------+ // | sending html code | // +-----------------------------------------------------------------------+ diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 9f2bde9e0..380248870 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -73,7 +73,6 @@ jQuery().ready(function(){ldelim} <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li> <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li> <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li> - <li><a href="{$U_ADVANCED_FEATURE}">{'Advanced features'|@translate}</a></li> </ul> </dd> </dl> diff --git a/admin/themes/default/template/advanced_feature.tpl b/admin/themes/default/template/advanced_feature.tpl deleted file mode 100644 index 76209387c..000000000 --- a/admin/themes/default/template/advanced_feature.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<div class="titrePage"> - <h2>{'Advanced features'|@translate}</h2> -</div> - -<ul> - {foreach from=$advanced_features item=feature} - <li><a href="{$feature.URL}" {$TAG_INPUT_ENABLED}>{$feature.CAPTION}</a></li> - {/foreach} -</ul> diff --git a/admin/themes/default/template/maintenance.tpl b/admin/themes/default/template/maintenance.tpl index 2208b5baa..0ac001156 100644 --- a/admin/themes/default/template/maintenance.tpl +++ b/admin/themes/default/template/maintenance.tpl @@ -3,6 +3,12 @@ </div> <ul> + {foreach from=$advanced_features item=feature} + <li><a href="{$feature.URL}" {$TAG_INPUT_ENABLED}>{$feature.CAPTION}</a></li> + {/foreach} +</ul> + +<ul> <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'Update categories informations'|@translate}</a></li> <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'Update images informations'|@translate}</a></li> <li><a href="{$U_MAINT_DATABASE}" {$TAG_INPUT_ENABLED}>{'Repair and optimize database'|@translate}</a></li> |