diff options
| author | Michael Scherer <misc@zarb.org> | 2011-04-19 12:53:36 +0200 |
|---|---|---|
| committer | Michael Scherer <misc@zarb.org> | 2011-04-19 12:53:36 +0200 |
| commit | 1bac695a72e263a4bd71d1d8079e06bb227c1077 (patch) | |
| tree | 7246e2206346fb635a9bb69fac942ead2d9d80b7 /phpBB/index.php | |
| parent | b85c3b967a7f6fa061439061076695613622960c (diff) | |
| download | forums-1bac695a72e263a4bd71d1d8079e06bb227c1077.tar forums-1bac695a72e263a4bd71d1d8079e06bb227c1077.tar.gz forums-1bac695a72e263a4bd71d1d8079e06bb227c1077.tar.bz2 forums-1bac695a72e263a4bd71d1d8079e06bb227c1077.tar.xz forums-1bac695a72e263a4bd71d1d8079e06bb227c1077.zip | |
revert previous commit, as phpbb-seo is incompatible with phpbb license
the commit is still in git, and can be reserected with a branch, but
having it on HEAD make forum deployment more difficult
Diffstat (limited to 'phpBB/index.php')
| -rw-r--r-- | phpBB/index.php | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/phpBB/index.php b/phpBB/index.php index f2892e3c6c..cc83641acd 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -24,25 +24,7 @@ include($phpbb_root_path . 'includes/functions_display.' . $phpEx); $user->session_begin(); $auth->acl($user->data); $user->setup('viewforum'); -// www.phpBB-SEO.com SEO TOOLKIT BEGIN -> Zero dupe -if (!empty($phpbb_seo->seo_opt['url_rewrite'])) { - $phpbb_seo->seo_path['canonical'] = $phpbb_seo->drop_sid(append_sid("{$phpbb_root_path}index.$phpEx")); -} -$seo_mark = request_var('mark', ''); -$keep_mark = in_array($seo_mark, array('topics', 'topic', 'forums', 'all')) ? (boolean) ($user->data['is_registered'] || $config['load_anon_lastread']) : false; -$phpbb_seo->seo_opt['zero_dupe']['redir_def'] = array( - 'hash' => array('val' => request_var('hash', ''), 'keep' => $keep_mark), - 'mark' => array('val' => $seo_mark, 'keep' => $keep_mark), -); -if ( !$phpbb_seo->seo_opt['zero_dupe']['strict'] ) { // strict mode is here a bit faster - if ( !empty($phpbb_seo->seo_static['index']) ) { - $phpbb_seo->set_cond( (boolean) (utf8_strpos($phpbb_seo->seo_path['uri'], $phpbb_seo->seo_static['index']) === false), 'do_redir', (empty($_GET) || (!empty($seo_mark) && !$keep_mark))); - } else { - $phpbb_seo->set_cond( (boolean) (utf8_strpos($phpbb_seo->seo_path['uri'], "index.$phpEx") !== false), 'do_redir', (empty($_GET) || (!empty($seo_mark) && !$keep_mark))); - } -} -$phpbb_seo->seo_chk_dupe(); -// www.phpBB-SEO.com SEO TOOLKIT END -> Zero dupe + display_forums('', $config['load_moderators']); // Set some stats, get posts count from forums data if we... hum... retrieve all forums data @@ -90,9 +72,6 @@ while ($row = $db->sql_fetchrow($result)) } else { - // www.phpBB-SEO.com SEO TOOLKIT BEGIN - $phpbb_seo->prepare_url('group', $row['group_name'], $row['group_id']); - // www.phpBB-SEO.com SEO TOOLKIT END $legend[] = '<a' . $colour_text . ' href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']) . '">' . $group_name . '</a>'; } } @@ -149,13 +128,7 @@ $template->assign_vars(array( ); // Output page -// www.phpBB-SEO.com SEO TOOLKIT BEGIN - META -$seo_meta->collect('description', $config['sitename'] . ' : ' . $config['site_desc']); -$seo_meta->collect('keywords', $config['sitename'] . ' ' . $seo_meta->meta['description']); -// www.phpBB-SEO.com SEO TOOLKIT END - META -// www.phpBB-SEO.com SEO TOOLKIT BEGIN - TITLE -page_header($config['sitename']); -// www.phpBB-SEO.com SEO TOOLKIT END - TITLE +page_header($user->lang['INDEX']); $template->set_filenames(array( 'body' => 'index_body.html') |