diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt
index 6f5566e9a9ba73d8b733c15c4dad223741bd3311..f6f36fda796bac1b6ec6d1a098c97aca8ed78505 100644
--- a/data/pages/wiki/dokuwiki.txt
+++ b/data/pages/wiki/dokuwiki.txt
@@ -12,34 +12,47 @@ DokuWiki is available at http://www.splitbrain.org/go/dokuwiki
All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>wiki:dokuwiki|wiki.splitbrain.org]].
- * [[doku>wiki:news|News and Announcements]]
- * [[doku>wiki:features|Features]]
+**About DokuWiki**
+
+ * [[doku>wiki:features|A feature list]] :!:
+ * [[doku>wiki:users|Happy Users]]
+ * [[doku>wiki:press|Who wrote about it]]
+ * [[doku>wiki:blogroll|What Bloggers think]]
+ * [[http://www.wikimatrix.org/show/DokuWiki|Compare it with other wiki software]]
+
+**Installing DokuWiki**
+
* [[doku>wiki:requirements|System Requirements]]
- * [[doku>wiki:compatibility|Browser Compatibility]]
- * [[doku>wiki:Install|How to install or upgrade]]
+ * [[http://www.splitbrain.org/go/dokuwiki|Download DokuWiki]] :!:
+ * [[doku>wiki:changes|Change Log]]
+ * [[doku>wiki:Install|How to install or upgrade]] :!:
* [[doku>wiki:config|Configuration]]
- * [[doku>wiki:FAQ|Frequently Asked Questions (FAQ)]]
- * [[doku>wiki:accesskeys|Accesskeys]]
- * [[doku>wiki:discussion:discussion|Discussion]]
- * [[doku>wiki:users|DokuWiki Users]]
- * [[doku>wiki:compare|Wiki Engine Comparison]]
- * [[doku>wiki:experiences|Experiences]]
- * [[doku>wiki:tips|Tips and Tricks]]
- * [[doku>wiki:tpl:templates|Templates]] and [[doku>wiki:plugins|Plugins]]
+**Using DokuWiki**
+
+ * [[wiki:syntax|Wiki Syntax]]
+ * [[doku>wiki:manual|The manual]] :!:
+ * [[doku>wiki:FAQ|Frequently Asked Questions (FAQ)]]
* [[doku>wiki:glossary|Glossary]]
- * [[http://bugs.splitbrain.org/index.php?project=1|Bugs and feature wishes]]
- * [[doku>wiki:mailinglist|Mailing List]]
+**Customizing DokuWiki**
- * [[doku>wiki:todo|ToDo List]]
+ * [[doku>wiki:tips|Tips and Tricks]]
+ * [[doku>wiki:tpl:templates|How to create and use templates]]
+ * [[doku>wiki:plugins|Installing plugins]]
* [[doku>wiki:development|Development Resources]]
- * [[doku>wiki:changes|Change Log]]
- * [[doku>wiki:thanks|Thanks]]
+
+**DokuWiki Feedback**
+
+ * [[doku>wiki:mailinglist|Join the mailing list]] :!:
+ * [[http://bugs.splitbrain.org/index.php?project=1|Submit bugs and feature wishes]]
+ * [[doku>wiki:discussion:discussion|The discussion pages]]
+ * [[http://www.wikimatrix.org/forum/viewforum.php?id=10|Share your experiences in the WikiMatrix forum]]
+ * [[doku>wiki:thanks|Some humble thanks]]
===== Copyright =====
-2004-2005 (c) Andreas Gohr <andi@splitbrain.org>
+2004-2006 (c) Andreas Gohr <andi@splitbrain.org>
The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider donating a few bucks to me via [[https://www.paypal.com/xclick/business=andi%40splitbrain.org&item_name=DokuWiki+Donation&no_shipping=1&no_note=1&tax=0&currency_code=EUR&lc=US|PayPal]] ;-).
diff --git a/feed.php b/feed.php
index 7cda260328712ff1efeeac84abd722002cc2a0b3..9636e65558a12b5bfbc45309302c2156dd13c4bb 100644
--- a/feed.php
+++ b/feed.php
@@ -41,20 +41,20 @@
$type = 'RSS1.0';
}
- // the feed is dynamic - we need a cache for each combo
+ // the feed is dynamic - we need a cache for each combo
// (but most people just use the default feed so it's still effective)
- $cache = getCacheName($num.$type.$mode.$ns.$ltype.$_SERVER['REMOTE_USER'],'.feed');
+ $cache = getCacheName($num.$type.$mode.$ns.$ltype.$_SERVER['REMOTE_USER'],'.feed');
- // check cacheage and deliver if nothing has changed since last
+ // check cacheage and deliver if nothing has changed since last
// time (with 5 minutes settletime)
- $cmod = @filemtime($cache); // 0 if not exists
- if($cmod && ($cmod+(5*60) >= @filemtime($conf['changelog']))){
- header('Content-Type: application/xml; charset=utf-8');
- print io_readFile($cache);
- exit;
+ $cmod = @filemtime($cache); // 0 if not exists
+ if($cmod && ($cmod+(5*60) >= @filemtime($conf['changelog']))){
+ header('Content-Type: application/xml; charset=utf-8');
+ print io_readFile($cache);
+ exit;
}
- // create new feed
+ // create new feed
$rss = new DokuWikiFeedCreator();
$rss->title = $conf['title'].(($ns) ? ' '.$ns : '');
$rss->link = DOKU_URL;
@@ -74,11 +74,11 @@
}
$feed = $rss->createFeed($type,'utf-8');
-
+
// save cachefile
- io_saveFile($cache,$feed);
+ io_saveFile($cache,$feed);
- // finally deliver
+ // finally deliver
header('Content-Type: application/xml; charset=utf-8');
print $feed;
@@ -97,7 +97,7 @@ function rssRecentChanges(&$rss,$num,$ltype,$ns,$minor){
$guardmail = ($conf['mailguard'] != '' && $conf['mailguard'] != 'none');
- $flags = RECENTS_SKIP_DELETED;
+ $flags = RECENTS_SKIP_DELETED;
if(!$minor) $flags += RECENTS_SKIP_MINORS;
$recents = getRecents(0,$num,$ns,$flags);
@@ -105,12 +105,12 @@ function rssRecentChanges(&$rss,$num,$ltype,$ns,$minor){
//this can take some time if a lot of recaching has to be done
@set_time_limit(90); // set max execution time
- foreach($recents as $recent){
+ foreach($recents as $recent){
$item = new FeedItem();
$item->title = $recent['id'];
$xhtml = p_wiki_xhtml($recent['id'],'',false);
-
+
if($conf['useheading']) {
$matches = array();
if(preg_match('|<h([1-9])>(.*?)</h\1>|', $xhtml, $matches))
@@ -142,13 +142,13 @@ function rssRecentChanges(&$rss,$num,$ltype,$ns,$minor){
$item->description = $desc;
$item->date = date('r',$recent['date']);
- $cat = getNS($recent['id']);
- if($cat) $item->category = $cat;
-
+ $cat = getNS($recent['id']);
+ if($cat) $item->category = $cat;
+
$user = null;
$user = @$recent['user']; // the @ spares time repeating lookup
$item->author = '';
-
+
if($user){
$userInfo = $auth->getUserData($user);
$item->author = $userInfo['name'];
@@ -199,7 +199,7 @@ function rssListNamespace(&$rss,$ns){
$item->description = $desc;
$item->date = date('r',$date);
$rss->addItem($item);
- }
+ }
}
/**