--- html.php.orig	2007-01-31 16:41:43.000000000 +0100
+++ html.php	2007-01-31 18:18:28.000000000 +0100
@@ -449,6 +449,164 @@
   global $INFO;
   global $conf;
   global $lang;
+  $revisions = getRevisions($ID, $first, $conf['recent']+1);
+  if(count($revisions)==0 && $first!=0){
+    $first=0;
+    $revisions = getRevisions($ID, $first, $conf['recent']+1);;
+  }
+  $hasNext = false;
+  if (count($revisions)>$conf['recent']) {
+    $hasNext = true;
+    array_pop($revisions); // remove extra log entry
+  }
+ 
+  $date = @date($conf['dformat'],$INFO['lastmod']);
+  //print '</td>';
+  print p_locale_xhtml('revisions');
+  if ($revisions){
+  print '<h1>'.$ID.'</h1>'; 
+  print '<form method="get" action="doku.php">';
+  print '<input type="hidden" name="id" value="'.$ID.'" />';
+  print '<input type="hidden" name="do" value="diff" />';
+  print ' <input type="submit" value="Compare selected versions" class="button"/>
+          <img src="'.DOKU_BASE.'lib/images/diff.png"> = COMPARE TO CURRENT VERSION
+          <center>
+          <table cellpadding="2" width="100%">
+          <tr align="center" style="background-color: #eeeeee">
+          <td width="10%">Select<br> Any Two:</br></td>
+          <td width="10%">Compare to <br>Current Version:</br></td>
+          <td width="15%">Edited on:</td>
+          <td width="15%">View Page Version:</td>
+          <td width="35%">Editor\'s comments (if any):</td>
+          <td nowrap="1">Edited by:</td>
+          </tr>
+          </table></center>
+ 
+          <center><table cellpadding="2" id="compare-table" width="100%">';
+  } 
+
+  if($INFO['exists'] && $first==0){
+    if ( (isset($INFO['meta']) && isset($INFO['meta']['last_change']) && $INFO['meta']['last_change']['type']==='e') ){ // if minor revision, italic 
+      print '<tr align="center" style="font-style: italic;">';
+    }
+    else {
+      print '<tr align="center">';
+    }
+    print '<td width="10%">';
+    if ($revisions) {
+      print '<input type="radio" value="" name="rev2" style="visibility:hidden">';
+      print '<input type="radio" value="" name="rev" checked="checked"></td>';
+    }
+    print ' <td width="10%">';
+    if ($revisions){
+      print '('.$lang['current'].')';
+    }
+    print '</td>';
+    print '<td width="15%">';
+    print $date;
+    print '</td>';
+ 
+    print '<td width="15%"><a class="wikilink1" href="'.wl($ID).'">current';
+    print '</a> </td><td width="35%">';
+    print $INFO['sum'];
+    print '</td><td nowrap="1"><span class="user">';
+    print $INFO['editor'];
+    print '</span>';
+    print '</td></tr>';
+  }
+  $checked = false;
+ 
+  foreach($revisions as $rev){
+    $date = date($conf['dformat'],$rev);
+    $info = getRevisionInfo($ID,$rev,true);
+    if ($info['type']===e) { // if minor revision, italic 
+      print '<tr align="center" style="font-style: italic;">';
+    }
+    else {
+      print '<tr align="center">';
+    }
+    print '<td width="10%">';
+ 
+    if(@file_exists(wikiFN($ID,$rev))){
+      if( !$checked ){
+        print '<input type="radio" name="rev2" checked="checked" value="'.$rev.'">';
+        $checked = true;
+      }
+      else{
+        print '<input type="radio" name="rev2" value="'.$rev.'">';
+      }
+      print '<input type="radio" name="rev" value="'.$rev.'"></td>';
+      print '<td width="10%"> <a href="'.wl($ID,"rev=$rev,do=diff").'">';
+      $p = array();
+      $p['src']    = DOKU_BASE.'lib/images/diff.png';
+      $p['border'] = 0;
+      $p['width']  = 15;
+      $p['height'] = 11;
+      $p['title']  = $lang['diff'];
+      $p['alt']    = $lang['diff'];
+      $att = buildAttributes($p);
+      print "<img $att />";
+      print '</a> </td>';
+      print '<td width="15%">';
+      print $date;
+      print '</td>';
+      print '<td width="15%"><a class="wikilink1" href="'.wl($ID,"rev=$rev").'">older version</a></td>';
+    }
+    else{
+      print '<input type="radio" value="" name="rev2" style="visibility:hidden"/>';
+      print '<input type="radio" value="" name="rev" style="visibility:hidden"/>';
+      print '<td width="10%"> <img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt=""></td>';
+      print '<td width="15%">';
+      print $date;
+      print '</td>';
+      print '<td width="15%" style="font-type: italic"><a>older version</a></td>';
+    }
+
+    print '<td width="35%">';
+    print htmlspecialchars($info['sum']);
+    print '</td><td nowrap="1"><span class="user">';
+ 
+    if($info['user']){
+        print $info['user'];
+    }else{
+        print $info['ip'];
+    }
+    print '</span></td></tr>';
+ 
+  }
+  if ($revisions){
+    print '</table></center><input type="submit" value="Compare selected versions" class="button"/></form>';
+  }
+ 
+  print '<div class="pagenav">';
+  $last = $first + $conf['recent'];
+  if ($first > 0) {
+    $first -= $conf['recent'];
+    if ($first < 0) $first = 0;
+    print '<div class="pagenav-prev">';
+    print html_btn('newer',$ID,"p",array('do' => 'revisions', 'first' => $first));
+    print '</div>';
+  }
+  if ($hasNext) {
+    print '<div class="pagenav-next">';
+    print html_btn('older',$ID,"n",array('do' => 'revisions', 'first' => $last));
+    print '</div>';
+  }
+  print '</div>';
+ 
+}
+
+/**
+ * list old revisions
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function html_revisions_old($first=0){
+  global $ID;
+  global $INFO;
+  global $conf;
+  global $lang;
   /* we need to get one additionally log entry to be able to
    * decide if this is the last page or is there another one.
    * see html_recent()
@@ -467,11 +625,23 @@
   $date = @date($conf['dformat'],$INFO['lastmod']);
 
   print p_locale_xhtml('revisions');
-  print '<ul>';
+  if ($revisions) {
+    print '<form method="get" action="doku.php">';
+    print '<input type="hidden" name="id" value="'.$ID.'" />';
+    print '<input type="hidden" name="do" value="diff" />';
+    print '<input type="submit" value="Compare selected versions" class="button"/>';
+  }
+  print '<ul>'."\n";
   if($INFO['exists'] && $first==0){
     print (isset($INFO['meta']) && isset($INFO['meta']['last_change']) && $INFO['meta']['last_change']['type']==='e') ? '<li class="minor">' : '<li>';
     print '<div class="li">';
 
+    if ($revisions) {
+      print '<input type="radio" value="" name="rev2" style="visibility:hidden"/>';
+      print '<input type="radio" value="" name="rev" checked="checked"/>';
+    }
+
+
     print $date;
 
     print ' <img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt="" /> ';
@@ -489,12 +659,31 @@
     print '</li>';
   }
 
+  $checked = false;
+
   foreach($revisions as $rev){
     $date = date($conf['dformat'],$rev);
     $info = getRevisionInfo($ID,$rev,true);
 
     print ($info['type']==='e') ? '<li class="minor">' : '<li>';
     print '<div class="li">';
+
+    if(@file_exists(wikiFN($ID,$rev))){
+        if( !$checked ){
+            print '<input type="radio" name="rev2" checked="checked" value="'.$rev.'"/>';
+            $checked = true;
+        }
+        else{
+            print '<input type="radio" name="rev2" value="'.$rev.'"/>';
+        }
+        print '<input type="radio" name="rev" value="'.$rev.'"/>';
+    }
+    else{
+      print '<input type="radio" value="" name="rev2" style="visibility:hidden"/>';
+      print '<input type="radio" value="" name="rev" style="visibility:hidden"/>';
+    }
+
+
     print $date;
 
     if(@file_exists(wikiFN($ID,$rev))){
@@ -526,10 +715,15 @@
     print '</span>';
 
     print '</div>';
-    print '</li>';
+    print '</li>'."\n";
   }
   print '</ul>';
 
+  if ($revisions) {
+    print '<input type="submit" value="Compare selected versions" class="button"/>';
+    print '</form>';
+  }
+
   print '<div class="pagenav">';
   $last = $first + $conf['recent'];
   if ($first > 0) {
@@ -812,17 +1006,53 @@
   require_once(DOKU_INC.'inc/DifferenceEngine.php');
   global $ID;
   global $REV;
+  global $REV2;
   global $lang;
   global $conf;
 
-  if($text){
+  // get the filetime of the current revision
+  // might use this for allowing the RSS feed to show diffs of current to old
+  $filetime = filemtime(wikiFN($ID));
+
+  if( $REV == $filetime ){
+    //print 'Filetime matched, using current<br>';
+    $REV = '';
+  }
+
+  if( $REV2 == $filetime ){
+    //print 'Filetime matched, using current<br>';
+    $REV2 = '';
+  }
+
+  if($text){ // diff for conflicts
     $df  = new Diff(explode("\n",htmlspecialchars(rawWiki($ID,''))),
                     explode("\n",htmlspecialchars(cleanText($text))));
     $left  = '<a class="wikilink1" href="'.wl($ID).'">'.
               $ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a>'.
               $lang['current'];
     $right = $lang['yours'];
-  }else{
+  }elseif($REV && $REV2){ // diff between versions
+    $df  = new Diff(explode("\n",htmlspecialchars(rawWiki($ID,$REV2))),
+                    explode("\n",htmlspecialchars(rawWiki($ID,$REV))));
+
+    $left  = '<a class="wikilink1" href="'.wl($ID,"rev=$REV2").'">'.
+              $ID.' '.date($conf['dformat'],$REV2).'</a>';
+
+    $right = '<a class="wikilink1" href="'.wl($ID,"rev=$REV").'">'.
+              $ID.' '.date($conf['dformat'],$REV).'</a>';
+
+  }elseif($REV2){ // diff between current and REV2
+    $df  = new Diff(explode("\n",htmlspecialchars(rawWiki($ID,$REV2))),
+                    explode("\n",htmlspecialchars(rawWiki($ID,$REV))));
+
+    $left = '<a class="wikilink1" href="'.wl($ID,"rev=$REV2").'">'.
+              $ID.' '.date($conf['dformat'],$REV2).'</a>';
+
+    $right  = '<a class="wikilink1" href="'.wl($ID).'">'.
+              $ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
+              $lang['current'];
+
+  }else{ 
     if($REV){
       $r = $REV;
     }else{
@@ -846,6 +1076,7 @@
               $ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
               $lang['current'];
   }
+
   $tdf = new TableDiffFormatter();
   if($intro) print p_locale_xhtml('diff');
   ?>