Index: /extensions/flickr2piwigo/admin/import.php =================================================================== --- /extensions/flickr2piwigo/admin/import.php (revision 16063) +++ /extensions/flickr2piwigo/admin/import.php (revision 16064) @@ -40,5 +40,5 @@ } -if (!isset($_GET['action'])) $_GET['action'] = 'choice'; +if (!isset($_GET['action'])) $_GET['action'] = 'main'; @@ -67,9 +67,24 @@ } + // logout + case 'logout': + { + unset($_SESSION['phpFlickr_auth_token']); + $_SESSION['page_infos'][] = l10n('Logued out'); + redirect(FLICKR_ADMIN.'-import'); + break; + } + // main menu - case 'choice': - { - $template->assign('list_albums_url', FLICKR_ADMIN.'-import&action=list_albums'); - $template->assign('import_all_url', FLICKR_ADMIN.'-import&action=list_all'); + case 'main': + { + $u = $flickr->people_getInfo($u['id']); + $template->assign(array( + 'username' => $conf['flickr2piwigo']['username'], + 'user_url' => $u['photosurl'], + 'logout_url' => FLICKR_ADMIN.'-import&action=logout', + 'list_albums_url' => FLICKR_ADMIN.'-import&action=list_albums', + 'import_all_url' => FLICKR_ADMIN.'-import&action=list_all', + )); break; } Index: /extensions/flickr2piwigo/admin/template/import.tpl =================================================================== --- /extensions/flickr2piwigo/admin/template/import.tpl (revision 16063) +++ /extensions/flickr2piwigo/admin/template/import.tpl (revision 16064) @@ -6,20 +6,24 @@ {if $ACTION == 'init_login'} -
+ -{elseif $ACTION == 'choice'} +{elseif $ACTION == 'main'}
- {'List my albums'|@translate} -
- {'Import all my pictures'|@translate}
+ {'Logued as'|@translate} : {$username}
+
+
+ +
{elseif $ACTION == 'list_albums'} -{$album.description}
*}