Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[contrib] Fix rom-o-matic
Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
Paul Sands authored and mcb30 committed Feb 12, 2012
1 parent d3630b6 commit 4108321
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 27 deletions.
4 changes: 2 additions & 2 deletions contrib/rom-o-matic/bottom.php
@@ -1,4 +1,4 @@
<?
<?php

/**
* Copyright (C) 2009 Marty Connor <mdc@etherboot.org>.
Expand Down Expand Up @@ -53,7 +53,7 @@
<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>
Expand Down
18 changes: 9 additions & 9 deletions contrib/rom-o-matic/customize-flags.php
Expand Up @@ -34,30 +34,30 @@
?>

<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:
//
Expand Down
10 changes: 5 additions & 5 deletions contrib/rom-o-matic/directions.php
@@ -1,4 +1,4 @@
<?
<?php

/**
* Copyright (C) 2009 Marty Connor <mdc@etherboot.org>.
Expand All @@ -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>
Expand All @@ -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 ); ?>
&nbsp;&nbsp;
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>
Expand Down
6 changes: 3 additions & 3 deletions contrib/rom-o-matic/index.php
Expand Up @@ -27,10 +27,10 @@

?>
<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">
Expand All @@ -44,4 +44,4 @@
</ol>
</form>

<? include_once $bottom_inc ?>
<?php include_once $bottom_inc ?>
12 changes: 6 additions & 6 deletions 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>.
Expand All @@ -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" ?>&nbsp;
<?php echo "$html_title" ?>&nbsp;
</h1>
<hr>
<h2>
<? echo "$html_tagline" ?>
<?php echo "$html_tagline" ?>
</h2>
</form>
<hr>
5 changes: 3 additions & 2 deletions contrib/rom-o-matic/utils.php
@@ -1,4 +1,4 @@
<? // -*- Mode: PHP; -*-
<?php // -*- Mode: PHP; -*-

/**
* Copyright (C) 2009 Marty Connor <mdc@etherboot.org>.
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4108321

Please sign in to comment.