From 3f803e5e8df5f91507a14467a07e89271f9e4e8e Mon Sep 17 00:00:00 2001
From: Gina Haeussge <gina@foosel.net>
Date: Sat, 26 Jun 2010 18:25:41 +0200
Subject: [PATCH] FS#1878: Hide Dokuwiki version information from metadata and
only show it to admins and manager in do=check. Also protected meta files
README, VERSION and COPYING additionally to .ht*
---
.htaccess.dist | 4 ++--
inc/infoutils.php | 4 +++-
inc/template.php | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.htaccess.dist b/.htaccess.dist
index 54ad4b589..aa2437b95 100644
--- a/.htaccess.dist
+++ b/.htaccess.dist
@@ -4,8 +4,8 @@
## global config. Symlinks maybe needed for URL rewriting.
#Options -Indexes -MultiViews +FollowSymLinks
-## make sure nobody gets the htaccess files
-<Files ~ "^[\._]ht">
+## make sure nobody gets the htaccess, README, COPYING or VERSION files
+<Files ~ "^([\._]ht|README$|VERSION$|COPYING$)">
Order allow,deny
Deny from all
Satisfy All
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 096662d24..87b29d7af 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -100,7 +100,9 @@ function check(){
global $conf;
global $INFO;
- msg('DokuWiki version: '.getVersion(),1);
+ if ($INFO['isadmin'] || $INFO['ismanager']){
+ msg('DokuWiki version: '.getVersion(),1);
+ }
if(version_compare(phpversion(),'5.1.2','<')){
msg('Your PHP version is too old ('.phpversion().' vs. 5.1.2+ needed)',-1);
diff --git a/inc/template.php b/inc/template.php
index 8847f788d..4d24c2191 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -255,7 +255,7 @@ function tpl_metaheaders($alt=true){
}
// the usual stuff
- $head['meta'][] = array( 'name'=>'generator', 'content'=>'DokuWiki '.getVersion() );
+ $head['meta'][] = array( 'name'=>'generator', 'content'=>'DokuWiki');
$head['link'][] = array( 'rel'=>'search', 'type'=>'application/opensearchdescription+xml',
'href'=>DOKU_BASE.'lib/exe/opensearch.php', 'title'=>$conf['title'] );
$head['link'][] = array( 'rel'=>'start', 'href'=>DOKU_BASE );
--
GitLab