diff options
| author | vdigital <vdigital@piwigo.org> | 2009-01-03 21:08:22 +0000 |
|---|---|---|
| committer | vdigital <vdigital@piwigo.org> | 2009-01-03 21:08:22 +0000 |
| commit | 9a0403c698033218f9e09c44e5ad313005e6fd6d (patch) | |
| tree | b5ddcdb85e08b61a208fa67297378812ad584c7d | |
| parent | 72b2c126c4c73dc32fc57f43bc2b26069df99d87 (diff) | |
- $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
Diffstat (limited to '')
| -rw-r--r-- | include/config_default.inc.php | 3 | ||||
| -rw-r--r-- | include/page_header.php | 11 | ||||
| -rw-r--r-- | template/yoga/header.tpl | 20 | ||||
| -rw-r--r-- | 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$ *} -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" -"http://www.w3.org/TR/html4/strict.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html lang="{$lang_info.code}" dir="{$lang_info.direction}"> <head> <meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}"> <meta name="generator" content="Piwigo (aka PWG), see piwigo.org"> +{if isset($meta_ref) } +{if isset($INFO_AUTHOR)} +<meta name="author" content="{$INFO_AUTHOR|replace:'"':' '}"> +{/if} +{if isset($related_tags)} +<meta name="keywords" content="{foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}{$tag.name}{/foreach}"> +{/if} +{if isset($COMMENT_IMG)} +<meta name="description" content="{$COMMENT_IMG|strip_tags:false|replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}"> +{else} +<meta name="description" content="{$PAGE_TITLE}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}"> +{/if} +{/if} + <title>{$GALLERY_TITLE} :: {$PAGE_TITLE}</title> <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico"> @@ -49,7 +62,8 @@ <![endif]--> {if not empty($head_elements)} - {foreach from=$head_elements item=elt}{$elt}{/foreach} + {foreach from=$head_elements item=elt}{$elt} + {/foreach} {/if} </head> 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} <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" {if isset($COMMENT_IMG)} - title="{$COMMENT_IMG|replace:'"':' '}" {else} title="{$current.TITLE|replace:'"':' '} - {$ALT_IMG}" + title="{$COMMENT_IMG|strip_tags:false|replace:'"':' '}" {else} title="{$current.TITLE|replace:'"':' '} - {$ALT_IMG}" {/if}> {if isset($high) } </a> |