[evolvis-commits] r8185: make / valid XHTML 1. 0 Transitional↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 15:59:24 CET 2011


Author: mirabilos
Date: 2011-02-24 15:59:24 +0100 (Thu, 24 Feb 2011)
New Revision: 8185

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
   trunk/gforge_base/evolvisforge-5.1/gforge/common/include/utils.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/include/Layout.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/include/html.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab
   trunk/gforge_base/evolvisforge-5.1/gforge/www/index_std.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/news/news_utils.php
Log:
make / valid XHTML 1.0 Transitional


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-24 14:59:22 UTC (rev 8184)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-24 14:59:24 UTC (rev 8185)
@@ -1,5 +1,17 @@
 2003-01-10  Ryan T. Sammartino  <ryants at shaw.ca>
 
+	* www/include/html.php: make / valid XHTML 1.0 Transitional.
+
+	* www/include/Layout.class: ditto.
+
+	* www/include/languages/Base.tab: ditto.
+
+	* common/include/utils.php: ditto.
+
+	* www/index_std.php: ditto.
+
+	* www/news/news_utils.php: ditto.
+
 	* www/my/diary.php: bug 158: pg_atoi when inserting diary entry.
 
 	* common/include/utils.php(util_make_links): exclude <> from

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/utils.php	2011-02-24 14:59:22 UTC (rev 8184)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/utils.php	2011-02-24 14:59:24 UTC (rev 8185)
@@ -129,7 +129,7 @@
 
 /**
  *	util_handle_message() - a convenience wrapper which sends messages
- *	to either a jabber account or email account or both, depending on 
+ *	to either a jabber account or email account or both, depending on
  *	user preferences
  *
  *	@param	array	array of user_id's from the user table
@@ -142,7 +142,7 @@
 	$address=array();
 
 	if (count($id_arr) < 1) {
-		
+
 	} else {
 		$res=db_query("SELECT jabber_address,email,jabber_only
 			FROM users WHERE user_id IN (". implode($id_arr,',') .")");
@@ -188,8 +188,8 @@
 	if (strlen($string) < 1) {
 		return '';
 	} else {
-		//$trans = get_html_translation_table(HTMLENTITIES, ENT_QUOTES); 
-		$trans = get_html_translation_table(HTML_ENTITIES); 
+		//$trans = get_html_translation_table(HTMLENTITIES, ENT_QUOTES);
+		$trans = get_html_translation_table(HTML_ENTITIES);
 		$trans = array_flip ($trans);
 		$str = strtr ($string, $trans);
 		return $str;
@@ -274,11 +274,11 @@
 	$start=$wrap-5;
 	$try=1;
 	$found=false;
-	
+
 	while (!$found) {
 		//find the first space starting at $start
 		$pos=@strpos($string,' ',$start);
-		
+
 		//if that space is too far over, go back and start more to the left
 		if (($pos > ($wrap+5)) || !$pos) {
 			$try++;
@@ -286,13 +286,13 @@
 			//if we've gotten so far left , just truncate the line
 			if ($start<=10) {
 				return $wrap;
-			}	   
+			}
 			$found=false;
 		} else {
 			$found=true;
-		}	   
-	}	   
-	
+		}
+	}
+
 	return $pos;
 }
 
@@ -307,7 +307,7 @@
  */
 function util_line_wrap ($text, $wrap = 80, $break = "\n") {
 	$paras = explode("\n", $text);
-			
+
 	$result = array();
 	$i = 0;
 	while ($i < count($paras)) {
@@ -316,18 +316,18 @@
 			$i++;
 		} else {
 			$pos=util_wrap_find_space($paras[$i],$wrap);
-			
+
 			$result[] = substr($paras[$i], 0, $pos);
-			
+
 			$new = trim(substr($paras[$i], $pos, strlen($paras[$i]) - $pos));
 			if ($new != '') {
 				$paras[$i] = $new;
 				$pos=util_wrap_find_space($paras[$i],$wrap);
 			} else {
 				$i++;
-			}	   
-		}	   
-	}			   
+			}
+		}
+	}
 	return implode($break, $result);
 }
 
@@ -349,7 +349,7 @@
 		// (RFC2396; http://www.w3.org/Addressing/URL/5.1_Wrappers.html)
 		$line = str_replace('>', "\1", $line);
 		$line = eregi_replace("([ \t]|^)www\."," http://www.",$line);
