Index: /extensions/SmartAlbums/admin.php =================================================================== --- /extensions/SmartAlbums/admin.php (revision 16937) +++ /extensions/SmartAlbums/admin.php (revision 16938) @@ -4,5 +4,5 @@ global $conf, $template, $page; -$page['tab'] = (isset($_GET['tab'])) ? $_GET['tab'] : $page['tab'] = 'cat_list'; +$page['tab'] = (isset($_GET['tab'])) ? $_GET['tab'] : 'cat_list'; if ($page['tab'] == 'album') @@ -19,8 +19,4 @@ $tabsheet->assign(); - $template->assign(array( - 'SMART_PATH' => SMART_PATH, - )); - include(SMART_PATH . 'admin/'.$page['tab'].'.php'); } Index: /extensions/SmartAlbums/admin/album.php =================================================================== --- /extensions/SmartAlbums/admin/album.php (revision 16937) +++ /extensions/SmartAlbums/admin/album.php (revision 16938) @@ -53,9 +53,5 @@ include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); $tabsheet = new tabsheet(); -$tabsheet->add('properties', l10n('Properties'), $admin_album_base_url.'-properties'); -$tabsheet->add('sort_order', l10n('Manage photo ranks'), $admin_album_base_url.'-sort_order'); -$tabsheet->add('permissions', l10n('Permissions'), $admin_album_base_url.'-permissions'); -$tabsheet->add('notification', l10n('Notification'), $admin_album_base_url.'-notification'); -$tabsheet->add('smartalbum', 'SmartAlbum', $self_url); +$tabsheet->set_id('album'); $tabsheet->select('smartalbum'); $tabsheet->assign(); Index: /extensions/SmartAlbums/main.inc.php =================================================================== --- /extensions/SmartAlbums/main.inc.php (revision 16937) +++ /extensions/SmartAlbums/main.inc.php (revision 16938) @@ -39,7 +39,21 @@ include_once(SMART_PATH.'include/cat_list.php'); + add_event_handler('loc_begin_cat_list', 'smart_cat_list'); - add_event_handler('loc_begin_admin_page', 'smart_add_admin_album_tab'); + add_event_handler('tabsheet_before_select','smart_tab', 50, 2); add_event_handler('get_admin_plugin_menu_links', 'smart_admin_menu'); +} + +function smart_tab($sheets, $id) +{ + if ($id == 'album') + { + $sheets['smartalbum'] = array( + 'caption' => 'SmartAlbum', + 'url' => SMART_ADMIN.'-album&cat_id='.$_GET['cat_id'], + ); + } + + return $sheets; } @@ -53,20 +67,3 @@ } -function smart_add_admin_album_tab() -{ - global $page, $template; - if ($page['page'] != 'album') return; - - $template->assign('SMART_CAT_ID', $_GET['cat_id']); - $template->set_prefilter('tabsheet', 'smart_add_admin_album_tab_prefilter'); -} -function smart_add_admin_album_tab_prefilter($content) -{ - $search = '{/foreach}'; - $add = ' -