[Scummvm-cvs-logs] CVS: web/include html.php,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Mon Oct 13 12:14:04 CEST 2003


Update of /cvsroot/scummvm/web/include
In directory sc8-pr-cvs1:/tmp/cvs-serv13765/include

Modified Files:
	html.php 
Log Message:
whitespace

Index: html.php
===================================================================
RCS file: /cvsroot/scummvm/web/include/html.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- html.php	12 Oct 2003 23:50:36 -0000	1.10
+++ html.php	13 Oct 2003 19:13:20 -0000	1.11
@@ -6,23 +6,11 @@
  *
  */
  
-$_indent_level = 0;
 $_trcolor = 0;
 
 // Set the current Indent Level
 function do_indent ($str, $v = 0)
 {
-	global $_indent_level;
-
-	if($v < 0)
-		$_indent_level += $v;
-
-	if($_indent_level > 0)
-	    $str =  str_repeat("  ", $_indent_level) . $str;
-
-	if($v > 0)
-		$_indent_level += $v;
-
 	return $str;
 }
 
@@ -90,99 +78,91 @@
 // Draw a Colored Pixel Line
 function html_line ($width = "100%", $height = 1, $color = "grey")
 {
-    global $file_root;
-    return '<img src="'.$file_root.'/images/'.$color.'_pixel.gif" height="'.$height.'" width="'.$width.'" alt="-">';
+	global $file_root;
+	return '<img src="'.$file_root.'/images/'.$color.'_pixel.gif" height="'.$height.'" width="'.$width.'" alt="-">';
 }
 
 function html_frame_start ($title = "", $width = "", $cellPad = 5, $cellSpc = 1, $color = "color2", $extra = "")
 {
+	global $file_root;
+	if ($width) { $width = 'width="'.$width.'"'; }
 
-    global $file_root;
-    global $_indent_level;
-    $_indent_level++;
-	  
-    if ($width) { $width = 'width="'.$width.'"'; }
+	$str = "\n".'<div align="center">'."\n";
+	$str .= '<table '.$width.' border="0" cellpadding="0" cellspacing="0">'."\n";
 
-    $str = "\n".'<div align="center">'."\n";
-    $str .= '<table '.$width.' border="0" cellpadding="0" cellspacing="0">'."\n";
-    
-    if ($title) {
-	$str .= '<tr><td class="topMenu">'."\n";
-	$str .= '    <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
-	$str .= '	 <td align="center"><span class="menuTitle"> '.$title.' </span></td>'."\n";
-	$str .= '    </tr></table>'."\n";
-	$str .= '</td></tr>'."\n";
-    }
-    
-    $str .= '<tr><td class='.$color.'>'."\n";
-    $str .= '<table width="100%" border="0" cellpadding="'.$cellPad.'" cellspacing="'.$cellSpc.'" '.$extra.'>'."\n";
+	if ($title) {
+		$str .= '<tr><td class="topMenu">'."\n";
+		$str .= '	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
+		$str .= '		<td align="center"><span class="menuTitle"> '.$title.' </span></td>'."\n";
+		$str .= '	</tr></table>'."\n";
+		$str .= '</td></tr>'."\n";
+	}
 
-    return $str;
+	$str .= '<tr><td class='.$color.'>'."\n";
+	$str .= '<table width="100%" border="0" cellpadding="'.$cellPad.'" cellspacing="'.$cellSpc.'" '.$extra.'>'."\n";
+
+	return $str;
 }
 
 function html_frame_end ($text = "")
 {
-    global $file_root;
-    global $_trcolor;
-    global $_indent_level;
-    $_indent_level--;
-	
-    $str .= '</table>'."\n";
-    $str .= '</td></tr>'."\n";
-    if ($text)
-    {
-	$str .= '<tr><td class="topMenu">'."\n";
-	$str .= '    <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
-	$str .= '	 <td align="center"><span class="menuTitle"> '.$text.' </span></td>'."\n";
-	$str .= '    </tr></table>'."\n";
+	global $file_root;
+	global $_trcolor;
+	$str .= '</table>'."\n";
 	$str .= '</td></tr>'."\n";
-    }
-    $str .= "</table>\n</div>\n\n";
-    $_trcolor = 0;
-    return $str;
+	if ($text)
+	{
+		$str .= '<tr><td class="topMenu">'."\n";
+		$str .= '	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
+		$str .= '		<td align="center"><span class="menuTitle"> '.$text.' </span></td>'."\n";
+		$str .= '	</tr></table>'."\n";
+		$str .= '</td></tr>'."\n";
+	}
+	$str .= "</table>\n</div>\n\n";
+	$_trcolor = 0;
+	return $str;
 }
 
 function html_round_frame_start ($title = "", $width = "", $extra = "", $innerPad = 5)
 {
+	global $file_root;
+	if ($width) { $width = 'width="'.$width.'"'; }
 
-    global $file_root;
-    if ($width) { $width = 'width="'.$width.'"'; }
-
-    $str = "\n".'<div align="center">'."\n";
-    $str .= '<table '.$width.' border="0" cellpadding="0" cellspacing="0">'."\n";
-    
-    if($title) {
-	$str .= '<tr><td class="topMenu">'."\n";
-	$str .= '    <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
-	$str .= '	 <td valign=top align="left"><img src="'.$file_root.'/images/main_left_top.gif" alt="-"></td>'."\n";
-	$str .= '	 <td align="center"><span class="menuTitle"> '.$title.' </span></td>'."\n";
-	$str .= '	 <td valign=top align="right"><img src="'.$file_root.'/images/main_right_top.gif" alt="-"></td>'."\n";
-	$str .= '    </tr></table>'."\n";
-	$str .= '</td></tr>'."\n";
-    }
-    
-    $str .= '<tr><td>'."\n";	
-    $str .= '<table width="100%" border="0" cellpadding='.$innerPad.' cellspacing=1 '.$extra.'><tr><td class="color2">'."\n";
+	$str = "\n".'<div align="center">'."\n";
+	$str .= '<table '.$width.' border="0" cellpadding="0" cellspacing="0">'."\n";
+	
+	if($title) {
+		$str .= '<tr><td class="topMenu">'."\n";
+		$str .= '	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
+		$str .= '		<td valign=top align="left"><img src="'.$file_root.'/images/main_left_top.gif" alt="-"></td>'."\n";
+		$str .= '		<td align="center"><span class="menuTitle"> '.$title.' </span></td>'."\n";
+		$str .= '		<td valign=top align="right"><img src="'.$file_root.'/images/main_right_top.gif" alt="-"></td>'."\n";
+		$str .= '	</tr></table>'."\n";
+		$str .= '</td></tr>'."\n";
+	}
+	
+	$str .= '<tr><td>'."\n";	
+	$str .= '<table width="100%" border="0" cellpadding='.$innerPad.' cellspacing=1 '.$extra.'><tr><td class="color2">'."\n";
 
-    return $str;
+	return $str;
 }
 
 function html_round_frame_end ($text = "")
 {
-    global $file_root;
-    $str .= '</td></tr></table></td></tr>'."\n";
-    if ($text)
-    {
-	$str .= '<tr><td class="topMenu">'."\n";
-	$str .= '    <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
-	$str .= '	 <td valign=bottom align="left"><img src="'.$file_root.'/images/main_left_bottom.gif" alt="-"></td>'."\n";
-	$str .= '	 <td align="center"><span class="menuTitle"> '.$text.' </span></td>'."\n";
-	$str .= '	 <td valign=bottom align="right"><img src="'.$file_root.'/images/main_right_bottom.gif" alt="-"></td>'."\n";
-	$str .= '    </tr></table>'."\n";
-	$str .= '</td></tr>'."\n";
-    }
-    $str .= "</table>\n</div>\n\n";
-    return $str;
+	global $file_root;
+	$str .= '</td></tr></table></td></tr>'."\n";
+	if ($text)
+	{
+		$str .= '<tr><td class="topMenu">'."\n";
+		$str .= '	<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
+		$str .= '		<td valign=bottom align="left"><img src="'.$file_root.'/images/main_left_bottom.gif" alt="-"></td>'."\n";
+		$str .= '		<td align="center"><span class="menuTitle"> '.$text.' </span></td>'."\n";
+		$str .= '		<td valign=bottom align="right"><img src="'.$file_root.'/images/main_right_bottom.gif" alt="-"></td>'."\n";
+		$str .= '	</tr></table>'."\n";
+		$str .= '</td></tr>'."\n";
+	}
+	$str .= "</table>\n</div>\n\n";
+	return $str;
 }
 
 function html_frame_row_color ($text = " ")
