From 613f4f752553ba3b2a27bbbd81ee9431be5dfa39 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 16 May 2014 11:32:01 +0200 Subject: [PATCH 1/4] [ticket/12555] Allow to set canonical URLs to avoid duplicate content PHPBB3-12555 --- phpBB/styles/prosilver/template/overall_header.html | 4 ++++ phpBB/styles/subsilver2/template/overall_header.html | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 353ba9139a..8c63ce9cea 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -18,6 +18,10 @@ + + + + + + + + From 199854af1bd0d52f7d3e720d6dc6aa0de5cd4a5a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 16 May 2014 11:32:33 +0200 Subject: [PATCH 2/4] [ticket/12555] Add canonical URl for memberlist mode=viewprofile Avoids duplicate content of: * memberlist.php?mode=viewprofile&u=user_id * memberlist.php?mode=viewprofile&un=username PHPBB3-12555 --- phpBB/memberlist.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 6c28f962dc..51171a0a74 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -677,6 +677,8 @@ switch ($mode) 'U_ADD_FOE' => (!$friend && !$foe && $foes_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&mode=foes&add=' . urlencode(htmlspecialchars_decode($member['username']))) : '', 'U_REMOVE_FRIEND' => ($friend && $friends_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&remove=1&usernames[]=' . $user_id) : '', 'U_REMOVE_FOE' => ($foe && $foes_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&remove=1&mode=foes&usernames[]=' . $user_id) : '', + + 'U_CANONICAL' => generate_board_url() . '/' . append_sid("memberlist.$phpEx", 'mode=viewprofile&u=' . $user_id, true, ''), )); if (!empty($profile_fields['row'])) From 08b5d052c6284514208b6af2e3b286c4c1f86f26 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 16 May 2014 11:34:04 +0200 Subject: [PATCH 3/4] [ticket/12555] Add canonical URL for viewforum Avoids duplicate content of: * viewforum.php?f=forum_id * viewforum.php?f=forum_id&start=0 PHPBB3-12555 --- phpBB/viewforum.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index f1b0b4df5b..6c7e56cffd 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -366,6 +366,7 @@ $template->assign_vars(array( 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '', 'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '', 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($start == 0) ? '' : "&start=$start")), + 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($start) ? "&start=$start" : ''), true, ''), 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics&mark_time=" . time()) : '', )); From 0ad2e22ec01deb40fdd174890ae92d896649a424 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 16 May 2014 11:38:37 +0200 Subject: [PATCH 4/4] [ticket/12555] Add canonical URL for viewtopic Avoids duplicate content of: * viewtopic.php?t=topic_id * viewtopic.php?f=forum_id&t=topic_id * viewtopic.php?f=forum_id&t=topic_id&hilit=highlight_string * viewtopic.php?f=forum_id&t=topic_id&view=unread * viewtopic.php?f=forum_id&p=post_id * viewtopic.php?f=forum_id&t=topic_id&start=0 PHPBB3-12555 --- phpBB/viewtopic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 95bee9789f..4553917d80 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -642,6 +642,7 @@ $template->assign_vars(array( 'U_TOPIC' => "{$server_path}viewtopic.$phpEx?f=$forum_id&t=$topic_id", 'U_FORUM' => $server_path, 'U_VIEW_TOPIC' => $viewtopic_url, + 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewtopic.$phpEx", "t=$topic_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($start) ? "&start=$start" : ''), true, ''), 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), 'U_VIEW_OLDER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=previous"), 'U_VIEW_NEWER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=next"),