diff options
author | Paul Sands <usg990a@cebridge.net> | 2012-02-12 13:35:43 +0000 |
---|---|---|
committer | Michael Brown <mcb30@ipxe.org> | 2012-02-12 13:35:43 +0000 |
commit | 4108321bf539768ce2175e92ac1e1687b667b109 (patch) | |
tree | 42944d9a15261e0621df5b9e73330f2df1e34397 /contrib/rom-o-matic | |
parent | d3630b6a6495129b4865e78f94ffb6769f941500 (diff) | |
download | ipxe-4108321bf539768ce2175e92ac1e1687b667b109.zip ipxe-4108321bf539768ce2175e92ac1e1687b667b109.tar.gz ipxe-4108321bf539768ce2175e92ac1e1687b667b109.tar.bz2 |
[contrib] Fix rom-o-matic
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'contrib/rom-o-matic')
-rw-r--r-- | contrib/rom-o-matic/bottom.php | 4 | ||||
-rw-r--r-- | contrib/rom-o-matic/customize-flags.php | 18 | ||||
-rw-r--r-- | contrib/rom-o-matic/directions.php | 10 | ||||
-rw-r--r-- | contrib/rom-o-matic/index.php | 6 | ||||
-rw-r--r-- | contrib/rom-o-matic/top.php | 12 | ||||
-rw-r--r-- | contrib/rom-o-matic/utils.php | 5 |
6 files changed, 28 insertions, 27 deletions
diff --git a/contrib/rom-o-matic/bottom.php b/contrib/rom-o-matic/bottom.php index a6343d4..9ba8e31 100644 --- a/contrib/rom-o-matic/bottom.php +++ b/contrib/rom-o-matic/bottom.php @@ -1,4 +1,4 @@ -<? +<?php /** * Copyright (C) 2009 Marty Connor <mdc@etherboot.org>. @@ -53,7 +53,7 @@ Resources: <hr> <font size="-1"> <br> - Please email <a href="mailto:<? echo "${webmaster_email}" ?>"><? echo "${webmaster_email}"?></a> + Please email <a href="mailto:<?php echo "${webmaster_email}" ?>"><?php echo "${webmaster_email}"?></a> with questions or comments about this website. </font> <br><br> diff --git a/contrib/rom-o-matic/customize-flags.php b/contrib/rom-o-matic/customize-flags.php index 2309043..e283921 100644 --- a/contrib/rom-o-matic/customize-flags.php +++ b/contrib/rom-o-matic/customize-flags.php @@ -34,30 +34,30 @@ include_once $top_inc; ?> <form action="build.php" method=POST> - <input type="hidden" name="version" value = "<? echo $version ?>"> + <input type="hidden" name="version" value = "<?php echo $version ?>"> <input type="hidden" name="use_flags" value="1"> <h3> - Make changes below and press <? echo $build ?> to create an image, <br> - Or press <? echo $restart ?> to return to the main page. + Make changes below and press <?php echo $build ?> to create an image, <br> + Or press <?php echo $restart ?> to return to the main page. </h3> <hr> <ul> - <? require ( "directions.php" ); ?> + <?php require ( "directions.php" ); ?> </ul> <hr> - <? echo_flags( $flags ); ?> + <?php echo_flags( $flags ); ?> <hr> <h3>Embedded Script:</h3> - <? echo textarea ( "embedded_script", "", "10", "50" ); ?> + <?php echo textarea ( "embedded_script", "", "10", "50" ); ?> <br><br> <hr> <center><table width="35%"><tr> - <td align="left"> <? echo $build; ?> </td> - <td align="right"> <? echo $restart ?></td> + <td align="left"> <?php echo $build; ?> </td> + <td align="right"> <?php echo $restart ?></td> </tr></table></center> </form> -<? include_once $bottom_inc; ?> +<?php include_once $bottom_inc; ?> <? // For emacs: // diff --git a/contrib/rom-o-matic/directions.php b/contrib/rom-o-matic/directions.php index 4532357..540121e 100644 --- a/contrib/rom-o-matic/directions.php +++ b/contrib/rom-o-matic/directions.php @@ -1,4 +1,4 @@ -<? +<?php /** * Copyright (C) 2009 Marty Connor <mdc@etherboot.org>. @@ -21,12 +21,12 @@ ?> <li> - Choose an output format: <? echo keys_menubox ( "ofmt", $ofmts, + Choose an output format: <?php echo keys_menubox ( "ofmt", $ofmts, isset ( $_POST['ofmt'] ) ? $_POST['ofmt'] : "") ?> <br><br> </li> <li> - Choose a NIC type: <? echo keys_menubox ( "nic", $nics, + Choose a NIC type: <?php echo keys_menubox ( "nic", $nics, isset ( $_POST['nic'] ) ? $_POST['nic'] : "" ) ?> <br><br> </li> @@ -40,11 +40,11 @@ <a href="http://www.ipxe.org/howto/romburning" target="_blank">here</a>. <br><br> - PCI VENDOR CODE: <? echo textbox ( "pci_vendor_code", + PCI VENDOR CODE: <?php echo textbox ( "pci_vendor_code", isset ( $_POST['pci_vendor_code'] ) ? $_POST['pci_vendor_code'] : "", 6 ); ?> - PCI DEVICE CODE: <? echo textbox ( "pci_device_code", + PCI DEVICE CODE: <?php echo textbox ( "pci_device_code", isset ( $_POST['pci_device_code'] ) ? $_POST['pci_device_code'] : "", 6 ); ?> <h4>Please note for ROM images:</h4> diff --git a/contrib/rom-o-matic/index.php b/contrib/rom-o-matic/index.php index 12b7e1a..26585c9 100644 --- a/contrib/rom-o-matic/index.php +++ b/contrib/rom-o-matic/index.php @@ -27,10 +27,10 @@ include_once $top_inc; ?> <form action="build.php" method=POST> - <input type="hidden" name="version" value = "<? echo $version ?>"> + <input type="hidden" name="version" value = "<?php echo $version ?>"> <h3>To create an image:</h3> <ol> - <? require ( "directions.php" ); ?> + <?php require ( "directions.php" ); ?> <li> Generate and download an image: <input type="submit" name="A" value="Get Image"> @@ -44,4 +44,4 @@ include_once $top_inc; </ol> </form> -<? include_once $bottom_inc ?> +<?php include_once $bottom_inc ?> diff --git a/contrib/rom-o-matic/top.php b/contrib/rom-o-matic/top.php index 2556208..42a8e2d 100644 --- a/contrib/rom-o-matic/top.php +++ b/contrib/rom-o-matic/top.php @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<? +<?php /** * Copyright (C) 2009 Marty Connor <mdc@etherboot.org>. @@ -25,17 +25,17 @@ <html> <head> - <link rev="made" href="mailto:<? echo "${webmaster_email}" ?>"> + <link rev="made" href="mailto:<?php echo "${webmaster_email}" ?>"> <meta name="keywords" content="rom, etherboot, ipxe, open source, rom-o-matic.net"> - <title><? echo $header_title ?></title> - <meta name="description" content="<? echo $description ?>"> + <title><?php echo $header_title ?></title> + <meta name="description" content="<?php echo $description ?>"> </head> <h1> -<? echo "$html_title" ?> +<?php echo "$html_title" ?> </h1> <hr> <h2> -<? echo "$html_tagline" ?> +<?php echo "$html_tagline" ?> </h2> </form> <hr> diff --git a/contrib/rom-o-matic/utils.php b/contrib/rom-o-matic/utils.php index dc5bd41..e0e62f4 100644 --- a/contrib/rom-o-matic/utils.php +++ b/contrib/rom-o-matic/utils.php @@ -1,4 +1,4 @@ -<? // -*- Mode: PHP; -*- +<?php // -*- Mode: PHP; -*- /** * Copyright (C) 2009 Marty Connor <mdc@etherboot.org>. @@ -131,7 +131,8 @@ function parse_nic_file () if ( strpos ( $first_eight_chars, "family" ) === 0 ) { // get pathname of NIC driver - list ( $dummy, $nic ) = split( "[ \t]+", $line ); + #list ( $dummy, $nic ) = split( "[ \t]+", $line ); + list ( $dummy, $nic ) = explode("\t", $line); settype ( $nic, "string" ); // extract filename name of driver from pathname |