Changeset 18882 for trunk

Timestamp:

06/17/17 17:45:15 (7 years ago)

Author:

Daniela Dorner

Message:

adapted to stricter server

File:

• trunk/www/dch/shifteval.php (modified) (6 diffs)

trunk/www/dch/shifteval.php

@@ -8 +8 @@
 <?php
 
-    echo (file_get_contents("../shifteval/header.html"));
+    //echo (file_get_contents("../shifteval/header.html"));
 
     if (!empty($_GET["startdate"]))
@@ -113 +113 @@
         while ($rowshifters = mysql_fetch_row($resultshifters))
         {
+            if(!isset($shifthours[$rowshifters[0]]))
+               $shifthours[$rowshifters[0]]=0;
+            if(!isset($totalhours[$rowshifters[0]]))
+               $totalhours[$rowshifters[0]]=0;
+            if (!isset($affiliation[$rowshifters[0]]))
+            {
+               $affiliation[$rowshifters[0]] = $rowshifters[0];
+               $institutes2[$rowshifters[0]] = 0;
+               $institutenames[$rowshifters[0]] = $rowshifters[0];
+               $institutetotalhours[$rowshifters[0]] = 0;
+               $instituteshifthours[$rowshifters[0]] = 0;
+            }
+
             $shifthours[$rowshifters[0]]+=$numhours/mysql_num_rows($resultshifters);
             $totalhours[$rowshifters[0]]+=$numhours/mysql_num_rows($resultshifters);
@@ -125 +138 @@
         while ($rowdebug = mysql_fetch_row($resultdebug))
         {
+            if(!isset($debughours[$rowdebug[0]]))
+               $debughours[$rowdebug[0]]=0;
+            if(!isset($totalhours[$rowdebug[0]]))
+               $totalhours[$rowdebug[0]]=0;
+
             $debughours[$rowdebug[0]]+=$numhours*0.5;
             $totalhours[$rowdebug[0]]+=$numhours*0.5;
@@ -149 +167 @@
         while ($rowexperts = mysql_fetch_row($resultexperts))
         {
+            if (!isset($experthours[$rowexperts[0]]))
+                $experthours[$rowexperts[0]]=0;
+
             $experthours[$rowexperts[0]]+=$numhours/mysql_num_rows($resultexperts)/$devide;
             $totalhours[$rowexperts[0]]+=$numhours/mysql_num_rows($resultexperts)/$devide;
@@ -174 +195 @@
         //if (!$institutetotalhours[$id])
         //    continue;
+
+        if ($institutes2[$id]==0)
+           continue;
+
         echo "<tr><td>";
         echo $name;//."(".$id.")";
@@ -188 +213 @@
     foreach ($users as $name=>$id)
     {
-        if (!$totalhours[$id])
+        if (!isset($totalhours[$id]) || !$totalhours[$id])
             continue;
+
+        if(!isset($totalhours[$id]))
+           $totalhours[$id]=0;
+        if(!isset($debughours[$id]))
+           $debughours[$id]=0;
+        if(!isset($experthours[$id]))
+           $experthours[$id]=0;
+
         echo "<tr><td>";
         echo $name;//." (".$id.")";