Index: /trunk/www/dch/shiftinfo.php
===================================================================
--- /trunk/www/dch/shiftinfo.php	(revision 19742)
+++ /trunk/www/dch/shiftinfo.php	(revision 19743)
@@ -14,6 +14,5 @@
 Who is on shift?
 (from <a href='https://www.fact-project.org/shift'>FACT shift plan<a>
-and <a href='https://www.fact-project.org/logbook/memberlist.php'>FACT logbook<a>)
-
+and <a href='https://www.fact-project.org/logbook/memberlist.php'>FACT logbook<a>)<br>
 <?php
 
@@ -67,5 +66,5 @@
 
 
-function get_expertinfo($db)
+function get_expertinfo($db, $type)
 {
     $query="SELECT username as login, usertitle as name, email, fid5 as mobile, fid7 as skype, fid8 as contactinfo, fid6 as availability
@@ -74,5 +73,5 @@
         LEFT JOIN memberlist.experts
         ON (ufid=userid)
-        WHERE now() < stop and now() > start";
+        WHERE now() < stop and now() > start AND not isnull (".$type.")";
     $result  = $db->query($query);
     $all = $result->fetch_all(MYSQLI_ASSOC);
@@ -128,10 +127,42 @@
     }
 }
-echo "</ul>\n <br>\n <br>\n ";
+echo "</ul>\n <br>\n";
 $result->free();
+
+echo "Remark for MAGIC shifters: please keep in mind that FACT shifters and experts will \n ";
+echo "usually be asleep during the night, so that messages on skype or by email might stay \n ";
+echo "unnoticed until the next morning.<br>\n  <br>\n ";
+
 
 echo "Expert-On-Call Contact Info: <br>\n <ul>\n";
 
-foreach (get_expertinfo($db) as $expertinfo)
+foreach (get_expertinfo($db, "expert") as $expertinfo)
+{
+    echo "<li>".userinfo_to_string($expertinfo)."</li><br>\n";
+
+}
+echo "</ul>\n";
+
+echo "Flare-Expert-On-Call Contact Info: <br>\n <ul>\n";
+
+foreach (get_expertinfo($db, "flare") as $expertinfo)
+{
+    echo "<li>".userinfo_to_string($expertinfo)."</li><br>\n";
+
+}
+echo "</ul>\n";
+
+echo "SH-Expert-On-Call Contact Info: <br>\n <ul>\n";
+
+foreach (get_expertinfo($db, "sh") as $expertinfo)
+{
+    echo "<li>".userinfo_to_string($expertinfo)."</li><br>\n";
+
+}
+echo "</ul>\n";
+
+echo "Fallback-Shifter Contact Info: <br>\n <ul>\n";
+
+foreach (get_expertinfo($db, "fallback") as $expertinfo)
 {
     echo "<li>".userinfo_to_string($expertinfo)."</li><br>\n";