Index: /trunk/www/dch/memberlist.php
===================================================================
--- /trunk/www/dch/memberlist.php	(revision 19097)
+++ /trunk/www/dch/memberlist.php	(revision 19098)
@@ -142,5 +142,5 @@
 
 
-    $current=" AND ADDDATE(start, INTERVAL 6 MONTH) < '".$date."' AND ADDDATE(stop, INTERVAL 1 YEAR) > '".$date."' ";
+    $current=" AND ADDDATE(start, INTERVAL 6 MONTH) <= '".$date."' AND ADDDATE(stop, INTERVAL 1 YEAR) >= '".$date."' ";
     $order=" ORDER BY lastname";
     $querycurrent=$selectcurrent.$from.$join.$where.$current;
@@ -207,5 +207,4 @@
     mysql_free_result($result);
 
-
     echo "<h3>Institute List:</h3>\n";
     echo "<table border='1'>\n";
@@ -236,4 +235,27 @@
     mysql_free_result($result);
 
+
+    $queryassoc="SELECT username, firstname, middlename, lastname, Date(associatedstart), if(associatedstop='2020-12-31 23:59:59', 'unlimited', Date(associatedstop)), inst.institutename FROM memberlist.members LEFT JOIN memberlist.institutes inst USING(instituteid) ";
+    $queryassoc.="WHERE not isnull(associatedstop) ORDER BY associatedstart";
+    //$queryassoc.="WHERE associatedstart <= '".$date."' AND associatedstop >= '".$date."' ";
+    //echo $queryassoc;
+    $result  = mysql_query($queryassoc);
+    //associated members
+    echo "<h3>Associated Members:</h3>\n";
+    echo "<table border='1'>\n";
+    echo "<tbody>\n";
+    echo "<thead><tr><th>First Middle Lastname</th><th>associated since</th><th>associated until</th><th>Host Institute (#)</th></tr></thead>\n";
+    while ($row = mysql_fetch_row($result))
+    {
+        echo "<tr>";
+        echo "<td>".$row[1]." ".$row[2]." ".$row[3]."</td>";
+        echo "<td>".$row[4]."</td>";
+        echo "<td>".$row[5]."</td>";
+        echo "<td>".mb_convert_encoding($row[6], 'utf-8', 'iso-8859-1')." (".array_search($row[6], $institutes).")</td>";
+    }
+
+    echo "</tbody>\n";
+    echo "</table>\n<br>\n";
+    mysql_free_result($result);
 
     echo "<form name='formular' action='memberlist.php' METHOD='GET'>\n";