jens/ShoppingList
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: jens:0971e3cfaf0856958d328b003b219b6a7559fcd3
Branches Tags
jens:master jens:development
...
compare: jens:master
Branches Tags
jens:master jens:development

4 Commits
0971e3cfaf ... master

Author SHA1 Message Date
jens
198f25277b Update 'phpInterface/shoppingListConfig.php' 
Added Mysql SSL
 2022-03-15 13:03:27 +01:00
jens
78b35b84f2 Update 'phpInterface/shoppingList.php' 
Added Mysql SSL
 2022-03-15 13:02:42 +01:00
jens
f7c470f5a1 Upload files to 'phpInterface' 
Preselect product that has just been added.
 2021-05-13 14:51:36 +02:00
Jens
6d828fe56e Error display deactivated. 2021-05-09 23:21:14 +02:00
2 changed files with 1904 additions and 1900 deletions
Expand all files Collapse all files

40
phpInterface/shoppingList.php
View File

@ -47,7 +47,14 @@
{ {
if(DBLink::$sqlLink == null) if(DBLink::$sqlLink == null)
{ {
DBLink::$sqlLink = new mysqli(Configuration::$mysqlserver, Configuration::$mysqluser, Configuration::$mysqlpw, Configuration::$mysqldb, Configuration::$mysqlPort); DBLink::$sqlLink = mysqli_init();
if(Configuration::$mysqlSSL)
{
DBLink::$sqlLink->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, true);
DBLink::$sqlLink->ssl_set(NULL, NULL, Configuration::$mysqlSslCertificatePath, NULL, NULL);
}
DBLink::$sqlLink->real_connect(Configuration::$mysqlserver, Configuration::$mysqluser, Configuration::$mysqlpw, Configuration::$mysqldb, Configuration::$mysqlPort);
// Verbindung überprüfen // Verbindung überprüfen
if (mysqli_connect_errno()) if (mysqli_connect_errno())
@ -206,6 +213,7 @@
if ($mysqli_result) if ($mysqli_result)
{ {
$this->ensurePlausibility(); $this->ensurePlausibility();
$this->setID(DBLink::getDbLink()->insert_id);
return true; return true;
} }
@ -341,7 +349,10 @@
$mysqli_result = DBLink::getDbLink()->query($SQL_command); $mysqli_result = DBLink::getDbLink()->query($SQL_command);
if ($mysqli_result) if ($mysqli_result)
{
$this->setID(DBLink::getDbLink()->insert_id);
return true; return true;
}
return false; return false;
} }
@ -479,6 +490,7 @@
if ($mysqli_result) if ($mysqli_result)
{ {
$this->setID(DBLink::getDbLink()->insert_id);
return true; return true;
} }
@ -619,6 +631,7 @@
if ($mysqli_result) if ($mysqli_result)
{ {
$this->setID(DBLink::getDbLink()->insert_id);
return true; return true;
} }
@ -778,6 +791,7 @@
if ($mysqli_result) if ($mysqli_result)
{ {
$this->setID(DBLink::getDbLink()->insert_id);
return true; return true;
} }
@ -878,9 +892,7 @@
} }
} }
?> /*
<!--
▄▄ ▄▄ ▄▄▄▄▄▄ ▄▄▄ ▄▄ ▄ ▄▄ ▄▄ ▄▄▄▄▄▄ ▄▄▄ ▄▄ ▄
█ █▄█ █ █ █ █ █ █ █ █▄█ █ █ █ █ █ █
█ █ ▄ █ █ █▄█ █ █ █ ▄ █ █ █▄█ █
@ -905,7 +917,8 @@
█ █ █ █ █ ▄ █ █ █ █ █ █ ▄ █
█▄▄▄█ █▄▄▄▄▄▄▄█▄▄▄▄▄▄▄█▄▄█ █▄▄█ █▄▄▄█ █▄▄▄▄▄▄▄█▄▄▄▄▄▄▄█▄▄█ █▄▄█
--> */
?>
<html> <html>
<head> <head>
@ -1083,7 +1096,10 @@
$p->setStoreType(StoreType::getById($_POST['productStoreTypeId'])); $p->setStoreType(StoreType::getById($_POST['productStoreTypeId']));
if($p->create()) if($p->create())
{
echo "Product has been created."; echo "Product has been created.";
$justCreatedProductId = $p->getID();
}
else else
echo "Product could not be created: ".mysqli_error(DBLink::getDbLink()); echo "Product could not be created: ".mysqli_error(DBLink::getDbLink());
} }
@ -1239,7 +1255,6 @@
mysqli_close(DBLink::getDbLink()); mysqli_close(DBLink::getDbLink());
function addToList($productId, $amount, $unitId) function addToList($productId, $amount, $unitId)
{ {
if($productId > 0 && $amount != 0 && isset($unitId) && strlen($unitId) > 0) if($productId > 0 && $amount != 0 && isset($unitId) && strlen($unitId) > 0)
@ -1292,7 +1307,6 @@
echo "Specifiy product, amount and unit."; echo "Specifiy product, amount and unit.";
} }
function removeFromList($productId, $listId, $amount, $unitId) function removeFromList($productId, $listId, $amount, $unitId)
{ {
if($productId > 0 && $amount != null && $unitId > 0) if($productId > 0 && $amount != null && $unitId > 0)
@ -1320,19 +1334,7 @@
<select name=\"productId\" id=\"productId\"> <select name=\"productId\" id=\"productId\">
<option value=\"0\">Select product to add</option> <option value=\"0\">Select product to add</option>
"; ";
/*
$SQL_command = "SELECT id, name FROM `products` ORDER BY name ASC";
$mysqli_result = DBLink::getDbLink()->query($SQL_command);
while ($row = mysqli_fetch_object($mysqli_result))
{
$currentId = (int)$row->id;
if(isset($justCreatedProductId) && $justCreatedProductId === $currentId)
echo "<option value=\"".$row->id."\" selected="selected">".$row->name."</option>";
else
echo "<option value=\"".$row->id."\">".$row->name."</option>";
}
*/
foreach(Product::getAllProducts() as $product) foreach(Product::getAllProducts() as $product)
{ {
$currentId = (int)$product->getID(); $currentId = (int)$product->getID();

2
phpInterface/shoppingListConfig.php
View File

@ -7,6 +7,8 @@
public static $mysqlpw = 'somePassword'; //Password public static $mysqlpw = 'somePassword'; //Password
public static $mysqldb = 'shoppingList'; //Database public static $mysqldb = 'shoppingList'; //Database
public static $mysqlPort = 3306; public static $mysqlPort = 3306;
public static $mysqlSSL = false;
public static $mysqlSslCertificatePath = "/etc/ssl/certs/yourCert.crt";
public static $rhasspyMasterUrl = "http://rhasspy-master:12101"; // URL of your Rhasspy master webpage WITHOUT ending slash. It is required if you want to trigger a retraining. public static $rhasspyMasterUrl = "http://rhasspy-master:12101"; // URL of your Rhasspy master webpage WITHOUT ending slash. It is required if you want to trigger a retraining.
} }
?> ?>