Changeset 18681 for trunk/www

Timestamp:

12/13/16 06:18:42 (8 years ago)

Author:

dneise

Message:

combine with shifthelper

- make utf8 complliant
- don't use contact info anymore
- break out some functions, less varnames with numbers 1 2 3

File:

• trunk/www/dch/shiftinfo.php (modified) (4 diffs)

trunk/www/dch/shiftinfo.php

@@ -12 +12 @@
 
 <a href='https://www.fact-project.org/smartfact'>Is FACT taking data?</a><br><br>
-Who is on shift? 
+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>)
 
-<!--#!/usr/bin/php-->
 <?php
 
@@ -32 +31 @@
 }
 
+
 function send_email($date, $msg_part)
 {
-    //echo "WARNING: no shift crew found -> need to send email.<br>\n";
     $to = "fact-online@lists.phys.ethz.ch";
-    //$to = "dorner@astro.uni-wuerzburg.de";
     $subject = $date.": shifter-info missing";
     $msg = "WARNING: No shifter-info available for ".$date."\n\n";
@@ -45 +43 @@
 }
 
+function get_userinfo($db, $username)
+{
+    // this is getting exactly one entry from the DB, since we get only
+    // one username, which is unique in the DB.
+    $query="SELECT username as login, usertitle as name, email, fid5 as mobile, fid7 as skype
+        FROM logbook.userfields
+        LEFT JOIN logbook.users
+        ON (uid=ufid)
+        WHERE username='".$username."'";
+    $result  = $db->query($query);
+    $all = $result->fetch_assoc();
+    $result->free();
+    return $all;
+}
+
+
+function get_expertinfo($db)
+{
+
+    $query="SELECT username as login, usertitle as name, email, fid5 as mobile, fid7 as skype
+        FROM logbook.userfields
+        LEFT JOIN logbook.users ON (uid=ufid)
+        LEFT JOIN memberlist.experts
+        ON (ufid=userid)
+        WHERE now() < stop and now() > start";
+    $result  = $db->query($query);
+    $all = $result->fetch_all(MYSQLI_ASSOC);
+    $result->free();
+    return $all;
+}
+
+function userinfo_to_string($userinfo){
+    $s = $userinfo['name'] . "[" .$userinfo['login']."]" . ": <br>";
+    $s .= "    email:" . $userinfo['email'] . "<br>";
+    $s .= "    mobile:" . $userinfo['mobile'] . "<br>";
+    $s .= "    skype:" . $userinfo['skype'] . "<br>";
+    return $s;
+}
+
+function send_warning_mail_to_user($userinfo){
+    $msg = "Dear " . $userinfo['name'] . "[".$userinfo['login']."]" ."\n\n";
+    $msg .= ", please insert your 'Shifthelper Mobile Phone Number' in ";
+    $msg .= ' https://www.fact-project.org/logbook/usercp.php?action=profile';
+    send_email($today, $msg);
+
+}
 
 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."'";
-//excluding experts and institutes (apart from 'moon')
 $query.=" AND NOT x=1 AND u NOT in('ISDC','ETHZ','TUDO','UNIWUE')";
 include ("db.php");
-$db_id = mysql_connect($host, $user, $pw);
-$result  = mysql_query($query);
-$numrows=mysql_num_rows($result);
+$db = new mysqli($host, $user, $pw, $database);
+$db->set_charset("utf8");
+$result  = $db->query($query);
+$numrows=mysqli_num_rows($result);
 if ($numrows==0)
     send_email($today, "Whoever is on shift, please insert your name to the shift calendar!\n");
@@ -59 +103 @@
     echo "&nbsp;&nbsp;Contact Info Shiftcrew: <br>\n ";
 echo "<ul>\n";
-while ($row = mysql_fetch_row($result))
+while ($row = $result->fetch_assoc())
 {
-    $query2="SELECT usertitle, fid8 FROM logbook.userfields LEFT JOIN logbook.users ON (uid=ufid) WHERE username='".$row[0]."'";
-    $result2  = mysql_query($query2);
-    while ($row2 = mysql_fetch_row($result2))
-    {
-        echo "<li>".$row2[0].": ".$row2[1]."</li>\n";
-        if (!$row2[1])
-            send_email($today, "Dear ".$row2[0].", please insert your 'Contact Info' in your logbook user-profile!");
+    
+    $userinfo = get_userinfo($db, $row['u']);
+    if ($userinfo['name']){
+        echo "<li>".userinfo_to_string($userinfo)."</li>\n";
+        if (!$userinfo['mobile'])
+            send_warning_mail_to_user($userinfo);
     }
-    mysql_free_result($result2);
 }
 echo "</ul>\n <br>\n <br>\n ";
-mysql_free_result($result);
+$result->free();
 
 echo "Expert-On-Call Contact Info: <br>\n <ul>\n";
-$query3="SELECT usertitle, fid8 FROM logbook.userfields LEFT JOIN logbook.users ON (uid=ufid) LEFT JOIN memberlist.experts ON (ufid=userid) WHERE now() < stop and now() > start";
-$result3  = mysql_query($query3);
-while ($row3 = mysql_fetch_row($result3))
-{
-    echo "<li>".$row3[0].": ".$row3[1]."</li>\n";
+
+foreach (get_expertinfo($db) as $expertinfo) {
+    echo "<li>".userinfo_to_string($expertinfo)."</li><br>\n";
+
 }
-mysql_free_result($result3);
 echo "</ul>\n";
-
-/*
-echo "General Contact Info: <br>\n <ul>\n";
-$query4="SELECT usertitle, fid8 FROM logbook.userfields LEFT JOIN logbook.users ON (uid=ufid) WHERE username='dorner'";
-$result4  = mysql_query($query4);
-while ($row4 = mysql_fetch_row($result4))
-{
-    echo "<li>".$row4[0].": ".$row4[1]."</li>\n";
-}
-mysql_free_result($result4);
-echo "</ul>\n";
-*/
-
 ?>