From 9a0403c698033218f9e09c44e5ad313005e6fd6d Mon Sep 17 00:00:00 2001 From: vdigital Date: Sat, 3 Jan 2009 21:08:22 +0000 Subject: - $conf['meta_ref'] is a new configuration parameter (Default true) Meta tags for description, author, and keywords are generated, except if meta robots "noindex" is forced (with some pages like search, recent cats, etc.). In addition, $conf['meta_ref'] = false is forcing "noindex, nofollow". merge -c3040 from branch 2.0 to trunk git-svn-id: http://piwigo.org/svn/trunk@3041 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/config_default.inc.php | 3 +++ include/page_header.php | 11 +++++++++++ template/yoga/header.tpl | 20 +++++++++++++++++--- template/yoga/picture_content.tpl | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/include/config_default.inc.php b/include/config_default.inc.php index cacade935..3f6407cc2 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -154,6 +154,9 @@ $conf['tn_height'] = 128; // bottom of each page ? $conf['show_version'] = true; +// meta_ref to reference multiple sets of incorporated pages or elements +// Set it false to avoid referencing in google, and other search engines. +$conf['meta_ref'] = true; // links : list of external links to add in the menu. An example is the best // than a long explanation : diff --git a/include/page_header.php b/include/page_header.php index 2fa509e86..ff9064978 100644 --- a/include/page_header.php +++ b/include/page_header.php @@ -56,6 +56,13 @@ if ( !empty($header_notes) ) $template->assign('header_notes',$header_notes); } +// No referencing is required +if ( !$conf['meta_ref'] ) +{ + $page['meta_robots']['noindex'] = 1; + $page['meta_robots']['nofollow'] = 1; +} + if ( !empty($page['meta_robots']) ) { $template->append('head_elements', @@ -64,6 +71,10 @@ if ( !empty($page['meta_robots']) ) .'">' ); } +if ( !isset($page['meta_robots']['noindex']) ) +{ + $template->assign('meta_ref',1); +} // refresh if ( isset( $refresh ) and intval($refresh) >= 0 diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index b0495c104..c64ae5959 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -1,10 +1,23 @@ {* $Id$ *} - + +{if isset($meta_ref) } +{if isset($INFO_AUTHOR)} + +{/if} +{if isset($related_tags)} + +{/if} +{if isset($COMMENT_IMG)} + +{else} + +{/if} +{/if} + {$GALLERY_TITLE} :: {$PAGE_TITLE} @@ -49,7 +62,8 @@ {if not empty($head_elements)} - {foreach from=$head_elements item=elt}{$elt}{/foreach} + {foreach from=$head_elements item=elt}{$elt} + {/foreach} {/if} diff --git a/template/yoga/picture_content.tpl b/template/yoga/picture_content.tpl index 5c9291357..b6e148fdd 100644 --- a/template/yoga/picture_content.tpl +++ b/template/yoga/picture_content.tpl @@ -4,7 +4,7 @@ {/if} {$ALT_IMG} {if isset($high) } -- cgit v1.2.3