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

Update: 2026-07-12 18:53:59

Browse Source
This commit is contained in:
Hamza-Ayed
2026-07-12 18:53:59 +03:00
parent 8cd4a4b57e
commit 653d73422f
54 changed files with 2078 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/Admin/rides/admin_get_rides_by_phone.php
+1 -18
View File
@@ -7,24 +7,7 @@ if ($role !== 'admin' && $role !== 'super_admin') {
exit;
}
/**
* تطبيع رقم الهاتف ليتوافق مع التخزين في قاعدة البيانات
*/
function normalizePhone($phone) {
$clean = preg_replace('/\D+/', '', $phone);
// Syria: 099XXXXXXX or 9639XXXXXXX
if (strlen($clean) === 10 && strpos($clean, '09') === 0) return '963' . substr($clean, 1);
if (strlen($clean) === 12 && strpos($clean, '963') === 0) return $clean;
if (strlen($clean) === 9 && strpos($clean, '9') === 0) return '963' . $clean;
// Jordan: 079XXXXXXX or 9627XXXXXXX
if (strlen($clean) === 10 && strpos($clean, '07') === 0) return '962' . substr($clean, 1);
if (strlen($clean) === 12 && strpos($clean, '962') === 0) return $clean;
if (strlen($clean) === 9 && strpos($clean, '7') === 0) return '962' . $clean;
// Egypt: 010XXXXXXXX or 2010XXXXXXXX
if (strlen($clean) === 11 && strpos($clean, '01') === 0) return '20' . substr($clean, 1);
if (strlen($clean) === 13 && strpos($clean, '20') === 0) return $clean;
return $clean;
}
// التطبيع عبر normalizePhone() الموحّدة في core/helpers.php (نفس المنطق سابقاً)
$phone = filterRequest('phone');
if (!$phone) {
backend/Admin/rides/monitorRide.php
+1 -18
View File
@@ -7,24 +7,7 @@ if ($role !== 'admin' && $role !== 'super_admin') {
exit;
}
/**
* تطبيع رقم الهاتف ليتوافق مع التخزين في قاعدة البيانات
*/
function normalizePhone($phone) {
$clean = preg_replace('/\D+/', '', $phone);
// Syria: 099XXXXXXX or 9639XXXXXXX
if (strlen($clean) === 10 && strpos($clean, '09') === 0) return '963' . substr($clean, 1);
if (strlen($clean) === 12 && strpos($clean, '963') === 0) return $clean;
if (strlen($clean) === 9 && strpos($clean, '9') === 0) return '963' . $clean;
// Jordan: 079XXXXXXX or 9627XXXXXXX
if (strlen($clean) === 10 && strpos($clean, '07') === 0) return '962' . substr($clean, 1);
if (strlen($clean) === 12 && strpos($clean, '962') === 0) return $clean;
if (strlen($clean) === 9 && strpos($clean, '7') === 0) return '962' . $clean;
// Egypt: 010XXXXXXXX or 2010XXXXXXXX
if (strlen($clean) === 11 && strpos($clean, '01') === 0) return '20' . substr($clean, 1);
if (strlen($clean) === 13 && strpos($clean, '20') === 0) return $clean;
return $clean;
}
// التطبيع عبر normalizePhone() الموحّدة في core/helpers.php (نفس المنطق سابقاً)
// 1. تسجيل بداية الطلب
$phone = filterRequest("phone");
backend/Admin/transit/org/update.php
+75
View File
@@ -0,0 +1,75 @@
<?php
// Admin/transit/org/update.php — تعديل بيانات مؤسسة + إدارة حالة العقد
// POST: org_id, [contract_status], [city], [contact_email], [website], [trial_ends_at]
//
// عند التعليق (suspended) أو الإنهاء (terminated):
// يُبطل جميع جلسات مشرفي المؤسسة فوراً (Redis + MySQL)
require_once __DIR__ . '/../../../connect.php';
if ($role !== 'admin' && $role !== 'super_admin') {
jsonError('Unauthorized: Admin access required', 403);
}
try { $transit_con = Database::get('transit'); }
catch (Exception $e) { jsonError('Transit service unavailable', 503); }
require_once __DIR__ . '/../../../transit/functions.php';
$orgId = filterRequest('org_id', 'int');
if (!$orgId) jsonError('org_id is required', 400);
$st = $transit_con->prepare("SELECT id, contract_status FROM transit_orgs WHERE id=? LIMIT 1");
$st->execute([$orgId]);
$org = $st->fetch();
if (!$org) jsonError('Organization not found', 404);
$updates = [];
$params = [];
// حقول يمكن تحديثها
if (($v = filterRequest('city')) !== null) { $updates[] = 'city=?'; $params[] = $v; }
if (($v = filterRequest('contact_email')) !== null) { $updates[] = 'contact_email=?'; $params[] = $v; }
if (($v = filterRequest('website')) !== null) { $updates[] = 'website=?'; $params[] = $v; }
if (($v = filterRequest('trial_ends_at')) !== null) { $updates[] = 'trial_ends_at=?'; $params[] = $v; }
$newStatus = null;
if (($v = filterRequest('contract_status')) !== null) {
$allowed = ['active', 'trial', 'suspended', 'terminated'];
if (!in_array($v, $allowed)) {
jsonError('Invalid contract_status. Allowed: ' . implode(', ', $allowed), 400);
}
$newStatus = $v;
$updates[] = 'contract_status=?';
$params[] = $v;
}
if (empty($updates)) jsonError('No fields to update', 400);
$updates[] = 'updated_at=NOW()';
$params[] = $orgId;
$transit_con->prepare(
"UPDATE transit_orgs SET " . implode(', ', $updates) . " WHERE id=?"
)->execute($params);
// إبطال جلسات المشرفين عند التعليق أو الإنهاء
if ($newStatus && in_array($newStatus, ['suspended', 'terminated'])) {
$admins = $transit_con->prepare("SELECT id FROM transit_org_admins WHERE org_id=?");
$admins->execute([$orgId]);
foreach ($admins->fetchAll(PDO::FETCH_COLUMN) as $adminId) {
$sessions = $transit_con->prepare("SELECT token_hash FROM transit_sessions WHERE admin_id=?");
$sessions->execute([$adminId]);
foreach ($sessions->fetchAll(PDO::FETCH_COLUMN) as $hash) {
if ($redis) $redis->del("transit:session:{$hash}");
}
$transit_con->prepare("DELETE FROM transit_sessions WHERE admin_id=?")->execute([$adminId]);
}
appLog("[ADMIN][TRANSIT][ORG][update] org={$orgId} contract_status={$newStatus} — all admin sessions invalidated");
} else {
appLog("[ADMIN][TRANSIT][ORG][update] org={$orgId} updated=" . implode(',', $updates));
}
jsonSuccess(['org_id' => $orgId, 'contract_status' => $newStatus ?? $org['contract_status']]);
backend/Admin/transit/route/approve.php
+58
View File
@@ -0,0 +1,58 @@
<?php
// Admin/transit/route/approve.php — فريق سيرو يعتمد أو يوقف خطاً
// POST: route_id, action (approve|suspend|reject)
require_once __DIR__ . '/../../../connect.php';
if ($role !== 'admin' && $role !== 'super_admin') {
jsonError('Unauthorized: Admin access required', 403);
}
try { $transit_con = Database::get('transit'); }
catch (Exception $e) { jsonError('Transit service unavailable', 503); }
require_once __DIR__ . '/../../../transit/functions.php';
$routeId = filterRequest('route_id', 'int');
$action = filterRequest('action');
if (!$routeId) jsonError('route_id is required', 400);
$allowed = ['approve', 'suspend', 'reject'];
if (!in_array($action, $allowed)) jsonError('Invalid action. Allowed: ' . implode(', ', $allowed), 400);
$st = $transit_con->prepare("SELECT id, org_id, name_ar, status FROM transit_routes WHERE id=? LIMIT 1");
$st->execute([$routeId]);
$route = $st->fetch();
if (!$route) jsonError('Route not found', 404);
$statusMap = [
'approve' => 'active',
'suspend' => 'suspended',
'reject' => 'rejected',
];
$newStatus = $statusMap[$action];
if ($route['status'] === $newStatus) {
jsonError("Route is already in status: {$newStatus}", 409);
}
$transit_con->prepare(
"UPDATE transit_routes
SET status=?, approved_by=?, approved_at=NOW(), updated_at=NOW()
WHERE id=?"
)->execute([$newStatus, (string)$user_id, $routeId]);
appLog("[TRANSIT][ROUTE] route #{$routeId} org#{$route['org_id']} → {$newStatus} by admin #{$user_id}", 'INFO');
// كتابة في Redis للسوكيت: transit:route_org:{routeId} → org_id
// يُستخدم في passenger_socket لتحقق العضوية
if (isset($redisLocation) && $redisLocation) {
$redisLocation->set("transit:route_org:{$routeId}", (string)$route['org_id']);
}
jsonSuccess([
'route_id' => $routeId,
'route_name' => $route['name_ar'],
'new_status' => $newStatus,
], "Route {$action}d successfully");
backend/Admin/transit/route/pending.php
+48
View File
@@ -0,0 +1,48 @@
<?php
// Admin/transit/route/pending.php — قائمة الخطوط المسودة بانتظار الاعتماد
// POST: — (اختياري: org_id للفلترة)
require_once __DIR__ . '/../../../connect.php';
if ($role !== 'admin' && $role !== 'super_admin') {
jsonError('Unauthorized: Admin access required', 403);
}
try { $transit_con = Database::get('transit'); }
catch (Exception $e) { jsonError('Transit service unavailable', 503); }
require_once __DIR__ . '/../../../transit/functions.php';
$orgIdFilter = filterRequest('org_id', 'int');
$sql = "SELECT r.id, r.org_id, r.name_ar, r.name_en, r.direction, r.distance_km,
r.duration_min, r.status, r.created_at,
o.name_ar AS org_name, o.type AS org_type, o.country,
(SELECT COUNT(*) FROM transit_stops s WHERE s.route_id = r.id) AS stops_count
FROM transit_routes r
JOIN transit_orgs o ON o.id = r.org_id
WHERE r.status = 'draft'";
$params = [];
if ($orgIdFilter) {
$sql .= " AND r.org_id = ?";
$params[] = $orgIdFilter;
}
$sql .= " ORDER BY r.created_at DESC LIMIT 100";
$st = $transit_con->prepare($sql);
$st->execute($params);
$routes = $st->fetchAll();
// جلب محطات كل خط للمعاينة
$stStops = $transit_con->prepare(
"SELECT id, sequence, name_ar, latitude, longitude, is_major
FROM transit_stops WHERE route_id=? ORDER BY sequence ASC"
);
foreach ($routes as &$r) {
$stStops->execute([$r['id']]);
$r['stops'] = $stStops->fetchAll();
}
unset($r);
jsonSuccess(['routes' => $routes, 'total' => count($routes)]);