*** empty log message ***

4 files changed, 103 insertions, 10 deletions

diff --git a/app-doc/gentoo-web/files/wiki/devtodo.php b/app-doc/gentoo-web/files/wiki/devtodo.php
index a9b7ebf13b08..58545ae7dfc6 100644
--- a/app-doc/gentoo-web/files/wiki/devtodo.php
+++ b/app-doc/gentoo-web/files/wiki/devtodo.php
@@ -4,11 +4,94 @@
 	main_header( 'Todo by developer' );
 
 	if ( !$devid ) $devid = $uid;
-	$username = mysql_query( "select username from users where uid=$devid" );
-	list( $username ) = mysql_fetch_row( $username );
-
+	$dude = mysql_query( "select * from users where uid=$devid" );
+	$dude = mysql_fetch_array( $dude );
 ?>
-<p style="font-size:medium;font-weight:bold;"><?=$username;?>'s uncompleted todos</p>
+<p style="font-size:medium;font-weight:bold;"><?=$dude['username'];?>'s Bio</p>
+<table width="95%" border=0 cellpadding=5 cellspacing=0>
+<tr>
+	<td width=150 valign="top"><table border=0 cellpadding=1 cellspacing=0 bgcolor="black"><tr><td><img src="bios/<?php if (file_exists('bios/'.$dude['uid'].'.png')) print $dude['uid'].'.png'; else print '0.png'; ?>" width=150 height=150 alt="<?=$dude['username'];?>"></td></tr></table></td>
+
+	<td valign="top">
+	<table border=0 cellpadding=2 cellspacing=0>
+	<tr>
+		<td><b>Real Name:</b></td>
+		<td><?=$dude['realname'];?></td>
+	</tr>
+	<tr>
+		<td><b>Title:</b></td>
+		<td><?=$dude['title'];?></td>
+	</tr>
+	<tr>
+		<td><b>Location:</b></td>
+		<td><?=$dude['location'];?></td>
+	</tr>
+	<tr>
+		<td><b>Email:</b></td>
+		<td><a href="mailto:<?=$dude['email'];?>"><?=$dude['email'];?></a></td>
+	</tr>
+	<tr>
+		<td valign="top"><b>Teams:</b></td>
+		<td>
+		<table border=0 cellpadding=1 cellspacing=0 bgcolor="black"><tr><td>
+		<table border=0 cellpadding=2 cellspacing=0 bgcolor="#bdbacc">
+		<tr>
+			<td>&nbsp;</td>
+			<td align="center"><b>Unaffiliated&nbsp;&nbsp;</b></td>
+			<td align="center"><b>Regular&nbsp;&nbsp;</b></td>
+			<td align="center"><b>Leader</b></td>
+		</tr>
+		<?php
+		// get team info
+		$xteams = $dude['team'];
+		$xteams = explode( ',', $xteams );
+		while ( $each = each($teams) ) {
+			if ( $each['key'] == 0 || $each['key'] == 1 ) continue; // skip 'none' and 'all'
+			$tm = 'u'; // set the default
+			if ( $devid != 'new' ) {
+				// are they a simple member? ...
+				reset( $xteams );
+				while ( $cur = each($xteams) ) {
+					if ( $cur['value'] == $each['key'] ) { $tm = 'r'; break; }
+				}
+				// are they the team LEADER?!?! :)
+				$ldr = mysql_query( 'select leader,gid from teams where gid='.$each['key'] );
+				list( $ldr, $thegid ) = mysql_fetch_row( $ldr );
+				$ldr = explode( ',', $ldr );
+				reset( $ldr );
+				while ( $pair = each($ldr) ) {
+					if ( $pair['value'] == $devid ) {
+						$tm = 'l';
+						$oldlead[] = $thegid;
+						break;
+					}
+				}
+			}
+			if ($tm!='u') {
+			?>
+		<tr>
+			<td><b><?=$each['value'];?></b></td>
+			<td align="center"><?php if ($tm=='u') print '<img src="images/dot.gif" width=10 height=10 alt="">'; else print '&nbsp;'; ?></td>
+			<td align="center"><?php if ($tm=='r') print '<img src="images/dot.gif" width=10 height=10 alt="">'; else print '&nbsp;'; ?></td>
+			<td align="center"><?php if ($tm=='l') print '<img src="images/dot.gif" width=10 height=10 alt="">'; else print '&nbsp;'; ?></td>
+		</tr>
+			<?php
+			}
+		}
+		?>
+		</table>
+		</td></tr></table>
+		</td>
+	</tr>
+	</table>
+	</td>
+
+</tr>
+</table>
+
+<p>&nbsp;</p>
+
+<p style="font-size:medium;font-weight:bold;"><?=$dude['username'];?>'s uncompleted todos</p>
 <table width="95%" border=0 cellpadding=2 cellspacing=2>
 <?php if ( $uid == $devid ) { ?>
 <tr>
@@ -56,7 +139,7 @@
 
 <p>&nbsp;</p>
 
-<p style="font-size:medium;font-weight:bold;"><?=$username;?>'s completed todos</p>
+<p style="font-size:medium;font-weight:bold;"><?=$dude['username'];?>'s completed todos</p>
 <table width="95%" border=0 cellpadding=2 cellspacing=2>
 <tr>
 	<td bgcolor="#dddaec"><b>Title</b></td>
diff --git a/app-doc/gentoo-web/files/wiki/functions.php b/app-doc/gentoo-web/files/wiki/functions.php
index 0cedde7f0257..618eeb235620 100644
--- a/app-doc/gentoo-web/files/wiki/functions.php
+++ b/app-doc/gentoo-web/files/wiki/functions.php
@@ -59,9 +59,9 @@ global $uid, $dbusername; ?>
 <table width="100%" height=96 border=0 cellpadding=0 cellspacing=0>
 <tr>
 	<td align="left"><img src="images/title.gif" width=292 height=96 alt="gentoo linux dev-wiki"></td>
-	<td align="right" background="images/titlebg.gif" width="100%" valign="top">&nbsp;<?php
-		if ( $uid ) { print "<p style=\"margin:0;padding:0 5px 0 0;color:#e0e0e0;\">Logged in as $dbusername.</p>\n<a href=\"index.php?action=logout\"><img src=\"images/logout.gif\" border=0></a>"; }
-	?></p></td>
+	<td align="right" background="images/titlebg.gif" width="100%" valign="top"><?php
+		if ( $uid ) { print "<p style=\"margin:0;padding:5px 5px 0 0;color:#e0e0e0;\">Logged in as $dbusername.<br><a href=\"index.php?action=logout\"><img src=\"images/logout.gif\" border=0></a></p>"; } else { print '&nbsp;'; }
+	?></td>
 </tr>
 </table>
 
diff --git a/app-doc/gentoo-web/files/wiki/teams.php b/app-doc/gentoo-web/files/wiki/teams.php
index f53a195b2830..20484b1f3fde 100644
--- a/app-doc/gentoo-web/files/wiki/teams.php
+++ b/app-doc/gentoo-web/files/wiki/teams.php
@@ -166,10 +166,16 @@
 <p><b>Team Members</b></p>
 <ul>
 <?php
-	$result = mysql_query( "select username,title,email,realname,location from users where team like '%$team_num%'" );
+	$result = mysql_query( "select username,team,title,email,realname,location from users where team like '%$team_num%'" );
 	while ( $dude = mysql_fetch_array($result) ) {
+		$dude['team'] = explode( ',', $dude['team'] );
+		$tmp = 0;
+		while ($each = each($dude['team']) ) {
+			if ($each['value'] == $team_num) { $tmp=1; break; }
+		}
+		if (!$tmp) continue;
 ?>
-	<li> <a href="mailto:<?=$dude['email'];?>"><?=$dude['realname'];?></a> (aka <?=$dude['username'];?>) - <?=$dude['title'];?> from <?=$dude['location'];?>
+		<li> <a href="mailto:<?=$dude['email'];?>"><?=$dude['realname'];?></a> (aka <?=$dude['username'];?>) - <?=$dude['title'];?><?php if ($dude['location']) print ' from '.$dude['location']; ?>
 <?php
 	}
 ?>
diff --git a/app-doc/gentoo-web/files/wiki/useredit.php b/app-doc/gentoo-web/files/wiki/useredit.php
index 6f94bc8c5e8f..1842a9d36b96 100644
--- a/app-doc/gentoo-web/files/wiki/useredit.php
+++ b/app-doc/gentoo-web/files/wiki/useredit.php
@@ -141,6 +141,10 @@ if ( !$xuid ) {
 	<form action="useredit.php" method="post">
 	<table border=0 cellpadding=2 cellspacing=0>
 	<tr>
+		<td align="right"><b>uid:</b></td>
+		<td><?=$dude['uid'];?></td>
+	</tr>
+	<tr>
 		<td align="right"><b>Real Name:</b></td>
 		<td><input type="text" name="realname" maxlength=200 value="<?=$dude['realname'];?>"></td>
 	</tr>