# 
# 
# patch "www/index.php"
#  from [8cda77dbe2da163ecad68bce5e4e9d036025a7d8]
#    to [dbdcfb046def381d796adc242fc9044f45be52d8]
# 
# patch "www/proj-ctrl.php"
#  from [5e750a6316c4026612c6e578c8f604470394b702]
#    to [264aac8e386a717b2e752fdcbdd8a57286c76147]
# 
============================================================
--- www/index.php	8cda77dbe2da163ecad68bce5e4e9d036025a7d8
+++ www/index.php	dbdcfb046def381d796adc242fc9044f45be52d8
@@ -18,26 +18,50 @@
 <div id="contents">
 
 <?
-#$query = "SELECT name, directory FROM projects";
-$query = "SELECT name FROM projects";
-$result = pg_exec($db, $query);
-if (!$result) {printf("ERROR"); }
-$rows = pg_numrows($result);
-for($i = 0; $i < $rows; ++$i) {
-	$row = pg_fetch_row ($result,$i);
+function display_project_summary($row, $maintainer_p) {
+	$pos_project = 0;
+	$pos_directory = 1;
 	printf("<div class=\"record\">\n");
-	printf("<span style=\"font-weight: bold;\">%s</span> | \n", $row[0]);
-	printf("<a href=\"projects/%s/\">Project info page</a> | \n", $row[0]);
-	if ($validuser) {
-		printf("<a href=\"projects/%s/admin.php\">Maintainer Page</a> | \n", $row[0]);
+	printf("<span style=\"font-weight: bold;\">%s</span> | \n", $row[$pos_project]);
+	printf("<a href=\"projects/%s/\">Project info page</a> | \n", $row[$pos_project]);
+	if ($maintainer_p) {
+		printf("<a href=\"projects/%s/admin.php\">Maintainer Page</a> | \n", $row[$pos_project]);
 	}
-	printf("<tt>mtn pull %s.%s \\*</tt>\n", $row[0], $hostname);
+	printf("<tt>mtn pull %s.%s \\*</tt>\n", $row[$pos_project], $hostname);
 	printf("<hr />\n");
-	if (is_file("projects/$row[0]/description")) {
-		print file_get_contents("projects/$row[0]/description");
+	if (is_file("projects/$row[$pos_project]/description")) {
+		print file_get_contents("projects/$row[$pos_project]/description");
 	}
 	printf("</div>\n");
 }
+
+# First, display those maintained by the logged in user, if any
+if ($validuser) {
+#	$query = "SELECT name, directory FROM projects WHERE name IN (SELECT project FROM permissions WHERE username = '%s')";
+	$query = "SELECT name FROM projects WHERE name IN (SELECT project FROM permissions WHERE username = '%s')";
+	$result = pg_exec($db, sprintf($query,$safeuser));
+	if (!$result) {printf("ERROR"); }
+	$rows = pg_numrows($result);
+	if ($rows > 0) {
+		printf("<p><b>Projects you help maintain:</b></p>");
+		for($i = 0; $i < $rows; ++$i) {
+			$row = pg_fetch_row ($result,$i);
+			display_project_summary($row, 1);
+		}
+	}
+}
+#$query = "SELECT name, directory FROM projects WHERE name NOT IN (SELECT project FROM permissions WHERE username = '%s')";
+$query = "SELECT name FROM projects WHERE name NOT IN (SELECT project FROM permissions WHERE username = '%s')";
+$result = pg_exec($db, sprintf($query,$safeuser));
+if (!$result) {printf("ERROR"); }
+$rows = pg_numrows($result);
+if ($rows > 0) {
+	printf("<p><b>Projects you don't help maintain:</b></p>");
+	for($i = 0; $i < $rows; ++$i) {
+		$row = pg_fetch_row ($result,$i);
+		display_project_summary($row, 0);
+	}
+}
 pg_close();
 ?>
 
============================================================
--- www/proj-ctrl.php	5e750a6316c4026612c6e578c8f604470394b702
+++ www/proj-ctrl.php	264aac8e386a717b2e752fdcbdd8a57286c76147
@@ -1,7 +1,6 @@
 <?
 include_once("common-ctrl.php");
 
-
 // Note that this returns an html page, not JSON.
 if ($action === "chhomepage") {
 	header('Content-type: text/html');
@@ -128,8 +127,9 @@
 			$projdir = $serverdir . '/projects/'. $project;
 			$projwww = $serverdir . '/www/projects/'. $project;
 #			$query = "INSERT INTO projects (name, directory) VALUES ('%s', '%s')";
+#			$result = pg_exec($db, sprintf($query, $safeproj, '/foobar'));
 			$query = "INSERT INTO projects (name) VALUES ('%s')";
-			$result = pg_exec($db, sprintf($query, $safeproj, '/foobar'));
+			$result = pg_exec($db, sprintf($query, $safeproj));
 			if(!$result) {
 				$err = true; 
 				print $json->encode(array("error" => "Internal server error."));