@@ -214,44 +194,25 @@
 
 function html_frame_row_form ($name = " ", $field = " ")
 {
-    $str  = '	 <tr valign="top"><td class="color1" width="200"><b class="menuTitle">'.$name.'</b></td>'."\n";
-    $str .= '	 <td class="color2" width="100%">'.$field.'</td></tr>'."\n";
+    $str  = '	<tr valign="top"><td class="color1" width="200"><b class="menuTitle">'.$name.'</b></td>'."\n";
+    $str .= '	<td class="color2" width="100%">'.$field.'</td></tr>'."\n";
     return $str;
 }
 
 
 function html_frame_row_form_title ($name = " ")
 {
-    $str  = '	 <tr valign="top"><td class="color3" colspan="2"><b class="menuTitle">'.$name.'</b></td></tr>'."\n";
+    $str  = '	<tr valign="top"><td class="color3" colspan="2"><b class="menuTitle">'.$name.'</b></td></tr>'."\n";
     return $str;
 }
 
-function html_select ($name, $values, $default = null, $descs = null)
+function html_back_link ($howmany = 1, $url = "")
 {
-    $str = "<select name='$name'>\n";
-    while(list($idx, $value) = each($values))
+	if (!$url)
 	{
-	    $desc = $value;
-	    if($descs)
-		$desc = $descs[$idx];
-
-	    if($value == $default)
-		$str .= "  <option selected value='$value'>$desc\n";
-	    else
-		$str .= "  <option value='$value'>$desc\n";
+		$url = 'javascript:history.back('.$howmany.');';
 	}
-    $str .= "</select>\n";
-
-    return $str;
-}
-
-function html_back_link ($howmany = 1, $url = "")
-{
-    if (!$url)
-    {
-	$url = 'javascript:history.back('.$howmany.');';
-    }
-    return '<p>   <a href="'.$url.'"><< Back</a></p>'."\n";
+	return '<p>   <a href="'.$url.'"><< Back</a></p>'."\n";
 }
 
 function html_form_start ($script, $name, $method = "post")
