Changeset 18802 for trunk/www

Timestamp:

04/03/17 05:25:30 (8 years ago)

Author:

Daniela Dorner

Message:

adapted to change of column fValidFrom in DB

Location:

trunk/www/db_po

Files:

• edit_po.php (modified) (2 diffs)
• get_date.php (modified) (1 diff)
• get_values.php (modified) (1 diff)
• insert_po.php (modified) (2 diffs)
• view_po.php (modified) (1 diff)

trunk/www/db_po/edit_po.php

@@ -12 +12 @@
 
     include ("include.php");
-    if (!isset($_SERVER['PHP_AUTH_USER']))
+    if (!isset($_SERVER['PHP_AUTH_USER']) && !isset($_SERVER['PHP_AUTH_PW']))
     {
         header('WWW-Authenticate: Basic realm="Edit FACT Configuration Database"');
@@ -22 +22 @@
         //echo "The password is not yet evaluated, but the username is inserted into the DB.<br>";
         if (!CheckUsernameAndPassword($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'], GetLDAPOptions()))
+        {
+            header('WWW-Authenticate: Basic realm="Edit FACT Configuration Database"');
+            header('HTTP/1.0 401 Unauthorized');
             return;
+        }
     }
 

trunk/www/db_po/get_date.php

@@ -86 +86 @@
         $query0.=" FROM History ";
         if (empty($identifier1))
-            $query0.=" WHERE NOT fValidFrom='0000-00-00 00:00:00' ";
+            $query0.=" WHERE NOT fValidFrom='1970-01-01 00:00:00' ";
         else
             $query0.=" WHERE Date_Format(fValidFrom, '". $identifier1."')='".$_GET["fStatusDate"]."'";

trunk/www/db_po/get_values.php

@@ -142 +142 @@
                    $_GET["fGetValCase"], $row0[0], $row0[12], $row0[6], $_GET["fGetValCase"], $row0[0], $row0[12]);
             //valid from
-            //if (strcmp('0000-00-00 00:00:00', $row0[1])==0)
+            //if (strcmp('1970-01-01 00:00:00', $row0[1])==0)
             //    printf("<td class='validsince%d' style='display:%s' id='notyetvalid%s'> %s </td>\n", $_GET["fGetValCase"], $generalshowhide, $row0[0], $row0[1]);
             //else
             //    printf("<td class='validsince%d' style='display:%s'> %s </td>\n", $_GET["fGetValCase"], $generalshowhide, $row0[1]);
-            if (strcmp('0000-00-00 00:00:00', $row0[1])==0)
+            if (strcmp('1970-01-01 00:00:00', $row0[1])==0)
                 printf("<td class='validsince%d' style='display:none' id='notyetvalid%s'> %s </td>\n", $_GET["fGetValCase"], $row0[0], $row0[1]);
             else

trunk/www/db_po/insert_po.php

@@ -190 +190 @@
         $query0.=" WHERE fIndex=".$_GET["fIndex"];
     if ($_GET["fUpdCase"]==6)
-        $query0.=" AND fValidFrom='0000-00-00 00:00:00'";
+        $query0.=" AND fValidFrom='1970-01-01 00:00:00'";
     $query0.=";";
 
@@ -204 +204 @@
         if ($_GET["fUpdCase"]==3 || $_GET["fUpdCase"]==4)
             $query0.=" AND NOT fIndex=".$_GET["fIndex"];
-        $query0.=" AND ((NOT ISNULL(fValue) AND NOT fValidFrom='0000-00-00 00:00:00') ";//normal entries, but not deleted ones
-        $query0.=" OR (ISNULL(fValue) AND fValidFrom='0000-00-00 00:00:00')); ";//new entries
+        $query0.=" AND ((NOT ISNULL(fValue) AND NOT fValidFrom='1970-01-01 00:00:00') ";//normal entries, but not deleted ones
+        $query0.=" OR (ISNULL(fValue) AND fValidFrom='1970-01-01 00:00:00')); ";//new entries
 
         //insert new counter to history

trunk/www/db_po/view_po.php

@@ -27 +27 @@
     mysql_select_db($db);
 
-    $query0="SELECT DATE_FORMAT(fValidFrom, '%Y') AS valid FROM History WHERE NOT fValidFrom='0000-00-00 00:00:00' group by valid";
+    $query0="SELECT DATE_FORMAT(fValidFrom, '%Y') AS valid FROM History WHERE NOT fValidFrom='1970-01-01 00:00:00' group by valid";
     $result0=mysql_query($query0, $db_id);