From 36218b959469d51958e1128158cc47a3e926620b Mon Sep 17 00:00:00 2001
From: Development <development@jupiter4.fritz.box>
Date: Fri, 25 Sep 2020 14:22:51 +0200
Subject: [PATCH] fixing some database issues

---
 includes/mysql.php     | 14 ++++++++++----
 index.php              |  6 +++---
 pages/edit_vendors.php | 30 +++++++++++++++---------------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/includes/mysql.php b/includes/mysql.php
index c104a27..7a6755e 100755
--- a/includes/mysql.php
+++ b/includes/mysql.php
@@ -2,24 +2,30 @@
 
   $MysqlErrorsArePresent = 0;
   $GlobalMysqlHandler=mysqli_connect($GlobalMysqlHost,$GlobalMysqlUser,$GlobalMysqlPwd);
-  
+
   if (!$GlobalMysqlHandler)
   {
-    ErrorLog("[mysql.php] Can not connect to mysql database \"$GlobalMysqlHost\" as \"$GlobalMysqlUser\"!");
+    $err_msg = "Cannot connect to mysql database \"$GlobalMysqlHost\" as \"$GlobalMysqlUser\"!";
+    $err_msg += "\nErrno: " . mysqli_connect_errno();
+    $err_msg += "\nError: " . mysqli_connect_error();
+    ErrorLog($err_msg);
     $MysqlErrorsArePresent = 1;
   }
   else
   {
     if (!mysqli_select_db($GlobalMysqlHandler, $GlobalMysqlDatabase))
     {
-      ErrorLog("[mysql.php] Can not select mysql database \"$GlobalMysqlDatabase\"!");
+      $err_msg = "Cannot select mysql database \"$GlobalMysqlDatabase\"!";
+      $err_msg += "\nErrno: " . mysqli_connect_errno();
+      $err_msg += "\nError: " . mysqli_connect_error();
+      ErrorLog($err_msg);
       $MysqlErrorsArePresent = 2;
     }
   }
 
   if ($MysqlErrorsArePresent)
     MessageError(LangSpellHtml('SentenceDatabaseError'));
-    
+
   function MysqlCloseDb ()
   {
     global $GlobalMysqlHandler;
diff --git a/index.php b/index.php
index e1448a8..0ac42b3 100755
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-$StartTime=time()+microtime();
+$StartTime = microtime(true);
 
 //set ToDo var
 if (isset($_GET['ToDo']))
@@ -97,14 +97,14 @@ MysqlCloseDb();
 
 if ($GlobalDebungMode)
 {
-  $StopTime=time()+microtime();
+  $StopTime = microtime(true);
   $TimeSpan=ceil(($StopTime-$StartTime)*1000);
   if ($TimeSpan<0)
   {
     ErrorLog("Execution time negative, start: '$StartTime' stop: '$StopTime' timespan: '$TimeSpan'!");
     echo "Start time: <strong>$StartTime s</strong><br>\n";
     echo "Stop time: <strong>$StopTime s</strong><br>\n";
-  }    
+  }
   echo "Script execution time: <strong>$TimeSpan ms</strong><br>\n";
 }
 ?>
diff --git a/pages/edit_vendors.php b/pages/edit_vendors.php
index aa2850a..ef7ca5f 100755
--- a/pages/edit_vendors.php
+++ b/pages/edit_vendors.php
@@ -13,7 +13,7 @@ if (UserHasRight('EditVendors'))
     $Homepage = (isset($_POST['Homepage']))? $_POST['Homepage']:"";
     $MinBill = (isset($_POST['MinBill']))? OtherConvertToFloat($_POST['MinBill']):0;
     $ShippingCost = (isset($_POST['ShippingCost']))? OtherConvertToFloat($_POST['ShippingCost']):0;
-    
+
     if (LockIsActive('Vendors',$_POST['Id']))
     {
       MessageError(LangSpellHtml('SentenceLockIsActive'));
@@ -66,7 +66,7 @@ if (UserHasRight('EditVendors'))
     {
       MessageError(LangSpellHtml('SentenceLockIsActive'));
     }
-      
+
   }
 
   //////////////
@@ -77,7 +77,7 @@ if (UserHasRight('EditVendors'))
     $Homepage = (isset($_POST['Homepage']))? $_POST['Homepage']:"";
     $MinBill = (isset($_POST['MinBill']))? OtherConvertToFloat($_POST['MinBill']):0;
     $ShippingCost = (isset($_POST['ShippingCost']))? OtherConvertToFloat($_POST['ShippingCost']):0;
-    
+
     if (!$Name)
     {
       $Error=1;
@@ -85,19 +85,19 @@ if (UserHasRight('EditVendors'))
     }
     else
     {
-      $InsertVendorQuery = "INSERT INTO `Vendors` ( `Name` , `Homepage` , `MinBill` , `ShippingCost` ) VALUES ( '$Name', '$Homepage', '$MinBill', '$ShippingCost' );";
-      if (!mysqli_query($GlobalMysqlHandler, $InsertVendorQuery))
-      {
-        ErrorLog("[edit_vendors.php] Database error while insert new vendor!");
+      $InsertVendorQuery = "INSERT INTO `Vendors` (`Name`, `Homepage`, `MinBill`, `ShippingCost`, `LockId`, `LockTime`) VALUES ('$Name', '$Homepage', '$MinBill', '$ShippingCost', 0, 0);";
+      if (mysqli_query($GlobalMysqlHandler, $InsertVendorQuery) === false) {
+        $err_msg = "Database error while insert new vendor!";
+        $err_msg += "\nErrno: " . mysqli_connect_errno();
+        $err_msg += "\nError: " . mysqli_connect_error();
+        ErrorLog($err_msg);
         MessageError(LangSpell('SentenceDatabaseError'));
-      }
-      else
-      {
+      } else {
         MessageSuccess(LangSpell('EditVendorsSentenceVendorNewAdded'));
       }
     }
   }
-  
+
   //////////////////
   //cancel editing
   if ($ToDo=="CancelEditVendor")
@@ -116,11 +116,11 @@ if (UserHasRight('EditVendors'))
 }
 
 if(UserHasRight('EditVendors') || UserHasRight('ViewSTPV'))
-{  
+{
   //////////////////
   //global content
   $GlobalContent.='<table>'."\n";
-  
+
   $GlobalContent.=' <tr>'."\n";
   $GlobalContent.='   <th>'.LangSpellHtml('EditVendorsId').'</th>'."\n";
   $GlobalContent.='   <th>'.LangSpellHtml('EditVendorsName').'</th>'."\n";
@@ -130,7 +130,7 @@ if(UserHasRight('EditVendors') || UserHasRight('ViewSTPV'))
   if (UserHasRight('EditVendors'))
     $GlobalContent.='   <th colspan="2">'.LangSpellHtml('EditVendorsEdit').'</th>'."\n";
   $GlobalContent.=' </tr>'."\n";
-  
+
   $VendorQuery = "SELECT * FROM `Vendors`";
   $VendorQuery = mysqli_query($GlobalMysqlHandler, $VendorQuery);
   while ($Vendor=mysqli_fetch_array($VendorQuery))
@@ -189,7 +189,7 @@ if(UserHasRight('EditVendors') || UserHasRight('ViewSTPV'))
     $GlobalContent.=' </tr>'."\n";
     $GlobalContent.=' </form>'."\n";
   }
-  
+
   $GlobalContent.='</table>'."\n";
 }
 else