pcwvanbeers/assetmgt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Database merge

Browse Source
This commit is contained in:
“VeLiTi”
2024-04-15 15:21:23 +02:00
parent 9803dcb9a1
commit df51ba8e58
17 changed files with 76 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/v0/authorization.php
View File

@@ -15,7 +15,7 @@ if (!empty($username) && !empty($password)) {
$username = strip_tags(trim($username));
$password = strip_tags(trim($password));
$conn = new mysqli($db,$dbuser,$dbpw,$dbname_users);
$conn = new mysqli($db,$dbuser,$dbpw,$dbname);
if ($conn->connect_error) {
die("Connection failed: " . $conn->connect_error);
}

2
api/v0/get/authorization.php
View File

@@ -15,7 +15,7 @@ if (!empty($username) && !empty($password)) {
$username = strip_tags(trim($username));
$password = strip_tags(trim($password));
$conn = new mysqli($db,$dbuser,$dbpw,$dbname_users);
$conn = new mysqli($db,$dbuser,$dbpw,$dbname);
if ($conn->connect_error) {
die("Connection failed: " . $conn->connect_error);
}

2
api/v0/get/user_credentials.php
View File

@@ -5,7 +5,7 @@ defined($security_key) or exit;
// Get user_details based on securitykey
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//Define Query
$stmt = $pdo->prepare('SELECT * FROM users WHERE service = ? OR userkey = ?');
//Excute Query

2
api/v1/authorization.php
View File

@@ -6,7 +6,7 @@ defined($security_key) or exit;
//------------------------------------------
$user_credentials = json_decode(decode_payload($input),true);
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
$username = $user_credentials['username'] ?? '';
//Define Query
$stmt = $pdo->prepare('SELECT id, username, password, salesID, partnerhierarchy, view, service, settings, lastlogin, userkey, language FROM users WHERE username = ?');

2
api/v1/get/accounts.php
View File

@@ -6,7 +6,7 @@ defined($security_key) or exit;
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//SoldTo is empty
if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}

2
api/v1/get/authorization.php
View File

@@ -6,7 +6,7 @@ defined($security_key) or exit;
//------------------------------------------
$user_credentials = json_decode(decode_payload($input),true);
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
$username = $user_credentials['username'];
//Define Query
$stmt = $pdo->prepare('SELECT id, username, password, salesID, partnerhierarchy, view, service, settings, lastlogin, userkey, language FROM users WHERE username = ?');

2
api/v1/get/partners.php
View File

@@ -6,7 +6,7 @@ defined($security_key) or exit;
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//SoldTo is empty
if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}

2
api/v1/get/profile.php
View File

@@ -5,7 +5,7 @@ defined($security_key) or exit;
// Users
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//Get user_rights from users.php
$partner = json_decode($partnerhierarchy);
//SoldTo is empty

2
api/v1/get/user_credentials.php
View File

@@ -5,7 +5,7 @@ defined($security_key) or exit;
// Get user_details based on securitykey
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//Define Query
$stmt = $pdo->prepare('SELECT * FROM users WHERE service = ? OR userkey = ?');
//Excute Query

2
api/v1/get/users.php
View File

@@ -5,7 +5,7 @@ defined($security_key) or exit;
// Users
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//Get user_rights from users.php
$partner = json_decode($partnerhierarchy);
//SoldTo is empty

2
api/v1/post/accounts.php
View File

@@ -5,7 +5,7 @@ defined($security_key) or exit;
// Products
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
$pdo2 = dbConnect($dbname);
//CONTENT FROM API (POST)
$post_content = json_decode(decode_payload($input),true);

10
api/v1/post/application.php
View File

@@ -15,7 +15,7 @@ if ($action !=''){
//Connect to DB
//------------------------------------------
$pdo = dbConnect($dbname);
$pdo2 = dbConnect($dbname_users);
$pdo2 = dbConnect($dbname);
//------------------------------------------
//CONTENT FROM API (POST)
@@ -147,7 +147,7 @@ switch ($action) {
//Check if shipto is empty and if empty search partner or create
if ($partner_equipment->shipto == ''){
$partner_shipto = getrowID($dbname_users,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype3.'"');
$partner_shipto = getrowID($dbname,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype3.'"');
if ($partner_shipto){
//Partner exists - Use it
$partnerhierarchy['shipto'] = $partner_shipto['partnerID'].'-'.$partnername;
@@ -167,7 +167,7 @@ switch ($action) {
}
//Check if location is empty and if empty search partner or create
if ($partner_equipment->location == ''){
$partner_location = getrowID($dbname_users,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype4.'"');
$partner_location = getrowID($dbname,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype4.'"');
if ($partner_location){
//Partner exists - Use it
$partnerhierarchy['location'] = $partner_location['partnerID'].'-'.$partnername;
@@ -250,7 +250,7 @@ switch ($action) {
//Check if shipto is empty and if empty search partner or create
if ($partner_equipment->shipto == ''){
$partner_shipto = getrowID($dbname_users,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype3.'"');
$partner_shipto = getrowID($dbname,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype3.'"');
if ($partner_shipto){
//Partner exists - Use it
$partnerhierarchy['shipto'] = $partner_shipto['partnerID'].'-'.$partnername;
@@ -270,7 +270,7 @@ switch ($action) {
}
//Check if location is empty and if empty search partner or create
if ($partner_equipment->location == ''){
$partner_location = getrowID($dbname_users,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype4.'"');
$partner_location = getrowID($dbname,'partnerID','partner','partnername = "'.$partnername.'" && partnertype="'.$partnertype4.'"');
if ($partner_location){
//Partner exists - Use it
$partnerhierarchy['location'] = $partner_location['partnerID'].'-'.$partnername;

2
api/v1/post/partners.php
View File

@@ -5,7 +5,7 @@ defined($security_key) or exit;
// Products
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//CONTENT FROM API (POST)
$post_content = json_decode(decode_payload($input),true);

2
api/v1/post/profile.php
View File

@@ -5,7 +5,7 @@ defined($security_key) or exit;
// users
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//CONTENT FROM API (POST)
$post_content = json_decode(decode_payload($input),true);

2
api/v1/post/users.php
View File

@@ -5,7 +5,7 @@ defined($security_key) or exit;
// users
//------------------------------------------
//Connect to DB
$pdo = dbConnect($dbname_users);
$pdo = dbConnect($dbname);
//CONTENT FROM API (POST)
$post_content = json_decode(decode_payload($input),true);