Index: trunk/www/dch/shiftinfo.php
===================================================================
--- trunk/www/dch/shiftinfo.php	(revision 15312)
+++ trunk/www/dch/shiftinfo.php	(revision 17150)
@@ -11,5 +11,5 @@
 
 
-<a href='https://www.fact-project.org/smartfact'>Is FACT taking data?</a><br>
+<a href='https://www.fact-project.org/smartfact'>Is FACT taking data?</a><br><br>
 Who is on shift? 
 (from <a href='https://www.fact-project.org/shift'>FACT shift plan<a>
@@ -17,12 +17,17 @@
 
 <?php
-$date=date("Ymd", mktime(0,0,date("H"-13),date("m"), date("d"), date("Y")));
-echo "<br> &nbsp;&nbsp;Night: ".$date." (date of sunset) <br>";
-$query="SELECT u FROM calendar.data WHERE CONCAT(y, LPAD(m+1, 2, 0), LPAD(d,2,0))='".$date."' AND x=0 ";
+
+if (date("H")>8)
+    $today=date("Ymd", mktime(0,0,0,date("m"), date("d"), date("Y")));
+else
+    $today=date("Ymd",strtotime(date("Y-m-d", mktime(0,0,0,date("m"), date("d"), date("Y")))." -1 day"));
+
+echo "<br> &nbsp;&nbsp;Night: ".$today." (date of sunset) <br>";
+$query="SELECT u FROM calendar.data WHERE CONCAT(y, LPAD(m+1, 2, 0), LPAD(d,2,0))='".$today."' AND x=0 ";
 //echo $query;
 include ("db.php");
 $db_id = mysql_connect($host, $user, $pw);
 $result  = mysql_query($query);
-echo "&nbsp;&nbsp;Contact Info: <br>\n <ul>\n";
+echo "&nbsp;&nbsp;Contact Info Shiftcrew: <br>\n <ul>\n";
 while ($row = mysql_fetch_row($result))
 {
@@ -37,6 +42,17 @@
     mysql_free_result($result2);
 }
+echo "</ul>\n <br>\n <br>\n ";
+mysql_free_result($result);
+
+echo "General Contact Info: <br>\n <ul>\n";
+$query3="SELECT usertitle, fid8 FROM logbook.userfields LEFT JOIN logbook.users ON (uid=ufid) WHERE username='dorner'";
+$result3  = mysql_query($query3);
+while ($row3 = mysql_fetch_row($result3))
+{
+    echo "<li>".$row3[0].": ".$row3[1]."</li>\n";
+}
+mysql_free_result($result3);
+
 echo "</ul>\n";
-mysql_free_result($result);
 
 ?>