From 4dc4b499e810ec672ae10f49fdcbf9a09a8e3115 Mon Sep 17 00:00:00 2001
From: matthiasgrimm <matthiasgrimm@users.sourceforge.net>
Date: Fri, 17 Jun 2005 15:03:35 +0200
Subject: [PATCH] make DokuWiki xml conform
XML has problems with usual PHP shortcuts like '<?' or '<?
darcs-hash:20050617130335-7ef76-8e98db5cdae5f8b81993a380cb3d3acc9ac33dbd.gz
---
conf/dokuwiki.php | 2 +-
conf/local.php.dist | 2 +-
inc/lang/cs/lang.php | 2 +-
inc/lang/da/lang.php | 2 +-
inc/lang/de/lang.php | 2 +-
inc/lang/en/lang.php | 2 +-
inc/lang/eo/lang.php | 2 +-
inc/lang/es/lang.php | 2 +-
inc/lang/et/lang.php | 2 +-
inc/lang/eu/lang.php | 2 +-
inc/lang/fi/lang.php | 2 +-
inc/lang/fr/lang.php | 2 +-
inc/lang/he/lang.php | 2 +-
inc/lang/hu/lang.php | 2 +-
inc/lang/it/lang.php | 2 +-
inc/lang/ko/lang.php | 2 +-
inc/lang/nl/lang.php | 2 +-
inc/lang/no/lang.php | 2 +-
inc/lang/pl/lang.php | 2 +-
inc/lang/pt-br/lang.php | 2 +-
inc/lang/pt/lang.php | 2 +-
inc/lang/ro/lang.php | 2 +-
inc/lang/ru/lang.php | 2 +-
inc/lang/sv/lang.php | 2 +-
inc/lang/vi/lang.php | 2 +-
inc/lang/zh-tw/lang.php | 2 +-
inc/lang/zh/lang.php | 2 +-
lib/tpl/default/main.php | 82 +++++++++++++++++++--------------------
lib/tpl/default/media.php | 28 ++++++-------
29 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 47b427fa3..8be47024c 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* This is DokuWiki's Main Configuration file
* This is a piece of PHP code so PHP syntax applies!
diff --git a/conf/local.php.dist b/conf/local.php.dist
index 54cb4015c..bcbb19e63 100644
--- a/conf/local.php.dist
+++ b/conf/local.php.dist
@@ -1,4 +1,4 @@
-<?
+<?php
/*
This is an example of how a local.php coul look like.
Simply copy the options you want to change from dokuwiki.php
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index e4f49cb9a..d6a8cae7b 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Czech language file
*
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 2d8e791bc..de20057d5 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* danish language file
*
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index ae7932806..53aa00bd0 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* german language file
*
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 93f43d089..ba9eb4e52 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* english language file
*
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index b7b60429c..bf0c42ef3 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Esperantiga dosiero
*
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 0552e2997..c3b4e2938 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* spanish language file
*
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 465482ae0..68e5a13b6 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Estonian language file
*
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index 4abf82815..b701beed3 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Basque language file
*
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 93d8c7c5f..5fb0b50db 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Finnish language file
*
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 583e6acd5..5e2fa1dfc 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* french language file
*
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 329314edd..8a6f4a9ad 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Hebrew language file
*
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index ac8f26b19..d66202780 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Hungarian language file
*
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index ca163afc9..0bafd77a7 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* italian language file
*
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 1fc4ee643..704ae0c43 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* korean language file
*
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index f562b686e..57ddd9ad4 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* dutch language file
*
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 418363bd2..61b7c4297 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Norwegian language file
*
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index e92eccd39..dd730316f 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* polish language file
* based on english one
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index e9ef83b1f..3c5486e79 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Brazilian Portuguese language file
*
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 305952cc9..57f69a353 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Portuguese language file
*
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 220cd4571..9048d34d3 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* romanian language file
*
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index e71314fde..72c71e701 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Russian language file
*
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index 59e6d0d4c..fe6bf65a0 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Swedish language file
*
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index d064b9e31..a0c86c608 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* vietnamese language file
*
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index a2669f32b..4cc36056e 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Chinese(Traditional) language file
*
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index f92078245..7709bca6f 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Chinese(Simplified) language file
*
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 28ad48f6f..e7dd3a7d1 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<?
+<?php
/**
* DokuWiki Default Template
*
@@ -14,116 +14,116 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$conf['lang']?>"
- lang="<?=$conf['lang']?>" dir="<?=$lang['direction']?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
+ lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction']?>">
<head>
- <title><?=$ID?> [<?=hsc($conf['title'])?>]</title>
+ <title><?php echo $ID?> [<php echo hsc($conf['title'])?>]</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <?tpl_metaheaders()?>
+ <?php tpl_metaheaders()?>
- <link rel="shortcut icon" href="<?=DOKU_BASE?>lib/images/favicon.ico" />
- <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>layout.css" />
- <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>design.css" />
+ <link rel="shortcut icon" href="<?php echo DOKU_BASE?>lib/images/favicon.ico" />
+ <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>layout.css" />
+ <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>design.css" />
- <? if($lang['direction'] == 'rtl') {?>
- <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>rtl.css" />
- <? } ?>
+ <?php if($lang['direction'] == 'rtl') {?>
+ <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>rtl.css" />
+ <?php } ?>
- <link rel="stylesheet" media="print" type="text/css" href="<?=DOKU_TPL?>print.css" />
+ <link rel="stylesheet" media="print" type="text/css" href="<?php echo DOKU_TPL?>print.css" />
<!--[if gte IE 5]>
<style type="text/css">
/* that IE 5+ conditional comment makes this only visible in IE 5+ */
/* IE bugfix for transparent PNGs */
- //DISABLED img { behavior: url("<?=DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
+ //DISABLED img { behavior: url("<?php echo DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
</style>
<![endif]-->
- <?/*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
+ <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
</head>
<body>
-<?/*old includehook*/ @include(dirname(__FILE__).'/topheader.html')?>
+<?php /*old includehook*/ @include(dirname(__FILE__).'/topheader.html')?>
<div class="dokuwiki">
- <?html_msgarea()?>
+ <?php html_msgarea()?>
<div class="stylehead">
<div class="header">
<div class="pagename">
- [[<?tpl_link(wl($ID,'do=backlink'),$ID)?>]]
+ [[<?php tpl_link(wl($ID,'do=backlink'),$ID)?>]]
</div>
<div class="logo">
- <?tpl_link(wl(),$conf['title'],'name="top" accesskey="h" title="[ALT+H]"')?>
+ <?php tpl_link(wl(),$conf['title'],'name="top" accesskey="h" title="[ALT+H]"')?>
</div>
</div>
- <?/*old includehook*/ @include(dirname(__FILE__).'/header.html')?>
+ <?php /*old includehook*/ @include(dirname(__FILE__).'/header.html')?>
<div class="bar" id="bar_top">
<div class="bar-left" id="bar_topleft">
- <?tpl_button('edit')?>
- <?tpl_button('history')?>
+ <?php tpl_button('edit')?>
+ <?php tpl_button('history')?>
</div>
<div class="bar-right" id="bar_topright">
- <?tpl_button('recent')?>
- <?tpl_searchform()?>
+ <?php tpl_button('recent')?>
+ <?php tpl_searchform()?>
</div>
</div>
- <?if($conf['breadcrumbs']){?>
+ <?php if($conf['breadcrumbs']){?>
<div class="breadcrumbs">
- <?tpl_breadcrumbs()?>
- <?//tpl_youarehere() //(some people prefer this)?>
+ <?php tpl_breadcrumbs()?>
+ <?php //tpl_youarehere() //(some people prefer this)?>
</div>
- <?}?>
+ <?php }?>
</div>
- <?flush()?>
+ <?php flush()?>
- <?/*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
+ <?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
<div class="page">
<!-- wikipage start -->
- <?tpl_content()?>
+ <?php tpl_content()?>
<!-- wikipage stop -->
</div>
<div class="clearer"> </div>
- <?flush()?>
+ <?php flush()?>
<div class="stylefoot">
<div class="meta">
<div class="user">
- <?tpl_userinfo()?>
+ <?php tpl_userinfo()?>
</div>
<div class="doc">
- <?tpl_pageinfo()?>
+ <?php tpl_pageinfo()?>
</div>
</div>
- <?/*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?>
+ <?php /*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?>
<div class="bar" id="bar_bottom">
<div class="bar-left" id="bar_bottomleft">
- <?tpl_button('edit')?>
- <?tpl_button('history')?>
+ <?php tpl_button('edit')?>
+ <?php tpl_button('history')?>
</div>
<div class="bar-right" id="bar_bottomright">
- <?tpl_button('admin')?>
- <?tpl_button('login')?>
- <?tpl_button('index')?>
- <?tpl_button('top')?>
+ <?php tpl_button('admin')?>
+ <?php tpl_button('login')?>
+ <?php tpl_button('index')?>
+ <?php tpl_button('top')?>
</div>
</div>
</div>
</div>
-<?/*old includehook*/ @include(dirname(__FILE__).'/footer.html')?>
+<?php /*old includehook*/ @include(dirname(__FILE__).'/footer.html')?>
</body>
</html>
diff --git a/lib/tpl/default/media.php b/lib/tpl/default/media.php
index 507717463..d4417d5f6 100644
--- a/lib/tpl/default/media.php
+++ b/lib/tpl/default/media.php
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<?
+<?php
/**
* DokuWiki Default Template
*
@@ -13,45 +13,45 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$conf['lang']?>" lang="<?=$conf['lang']?>" dir="ltr">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr">
<head>
- <title><?=hsc($lang['mediaselect'])?> [<?=hsc($conf['title'])?>]</title>
+ <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <?tpl_metaheaders()?>
+ <?php tpl_metaheaders()?>
- <link rel="shortcut icon" href="<?=DOKU_BASE?>lib/images/favicon.ico" />
- <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>layout.css" />
- <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>design.css" />
+ <link rel="shortcut icon" href="<?php echo DOKU_BASE?>lib/images/favicon.ico" />
+ <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>layout.css" />
+ <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>design.css" />
<!--[if gte IE 5]>
<style type="text/css">
/* that IE 5+ conditional comment makes this only visible in IE 5+ */
/* IE bugfix for transparent PNGs */
- //DISABLED img { behavior: url("<?=DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
+ //DISABLED img { behavior: url("<?php echo DOKU_BASE?>lib/scripts/pngbehavior.htc"); }
</style>
<![endif]-->
</head>
<body>
<div class="dokuwiki">
- <?html_msgarea()?>
+ <?php html_msgarea()?>
- <h1><?=hsc($lang['mediaselect'])?> <code><?=hsc($NS)?></code></h1>
+ <h1><?php echo hsc($lang['mediaselect'])?> <code><?php echo hsc($NS)?></code></h1>
<div class="mediaselect">
<div class="mediaselect-left">
- <b><a href="<?=DOKU_BASE?>/lib/exe/media.php?ns="><?=hsc($lang['namespaces'])?></a></b>
+ <b><a href="<?php echo DOKU_BASE?>/lib/exe/media.php?ns="><?php echo hsc($lang['namespaces'])?></a></b>
- <?tpl_medianamespaces()?>
+ <?php tpl_medianamespaces()?>
</div>
<div class="mediaselect-right">
- <?tpl_mediafilelist()?>
+ <?php tpl_mediafilelist()?>
<div class="uploadform">
- <?tpl_mediauploadform()?>
+ <?php tpl_mediauploadform()?>
</div>
</div>
--
GitLab