From 507ee4b137390689631413b65641f6228ef1216e Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Thu, 13 Apr 2006 10:47:35 +0000 Subject: [PATCH] Abstract link generation, b2evo BC fix --- include/admin/importers/b2evolution.inc.php | 2 +- include/admin/overview.inc.php | 50 ++++++++++++++------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/include/admin/importers/b2evolution.inc.php b/include/admin/importers/b2evolution.inc.php index 26a8fb3..a2571c6 100644 --- a/include/admin/importers/b2evolution.inc.php +++ b/include/admin/importers/b2evolution.inc.php @@ -143,7 +143,7 @@ class Serendipity_Import_b2evolution extends Serendipity_Import { $entry = array('title' => $this->decode($entries[$x]['post_title']), 'isdraft' => ($entries[$x]['post_status'] == 'published') ? 'false' : 'true', 'allow_comments' => ($entries[$x]['post_comments'] == 'open' ) ? 'true' : 'false', - 'timestamp' => strtotime($entries[$x]['post_issue_date']), + 'timestamp' => strtotime((isset($entries[$x]['post_issue_date']) ? $entries[$x]['post_issue_date'] : $entries[$x]['post_date'])), 'body' => $this->strtr($entries[$x]['post_content'])); $entry['authorid'] = ''; diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php index 6ba92c3..92d3e61 100644 --- a/include/admin/overview.inc.php +++ b/include/admin/overview.inc.php @@ -8,20 +8,36 @@ if (IN_serendipity !== true) { } $user = serendipity_fetchAuthor($serendipity['authorid']); -?> - - . - -' . "\n"; -echo '

' . FURTHER_LINKS . '

' . "\n"; -echo '' . "\n"; -echo '' . "\n"; - -serendipity_plugin_api::hook_event('backend_frontpage_display', $serendipity); + +$output = array( + 'welcome' => WELCOME_BACK . ' ' . $user[0]['realname'], + 'show_links' => true, + 'links_title' => FURTHER_LINKS, + 'links' => array( + '' . FURTHER_LINKS_S9Y . '', + '' . FURTHER_LINKS_S9Y_DOCS . '', + '' . FURTHER_LINKS_S9Y_BLOG . '', + '' . FURTHER_LINKS_S9Y_FORUMS . '', + '' . FURTHER_LINKS_S9Y_SPARTACUS . '' + ), + 'links_css' => 'further_links', + 'more' => '' +); + +serendipity_plugin_api::hook_event('backend_frontpage_display', $output); + +echo $output['welcome']; + +if ($output['show_links']) { + echo '' . "\n"; +} + +echo $output['more']; + -- 2.39.5