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

تحديث شامل للوحة التحكم وإضافة كافة الميزات للـ WebSidebar

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-26 03:22:47 +03:00
parent 5ec54c03f5
commit 2bacb1b9e1
16 changed files with 80 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/Admin/jwtService.php
+4 -7
View File
@@ -6,14 +6,11 @@
require_once __DIR__ . '/../core/bootstrap.php'; require_once __DIR__ . '/../core/bootstrap.php';
header('Content-Type: application/json'); header('Content-Type: application/json');
header("Access-Control-Allow-Origin: https://siromove.com");
header("Access-Control-Allow-Methods: POST, OPTIONS");
header("Access-Control-Allow-Headers: Content-Type, Authorization");
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
http_response_code(200);
exit;
}
// ── Rate Limiting ─────────────────────────────────────────── // ── Rate Limiting ───────────────────────────────────────────
$limiter = new RateLimiter($redis); $limiter = new RateLimiter($redis);
backend/Admin/rides/get_driver_live_pos.php
+1 -1
View File
@@ -6,7 +6,7 @@
require_once __DIR__ . '/../../connect.php'; // تأكد أن هذا الملف يحتوي على $con_tracking require_once __DIR__ . '/../../connect.php'; // تأكد أن هذا الملف يحتوي على $con_tracking
header("Access-Control-Allow-Origin: https://siromove.com");
header("Content-Type: application/json; charset=UTF-8"); header("Content-Type: application/json; charset=UTF-8");
try { try {
backend/Admin/rides/get_rides_by_status.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php <?php
require_once __DIR__ . '/../../connect.php'; require_once __DIR__ . '/../../connect.php';
header("Access-Control-Allow-Origin: https://siromove.com");
header('Content-Type: application/json; charset=utf-8'); header('Content-Type: application/json; charset=utf-8');
try { try {
backend/core/bootstrap.php
+3 -1
View File
@@ -42,7 +42,9 @@ header("X-XSS-Protection: 1; mode=block");
// CORS مع التحقق من المصدر المسموح // CORS مع التحقق من المصدر المسموح
$allowedOrigins = array_map('trim', explode(',', getenv('CORS_ALLOWED_ORIGINS') ?: 'https://siromove.com,https://admin.siromove.com')); $envOrigins = array_map('trim', explode(',', getenv('CORS_ALLOWED_ORIGINS') ?: ''));
$defaultOrigins = ['https://siromove.com', 'https://admin.siromove.com', 'https://jordan-siro.intaleqapp.com', 'http://localhost', 'http://127.0.0.1'];
$allowedOrigins = array_unique(array_merge($envOrigins, $defaultOrigins));
$origin = $_SERVER['HTTP_ORIGIN'] ?? ''; $origin = $_SERVER['HTTP_ORIGIN'] ?? '';
if (in_array($origin, $allowedOrigins)) { if (in_array($origin, $allowedOrigins)) {
header("Access-Control-Allow-Origin: $origin"); header("Access-Control-Allow-Origin: $origin");
backend/fix_cors.php
+40
View File
@@ -0,0 +1,40 @@
<?php
$files = [
'loginAdmin.php',
'login.php',
'loginFirstTimeDriver.php',
'loginWallet.php',
'ride/rides/get_driver_location.php',
'ride/rides/public_track_location.php',
'ride/location/getUpdatedLocationForAdmin.php',
'Admin/jwtService.php',
'Admin/rides/get_driver_live_pos.php',
'Admin/rides/get_rides_by_status.php',
'loginFirstTime.php',
'loginJwtDriver.php'
];
foreach ($files as $file) {
$fullPath = __DIR__ . '/' . $file;
if (!file_exists($fullPath)) continue;
$content = file_get_contents($fullPath);
// Remove variations of the CORS header
$content = preg_replace('/header\s*\(\s*[\'"]Access-Control-Allow-Origin:[^\'"]*[\'"]\s*\)\s*;/i', '', $content);
// Remove manually added Access-Control-Allow-Methods and Headers since bootstrap.php does it
$content = preg_replace('/header\s*\(\s*[\'"]Access-Control-Allow-Methods:[^\'"]*[\'"]\s*\)\s*;/i', '', $content);
$content = preg_replace('/header\s*\(\s*[\'"]Access-Control-Allow-Headers:[^\'"]*[\'"]\s*\)\s*;/i', '', $content);
// Remove manually added Access-Control-Allow-Credentials
$content = preg_replace('/header\s*\(\s*[\'"]Access-Control-Allow-Credentials:[^\'"]*[\'"]\s*\)\s*;/i', '', $content);
// Remove the OPTIONS check since bootstrap.php handles it
$content = preg_replace('/if\s*\(\$_SERVER\[\'REQUEST_METHOD\'\]\s*===\s*\'OPTIONS\'\)\s*\{\s*http_response_code\(\d+\);\s*exit;\s*\}/i', '', $content);
// Also remove any remaining Access-Control headers in variables (like the one in loginAdmin)
$content = preg_replace('/if\s*\(\$isLocal\s*\|\|\s*in_array\(\$requestOrigin,\s*\$allowedOrigins,\s*true\)\)\s*\{[^}]+\}\s*else\s*\{[^}]+\}/i', '', $content);
// Some files check if $_SERVER['REQUEST_METHOD'] == 'OPTIONS' in different format
$content = preg_replace('/if\s*\(\s*\$_SERVER\[\'REQUEST_METHOD\'\]\s*==\s*\'OPTIONS\'\s*\)\s*\{\s*http_response_code\(\d+\);\s*exit;\s*\}/i', '', $content);
file_put_contents($fullPath, $content);
echo "Fixed $file\n";
}
backend/login.php
+4 -7
View File
@@ -6,14 +6,11 @@
require_once __DIR__ . '/core/bootstrap.php'; require_once __DIR__ . '/core/bootstrap.php';
header('Content-Type: application/json'); header('Content-Type: application/json');
header('Access-Control-Allow-Origin: https://siromove.com');
header('Access-Control-Allow-Methods: POST, OPTIONS');
header('Access-Control-Allow-Headers: Content-Type, Authorization, X-Device-FP');
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
http_response_code(200);
exit;
}
$startTime = microtime(true); $startTime = microtime(true);
backend/loginAdmin.php
+5 -12
View File
@@ -17,20 +17,13 @@ $allowedOrigins = array_filter([
$requestOrigin = $_SERVER['HTTP_ORIGIN'] ?? ''; $requestOrigin = $_SERVER['HTTP_ORIGIN'] ?? '';
if (!empty($requestOrigin)) { if (!empty($requestOrigin)) {
$isLocal = strpos($requestOrigin, 'http://localhost') === 0 || strpos($requestOrigin, 'http://127.0.0.1') === 0; $isLocal = strpos($requestOrigin, 'http://localhost') === 0 || strpos($requestOrigin, 'http://127.0.0.1') === 0;
if ($isLocal || in_array($requestOrigin, $allowedOrigins, true)) {
header("Access-Control-Allow-Origin: " . $requestOrigin);
} else {
header("Access-Control-Allow-Origin: https://siromove.com");
}
} }
header("Access-Control-Allow-Credentials: true");
header("Access-Control-Allow-Methods: POST, OPTIONS");
header("Access-Control-Allow-Headers: Content-Type, Authorization");
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
http_response_code(200);
exit;
}
// ── Rate Limiting ─────────────────────────────────────────── // ── Rate Limiting ───────────────────────────────────────────
$limiter = new RateLimiter($redis); $limiter = new RateLimiter($redis);
backend/loginFirstTime.php
+4 -7
View File
@@ -9,14 +9,11 @@ ini_set('display_startup_errors', 1);
error_reporting(E_ALL); error_reporting(E_ALL);
header('Content-Type: application/json'); header('Content-Type: application/json');
header('Access-Control-Allow-Origin: https://siromove.com');
header('Access-Control-Allow-Methods: POST, OPTIONS');
header('Access-Control-Allow-Headers: Content-Type, Authorization');
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
http_response_code(200);
exit;
}
try { try {
$limiter = new RateLimiter($redis); $limiter = new RateLimiter($redis);
backend/loginFirstTimeDriver.php
+4 -7
View File
@@ -7,14 +7,11 @@
require_once __DIR__ . '/core/bootstrap.php'; require_once __DIR__ . '/core/bootstrap.php';
header('Content-Type: application/json'); header('Content-Type: application/json');
header('Access-Control-Allow-Origin: https://siromove.com');
header('Access-Control-Allow-Methods: POST, OPTIONS');
header('Access-Control-Allow-Headers: Content-Type, Authorization');
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
http_response_code(200);
exit;
}
try { try {
$limiter = new RateLimiter($redis); $limiter = new RateLimiter($redis);
backend/loginJwtDriver.php
+4 -7
View File
@@ -6,14 +6,11 @@
require_once __DIR__ . '/core/bootstrap.php'; require_once __DIR__ . '/core/bootstrap.php';
header('Content-Type: application/json; charset=utf-8'); header('Content-Type: application/json; charset=utf-8');
header('Access-Control-Allow-Origin: https://siromove.com');
header('Access-Control-Allow-Methods: POST, OPTIONS');
header('Access-Control-Allow-Headers: Content-Type, Authorization, X-Device-FP');
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
http_response_code(204);
exit;
}
$startTime = microtime(true); $startTime = microtime(true);
backend/loginWallet.php
+4 -7
View File
@@ -6,14 +6,11 @@
require_once __DIR__ . '/core/bootstrap.php'; require_once __DIR__ . '/core/bootstrap.php';
header('Content-Type: application/json'); header('Content-Type: application/json');
header('Access-Control-Allow-Origin: https://siromove.com');
header('Access-Control-Allow-Methods: POST, OPTIONS');
header('Access-Control-Allow-Headers: Content-Type, Authorization, X-Device-FP');
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
http_response_code(200);
exit;
}
try { try {
$limiter = new RateLimiter($redis); $limiter = new RateLimiter($redis);
backend/ride/location/getUpdatedLocationForAdmin.php
+1 -1
View File
@@ -5,7 +5,7 @@
require_once __DIR__ . '/../../connect.php'; require_once __DIR__ . '/../../connect.php';
header("Access-Control-Allow-Origin: https://siromove.com");
header("Content-Type: application/json; charset=UTF-8"); header("Content-Type: application/json; charset=UTF-8");
// تفعيل إظهار الأخطاء لمعرفة مشكلة الكتابة // تفعيل إظهار الأخطاء لمعرفة مشكلة الكتابة
backend/ride/rides/get_driver_location.php
+1 -1
View File
@@ -4,7 +4,7 @@
require_once __DIR__ . '/../../get_connect.php'; require_once __DIR__ . '/../../get_connect.php';
// السماح بالوصول من أي دومين (لأن الرابط سيفتح في متصفح العميل) // السماح بالوصول من أي دومين (لأن الرابط سيفتح في متصفح العميل)
header("Access-Control-Allow-Origin: https://siromove.com");
header("Content-Type: application/json; charset=UTF-8"); header("Content-Type: application/json; charset=UTF-8");
$rideID = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT); $rideID = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT);
backend/ride/rides/public_track_location.php
+2 -2
View File
@@ -13,8 +13,8 @@ while (ob_get_level()) {
// ابدأ مخزناً جديداً ونظيفاً لهذا الملف فقط // ابدأ مخزناً جديداً ونظيفاً لهذا الملف فقط
ob_start(); ob_start();
header("Access-Control-Allow-Origin: https://siromove.com");
header("Access-Control-Allow-Methods: GET");
header("Content-Type: application/json; charset=UTF-8"); header("Content-Type: application/json; charset=UTF-8");
function sendError($message, $code = 400, $extra = []) { function sendError($message, $code = 400, $extra = []) {
dashboard/siro-admin/flutter_bootstrap.js
+1 -1
View File
@@ -37,6 +37,6 @@ _flutter.buildConfig = {"engineRevision":"6c0baaebf70e0148f485f27d5616b3d3382da7
_flutter.loader.load({ _flutter.loader.load({
serviceWorkerSettings: { serviceWorkerSettings: {
serviceWorkerVersion: "2630941020" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */ serviceWorkerVersion: "1218528987" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
} }
}); });
dashboard/siro-admin/index.html
+1 -1
View File
@@ -14,7 +14,7 @@
This is a placeholder for base href that will be replaced by the value of This is a placeholder for base href that will be replaced by the value of
the `--base-href` argument provided to `flutter build`. the `--base-href` argument provided to `flutter build`.
--> -->
<base href="/dashboard/siro-admin/"> <base href="/">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta content="IE=Edge" http-equiv="X-UA-Compatible"> <meta content="IE=Edge" http-equiv="X-UA-Compatible">