Changeset 19962 for trunk

Timestamp:

05/20/20 18:24:40 (5 years ago)

Author:

Daniela Dorner

Message:

added information on who is also in magic

File:

• trunk/www/dch/memberlist.php (modified) (8 diffs)

trunk/www/dch/memberlist.php

@@ -102 +102 @@
     //members where not isnull(start) and not isnull(stop) group by username;
 
-    $selectcurrent="SELECT userid, firstname, middlename, lastname, inst.institutename, also.institutefullname, inst.institutefullname, inst.instituteadresse ";
+    $selectcurrent="SELECT userid, firstname, middlename, lastname, inst.institutename, also.institutefullname, inst.institutefullname, inst.instituteadresse, alsomagic ";
     $selectall="SELECT username, Date(start) AS 'from', if(stop='2020-12-31 23:59:59', 'unlimited', Date(stop)) AS 'until',";
     $selectall.=" DATE(ADDDATE(start, INTERVAL 6 MONTH)) AS 'author since', ";
@@ -123 +123 @@
         break;
     }
-    $selectlist.="inst.institutename, also.institutefullname, inst.institutefullname, inst.instituteadresse  ";
+    $selectlist.="inst.institutename, also.institutefullname, inst.institutefullname, inst.instituteadresse, alsomagic ";
     $from=" FROM memberlist.members ";
     $join=" LEFT JOIN memberlist.institutes inst USING(instituteid) ";
@@ -162 +162 @@
 //    echo $querylist."<br>\n<br>\n";
     echo $_GET["corresponding"];
-    echo "<h3>Current Author List:</h3>\n";
+    $result  = mysql_query($querycurrent);
+    $num_rows = mysql_num_rows($result);
+    echo "<h3>Current Author List: ".$num_rows." authors</h3>\n";
     echo "<table border='1'>\n";
-    echo "<thead><tr><th>*</th><th>First Middle Lastname</th><th>Institute (#)</th><th>also at</th></tr></thead>\n";
+    echo "<thead><tr><th>*</th><th>First Middle Lastname</th><th>Institute (#)</th><th>also at</th><th>also MAGIC</th></tr></thead>\n";
     echo "<tbody>\n";
-    $result  = mysql_query($querycurrent);
     $counter=0;
     $letter=a;
@@ -196 +197 @@
                 $letter++;
             }
-            echo "<td>".$row[5]." (".array_search($row[5], $alsos).") </td></tr>";
-        }
+            echo "<td>".$row[5]." (".array_search($row[5], $alsos).") </td>";
+        }
+        else
+            echo "<td></td>";
+        if ($row[8])
+            echo "<td>y</td></tr>";
         else
             echo "<td></td></tr>";
@@ -282 +287 @@
     else
         echo "<input type=radio name='textformat' value='text'> text <br>";
+    if ($_GET["magic"]=="on")
+        echo "<input type=checkbox name='magic' checked> show magic <br>";
+    else
+        echo "<input type=checkbox name='magic'> show magic <br>";
     echo "<br><input type='submit' value='Get List'>\n";
     echo "</form>\n";
@@ -315 +324 @@
         if ($row[2])
             echo GetSup($textformat, array_search($row[2], $alsos));
+        if ($_GET["magic"]=="on" && $row[5])
+            echo GetSup($textformat, "*");
         echo GetEndl($textformat, ",");
     }
@@ -341 +352 @@
             if ($row[2])
                 echo GetSup($textformat, array_search($row[2], $alsos));
+            if ($row[5])
+                echo GetSup($textformat, "*");
             echo GetEndl($textformat, ",");
         }
@@ -350 +363 @@
     foreach ($alsos as $num => $name)
         echo GetSup($textformat, $num)." also at ".GetBla($textformat, $name).GetEndl($textformat, "");
+    if ($_GET["magic"]=="on")
+        echo GetSup($textformat, "*")." also in MAGIC ";