-		$text = eregi_replace("([[:alnum:]]+)://([^[:space:]<\1]*)([[:alnum:]#?/&=])", "<a href=\"\\1://\\2\\3\" target=\"_blank\" target=\"_new\">\\1://\\2\\3</a>", $line);
+		$text = eregi_replace("([[:alnum:]]+)://([^[:space:]<\1]*)([[:alnum:]#?/&=])", "<a href=\"\\1://\\2\\3\" target=\"_new\">\\1://\\2\\3</a>", $line);
 		$text = eregi_replace("([[:space:]]|^)(([a-z0-9_]|\\-|\\.)+@([^[:space:]]*)([[:alnum:]-]))", "\\1<a href=\"mailto:\\2\" target=\"_new\">\\2</a>", $text);
 		$text = str_replace("\1", '>', $text);
 		$newText .= $text;
@@ -380,7 +380,7 @@
  * @param		int		Number of options to be in the array
  * @param		string	The name of the checkboxes
  * @param		array	An array of boxes to be pre-checked
- * 
+ *
  */
 function utils_buildcheckboxarray($options,$name,$checked_array) {
 	$option_count=count($options);
@@ -404,18 +404,18 @@
  * @return	a string holding the HTML to mark a required field
  */
 function utils_requiredField() {
-	return '<span><font color="red">*</font></span>'; 
+	return '<span><font color="red">*</font></span>';
 }
 
 /**
  * GraphResult() - Takes a database result set and builds a graph.
  * The first column should be the name, and the second column should be the values
  * Be sure to include HTL_Graphs.php before using this function
- * 
+ *
  * @author Tim Perdue tperdue at valinux.com
  * @param		int		The databse result set ID
  * @param		string	The title of the graph
- * 
+ *
  */
 Function GraphResult($result,$title) {
 	$rows=db_numrows($result);
@@ -442,7 +442,7 @@
 
 /**
  * GraphIt() - Build a graph
- * 
+ *
  * @author Tim Perdue tperdue at valinux.com
  * @param		array	An array of names
  * @param		array	An array of values
@@ -544,7 +544,7 @@
  * @param		int		The result set ID
  * @param		string	The title of the result set
  * @param		bool	The option to turn URL's into links
- * 
+ *
  */
 Function  ShowResultSet($result,$title="Untitled",$linkify=false)  {
 	global $group_id,$HTML;
@@ -568,7 +568,7 @@
 			$cell_data[] = array(db_fieldname($result,$i));
 		}
 		echo $HTML->multiTableRow('',$cell_data, TRUE);
-		
+
 		/*  Create the rows  */
 		for ($j = 0; $j < $rows; $j++) {
 			echo '<tr '. $HTML->boxGetAltRowStyle($j) . '>';
@@ -637,7 +637,7 @@
 
 /**
  * valid_hostname() - Validates a hostname string to make sure it doesn't contain invalid characters
- * 
+ *
  * @param		string	The optional hostname string
  * @returns true on success/false on failur
  *

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/Layout.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/Layout.class	2011-02-24 14:59:22 UTC (rev 8184)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/Layout.class	2011-02-24 14:59:24 UTC (rev 8185)
@@ -2,12 +2,12 @@
 /**
  * Base layout class.
  *
- * Extends the basic Error class to add HTML functions 
- * for displaying all site dependent HTML, while allowing 
+ * Extends the basic Error class to add HTML functions
+ * for displaying all site dependent HTML, while allowing
  * extendibility/overriding by themes via the Theme class.
- * 
+ *
  * Make sure browser.php is included _before_ you create an instance of this object.
- * 
+ *
  * Geoffrey Herteg, August 29, 2000
  *
  * @version   $Id$
@@ -109,19 +109,19 @@
 		} else {
 			$params['title'] =  $GLOBALS['sys_name'] . ":" . $params['title'];
 		}
+		print '<?xml version="1.0" encoding="' . $Language->getEncoding(). '"?>';
+		?>
 
-		?>
 <!DOCTYPE html
 	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="<?php echo $Language->getLanguageCode(); ?>">
 
-<html lang="<?php echo $Language->getLanguageCode(); ?>">
   <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $Language->getEncoding(); ?>">
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $Language->getEncoding(); ?>" />
 	<title><?php echo $params['title']; ?></title>
-	<script language="JavaScript">
+	<script language="JavaScript" type="text/javascript">
 	<!--
 	function help_window(helpurl) {
 		HelpWin = window.open( helpurl,'HelpWindow','scrollbars=yes,resizable=yes,toolbar=no,height=400,width=400');
@@ -147,6 +147,13 @@
 
 <style type="text/css">
 	<!--
+	BODY {
+		margin-top: 3;
+		margin-left: 3;
+		margin-right: 3;
+		margin-bottom: 3;
+		background: #01004e;
+	}
 	ol,ul,p,body,td,tr,th,form { font-family: <?php echo $site_fonts; ?>; font-size:<?php echo $this->FONTSIZE; ?>;
 		color: <?php echo $this->FONTCOLOR_CONTENT ?>; }
 
@@ -176,14 +183,14 @@
 
 </head>
 
-<body topmargin="3" marginheight="3" marginwidth="3" leftmargin="3" rightmargin="3" bgcolor="#01004e">
+<body>
 
-<table border=0 width="100%" cellspacing="0" cellpadding=0>
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
 
 	<tr>
 		<td><a href="/"><?php echo html_image('logo.png',198,52,array('border'=>'0')); ?></a></td>
 		<td><?php echo $this->searchBox(); ?></td>
-		<td align="RIGHT"><?php
+		<td align="right"><?php
 			if (session_loggedin()) {
 				?>
 				<a href="/account/logout.php"><?php echo html_image($Language->getText('image','logout'),74,14,array('border'=>'0')); ?></a><br />
@@ -202,11 +209,11 @@
 
 </table>
 
-<table border=0 width="100%" cellspacing="0" cellpadding=0>
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
 
 	<tr>
 		<td> </td>
-		<td colspan=3>
+		<td colspan="3">
 
 <?php echo $this->outerTabs($params); ?>
 
@@ -215,18 +222,18 @@
 	</tr>
 
 	<tr>
-		<td align="left" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/topleft.png" height="9" width="9"></td>
-		<td bgcolor="#E0E0E0" width="30"><img src="<?php echo $this->imgroot; ?>clear.png" width="30" height="1"></td>
-		<td bgcolor="#E0E0E0"><img src="<?php echo $this->imgroot; ?>clear.png" width="1" height="1"></td>
-		<td bgcolor="#E0E0E0" width="30"><img src="<?php echo $this->imgroot; ?>clear.png" width=30 height=1></td>
-		<td align="right" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/topright.png" height="9" width="9"></td>
+		<td align="left" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/topleft.png" height="9" width="9" alt="" /></td>
+		<td bgcolor="#E0E0E0" width="30"><img src="<?php echo $this->imgroot; ?>clear.png" width="30" height="1" alt="" /></td>
+		<td bgcolor="#E0E0E0"><img src="<?php echo $this->imgroot; ?>clear.png" width="1" height="1" alt="" /></td>
+		<td bgcolor="#E0E0E0" width="30"><img src="<?php echo $this->imgroot; ?>clear.png" width="30" height="1" alt="" /></td>
+		<td align="right" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/topright.png" height="9" width="9" alt="" /></td>
 	</tr>
 
 	<tr>
 
 		<!-- Outer body row -->
 
-		<td bgcolor="#E0E0E0"><img src="<?php echo $this->imgroot; ?>clear.png" width="10" height="1"></td>
+		<td bgcolor="#E0E0E0"><img src="<?php echo $this->imgroot; ?>clear.png" width="10" height="1" alt="" /></td>
 		<td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
 
 			<!-- Inner Tabs / Shell -->
@@ -255,13 +262,13 @@
 
 ?>
 			<tr>
-				<td align="left" bgcolor="#ffffff" width="9"><img src="<?php echo $this->imgroot; ?>tabs/topleft-inner.png" height="9" width="9"></td>
-				<td bgcolor="#ffffff"><img src="<?php echo $this->imgroot; ?>clear.png" width="1" height="1"></td>
-				<td align="right" bgcolor="#ffffff" width="9"><img src="<?php echo $this->imgroot; ?>tabs/topright-inner.png" height="9" width="9"></td>
+				<td align="left" bgcolor="#ffffff" width="9"><img src="<?php echo $this->imgroot; ?>tabs/topleft-inner.png" height="9" width="9" alt="" /></td>
+				<td bgcolor="#ffffff"><img src="<?php echo $this->imgroot; ?>clear.png" width="1" height="1" alt="" /></td>
+				<td align="right" bgcolor="#ffffff" width="9"><img src="<?php echo $this->imgroot; ?>tabs/topright-inner.png" height="9" width="9" alt="" /></td>
 			</tr>
 
 			<tr>
-				<td bgcolor="#ffffff"><img src="<?php echo $this->imgroot; ?>clear.png" width="10" height="1"></td>
+				<td bgcolor="#ffffff"><img src="<?php echo $this->imgroot; ?>clear.png" width="10" height="1" alt="" /></td>
 				<td valign="top" width="99%" bgcolor="white">
 
 	<?php
@@ -298,31 +305,31 @@
 
 
 				</td>
-				<td width="10" bgcolor="#ffffff"><img src="<?php echo $this->imgroot; ?>clear.png" width="2" height="1"></td>
+				<td width="10" bgcolor="#ffffff"><img src="<?php echo $this->imgroot; ?>clear.png" width="2" height="1" alt="" /></td>
 			</tr>
 			<tr>
-				<td align="left" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/bottomleft-inner.png" height="11" width="11"></td>
-				<td bgcolor="#ffffff"><img src="<?php echo $this->imgroot; ?>clear.png" width="1" height="1"></td>
-				<td align="right" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/bottomright-inner.png" height="11" width="11"></td>
+				<td align="left" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/bottomleft-inner.png" height="11" width="11" alt="" /></td>
+				<td bgcolor="#ffffff"><img src="<?php echo $this->imgroot; ?>clear.png" width="1" height="1" alt="" /></td>
+				<td align="right" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/bottomright-inner.png" height="11" width="11" alt="" /></td>
 			</tr>
-			</TABLE>
+			</table>
 
 		<!-- end inner body row -->
 
 		</td>
-		<td width="10" bgcolor="#E0E0E0"><img src="<?php echo $this->imgroot; ?>clear.png" width="2" height="1"></td>
+		<td width="10" bgcolor="#E0E0E0"><img src="<?php echo $this->imgroot; ?>clear.png" width="2" height="1" alt="" /></td>
 	</tr>
 	<tr>
-		<td align="left" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/bottomleft.png" height="9" width="9"></td>
-		<td bgcolor="#E0E0E0" colspan="3"><img src="<?php echo $this->imgroot; ?>clear.png" width="1" height=1></td>
-		<td align="right" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/bottomright.png" height="9" width="9"></td>
+		<td align="left" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/bottomleft.png" height="9" width="9" alt="" /></td>
+		<td bgcolor="#E0E0E0" colspan="3"><img src="<?php echo $this->imgroot; ?>clear.png" width="1" height="1" alt="" /></td>
+		<td align="right" bgcolor="#E0E0E0" width="9"><img src="<?php echo $this->imgroot; ?>tabs/bottomright.png" height="9" width="9" alt="" /></td>
 	</tr>
 </table>
 <?php
 	global $sys_show_source;
 	if ($sys_show_source) {
 		global $SCRIPT_NAME;
-		print '<A CLASS=showsource HREF="/source.php?file=' . $SCRIPT_NAME . '"> Show Source</a>';
+		print '<a class="showsource" href="/source.php?file=' . $SCRIPT_NAME . '"> Show Source</a>';
 	}
 ?>
 
@@ -349,7 +356,7 @@
 		<tr><td>
 			<table cellspacing="0" cellpadding="2" width="100%" border="0" bgcolor="'. $this->COLOR_HTMLBOX_BACK.'">
 				<tr style="background-color:'.$this->COLOR_HTMLBOX_TITLE.'" align="center">
-					<td colspan="2"><span class=titlebar>'.$title.'</span></td>
+					<td colspan="2"><span class="titlebar">'.$title.'</span></td>
 				</tr>
 				<tr align="left">
 					<td colspan="2">';
@@ -366,7 +373,7 @@
 					</td>
 				</tr>
 				<tr style="background-color:'.$this->COLOR_HTMLBOX_TITLE.'" align="center">
-					<td colspan="2"><spn class="titlebar">'.$title.'</span></td>
+					<td colspan="2"><span class="titlebar">'.$title.'</span></td>
 				</tr>
 				<tr align="left" style="background-color:'. $this->COLOR_HTMLBOX_BACK .'">
 					<td colspan="2">';
@@ -416,7 +423,7 @@
 		if ($links_arr) {
 			for ($i=0; $i<$count; $i++) {
 				$return .= '
-				<td align="center"><a class=sortbutton href="'.$links_arr[$i].'"><span style="color:'.
+				<td align="center"><a class="sortbutton "href="'.$links_arr[$i].'"><span style="color:'.
 				$this->FONTCOLOR_HTMLBOX_TITLE.'"><strong>'.$title_arr[$i].'</strong></span></a></td>';
 			}
 		} else {
@@ -454,9 +461,9 @@
 			// get group info using the common result set
 			$project =& group_get_object($params['group']);
 			if ($project->isError()) {
-		
+
 			} elseif (!$project->isProject()) {
-			
+
 			} else {
 				$TABS_DIRS[]='/projects/'.$project->getUnixName().'/';
 				$TABS_TITLES[]=$project->getPublicName();
@@ -506,7 +513,7 @@
 		(($toptab == 'home') ? $selected=(count($TABS_TITLES)-1) : '' );
 
 		if (user_ismember($group,'A')) {
-			// Project Admin 
+			// Project Admin
 			$TABS_DIRS[]='/project/admin/?group_id='. $group;
 			$TABS_TITLES[]=$Language->getText('group','short_admin');
 			(($toptab == 'admin') ? $selected=(count($TABS_TITLES)-1) : '' );
@@ -526,7 +533,7 @@
 		// Artifact Tracking
 		$TABS_DIRS[]='/tracker/?group_id='.$group;
 		$TABS_TITLES[]=$Language->getText('group','short_tracker');
-		(($toptab == 'tracker' || $toptab == 'bugs' || $toptab == 'support' || $toptab == 'patch') 
+		(($toptab == 'tracker' || $toptab == 'bugs' || $toptab == 'support' || $toptab == 'patch')
 				? $selected=(count($TABS_TITLES)-1) : '' );
 
 		// Mailing Lists
@@ -647,7 +654,7 @@
 		<form action="/search/" method="post"'.$new_window.'>
 		<table border="0" cellpadding="0" cellspacing="0">
 		<tr><td>
-		<div="center" style="font-size:smaller">
+		<div align="center" style="font-size:smaller">
 
 		<select name="type_of_search">';
 
@@ -657,21 +664,21 @@
 				$ath = new ArtifactTypeHtml($group,$atid);
 				if ($ath && is_object($ath)) {
 				print '
-				<option value="artifact"'.( $type_of_search == 'artifact' ? ' SELECTED' : '' ).'>'. $ath->getName() .'</option>';
+				<option value="artifact"'.( $type_of_search == 'artifact' ? ' selected="selected"' : '' ).'>'. $ath->getName() .'</option>';
 				}
 			}
 		} else if ($group_id && $forum_id) {
 			print '
-			<option value="forums"'.( $type_of_search == 'forums' ? ' SELECTED' : '' ).'>This Forum</option>';
+			<option value="forums"'.( $type_of_search == 'forums' ? ' selected="selected"' : '' ).'>This Forum</option>';
 		}
 		print '
-			<option value="soft"'.( $type_of_search == 'soft' ? ' SELECTED' : '' ).'>'.$Language->getText('searchbox','softwaregroup').'</option>';
+			<option value="soft"'.( $type_of_search == 'soft' ? ' selected="selected"' : '' ).'>'.$Language->getText('searchbox','softwaregroup').'</option>';
 		print '
-			<option value="skill"'.( $type_of_search == 'skill' ? ' SELECTED' : '' ).'>'.$Language->getText('searchbox','skill').'</option>';
+			<option value="skill"'.( $type_of_search == 'skill' ? ' selected="selected"' : '' ).'>'.$Language->getText('searchbox','skill').'</option>';
 		print '
-			<option value="people"'.( $type_of_search == 'people' ? ' SELECTED' : '' ).'>'.$Language->getText('searchbox','people').'</option>';
+			<option value="people"'.( $type_of_search == 'people' ? ' selected="selected"' : '' ).'>'.$Language->getText('searchbox','people').'</option>';
 		print '
-			</select>';
+			</select></div>';
 
 //		print '<br />';
 //		print '
@@ -680,31 +687,31 @@
 		print '</td><td> </td>';
 		if ( isset($forum_id) ) {
 			print '
-			<input type="hidden" value="'.$forum_id.'" name="forum_id">';
+			<input type="hidden" value="'.$forum_id.'" name="forum_id" />';
 		}
 		if ( isset($group_id) ) {
 			print '
-			<input type="hidden" value="'.$group_id.'" name="group_id">';
+			<input type="hidden" value="'.$group_id.'" name="group_id" />';
 		}
 		if ( isset($atid) ) {
 			print '
-			<input type="hidden" value="'.$atid.'" name="atid">';
+			<input type="hidden" value="'.$atid.'" name="atid" />';
 		}
 		print '<td>';
 		print '
-		<input type="text" SIZE="12" name="words" value="'.$words.'">';
+		<input type="text" size="12" name="words" value="'.$words.'" />';
 
 		print '</td><td> </td><td>';
-		print '<input type="submit" name="Search" value="'.$Language->getText('searchbox','search').'">';
+		print '<input type="submit" name="Search" value="'.$Language->getText('searchbox','search').'" />';
 
 		print '
 		</td></tr></table>';
-		print '</form></font>';
+		print '</form>';
 
 	}
 
 	/**
-	 * subMenu() - Takes two array of titles and links and build a menu 
+	 * subMenu() - Takes two array of titles and links and build a menu
 	 *
 	 * @param	   array   The array of titles
 	 * @param	   array   The array of title links
@@ -718,7 +725,7 @@
 		for ($i=0; $i<$count; $i++) {
 			$return .= '
 				<a href='.$links_arr[$i].'>'.$title_arr[$i].'</a> | ';
-		} 
+		}
 		$return .= '
 				<a href='.$links_arr[$i].'>'.$title_arr[$i].'</a>
 			</strong><p>';
@@ -729,10 +736,10 @@
 	 * multiTableRow() - create a mutlilevel row in a table
 	 *
 	 * @param	string	the row attributes
-	 * @param	array	the array of cell data, each element is an array, 
-	 *				  	the first item being the text, 
-	 *				    the subsequent items are attributes (dont include 
-	 *					the bgcolor for the title here, that will be 
+	 * @param	array	the array of cell data, each element is an array,
+	 *				  	the first item being the text,
+	 *				    the subsequent items are attributes (dont include
+	 *					the bgcolor for the title here, that will be
 	 *					handled by $istitle
 	 * @param	boolean is this row part of the title ?
 	 *
@@ -758,14 +765,14 @@
 				$return .='</strong></font>';
 			}
 			$return .= '</td>';
-		
+
 		}
 		$return .= '</tr>
 		';
-		
+
 		return $return;
 	 }
-	 
+
 }
 
 ?>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/html.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/html.php	2011-02-24 14:59:22 UTC (rev 8184)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/html.php	2011-02-24 14:59:24 UTC (rev 8185)
@@ -15,7 +15,7 @@
  * @param		string	The feedback.
  */
 function html_feedback_top($feedback) {
-	if (!$feedback) 
+	if (!$feedback)
 		return '';
 	print '
 		<h3><span style="color:red">'.$feedback.'</span></h3>';
@@ -40,7 +40,7 @@
  * @param		string	The feedback.
  */
 function html_feedback_bottom($feedback) {
-	if (!$feedback) 
+	if (!$feedback)
 		return '';
 	print '
 		<h3><span style="color:red">'.$feedback.'</span></h3>';
@@ -81,7 +81,7 @@
 		"FROM db_images WHERE id='$id'";
 	$result=db_query($sql);
 	$rows=db_numrows($result);
-	
+
 	if (!$result || $rows < 1) {
 		return db_error();
 	} else {
@@ -108,8 +108,14 @@
 	}
 
 	// ## insert a border tag if there isn't one
-	if (!$args['border']) $return .= (" border=\"0\"");
+	if (!isset($args['border'])) {
+		$return .= ' border="0"';
+	}
 
+	if (!isset($args['alt'])) {
+		$return .= ' alt=""';
+	}
+
 	// ## add image dimensions
 	$return .= " width=\"" . $width . "\"";
 	$return .= " height=\"" . $height . "\"";
@@ -327,7 +333,7 @@
 
 /**
  * get_priority_color() - Wrapper for html_get_priority_color().
- * 
+ *
  * @see	html_get_priority_color()
  */
 function get_priority_color ($index) {
@@ -342,14 +348,14 @@
  */
 function html_get_priority_color ($index) {
 	global $bgpri;
-	
+
 	/* make sure that index is of appropriate type and range */
 	$index = (int)$index;
 	if ($index<1) {
 		$index=1;
 	} else if ($index>9) {
 		$index=9;
-	}   
+	}
 	//return "prior$index";
 	return $bgpri[$index];
 }
@@ -414,7 +420,7 @@
 	}
 }
 
-/** 
+/**
  *	site_user_header() - everything required to handle security and
  *	add navigation for user pages like /my/ and /account/
  *
@@ -441,7 +447,7 @@
 }
 
 /**
- *	site_project_header() - everything required to handle 
+ *	site_project_header() - everything required to handle
  *	security and state checks for a project web page
  *
  *	@param params array() must contain $toptab and $group
@@ -457,7 +463,7 @@
 
 	$group_id=$params['group'];
 
-	//get the project object 
+	//get the project object
 	$project =& group_get_object($group_id);
 
 	if (!$project || !is_object($project)) {
@@ -484,8 +490,8 @@
 }
 
 /**
- *	site_project_footer() - currently a simple shim 
- *	that should be on every project page,  rather than 
+ *	site_project_footer() - currently a simple shim
+ *	that should be on every project page,  rather than
  *	a direct call to site_footer() or theme_footer()
  *
  *	@param params array() empty
@@ -498,7 +504,7 @@
 }
 
 /**
- *	site_user_header() - everything required to handle security and 
+ *	site_user_header() - everything required to handle security and
  *	add navigation for user pages like /my/ and /account/
  *
  *	@param params array() must contain $user_id
@@ -519,8 +525,8 @@
 
 }
 
-/** 
- *	site_user_footer() - currently a simple shim that should be on every user page, 
+/**
+ *	site_user_footer() - currently a simple shim that should be on every user page,
  *	rather than a direct call to site_footer() or theme_footer()
  *
  *	@param params array() empty
@@ -530,16 +536,16 @@
 
 	echo html_feedback_bottom($GLOBALS['feedback']);
 	echo $HTML->footer($params);
-}	   
+}
 
-/** 
+/**
  *	html_clean_hash_string() - Remove noise characters from hex hash string
- *	
+ *
  *	Thruout SourceForge, URLs with hexadecimal hash string parameters
- *	are being sent via email to request confirmation of user actions. 
+ *	are being sent via email to request confirmation of user actions.
  *	It was found that some mail clients distort this hash, so we take
  *	special steps to encode it in the way which help to preserve its
- *	recognition. This routine 
+ *	recognition. This routine
  *
  *	@param hashstr required hash parameter as received from browser
  *	@return pure hex string
@@ -549,11 +555,11 @@
 	if (substr($hashstr,0,1)=="_") {
 		$hashstr = substr($hashstr, 1);
 	}
-				
+
 	if (substr($hashstr, strlen($hashstr)-1, 1)==">") {
 		$hashstr = substr($hashstr, 0, strlen($hashstr)-1);
 	}
-	
+
 	return $hashstr;
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab	2011-02-24 14:59:22 UTC (rev 8184)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/languages/Base.tab	2011-02-24 14:59:24 UTC (rev 8185)
@@ -399,7 +399,7 @@
 news_utils	nonews	No News Items Found
 news_utils	archive	News archive
 news_utils	submit	Submit News
-news_utils	readmore	<NOBR>Read More/Comment</NOBR>
+news_utils	readmore	Read More/Comment
 people	about_blurb	<P>The $1 Project Help Wanted board is for non-commercial, project volunteer openings. Commercial use is prohibited.<P>Project listings remain live for two weeks, or until closed by the poster, whichever comes first. (Project administrators may always re-post expired openings.)<P>Browse through the category menu to find projects looking for your help.<P>If you're a project admin, log in and submit help wanted requests through your project administration page.<P>To suggest new job categories, submit a request via the support manager.<P>
 people	section	Project Help Wanted
 people	title	Projects Needing Help

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/index_std.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/index_std.php	2011-02-24 14:59:22 UTC (rev 8184)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/index_std.php	2011-02-24 14:59:24 UTC (rev 8185)
@@ -3,21 +3,27 @@
 <tr><td width="65%" valign="top">
 <h2>Welcome to the GForge 3.0 Project!</h2>
 <p>
-GForge is an Open Source collaborative software development tool, which allows you to organize 
-and manage any number of software development projects. It's perfect for managing 
+GForge is an Open Source collaborative software development tool, which allows you to organize
+and manage any number of software development projects. It's perfect for managing
 large teams of software engineers and/or engineers scattered among multiple locations.
+</p>
 <p>
 <strong>Track Bugs, Patches, Feature Requests, and Support Requests</strong>
+</p>
 <p>
-<a href="/tracker/?atid=101&group_id=5&func=browse"><img src="/images/gforge.jpg" width="450" height="268" border="0"></a>
+<a href="/tracker/?atid=101&group_id=5&func=browse"><img src="/images/gforge.jpg" width="450" height="268" border="0" alt="" /></a>
+</p>
 <p>
 <strong>New Project Management Tools:</strong>
+</p>
 <p>
-The new Project Manager allows you to create task lists, constraints, and track the 
+The new Project Manager allows you to create task lists, constraints, and track the
 progress of your project. The data can then be plotted in a standard Gantt chart.
+</p>
 <p>
-<a href="http://dev.gforge.org/pm/task.php?group_id=5&group_project_id=2&func=ganttpage"><img src="/images/gantt.png" width="447" height="230" border="0"></a>
-<p>
+<a href="http://dev.gforge.org/pm/task.php?group_id=5&group_project_id=2&func=ganttpage"><img src="/images/gantt.png" width="447" height="230" border="0" alt="" /></a>
+</p>
+<p />
 
 <?php
 echo $HTML->boxTop($Language->getText('group','long_news'));
@@ -41,26 +47,26 @@
 <a href="http://www.python.org/">Python *</a><br />
 <a href="http://jabberd.jabberstudio.org/">Jabber Server *</a><br />
 * optional
-<p>
+<p />
 <strong>Get Help</strong><br />
 <a href="http://gforge.org/forum/forum.php?forum_id=6"><strong>Help Board</strong></a><br />
 <a href="http://gforge.org/docman/?group_id=1"><strong>Online Docs</strong></a><br />
-<p>
+<p />
 <strong>Contribute!</strong><br />
 <a href="http://gforge.org/projects/gforge/"><strong>GForge Project Page</strong></a><br />
 <a href="http://gforge.org/forum/forum.php?forum_id=5"><strong>Developer Board</strong></a><br />
 <a href="http://gforge.org/forum/forum.php?forum_id=29"><strong>Oracle Board</strong></a><br />
 <a href="http://gforge.org/forum/forum.php?forum_id=44"><strong>SOAP API</strong></a><br />
-<a href="http://gforge.org/tracker/?atid=105&group_id=1&func=browse"><strong>Bug Tracker</strong></a><br />
-<a href="http://gforge.org/tracker/?func=browse&group_id=1&atid=106"><strong>Patch Submissions</strong></a><br />
-<a href="http://gforge.org/tracker/?func=browse&group_id=1&atid=119"><strong>Feature Requests</strong></a>
-<p>
-<a href="http://www.debian.org/"><strong>Debian Users</strong></a> can simply add 
-"http://people.debian.org/~bayle/" to /etc/apt/sources.list and type 
-"apt-get install gforge" to 
-install a working GForge-3.0pre7 system, thanks to Christian Bayle and 
+<a href="http://gforge.org/tracker/?atid=105&group_id=1&func=browse"><strong>Bug Tracker</strong></a><br />
+<a href="http://gforge.org/tracker/?func=browse&group_id=1&atid=106"><strong>Patch Submissions</strong></a><br />
+<a href="http://gforge.org/tracker/?func=browse&group_id=1&atid=119"><strong>Feature Requests</strong></a>
+<p />
+<a href="http://www.debian.org/"><strong>Debian Users</strong></a> can simply add
+"http://people.debian.org/~bayle/" to /etc/apt/sources.list and type
+"apt-get install gforge" to
+install a working GForge-3.0pre7 system, thanks to Christian Bayle and
 the Debian-SF project.
-<p>
+<p />
 <?php
 echo $HTML->boxBottom();
 echo show_features_boxes();

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/news/news_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/news/news_utils.php	2011-02-24 14:59:22 UTC (rev 8184)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/news/news_utils.php	2011-02-24 14:59:24 UTC (rev 8185)
@@ -70,8 +70,6 @@
 		$return .= $Language->getText('news_utils', 'nonews');
 		$return .= db_error();
 	} else {
-		echo '
-			<dl compact="compact">';
 		for ($i=0; $i<$rows; $i++) {
 			if ($show_summaries && $limit) {
 				//get the first paragraph of the story
@@ -82,7 +80,7 @@
 				} else {
 					$summ_txt='<br />'. util_make_links( $arr[0] );
 				}
-				//show the project name 
+				//show the project name
 				if (db_result($result,$i,'type')==2) {
 					$group_type='/foundry/';
 				} else {
@@ -96,11 +94,11 @@
 
 			if (!$limit) {
 				if ($show_forum) {
-					$return .= '<li><a href="/forum/forum.php?forum_id='. db_result($result,$i,'forum_id') .'"><strong>'. db_result($result,$i,'summary') . '</strong></a></li>';
+					$return .= '<li><a href="/forum/forum.php?forum_id='. db_result($result,$i,'forum_id') .'"><strong>'. db_result($result,$i,'summary') . '</strong></a>';
 				} else {
-					$return .= '<li><strong>'. db_result($result,$i,'summary') . '</strong></li>';
+					$return .= '<li><strong>'. db_result($result,$i,'summary') . '</strong>';
 				}
-				$return .= '   <em>'. date($sys_datefmt,db_result($result,$i,'date')).'</em><br />';
+				$return .= '   <em>'. date($sys_datefmt,db_result($result,$i,'date')).'</em><br /></li>';
 			} else {
 				if ($show_forum) {
 					$return .= '
@@ -113,10 +111,10 @@
 					$return .= '
 					<br /> ';
 				}
-				$return .= '   <em>'. db_result($result,$i,'user_name') .' - '. 
-					date($sys_datefmt,db_result($result,$i,'date')). '</em>' . 
+				$return .= '   <em>'. db_result($result,$i,'user_name') .' - '.
+					date($sys_datefmt,db_result($result,$i,'date')). '</em>' .
 					$proj_name . $summ_txt;
-				
+
 				$sql="SELECT total FROM forum_group_list_vw WHERE group_forum_id='" . db_result($result,$i,'forum_id') . "'";
 				$res2 = db_query($sql);
 				$num_comments = db_result($res2,0,'total');
@@ -139,11 +137,14 @@
 			}
 
 			if ($limit==1 && $tail_headlines) {
-				$return .= "<ul>";
+				$return .= "<ul>\n";
 			}
 			if ($limit) {
 				$limit--;
 			}
+			if (!$limit && $i==$rows-1) {
+				$return .= "</ul>\n";
+			}
 		}
 	}
 
@@ -155,7 +156,7 @@
 
 	if ($show_forum) {
 		if ($tail_headlines) {
-			$return .= '</ul><hr width="100%" size="1" noshade="noshade" />'."\n";
+			$return .= '<hr width="100%" size="1" noshade="noshade" />'."\n";
 		}
 
 		$return .= '<div align="center">'
@@ -176,7 +177,7 @@
 function news_foundry_latest($group_id=0,$limit=5,$show_summaries=true) {
 	global $sys_datefmt,$Language;
 	/*
-		Show a the latest news for a portal 
+		Show a the latest news for a portal
 	*/
 
 	$sql="SELECT groups.group_name,groups.unix_group_name,users.user_name,news_bytes.forum_id,news_bytes.summary,news_bytes.date,news_bytes.details ".



More information about the evolvis-commits mailing list