robin.thoni
/
ipxe
關註 1
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 11 Wiki Activity
瀏覽代碼

[contrib] Fix rom-o-matic 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Paul Sands 14 年之前
父節點
d3630b6a64
當前提交
4108321bf5
共有 6 個文件被更改，包括 28 次插入 和 27 次删除
分割檢視 顯示文件統計
  1. 2
    2
      contrib/rom-o-matic/bottom.php
  2. 9
    9
      contrib/rom-o-matic/customize-flags.php
  3. 5
    5
      contrib/rom-o-matic/directions.php
  4. 3
    3
      contrib/rom-o-matic/index.php
  5. 6
    6
      contrib/rom-o-matic/top.php
  6. 3
    2
      contrib/rom-o-matic/utils.php

+ 2
- 2
contrib/rom-o-matic/bottom.php 查看文件 

@@ -1,4 +1,4 @@
1 
-<?
1 
+<?php
2 2
3 3 
 /**
4 4 
  * Copyright (C) 2009 Marty Connor <mdc@etherboot.org>.
 
@@ -53,7 +53,7 @@ Resources:
53 53 
 <hr>
54 54 
   <font size="-1">
55 55 
     <br>
56 
-    Please email <a href="mailto:<? echo "${webmaster_email}" ?>"><? echo "${webmaster_email}"?></a>
56 
+    Please email <a href="mailto:<?php echo "${webmaster_email}" ?>"><?php echo "${webmaster_email}"?></a>
57 57 
     with questions or comments about this website.
58 58 
   </font>
59 59 
   <br><br>

+ 9
- 9
contrib/rom-o-matic/customize-flags.php 查看文件 

@@ -34,30 +34,30 @@ include_once $top_inc;
34 34 
 ?>
35 35
36 36 
 <form action="build.php" method=POST>
37 
-  <input type="hidden" name="version" value = "<? echo $version ?>">
37 
+  <input type="hidden" name="version" value = "<?php echo $version ?>">
38 38 
   <input type="hidden" name="use_flags" value="1">
39 39 
   <h3>
40 
-    Make changes below and press <? echo $build ?> to create an image, <br>
41 
-    Or press <? echo $restart ?> to return to the main page.
40 
+    Make changes below and press <?php echo $build ?> to create an image, <br>
41 
+    Or press <?php echo $restart ?> to return to the main page.
42 42 
   </h3>
43 43 
   <hr>
44 44 
   <ul>
45 
-  <? require ( "directions.php" ); ?>
45 
+  <?php require ( "directions.php" ); ?>
46 46 
   </ul>
47 47 
   <hr>
48 
-  <? echo_flags( $flags ); ?>
48 
+  <?php echo_flags( $flags ); ?>
49 49 
   <hr>
50 50 
   <h3>Embedded Script:</h3>
51 
-  <? echo textarea ( "embedded_script", "", "10", "50" ); ?>
51 
+  <?php echo textarea ( "embedded_script", "", "10", "50" ); ?>
52 52 
   <br><br>
53 53 
   <hr>
54 54 
   <center><table width="35%"><tr>
55 
-  <td align="left"> <? echo $build; ?> </td>
56 
-  <td align="right"> <? echo $restart ?></td>
55 
+  <td align="left"> <?php echo $build; ?> </td>
56 
+  <td align="right"> <?php echo $restart ?></td>
57 57 
   </tr></table></center>
58 58 
 </form>
59 59
60 
-<? include_once $bottom_inc; ?>
60 
+<?php include_once $bottom_inc; ?>
61 61 
 <?
62 62 
 // For emacs:
63 63 
 //

+ 5
- 5
contrib/rom-o-matic/directions.php 查看文件 

@@ -1,4 +1,4 @@
1 
-<?
1 
+<?php
2 2
3 3 
 /**
4 4 
  * Copyright (C) 2009 Marty Connor <mdc@etherboot.org>.
 
@@ -21,12 +21,12 @@
21 21
22 22 
 ?>
23 23 
     <li>
24 
-      Choose an output format: <? echo keys_menubox ( "ofmt", $ofmts,
24 
+      Choose an output format: <?php echo keys_menubox ( "ofmt", $ofmts,
25 25 
       isset ( $_POST['ofmt'] ) ? $_POST['ofmt'] : "") ?>
26 26 
       <br><br>
27 27 
     </li>
28 28 
     <li>
29 
-      Choose a NIC type: <? echo keys_menubox ( "nic", $nics,
29 
+      Choose a NIC type: <?php echo keys_menubox ( "nic", $nics,
30 30 
       isset ( $_POST['nic'] ) ? $_POST['nic'] : "" ) ?>
31 31 
       <br><br>
32 32 
     </li>
 
@@ -40,11 +40,11 @@
40 40 
       <a href="http://www.ipxe.org/howto/romburning"
41 41 
       target="_blank">here</a>.
42 42 
       <br><br>
43 
-      PCI VENDOR CODE:  <? echo textbox ( "pci_vendor_code",
43 
+      PCI VENDOR CODE:  <?php echo textbox ( "pci_vendor_code",
44 44 
       isset ( $_POST['pci_vendor_code'] ) ? $_POST['pci_vendor_code']
45 45 
               : "", 6 ); ?>
46 46 
       &nbsp;&nbsp;
47 
-      PCI DEVICE CODE:  <? echo textbox ( "pci_device_code",
47 
+      PCI DEVICE CODE:  <?php echo textbox ( "pci_device_code",
48 48 
       isset ( $_POST['pci_device_code'] ) ? $_POST['pci_device_code']
49 49 
               : "", 6 ); ?>
50 50 
       <h4>Please note for ROM images:</h4>

+ 3
- 3
contrib/rom-o-matic/index.php 查看文件 

@@ -27,10 +27,10 @@ include_once $top_inc;
27 27
28 28 
 ?>
29 29 
 <form action="build.php" method=POST>
30 
-  <input type="hidden" name="version" value = "<? echo $version ?>">
30 
+  <input type="hidden" name="version" value = "<?php echo $version ?>">
31 31 
   <h3>To create an image:</h3>
32 32 
   <ol>
33 
-    <? require ( "directions.php" ); ?>
33 
+    <?php require ( "directions.php" ); ?>
34 34 
     <li>
35 35 
       Generate and download an image:
36 36 
       <input type="submit" name="A" value="Get Image">
 
@@ -44,4 +44,4 @@ include_once $top_inc;
44 44 
   </ol>
45 45 
 </form>
46 46
47 
-<? include_once $bottom_inc ?>
47 
+<?php include_once $bottom_inc ?>

+ 6
- 6
contrib/rom-o-matic/top.php 查看文件 

@@ -1,6 +1,6 @@
1 1 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2 2
3 
-<?
3 
+<?php
4 4
5 5 
 /**
6 6 
  * Copyright (C) 2009 Marty Connor <mdc@etherboot.org>.
 
@@ -25,17 +25,17 @@
25 25
26 26 
 <html>
27 27 
 <head>
28 
-  <link rev="made" href="mailto:<? echo "${webmaster_email}" ?>">
28 
+  <link rev="made" href="mailto:<?php echo "${webmaster_email}" ?>">
29 29 
   <meta name="keywords" content="rom, etherboot, ipxe, open source, rom-o-matic.net">
30 
-  <title><? echo $header_title ?></title>
31 
-  <meta name="description" content="<? echo $description ?>">
30 
+  <title><?php echo $header_title ?></title>
31 
+  <meta name="description" content="<?php echo $description ?>">
32 32 
 </head>
33 33 
 <h1>
34 
-<? echo "$html_title" ?>&nbsp;
34 
+<?php echo "$html_title" ?>&nbsp;
35 35 
 </h1>
36 36 
 <hr>
37 37 
 <h2>
38 
-<? echo "$html_tagline" ?>
38 
+<?php echo "$html_tagline" ?>
39 39 
 </h2>
40 40 
 </form>
41 41 
 <hr>

+ 3
- 2
contrib/rom-o-matic/utils.php 查看文件 

@@ -1,4 +1,4 @@
1 
-<? // -*- Mode: PHP; -*-
1 
+<?php // -*- Mode: PHP; -*-
2 2
3 3 
 /**
4 4 
  * Copyright (C) 2009 Marty Connor <mdc@etherboot.org>.
 
@@ -131,7 +131,8 @@ function parse_nic_file ()
131 131 
         if ( strpos ( $first_eight_chars, "family" ) === 0 ) {
132 132
133 133 
             // get pathname of NIC driver
134 
-            list ( $dummy, $nic ) = split( "[ \t]+", $line );
134 
+            #list ( $dummy, $nic ) = split( "[ \t]+", $line );
135 
+            list ( $dummy, $nic ) = explode("\t", $line);
135 136 
             settype ( $nic, "string" );
136 137
137 138 
             // extract filename name of driver from pathname

Write Preview
Loading…
取消
儲存