@@ -337,21 +298,21 @@
 // url-ify urls
 function html_urlify ($text)
 {
-    $text = htmlspecialchars($text);
+	$text = htmlspecialchars($text);
 
-    $urlreg = "([a-zA-Z]+://([^\t\r\n ]+))";
-    if (ereg($urlreg,$text))
-    {
-	$text = ereg_replace($urlreg, "<a href=\"\\1\"> \\2 </a>", $text);
-    }
-    
-    $emailreg = "([a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+)";
-    if (ereg($emailreg,$text))
-    {
-	$text = ereg_replace($emailreg, "<a href='mailto:\\1'>\\1</a>", $text);
-    }
+	$urlreg = "([a-zA-Z]+://([^\t\r\n ]+))";
+	if (ereg($urlreg,$text))
+	{
+		$text = ereg_replace($urlreg, "<a href=\"\\1\"> \\2 </a>", $text);
+	}
+	
+	$emailreg = "([a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+)";
+	if (ereg($emailreg,$text))
+	{
+		$text = ereg_replace($emailreg, "<a href='mailto:\\1'>\\1</a>", $text);
+	}
 
-    return $text;
+	return $text;
 }
 
 // simple httpd header redirect 
@@ -379,21 +340,10 @@
 
 <body>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-    <td style="background-image:url(<?=$file_root?>/images/scummvm_top_tile.png)">
-	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-	    <td align="left"><img src="<?=$file_root?>/images/scummvm_logo.png"  width="407" height="111" alt="ScummVM"></td>
-	    <td>
-		 
-	    </td>
-	    <td align="right"><img src="<?=$file_root?>/images/scummvm_chars.png" width="193" height="111"  alt="-"></td>
-	</tr>
-	</table>
-    </td>
-</tr>
-</table>
+<div style="width: 100%; height: 111px; background-image:url(<?=$file_root?>/images/scummvm_top_tile.png)">
+	<img src="<?=$file_root?>/images/scummvm_logo.png"  width="407" height="111" alt="ScummVM" style="float: left">
+	<img src="<?=$file_root?>/images/scummvm_chars.png" width="193" height="111" alt="-" style="float: right">
+</div>
 
 <?
 }





More information about the Scummvm-git-logs mailing list