Hamza/intaleq_v3_pure_php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed SQL query columns and switched Wallet token to secret_key_pay

Browse Source
This commit is contained in:
Hamza-Ayed
2026-04-28 13:39:50 +03:00
parent 79046da4be
commit 1005bc11b8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
loginWallet.php
View File

@@ -77,7 +77,9 @@ try {
'jti' => bin2hex(random_bytes(16)), 'jti' => bin2hex(random_bytes(16)),
]; ];
$secretKey = trim(file_get_contents('/home/intaleq-api/.secret_key')); $secretKey = file_exists('/home/intaleq-api/.secret_key_pay')
? trim(file_get_contents('/home/intaleq-api/.secret_key_pay'))
: trim(file_get_contents('/home/intaleq-api/.secret_key'));
$jwt = Firebase\JWT\JWT::encode($payload, $secretKey, 'HS256'); $jwt = Firebase\JWT\JWT::encode($payload, $secretKey, 'HS256');
$hmac = hash_hmac('sha256', $id, getenv('SECRET_KEY_HMAC')); $hmac = hash_hmac('sha256', $id, getenv('SECRET_KEY_HMAC'));

10
ride/location/get.php
View File

@@ -85,11 +85,11 @@ try {
SELECT SELECT
d.id AS driver_id, d.id AS driver_id,
d.phone, d.email, d.birthdate, d.first_name, d.last_name, d.gender, d.maritalStatus, d.phone, d.email, d.birthdate, d.first_name, d.last_name, d.gender, d.maritalStatus,
COALESCE(cr.make, d.make, '') AS make, cr.make,
cr.car_plate, cr.car_plate,
COALESCE(cr.model, d.model, '') AS model, cr.model,
cr.color, cr.vin, cr.color_hex, cr.color, cr.vin, cr.color_hex,
COALESCE(cr.year, d.year, 0) AS year, cr.year,
cr.vehicle_category_id, cr.vehicle_category_id,
dt.token, dt.token,
COALESCE(rdAvg.ratingDriver, 0) AS ratingDriver COALESCE(rdAvg.ratingDriver, 0) AS ratingDriver
@@ -102,8 +102,8 @@ try {
GROUP BY driver_id GROUP BY driver_id
) rdAvg ON rdAvg.driver_id = d.id ) rdAvg ON rdAvg.driver_id = d.id
WHERE d.id IN ($placeholders) WHERE d.id IN ($placeholders)
AND COALESCE(cr.year, d.year, 0) > 2000 AND COALESCE(cr.year, 0) > 2000
AND (COALESCE(cr.make, d.make, '') NOT LIKE '%دراج%' AND COALESCE(cr.model, d.model, '') NOT LIKE '%دراج%') -- AND (cr.make NOT LIKE '%دراج%' AND cr.model NOT LIKE '%دراج%')
"; ";
$stmt = $con->prepare($sql_drivers_info); $stmt = $con->prepare($sql_drivers_info);