From 94153a950819d93374863c4737deae9f5e47347e Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Sun, 14 Feb 2010 17:41:05 +0000
Subject: [PATCH] Adjusted Contiki download page content to the fact that there
 are now two disk images (apart from the larger D71 image for the C128).

---
 tools/6502/contiki.html | 17 ++++++-----------
 tools/6502/download.php | 16 +++++++++-------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/tools/6502/contiki.html b/tools/6502/contiki.html
index 4e6185866..c1091f167 100644
--- a/tools/6502/contiki.html
+++ b/tools/6502/contiki.html
@@ -105,17 +105,12 @@
      <td colspan="3" />
     </tr><tr class="p">
      <td colspan="3">
-      <table width="100%" cellpadding="0" cellspacing="0">
-       <tr>
-        <td>
-         <input type="radio" name="disk" id="disk" value="1" checked="checked" />
-         <label for="disk">Complete Disk Image</label>
-        </td><td align="right">
-         <input type="radio" name="disk" id="conf" value="0" />
-         <label for="conf">Configuration File Only</label>
-        </td>
-       </tr>
-      </table>
+      <input type="radio" name="disk" id="conf"   value="0" />
+      <label for="conf">Configuration File Only</label><br />
+      <input type="radio" name="disk" id="disk-1" value="1" checked="checked" />
+      <label for="disk-1">Complete Image Of Disk 1</label><br />
+      <input type="radio" name="disk" id="disk-2" value="2" />
+      <label for="disk-2">Complete Image Of Disk 2</label>
      </td>
     </tr><tr class="bg">
      <td colspan="3" />
diff --git a/tools/6502/download.php b/tools/6502/download.php
index 7dd3035ff..c1f2e682b 100644
--- a/tools/6502/download.php
+++ b/tools/6502/download.php
@@ -5,23 +5,25 @@ $cfg .= chr($_GET['mask-a']).chr($_GET['mask-b']).chr($_GET['mask-c']).chr($_GET
 $cfg .= chr($_GET['dgw-a']). chr($_GET['dgw-b']). chr($_GET['dgw-c']). chr($_GET['dgw-d']);
 $cfg .= chr($_GET['dns-a']). chr($_GET['dns-b']). chr($_GET['dns-c']). chr($_GET['dns-d']);
 
+$dsk = $_GET['disk'];
+
 switch ($_GET['machine']) {
 case "apple2":
     $hex = $_GET['apple2-addr'];
     $drv = $_GET['apple2-drv'];
-    $ext = 'dsk';
+    $ext = '-' . $dsk . '.dsk';
     $ofs = 0x05B00;
     break;
 case "c64":
     $hex = strtok($_GET['c64-addr-drv'],  '-');
     $drv = strtok('-');
-    $ext = 'd64';
+    $ext = '-' . $dsk . '.d64';
     $ofs = 0x15002;
     break;
 case "c128":
     $hex = strtok($_GET['c128-addr-drv'], '-');
     $drv = strtok('-');
-    $ext = 'd71';
+    $ext = '.d71';
     $ofs = 0x15002;
     break;
 }
@@ -30,15 +32,15 @@ $addr = hexdec($hex);
 $cfg .= chr($addr % 0x100).chr($addr / 0x100);
 $cfg .= $drv;
 
-if ($_GET['disk']) {
-    $out = substr_replace(file_get_contents('contiki.' . $ext), $cfg, $ofs, strlen($cfg));
+if ($dsk) {
+    $out = substr_replace(file_get_contents('contiki'. $ext), $cfg, $ofs, strlen($cfg));
 } else {
-    $ext = 'cfg';
+    $ext = '.cfg';
     $out = $cfg;
 }
 
 header('Content-Type: application/octetstream');
-header('Content-Disposition: attachment; filename=contiki.' . $ext);
+header('Content-Disposition: attachment; filename=contiki' . $ext);
 print($out);
 
 ?>