From c5170a88d247aed6694e590b20363683d0cb6204 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Thu, 11 Jun 2026 13:47:40 +0300 Subject: [PATCH] Update: 2026-06-11 13:47:39 --- backend/Admin/adminUser/add_invoice.php | 2 +- backend/Admin/auth/debug_login.php | 2 +- backend/Admin/auth/loginWallet.php | 4 +- backend/Admin/debug/env_test.php | 4 +- backend/aggregate_files.py | 4 +- backend/auth/captin/updateShamCashDriver.php | 2 +- backend/auth/document_syria/ai_document.php | 2 +- .../auth/document_syria/uploadDocSyria.php | 2 +- backend/auth/syria/auth_proxy.php | 2 +- .../syria/driver/register_driver_and_car.php | 2 +- .../auth/syria/driver/sendWhatsAppDriver.php | 4 +- backend/auth/syria/sendWhatsOpt.php | 4 +- backend/auth/syria/send_survey.php | 2 +- backend/auth/syria/uploadSyrianDocs.php | 2 +- backend/auth/token_passenger/verify_otp.php | 2 +- backend/core/Auth/JwtService.php | 6 +- backend/core/bootstrap.php | 6 +- backend/driver_socket.php | 2 +- backend/email/sendTripEmail.php | 14 +- backend/encrypt_decrypt.php | 4 +- backend/functions.php | 16 +- backend/intaleq_v1.code-workspace | 8 +- backend/intaleq_v1_secure_latest.md | 176 +- backend/invest_code.php | 74 +- backend/loginFirstTime.php | 2 +- backend/loginFirstTimeDriver.php | 2 +- backend/loginJwtWalletDriver.php | 2 +- backend/loginWallet.php | 2 +- backend/migrate_driver_passwords.php | 2 +- backend/privacy_policy.php | 12 +- backend/privacy_policy1.php | 16 +- backend/ride/chat/send_message.php | 2 +- backend/ride/feedBack/add_solve_all.php | 4 +- backend/ride/location/driversTime.html | 2 +- backend/ride/location/print.php | 4 +- backend/ride/rate/sendEmailRateingApp.php | 14 +- .../ride/rides/cancel_ride_by_passenger.php | 2 +- backend/ride/rides/public_track_location.php | 2 +- backend/ride/rides/test_notification.php | 2 +- backend/schema_primary.sql | 12 +- backend/schema_tracking.sql | 12 +- .../registerDriverAndCarService.php | 2 +- backend/serviceapp/updateDriverToActive.php | 2 +- backend/serviceapp/web/drivers.html | 2 +- backend/uploadImagePortrate.php | 2 +- backend/upload_audio.php | 2 +- backend/webhook_sms/webhook.php | 2 +- debug.log | 2 +- knowledge/AI_CONTEXT.md | 8 +- knowledge/PASSENGER_JOURNEY.md | 2 +- knowledge/PROJECT_OVERVIEW.md | 8 +- knowledge/SYSTEM_ARCHITECTURE.md | 6 +- .../android/app/src/main/cpp/CMakeLists.txt | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 12 +- siro_admin/lib/constant/links.dart | 12 +- .../controller/firebase/firbase_messge.dart | 2 +- .../firebase/notification_service.dart | 2 +- .../controller/functions/security_checks.dart | 2 +- siro_admin/lib/main.dart | 2 +- .../lib/views/admin/admin_home_page.dart | 4 +- .../views/admin/drivers/driver_the_best.dart | 2 +- .../admin/drivers/driver_tracker_screen.dart | 8 +- .../macos/Runner.xcodeproj/project.pbxproj | 18 +- .../xcshareddata/xcschemes/Runner.xcscheme | 8 +- .../macos/Runner/Configs/AppInfo.xcconfig | 6 +- siro_admin/web/index.html | 4 +- siro_admin/web/manifest.json | 4 +- .../reply/cache-v2-f03761f9d1223ce461cd.json | 22 +- .../cmakeFiles-v1-964b64bf2c48d4a79ec9.json | 14 +- .../codemodel-v2-77ef485f784e26f030f3.json | 6 +- ...native-lib-Debug-0d358e35276bd00e9269.json | 2 +- .../.cxx/Debug/2j1f5m6a/arm64-v8a/.ninja_deps | Bin 153884 -> 149241 bytes .../.cxx/Debug/2j1f5m6a/arm64-v8a/.ninja_log | 2 +- .../Debug/2j1f5m6a/arm64-v8a/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 7920 -> 7520 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 8056 -> 7640 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 6064 -> 5880 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 6176 -> 5998 bytes .../CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 462184 -> 428916 bytes .../2j1f5m6a/arm64-v8a/CMakeFiles/rules.ninja | 4 +- .../arm64-v8a/android_gradle_build.json | 8 +- .../arm64-v8a/android_gradle_build_mini.json | 8 +- .../.cxx/Debug/2j1f5m6a/arm64-v8a/build.ninja | 32 +- .../2j1f5m6a/arm64-v8a/build_file_index.txt | 2 +- .../2j1f5m6a/arm64-v8a/cmake_install.cmake | 6 +- .../2j1f5m6a/arm64-v8a/compile_commands.json | 6 +- .../arm64-v8a/compile_commands.json.bin | Bin 970 -> 963 bytes .../arm64-v8a/configure_fingerprint.bin | 40 +- .../arm64-v8a/metadata_generation_command.txt | 8 +- .../arm64-v8a/symbol_folder_index.txt | 2 +- .../reply/cache-v2-aa9d167e8d32a264af7e.json | 22 +- .../cmakeFiles-v1-73e390d5e1d38be31a4e.json | 14 +- .../codemodel-v2-d22e5c1036f2219751b3.json | 6 +- ...native-lib-Debug-f257690d64d152ec2b86.json | 2 +- .../Debug/2j1f5m6a/armeabi-v7a/.ninja_deps | Bin 153228 -> 148600 bytes .../Debug/2j1f5m6a/armeabi-v7a/.ninja_log | 2 +- .../Debug/2j1f5m6a/armeabi-v7a/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 6020 -> 5615 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 6156 -> 5751 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 4160 -> 4043 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 4236 -> 4122 bytes .../CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 365656 -> 337646 bytes .../armeabi-v7a/CMakeFiles/rules.ninja | 4 +- .../armeabi-v7a/android_gradle_build.json | 8 +- .../android_gradle_build_mini.json | 8 +- .../Debug/2j1f5m6a/armeabi-v7a/build.ninja | 32 +- .../2j1f5m6a/armeabi-v7a/build_file_index.txt | 2 +- .../2j1f5m6a/armeabi-v7a/cmake_install.cmake | 6 +- .../armeabi-v7a/compile_commands.json | 6 +- .../armeabi-v7a/compile_commands.json.bin | Bin 1011 -> 1004 bytes .../armeabi-v7a/configure_fingerprint.bin | 44 +- .../metadata_generation_command.txt | 8 +- .../armeabi-v7a/symbol_folder_index.txt | 2 +- .../app/.cxx/Debug/2j1f5m6a/hash_key.txt | 4 +- .../reply/cache-v2-0def829273509cde3a7e.json | 22 +- .../cmakeFiles-v1-c684d75b7cc460903c07.json | 14 +- .../codemodel-v2-7cd6c1da16c8c6ab93ff.json | 6 +- ...native-lib-Debug-dd8e94c6a37ef0d8683a.json | 2 +- .../app/.cxx/Debug/2j1f5m6a/x86/.ninja_deps | Bin 153992 -> 149343 bytes .../app/.cxx/Debug/2j1f5m6a/x86/.ninja_log | 2 +- .../.cxx/Debug/2j1f5m6a/x86/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 5912 -> 5499 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 6052 -> 5631 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 3944 -> 3815 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 4020 -> 3891 bytes .../x86/CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../x86/CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 352268 -> 318093 bytes .../Debug/2j1f5m6a/x86/CMakeFiles/rules.ninja | 4 +- .../2j1f5m6a/x86/android_gradle_build.json | 8 +- .../x86/android_gradle_build_mini.json | 8 +- .../app/.cxx/Debug/2j1f5m6a/x86/build.ninja | 32 +- .../Debug/2j1f5m6a/x86/build_file_index.txt | 2 +- .../Debug/2j1f5m6a/x86/cmake_install.cmake | 6 +- .../Debug/2j1f5m6a/x86/compile_commands.json | 6 +- .../2j1f5m6a/x86/compile_commands.json.bin | Bin 983 -> 976 bytes .../2j1f5m6a/x86/configure_fingerprint.bin | 34 +- .../x86/metadata_generation_command.txt | 8 +- .../2j1f5m6a/x86/symbol_folder_index.txt | 2 +- .../reply/cache-v2-771f0baf8c720e50ed5a.json | 22 +- .../cmakeFiles-v1-39d23928757c5570536f.json | 14 +- .../codemodel-v2-06be0ac352f74f4237d3.json | 6 +- ...native-lib-Debug-e2206948ef59b6eac031.json | 2 +- .../.cxx/Debug/2j1f5m6a/x86_64/.ninja_deps | Bin 154032 -> 149378 bytes .../app/.cxx/Debug/2j1f5m6a/x86_64/.ninja_log | 2 +- .../.cxx/Debug/2j1f5m6a/x86_64/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 7272 -> 6924 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 7416 -> 7057 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 5440 -> 5244 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 5536 -> 5350 bytes .../x86_64/CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../x86_64/CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 458560 -> 423840 bytes .../2j1f5m6a/x86_64/CMakeFiles/rules.ninja | 4 +- .../2j1f5m6a/x86_64/android_gradle_build.json | 8 +- .../x86_64/android_gradle_build_mini.json | 8 +- .../.cxx/Debug/2j1f5m6a/x86_64/build.ninja | 32 +- .../2j1f5m6a/x86_64/build_file_index.txt | 2 +- .../Debug/2j1f5m6a/x86_64/cmake_install.cmake | 6 +- .../2j1f5m6a/x86_64/compile_commands.json | 6 +- .../2j1f5m6a/x86_64/compile_commands.json.bin | Bin 966 -> 959 bytes .../2j1f5m6a/x86_64/configure_fingerprint.bin | 40 +- .../x86_64/metadata_generation_command.txt | 8 +- .../2j1f5m6a/x86_64/symbol_folder_index.txt | 2 +- .../profile/arm64-v8a/compile_commands.json | 6 +- .../profile/armeabi-v7a/compile_commands.json | 6 +- .../tools/profile/x86/compile_commands.json | 6 +- .../profile/x86_64/compile_commands.json | 6 +- .../android/app/src/main/cpp/CMakeLists.txt | 2 +- .../example/intaleq_driver/MapPresentation.kt | 4 +- .../com/example/intaleq_driver/MyCarScreen.kt | 12 +- .../app/src/main/res/values-ar/strings.xml | 2 +- siro_driver/devtools_options.yaml | 3 + siro_driver/ios/Podfile.lock | 182 +- siro_driver/ios/README.md | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 12 +- siro_driver/lib/constant/info.dart | 22 +- siro_driver/lib/constant/links.dart | 25 +- siro_driver/lib/constant/notification.dart | 4 +- .../auth/captin/invit_controller.dart | 20 +- .../auth/captin/phone_helper_controller.dart | 14 +- .../auth/syria/registration_controller.dart | 2 +- .../firebase/notification_service.dart | 2 +- .../functions/app_update_controller.dart | 4 +- .../controller/functions/package_info.dart | 4 +- .../controller/functions/security_checks.dart | 2 +- .../gamification/referral_controller.dart | 8 +- .../home/captin/home_captain_controller.dart | 4 +- .../home/captin/map_driver_controller.dart | 121 +- .../navigation/navigation_controller.dart | 8 +- .../home/navigation/navigation_view.dart | 5 +- .../lib/controller/local/translations.dart | 188 +- .../mtn_new/mtn_payment_new_screen.dart | 2 +- .../controller/rate/rate_app_controller.dart | 4 +- siro_driver/lib/main.dart | 4 +- .../lib/models/model/onboarding_model.dart | 8 +- siro_driver/lib/models/overlay_service.dart | 2 +- siro_driver/lib/readme.md | 4 +- siro_driver/lib/splash_screen_page.dart | 2 +- .../auth/captin/cards/syrian_card_a_i.dart | 4 +- .../views/auth/captin/contact_us_page.dart | 4 +- .../lib/views/auth/captin/otp_page.dart | 10 +- .../views/auth/syria/registration_view.dart | 2 +- .../views/home/Captin/About Us/about_us.dart | 4 +- .../Captin/About Us/frequantly_question.dart | 18 +- .../home/Captin/About Us/using_app_page.dart | 8 +- .../Captin/history/history_details_page.dart | 8 +- .../Captin/home_captain/drawer_captain.dart | 2 +- .../home/Captin/home_captain/home_captin.dart | 5 +- .../Captin/home_captain/osm_view_map.dart | 1 - .../widget/left_menu_map_captain.dart | 2 +- .../google_driver_map_page.dart | 12 +- .../Captin/orderCaptin/marker_generator.dart | 38 + .../home/my_wallet/card_wallet_widget.dart | 2 +- .../views/home/profile/complaint_page.dart | 2 +- .../views/home/profile/profile_captain.dart | 4 +- .../lib/views/widgets/error_snakbar.dart | 19 +- .../macos/Runner.xcodeproj/project.pbxproj | 18 +- .../xcshareddata/xcschemes/Runner.xcscheme | 8 +- .../macos/Runner/Configs/AppInfo.xcconfig | 4 +- siro_driver/pubspec.yaml | 2 +- siro_driver/shorebird.yaml | 14 + .../trip_overlay_plugin/android/build.gradle | 4 +- .../trip_overlay_plugin/TripOverlayPlugin.kt | 2 +- .../TripzOverlayReciver.kt | 4 +- .../TripzOverlayService.kt | 2 +- .../TripOverlayPluginTest.kt | 2 +- .../example/android/app/build.gradle.kts | 4 +- .../MainActivity.kt | 2 +- siro_driver/trip_overlay_plugin/pubspec.yaml | 2 +- siro_driver/web/index.html | 4 +- siro_driver/web/manifest.json | 4 +- siro_rider/analyze_report.txt | 2 +- .../reply/cache-v2-ac68e6030ad9864cea0c.json | 22 +- .../cmakeFiles-v1-c7966f8678bacc51340d.json | 14 +- .../codemodel-v2-3341f8efb12b0cdce1a6.json | 6 +- ...native-lib-Debug-4f3f22efb16e3d7daf88.json | 2 +- .../.cxx/Debug/3p4b322x/arm64-v8a/.ninja_deps | Bin 157744 -> 152640 bytes .../.cxx/Debug/3p4b322x/arm64-v8a/.ninja_log | 8 +- .../Debug/3p4b322x/arm64-v8a/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 7912 -> 7508 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 8048 -> 7632 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 6056 -> 5872 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 6168 -> 5988 bytes .../CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 462160 -> 428886 bytes .../3p4b322x/arm64-v8a/CMakeFiles/rules.ninja | 4 +- .../arm64-v8a/android_gradle_build.json | 8 +- .../arm64-v8a/android_gradle_build_mini.json | 8 +- .../.cxx/Debug/3p4b322x/arm64-v8a/build.ninja | 32 +- .../3p4b322x/arm64-v8a/build_file_index.txt | 2 +- .../3p4b322x/arm64-v8a/cmake_install.cmake | 6 +- .../3p4b322x/arm64-v8a/compile_commands.json | 6 +- .../arm64-v8a/compile_commands.json.bin | Bin 956 -> 950 bytes .../arm64-v8a/configure_fingerprint.bin | 34 +- .../arm64-v8a/metadata_generation_command.txt | 8 +- .../arm64-v8a/symbol_folder_index.txt | 2 +- .../reply/cache-v2-fbe345bef3a391426801.json | 22 +- .../cmakeFiles-v1-01669e876dc9f2bb8a18.json | 14 +- .../codemodel-v2-ba4c045041473ec094f3.json | 6 +- ...native-lib-Debug-e7984760091d45dea211.json | 2 +- .../Debug/3p4b322x/armeabi-v7a/.ninja_deps | Bin 157076 -> 151992 bytes .../Debug/3p4b322x/armeabi-v7a/.ninja_log | 8 +- .../Debug/3p4b322x/armeabi-v7a/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 6012 -> 5612 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 6152 -> 5750 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 4152 -> 4035 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 4228 -> 4113 bytes .../CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 365632 -> 337507 bytes .../armeabi-v7a/CMakeFiles/rules.ninja | 4 +- .../armeabi-v7a/android_gradle_build.json | 8 +- .../android_gradle_build_mini.json | 8 +- .../Debug/3p4b322x/armeabi-v7a/build.ninja | 32 +- .../3p4b322x/armeabi-v7a/build_file_index.txt | 2 +- .../3p4b322x/armeabi-v7a/cmake_install.cmake | 6 +- .../armeabi-v7a/compile_commands.json | 6 +- .../armeabi-v7a/compile_commands.json.bin | Bin 997 -> 990 bytes .../armeabi-v7a/configure_fingerprint.bin | 34 +- .../metadata_generation_command.txt | 8 +- .../armeabi-v7a/symbol_folder_index.txt | 2 +- .../app/.cxx/Debug/3p4b322x/hash_key.txt | 4 +- .../reply/cache-v2-22adc30e24d1cde66655.json | 22 +- .../cmakeFiles-v1-35d31ba9bf56409b7a67.json | 14 +- .../codemodel-v2-be0711a4c4315a985e60.json | 6 +- ...native-lib-Debug-0e0bb6a93a67c046adcd.json | 2 +- .../app/.cxx/Debug/3p4b322x/x86/.ninja_deps | Bin 157860 -> 152747 bytes .../app/.cxx/Debug/3p4b322x/x86/.ninja_log | 8 +- .../.cxx/Debug/3p4b322x/x86/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 5908 -> 5489 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 6044 -> 5626 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 3936 -> 3809 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 4012 -> 3881 bytes .../x86/CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../x86/CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 352244 -> 318102 bytes .../Debug/3p4b322x/x86/CMakeFiles/rules.ninja | 4 +- .../3p4b322x/x86/android_gradle_build.json | 8 +- .../x86/android_gradle_build_mini.json | 8 +- .../app/.cxx/Debug/3p4b322x/x86/build.ninja | 32 +- .../Debug/3p4b322x/x86/build_file_index.txt | 2 +- .../Debug/3p4b322x/x86/cmake_install.cmake | 6 +- .../Debug/3p4b322x/x86/compile_commands.json | 6 +- .../3p4b322x/x86/compile_commands.json.bin | Bin 969 -> 962 bytes .../3p4b322x/x86/configure_fingerprint.bin | 34 +- .../x86/metadata_generation_command.txt | 8 +- .../3p4b322x/x86/symbol_folder_index.txt | 2 +- .../reply/cache-v2-86edb7da5139c6e94813.json | 22 +- .../cmakeFiles-v1-ef5580e7a2680dcbf06e.json | 14 +- .../codemodel-v2-a4bfdef084a4abc0750a.json | 6 +- ...native-lib-Debug-d7ee57911fde8f30f4c7.json | 2 +- .../.cxx/Debug/3p4b322x/x86_64/.ninja_deps | Bin 157896 -> 152786 bytes .../app/.cxx/Debug/3p4b322x/x86_64/.ninja_log | 8 +- .../.cxx/Debug/3p4b322x/x86_64/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 7264 -> 6924 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 7416 -> 7064 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 5432 -> 5238 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 5528 -> 5340 bytes .../x86_64/CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../x86_64/CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 458544 -> 423797 bytes .../3p4b322x/x86_64/CMakeFiles/rules.ninja | 4 +- .../3p4b322x/x86_64/android_gradle_build.json | 8 +- .../x86_64/android_gradle_build_mini.json | 8 +- .../.cxx/Debug/3p4b322x/x86_64/build.ninja | 32 +- .../3p4b322x/x86_64/build_file_index.txt | 2 +- .../Debug/3p4b322x/x86_64/cmake_install.cmake | 6 +- .../3p4b322x/x86_64/compile_commands.json | 6 +- .../3p4b322x/x86_64/compile_commands.json.bin | Bin 952 -> 946 bytes .../3p4b322x/x86_64/configure_fingerprint.bin | 34 +- .../x86_64/metadata_generation_command.txt | 8 +- .../3p4b322x/x86_64/symbol_folder_index.txt | 2 +- .../reply/cache-v2-728e9c47ecb3b5b175ac.json | 22 +- .../cmakeFiles-v1-77dbeabcd99acbc02a06.json | 14 +- .../codemodel-v2-178b1e5f97202b0195cd.json | 6 +- ...b-RelWithDebInfo-3114bc1da836e855ba35.json | 2 +- .../6t1m4b5v/arm64-v8a/.ninja_deps | Bin 154016 -> 149334 bytes .../6t1m4b5v/arm64-v8a/.ninja_log | 6 +- .../6t1m4b5v/arm64-v8a/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 7920 -> 7515 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 8056 -> 7641 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 6064 -> 5880 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 6176 -> 5998 bytes .../CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 268616 -> 251728 bytes .../6t1m4b5v/arm64-v8a/CMakeFiles/rules.ninja | 4 +- .../arm64-v8a/android_gradle_build.json | 8 +- .../arm64-v8a/android_gradle_build_mini.json | 8 +- .../6t1m4b5v/arm64-v8a/build.ninja | 32 +- .../6t1m4b5v/arm64-v8a/build_file_index.txt | 2 +- .../6t1m4b5v/arm64-v8a/cmake_install.cmake | 6 +- .../6t1m4b5v/arm64-v8a/compile_commands.json | 6 +- .../arm64-v8a/compile_commands.json.bin | Bin 967 -> 961 bytes .../arm64-v8a/configure_fingerprint.bin | 44 +- .../arm64-v8a/metadata_generation_command.txt | 8 +- .../arm64-v8a/symbol_folder_index.txt | 2 +- .../reply/cache-v2-d96be89e561ddbdb427b.json | 22 +- .../cmakeFiles-v1-d97ff819bedc1f668e78.json | 14 +- .../codemodel-v2-2cd405323bccec3049e3.json | 6 +- ...b-RelWithDebInfo-bcf9e1b402252f2dca93.json | 2 +- .../6t1m4b5v/armeabi-v7a/.ninja_deps | Bin 153364 -> 148699 bytes .../6t1m4b5v/armeabi-v7a/.ninja_log | 6 +- .../6t1m4b5v/armeabi-v7a/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 6024 -> 5618 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 6160 -> 5753 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 4160 -> 4043 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 4240 -> 4127 bytes .../CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 170036 -> 156176 bytes .../armeabi-v7a/CMakeFiles/rules.ninja | 4 +- .../armeabi-v7a/android_gradle_build.json | 8 +- .../android_gradle_build_mini.json | 8 +- .../6t1m4b5v/armeabi-v7a/build.ninja | 32 +- .../6t1m4b5v/armeabi-v7a/build_file_index.txt | 2 +- .../6t1m4b5v/armeabi-v7a/cmake_install.cmake | 6 +- .../armeabi-v7a/compile_commands.json | 6 +- .../armeabi-v7a/compile_commands.json.bin | Bin 1008 -> 1001 bytes .../armeabi-v7a/configure_fingerprint.bin | 46 +- .../metadata_generation_command.txt | 8 +- .../armeabi-v7a/symbol_folder_index.txt | 2 +- .../.cxx/RelWithDebInfo/6t1m4b5v/hash_key.txt | 4 +- .../reply/cache-v2-877b4b6e02b454b55c99.json | 22 +- .../cmakeFiles-v1-21d49c7f3fdae7d7b78c.json | 14 +- .../codemodel-v2-b3bd8a6f356ff1998ee7.json | 6 +- ...b-RelWithDebInfo-b7e704f3d8692e1145e6.json | 2 +- .../RelWithDebInfo/6t1m4b5v/x86/.ninja_deps | Bin 154128 -> 149444 bytes .../RelWithDebInfo/6t1m4b5v/x86/.ninja_log | 6 +- .../6t1m4b5v/x86/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 5916 -> 5501 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 6056 -> 5630 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 3944 -> 3815 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 4024 -> 3895 bytes .../x86/CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../x86/CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 151872 -> 138860 bytes .../6t1m4b5v/x86/CMakeFiles/rules.ninja | 4 +- .../6t1m4b5v/x86/android_gradle_build.json | 8 +- .../x86/android_gradle_build_mini.json | 8 +- .../RelWithDebInfo/6t1m4b5v/x86/build.ninja | 32 +- .../6t1m4b5v/x86/build_file_index.txt | 2 +- .../6t1m4b5v/x86/cmake_install.cmake | 6 +- .../6t1m4b5v/x86/compile_commands.json | 6 +- .../6t1m4b5v/x86/compile_commands.json.bin | Bin 980 -> 973 bytes .../6t1m4b5v/x86/configure_fingerprint.bin | 36 +- .../x86/metadata_generation_command.txt | 8 +- .../6t1m4b5v/x86/symbol_folder_index.txt | 2 +- .../reply/cache-v2-85ff97705f04cc8292b7.json | 22 +- .../cmakeFiles-v1-69d1109946a66019ce62.json | 14 +- .../codemodel-v2-da3349587414bdce9aac.json | 6 +- ...b-RelWithDebInfo-29a34f6bd1f7a930d882.json | 2 +- .../6t1m4b5v/x86_64/.ninja_deps | Bin 154168 -> 149485 bytes .../RelWithDebInfo/6t1m4b5v/x86_64/.ninja_log | 6 +- .../6t1m4b5v/x86_64/CMakeCache.txt | 20 +- .../CMakeDetermineCompilerABI_C.bin | Bin 7272 -> 6925 bytes .../CMakeDetermineCompilerABI_CXX.bin | Bin 7424 -> 7066 bytes .../CompilerIdC/CMakeCCompilerId.o | Bin 5440 -> 5244 bytes .../CompilerIdCXX/CMakeCXXCompilerId.o | Bin 5536 -> 5350 bytes .../x86_64/CMakeFiles/CMakeConfigureLog.yaml | 28 +- .../x86_64/CMakeFiles/TargetDirectories.txt | 6 +- .../native-lib.dir/native-lib.cpp.o | Bin 213432 -> 199547 bytes .../6t1m4b5v/x86_64/CMakeFiles/rules.ninja | 4 +- .../6t1m4b5v/x86_64/android_gradle_build.json | 8 +- .../x86_64/android_gradle_build_mini.json | 8 +- .../6t1m4b5v/x86_64/build.ninja | 32 +- .../6t1m4b5v/x86_64/build_file_index.txt | 2 +- .../6t1m4b5v/x86_64/cmake_install.cmake | 6 +- .../6t1m4b5v/x86_64/compile_commands.json | 6 +- .../6t1m4b5v/x86_64/compile_commands.json.bin | Bin 963 -> 957 bytes .../6t1m4b5v/x86_64/configure_fingerprint.bin | 42 +- .../x86_64/metadata_generation_command.txt | 8 +- .../6t1m4b5v/x86_64/symbol_folder_index.txt | 2 +- .../profile/arm64-v8a/compile_commands.json | 6 +- .../profile/armeabi-v7a/compile_commands.json | 6 +- .../tools/profile/x86/compile_commands.json | 6 +- .../profile/x86_64/compile_commands.json | 6 +- .../release/arm64-v8a/compile_commands.json | 6 +- .../release/armeabi-v7a/compile_commands.json | 6 +- .../tools/release/x86/compile_commands.json | 6 +- .../release/x86_64/compile_commands.json | 6 +- .../android/app/src/main/cpp/CMakeLists.txt | 2 +- .../com/siro/siro_rider/MainActivity.kt | 2 +- .../app/src/main/res/values-ar/strings.xml | 2 +- siro_rider/assets/style.json | 8 +- siro_rider/assets/style_dark.json | 8 +- siro_rider/devtools_options.yaml | 3 + .../RideWidget/RideWidgetLiveActivity.swift | 6 +- .../ios/RideWidgetExtension.entitlements | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 6 +- siro_rider/ios/Runner/Runner.entitlements | 2 +- siro_rider/lib/README.md | 4 +- siro_rider/lib/constant/colors.dart | 2 +- siro_rider/lib/constant/info.dart | 20 +- siro_rider/lib/constant/links.dart | 20 +- siro_rider/lib/constant/notification.dart | 20 +- siro_rider/lib/constant/table_names.dart | 2 +- .../controller/auth/register_controller.dart | 6 +- .../controller/firebase/firbase_messge.dart | 4 +- .../firebase/notification_service.dart | 2 +- .../controller/functions/package_info.dart | 4 +- .../controller/functions/securty_check.dart | 2 +- siro_rider/lib/controller/home/compare.sh | 2 +- .../lib/controller/home/compare_precise.py | 2 +- .../home/ios_live_activity_service.dart | 2 +- .../home/map/map_engine_controller.dart | 49 +- .../home/map/ride_lifecycle_controller.dart | 109 +- .../home/map/ui_interactions_controller.dart | 18 +- .../home/map_passenger_controller.dart | 28 +- .../home/profile/invit_controller.dart | 14 +- .../home/splash_screen_controlle.dart | 10 +- .../home/trip_monitor_controller.dart | 4 +- .../lib/controller/local/translations.dart | 2268 ++++++++--------- .../payment/paymob/paymob_wallet.dart | 2 +- .../lib/models/model/onboarding_model.dart | 8 +- siro_rider/lib/services/pip_service.dart | 2 +- .../lib/services/ride_live_notification.dart | 2 +- .../lib/services/ride_tracking_native.dart | 2 +- siro_rider/lib/splash_screen_page.dart | 6 +- siro_rider/lib/views/Rate/rate_captain.dart | 2 +- siro_rider/lib/views/auth/login_page.dart | 2 +- siro_rider/lib/views/auth/otp_page.dart | 2 +- .../lib/views/home/HomePage/about_page.dart | 4 +- .../lib/views/home/HomePage/contact_us.dart | 8 +- .../HomePage/frequentlyQuestionsPage.dart | 12 +- .../lib/views/home/map_page_passenger.dart | 4 +- .../home/map_widget.dart/map_menu_widget.dart | 6 +- .../home/my_wallet/passenger_wallet.dart | 2 +- .../navigation/navigation_controller.dart | 3 +- .../views/home/profile/complaint_page.dart | 2 +- siro_rider/macos/Runner/Release.entitlements | 4 + siro_rider/pubspec.yaml | 2 +- siro_rider/shorebird.yaml | 14 + .../android/app/src/main/cpp/CMakeLists.txt | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 12 +- siro_service/lib/constant/links.dart | 12 +- .../controller/functions/security_helper.dart | 2 +- .../mainController/pages/driver_page.dart | 4 +- .../pages/drivers_cant_register.dart | 4 +- .../mainController/pages/welcome_call.dart | 4 +- .../ragister_service_controller.dart | 2 +- .../registration_captain_controller.dart | 2 +- siro_service/lib/login_page.dart | 2 +- siro_service/lib/views/home/main.dart | 2 +- .../macos/Runner.xcodeproj/project.pbxproj | 18 +- .../xcshareddata/xcschemes/Runner.xcscheme | 8 +- .../macos/Runner/Configs/AppInfo.xcconfig | 4 +- siro_service/web/index.html | 4 +- siro_service/web/manifest.json | 4 +- socket_intaleq/driver_socket.php | 2 +- 516 files changed, 3654 insertions(+), 3321 deletions(-) create mode 100644 siro_driver/devtools_options.yaml create mode 100644 siro_driver/shorebird.yaml rename siro_driver/trip_overlay_plugin/android/src/main/kotlin/com/{intaleq_driver => siro_driver}/trip_overlay_plugin/TripOverlayPlugin.kt (99%) rename siro_driver/trip_overlay_plugin/android/src/main/kotlin/com/{intaleq_driver => siro_driver}/trip_overlay_plugin/TripzOverlayReciver.kt (97%) rename siro_driver/trip_overlay_plugin/android/src/main/kotlin/com/{intaleq_driver => siro_driver}/trip_overlay_plugin/TripzOverlayService.kt (99%) rename siro_driver/trip_overlay_plugin/android/src/test/kotlin/com/{intaleq_driver => siro_driver}/trip_overlay_plugin/TripOverlayPluginTest.kt (95%) create mode 100644 siro_rider/devtools_options.yaml create mode 100644 siro_rider/shorebird.yaml diff --git a/backend/Admin/adminUser/add_invoice.php b/backend/Admin/adminUser/add_invoice.php index b89ee83..72469ce 100755 --- a/backend/Admin/adminUser/add_invoice.php +++ b/backend/Admin/adminUser/add_invoice.php @@ -59,7 +59,7 @@ if (isset($_FILES['image']) && $_FILES['image']['error'] === UPLOAD_ERR_OK) { exit; } - $linkImage = 'https://intaleq.xyz/intaleq/Admin/adminUser/invoice_images/' . $new_filename; + $linkImage = 'https://intaleq.xyz/siro/Admin/adminUser/invoice_images/' . $new_filename; error_log("[add_invoice.php] ✅ Image uploaded successfully: $linkImage"); } diff --git a/backend/Admin/auth/debug_login.php b/backend/Admin/auth/debug_login.php index 57ee58d..f469e3b 100644 --- a/backend/Admin/auth/debug_login.php +++ b/backend/Admin/auth/debug_login.php @@ -54,7 +54,7 @@ try { } // 5. التحقق من PHP error log الأخير -$logPath = '/home/intaleq-api/logs/php_errors.log'; +$logPath = '/home/siro-api/logs/php_errors.log'; if (file_exists($logPath)) { $lines = file($logPath); $checks['last_5_errors'] = array_map('trim', array_slice($lines, -5)); diff --git a/backend/Admin/auth/loginWallet.php b/backend/Admin/auth/loginWallet.php index 095139a..af4c3c6 100644 --- a/backend/Admin/auth/loginWallet.php +++ b/backend/Admin/auth/loginWallet.php @@ -23,11 +23,11 @@ if ($admin->role !== 'admin' && $admin->role !== 'super_admin') { try { // جلب المفتاح المشترك لسيرفر المحفظة - $payKeyPath = '/home/intaleq-api/.secret_key_pay'; + $payKeyPath = '/home/siro-api/.secret_key_pay'; $payKey = file_exists($payKeyPath) ? trim(file_get_contents($payKeyPath)) : getenv('SECRET_KEY_PAY'); if (empty($payKey)) { - $payKey = trim(@file_get_contents('/home/intaleq-api/.secret_key')); + $payKey = trim(@file_get_contents('/home/siro-api/.secret_key')); } if (empty($payKey)) { diff --git a/backend/Admin/debug/env_test.php b/backend/Admin/debug/env_test.php index afe0cc0..b57fc4b 100644 --- a/backend/Admin/debug/env_test.php +++ b/backend/Admin/debug/env_test.php @@ -36,8 +36,8 @@ foreach ($keysToCheck as $key) { echo "\n\n=== فحص الملفات المباشرة ===\n\n"; $filesToCheck = [ - '/home/intaleq-api/.internal_socket_key', - '/home/intaleq-api/.secret_key_pay' + '/home/siro-api/.internal_socket_key', + '/home/siro-api/.secret_key_pay' ]; foreach ($filesToCheck as $file) { diff --git a/backend/aggregate_files.py b/backend/aggregate_files.py index a0b6fe7..ccba4d1 100644 --- a/backend/aggregate_files.py +++ b/backend/aggregate_files.py @@ -2,13 +2,13 @@ import os # Configuration PROJECT_DIR = '.' -OUTPUT_FILE = 'intaleq_v1_secure_latest.md' +OUTPUT_FILE = 'siro_v1_secure_latest.md' EXCLUDED_DIRS = {'.git', 'vendor', 'node_modules', '.gemini'} EXCLUDED_FILES = {OUTPUT_FILE, 'aggregate_files.py'} def aggregate_files(): with open(OUTPUT_FILE, 'w', encoding='utf-8') as outfile: - outfile.write(f'# Intaleq V1 - Secure Latest Version\n\n') + outfile.write(f'# Siro V1 - Secure Latest Version\n\n') for root, dirs, files in os.walk(PROJECT_DIR): # Prune excluded directories diff --git a/backend/auth/captin/updateShamCashDriver.php b/backend/auth/captin/updateShamCashDriver.php index b8af407..be3abda 100755 --- a/backend/auth/captin/updateShamCashDriver.php +++ b/backend/auth/captin/updateShamCashDriver.php @@ -5,7 +5,7 @@ require_once __DIR__ . '/../../connect.php'; $id = filterRequest("id"); // استقبال بيانات شام كاش من التطبيق -$accountBank = filterRequest("accountBank"); // الاسم (مثال: intaleq) +$accountBank = filterRequest("accountBank"); // الاسم (مثال: siro) $bankCode = filterRequest("bankCode"); // الكود الطويل (مثال: 80f23afe...) // التحقق من وصول البيانات المطلوبة diff --git a/backend/auth/document_syria/ai_document.php b/backend/auth/document_syria/ai_document.php index f8b4715..e050cf7 100755 --- a/backend/auth/document_syria/ai_document.php +++ b/backend/auth/document_syria/ai_document.php @@ -46,7 +46,7 @@ if (!move_uploaded_file($file['tmp_name'], $uploadPath)) { exit; } -$imageUrl = "https://intaleq.xyz/intaleq/auth/uploads/documents/" . $uniqueName ; +$imageUrl = "https://intaleq.xyz/siro/auth/uploads/documents/" . $uniqueName ; $imageData = file_get_contents($uploadPath); $imageBase64 = base64_encode($imageData); diff --git a/backend/auth/document_syria/uploadDocSyria.php b/backend/auth/document_syria/uploadDocSyria.php index 6acb2d4..7cc0aba 100755 --- a/backend/auth/document_syria/uploadDocSyria.php +++ b/backend/auth/document_syria/uploadDocSyria.php @@ -87,7 +87,7 @@ if (!defined('BASE_URL')) { } // ⚙️ مسار الرابط العام (عدّل المسار حسب نشر مشروعك) -$publicPath = "/intaleq/auth/uploads/documents/" . $uniqueName; +$publicPath = "/siro/auth/uploads/documents/" . $uniqueName; $imageUrl = rtrim(BASE_URL, '/') . $publicPath; // ✅ نتيجة نهائية: فقط رابط الصورة وبعض البيانات المفيدة diff --git a/backend/auth/syria/auth_proxy.php b/backend/auth/syria/auth_proxy.php index beb4ac0..067e8d5 100755 --- a/backend/auth/syria/auth_proxy.php +++ b/backend/auth/syria/auth_proxy.php @@ -14,7 +14,7 @@ $redirectUri = 'https://api.tripz-egypt.com/tripz/auth/syria/auth_proxy.php'; // // 3. APP CONFIGURATION: Your Flutter app's custom URI scheme // This is how the browser will redirect back to your app. -$appRedirectScheme = 'intaleqapp://auth'; // e.g., myapp://auth +$appRedirectScheme = 'siroapp://auth'; // e.g., myapp://auth // Create a new Google Client object $client = new Google_Client(); diff --git a/backend/auth/syria/driver/register_driver_and_car.php b/backend/auth/syria/driver/register_driver_and_car.php index ccdc85d..2c2ad71 100755 --- a/backend/auth/syria/driver/register_driver_and_car.php +++ b/backend/auth/syria/driver/register_driver_and_car.php @@ -337,7 +337,7 @@ $pwdHashed = password_hash($rawSecret, PASSWORD_DEFAULT); /* ================== 11) Notification ================== */ try { - $fcmSendUrl = 'https://api.intaleq.xyz/intaleq/ride/firebase/send_fcm.php'; + $fcmSendUrl = 'https://api.intaleq.xyz/siro/ride/firebase/send_fcm.php'; $driverFullName = $raw_first_name . ' ' . $raw_last_name; $notificationTitle = 'تسجيل سائق جديد'; diff --git a/backend/auth/syria/driver/sendWhatsAppDriver.php b/backend/auth/syria/driver/sendWhatsAppDriver.php index 74545fb..7e99465 100755 --- a/backend/auth/syria/driver/sendWhatsAppDriver.php +++ b/backend/auth/syria/driver/sendWhatsAppDriver.php @@ -40,8 +40,10 @@ $otp = (string)rand(100, 999); $nabehUrl = 'https://otp.intaleqapp.com/api/request-otp.php'; $appKey = getenv('NABEH_OTP_APP_KEY'); +$phoneWithPlus = (strpos($receiver, '+') === 0) ? $receiver : '+' . $receiver; + $payload = [ - 'phone' => $receiver, + 'phone' => $phoneWithPlus, 'device_type' => 'android', 'method' => 'whatsapp', 'code' => $otp diff --git a/backend/auth/syria/sendWhatsOpt.php b/backend/auth/syria/sendWhatsOpt.php index 0c7360d..469db6a 100755 --- a/backend/auth/syria/sendWhatsOpt.php +++ b/backend/auth/syria/sendWhatsOpt.php @@ -52,8 +52,10 @@ $otp = (string)rand(100, 999); $nabehUrl = 'https://otp.intaleqapp.com/api/request-otp.php'; $appKey = getenv('NABEH_OTP_APP_KEY'); +$phoneWithPlus = (strpos($receiver, '+') === 0) ? $receiver : '+' . $receiver; + $payload = [ - 'phone' => $receiver, + 'phone' => $phoneWithPlus, 'device_type' => 'android', 'method' => 'whatsapp', 'code' => $otp diff --git a/backend/auth/syria/send_survey.php b/backend/auth/syria/send_survey.php index 6d088da..31d991c 100755 --- a/backend/auth/syria/send_survey.php +++ b/backend/auth/syria/send_survey.php @@ -19,7 +19,7 @@ $surveyMessage = [ "text" => "استطلاع رأي سريع 🌟" ], "body" => [ - "text" => "هل كانت تجربة التسجيل في تطبيق *انطلق* سهلة بالنسبة لك؟\n\n👇 اضغط أحد الخيارات:" + "text" => "هل كانت تجربة التسجيل في تطبيق *سيرو* سهلة بالنسبة لك؟\n\n👇 اضغط أحد الخيارات:" ], "footer" => [ "text" => "للتواصل: +962 7XXXXXXX - رابط التطبيق: https://intaleq.xyz" diff --git a/backend/auth/syria/uploadSyrianDocs.php b/backend/auth/syria/uploadSyrianDocs.php index d5e69ff..bb0cd2f 100755 --- a/backend/auth/syria/uploadSyrianDocs.php +++ b/backend/auth/syria/uploadSyrianDocs.php @@ -10,7 +10,7 @@ const MAX_FILE_MB = 5; const ALLOWED_MIMES = ['image/jpeg','image/png','image/webp']; // فقط صور const UPLOAD_ROOT = __DIR__ . "/../../private_uploads"; // مجلد خاص (غير عام) const SIGN_SECRET = getenv('SECRET_KEY_HMAC'); // غيّرها واقرأها من .env -const PUBLIC_BASE = 'https://syria.intaleq.xyz/intaleq'; // الدومين العلني +const PUBLIC_BASE = 'https://syria.intaleq.xyz/siro'; // الدومين العلني const SIGNED_TTL_SEC = 172800; // 2 days = 60*60*24 // أنشئ مجلد الرفع إن لم يكن موجودًا diff --git a/backend/auth/token_passenger/verify_otp.php b/backend/auth/token_passenger/verify_otp.php index cdc13db..2c3aced 100755 --- a/backend/auth/token_passenger/verify_otp.php +++ b/backend/auth/token_passenger/verify_otp.php @@ -1,6 +1,6 @@ secretKey = trim(file_get_contents('/home/intaleq-api/.secret_key')); + $this->secretKey = trim(file_get_contents('/home/siro-api/.secret_key')); $this->hmacSecret = getenv('SECRET_KEY_HMAC') ?: ''; $this->fpPepper = getenv('FP_PEPPER') ?: ''; $this->issuer = (string)(getenv('APP_ISSUER') ?: ''); @@ -145,7 +145,7 @@ class JwtService self::abort(401, 'Token expired'); } catch (SignatureInvalidException $e) { // محاولة فك التشفير بمفتاح المحفظة (Wallet secret fallback) - $payKeyPath = '/home/intaleq-api/.secret_key_pay'; + $payKeyPath = '/home/siro-api/.secret_key_pay'; $payKey = file_exists($payKeyPath) ? trim(file_get_contents($payKeyPath)) : ''; if ($payKey) { @@ -288,7 +288,7 @@ class JwtService { $keyPath = getenv('INTERNAL_SOCKET_KEY_PATH'); $sent = $_SERVER['HTTP_X_INTERNAL_KEY'] ?? ''; - $expected = (file_exists($keyPath) ? trim(file_get_contents($keyPath)) : '') ?: 'Intaleq_Secure_Bridge_Key_2026_@!socket'; + $expected = (file_exists($keyPath) ? trim(file_get_contents($keyPath)) : '') ?: 'Siro_Secure_Bridge_Key_2026_@!socket'; if (!$expected || !hash_equals($expected, $sent)) { error_log('[SECURITY] Invalid internal key from: ' . ($_SERVER['REMOTE_ADDR'] ?? '?')); diff --git a/backend/core/bootstrap.php b/backend/core/bootstrap.php index 5a4029f..324bf92 100644 --- a/backend/core/bootstrap.php +++ b/backend/core/bootstrap.php @@ -12,7 +12,7 @@ ini_set('display_errors', '0'); ini_set('log_errors', '1'); // تحديد مسار اللوج بشكل ديناميكي (محلياً أو سيرفر) -$logPath = '/home/intaleq-api/logs/php_errors.log'; +$logPath = '/home/siro-api/logs/php_errors.log'; if (!file_exists(dirname($logPath)) || !is_writable(dirname($logPath))) { $logPath = __DIR__ . '/../logs/php_errors.log'; } @@ -40,7 +40,7 @@ if ($vendorPath) require_once $vendorPath; require_once __DIR__ . '/helpers.php'; // تحديد مسار الـ .env بشكل ديناميكي -$envFile = '/home/intaleq-api/env/.env'; +$envFile = '/home/siro-api/env/.env'; if (!file_exists($envFile)) { $envFile = __DIR__ . '/../.env'; // مسار محلي افتراضي } @@ -57,7 +57,7 @@ try { if ($redis->connect($redisHost, $redisPort, 1.5)) { if ($redisPass) $redis->auth($redisPass); - $redis->setOption(Redis::OPT_PREFIX, 'intaleq:'); + $redis->setOption(Redis::OPT_PREFIX, 'siro:'); } else { $redis = null; } diff --git a/backend/driver_socket.php b/backend/driver_socket.php index 9f24cfb..36547e1 100644 --- a/backend/driver_socket.php +++ b/backend/driver_socket.php @@ -171,7 +171,7 @@ function sendFCM_Async(string $token, string $title, string $body, array $rideDa $http = new AsyncHttp(); $http->request( - 'https://api.intaleq.xyz/intaleq/ride/firebase/send_fcm.php', + 'https://api.intaleq.xyz/siro/ride/firebase/send_fcm.php', [ 'method' => 'POST', 'data' => json_encode([ diff --git a/backend/email/sendTripEmail.php b/backend/email/sendTripEmail.php index eb9adc7..476901d 100755 --- a/backend/email/sendTripEmail.php +++ b/backend/email/sendTripEmail.php @@ -25,7 +25,7 @@ if (!$passengerEmail || !filter_var($passengerEmail, FILTER_VALIDATE_EMAIL)) { jsonError("Invalid email address"); } -$INTALEQ_SMTP_PASSWORD = getenv('INTALEQ_SMTP_PASSWORD'); +$SIRO_SMTP_PASSWORD = getenv('SIRO_SMTP_PASSWORD'); // بناء محتوى الإيميل بتصميم عصري وبريميوم $bodyEmail = " @@ -55,12 +55,12 @@ $bodyEmail = "
-

INTALEQ

+

SIRO

Your journey, our priority

Hello, $passengerName!
-

Thank you for choosing INTALEQ. Your trip has been successfully confirmed. Here is your digital receipt:

+

Thank you for choosing SIRO. Your trip has been successfully confirmed. Here is your digital receipt:

@@ -89,7 +89,7 @@ $bodyEmail = "

If you have any questions, feel free to contact our support team at any time.

-

© " . date('Y') . " INTALEQ. All rights reserved.

+

© " . date('Y') . " SIRO. All rights reserved.

Smart Transportation Solutions

@@ -102,14 +102,14 @@ try { $mail->Host = 'smtp.hostinger.com'; $mail->SMTPAuth = true; $mail->Username = $EMAIL_ADDRESS; - $mail->Password = $INTALEQ_SMTP_PASSWORD; + $mail->Password = $SIRO_SMTP_PASSWORD; $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS; $mail->Port = 587; - $mail->setFrom($EMAIL_ADDRESS, 'INTALEQ'); + $mail->setFrom($EMAIL_ADDRESS, 'SIRO'); $mail->addAddress($passengerEmail, $passengerName); $mail->isHTML(true); - $mail->Subject = 'Your INTALEQ Trip Details'; + $mail->Subject = 'Your SIRO Trip Details'; $mail->Body = $bodyEmail; $mail->send(); diff --git a/backend/encrypt_decrypt.php b/backend/encrypt_decrypt.php index 80187fd..ca09388 100755 --- a/backend/encrypt_decrypt.php +++ b/backend/encrypt_decrypt.php @@ -3,11 +3,11 @@ require_once realpath(__DIR__ . '/../vendor/autoload.php'); require_once 'load_env.php'; -$env_file = '/home/intaleq-api/env/.env'; +$env_file = '/home/siro-api/env/.env'; loadEnvironment($env_file); -$key = trim(file_get_contents('/home/intaleq-api/.enckey')); +$key = trim(file_get_contents('/home/siro-api/.enckey')); $iv = getenv('initializationVector'); // 16 bytes diff --git a/backend/functions.php b/backend/functions.php index 7ea50f1..e1a6280 100755 --- a/backend/functions.php +++ b/backend/functions.php @@ -8,7 +8,7 @@ use Firebase\JWT\SignatureInvalidException; use Firebase\JWT\BeforeValidException; -$INTERNAL_KEY = trim((string)@file_get_contents('/home/intaleq-api/.internal_socket_key')); +$INTERNAL_KEY = trim((string)@file_get_contents('/home/siro-api/.internal_socket_key')); /** @@ -23,7 +23,7 @@ $INTERNAL_KEY = trim((string)@file_get_contents('/home/intaleq-api/.internal_soc function sendToLocationServer($action, $data) { // رابط سيرفر اللوكيشن الداخلي أو العام $url = "http://188.68.36.205:2021"; - $INTERNAL_KEY = trim((string)@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim((string)@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = [ 'action' => $action, @@ -44,7 +44,7 @@ function sendToLocationServer($action, $data) { function findBestDrivers($con, $lat, $lng, $carType) { // 1. الاتصال بـ Redis لجلب الأقرب $locationServerUrl = "https://location.intaleq.xyz/api_get_nearby.php"; - $INTERNAL_KEY = trim((string)@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim((string)@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = ['lat' => $lat, 'lng' => $lng, 'radius' => 5, 'limit' => 100]; @@ -159,7 +159,7 @@ function findBestDrivers($con, $lat, $lng, $carType) { function notifyDriversRideTaken($rideId, $winnerDriverId) { // رابط سيرفر السائقين الداخلي (نفس البورت المستخدم في driver_socket.php) $url = "http://188.68.36.205:2021"; - $INTERNAL_KEY = trim((string)@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim((string)@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = [ 'action' => 'ride_taken_event', // هذا الأكشن الجديد في السوكيت @@ -181,7 +181,7 @@ function notifyDriversRideTaken($rideId, $winnerDriverId) { function notifyDriversOnLocationServer($drivers_ids_array, $payload, $rideId = null) { // رابط سيرفر اللوكيشن الخارجي $url = "http://188.68.36.205:2021"; - $INTERNAL_KEY = trim((string)@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim((string)@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = [ 'action' => 'dispatch_order', // اسم الحدث المتفق عليه في socket_server.php هناك @@ -217,10 +217,10 @@ function notifyDriversOnLocationServer($drivers_ids_array, $payload, $rideId = n function notifyPassengerOnRideServer($passenger_id, $payload) { // الرابط لسيرفر سوكيت الركاب — IP مباشر لتجاوز مشاكل الجدار الناري والدومين $url = "http://188.68.36.205:3031"; - $INTERNAL_KEY = trim((string)@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim((string)@file_get_contents('/home/siro-api/.internal_socket_key')); if (empty($INTERNAL_KEY)) { - error_log("[SOCKET_CRITICAL] Internal key missing at /home/intaleq-api/.internal_socket_key"); + error_log("[SOCKET_CRITICAL] Internal key missing at /home/siro-api/.internal_socket_key"); } $postData = [ @@ -263,7 +263,7 @@ function dispatchRideToDrivers($driversData, $rideId, $payloadTemplate, $startNa error_log("🚀 [DISPATCH_START] RideID: $rideId | Drivers Count: $countDrivers"); $socketUrl = 'http://188.68.36.205:2021'; - $internalKeyPath = '/home/intaleq-api/.internal_socket_key'; + $internalKeyPath = '/home/siro-api/.internal_socket_key'; $internalKey = file_exists($internalKeyPath) ? trim((string)@file_get_contents($internalKeyPath)) : ''; foreach ($driversData as $driver) { diff --git a/backend/intaleq_v1.code-workspace b/backend/intaleq_v1.code-workspace index 7909573..56bd15c 100644 --- a/backend/intaleq_v1.code-workspace +++ b/backend/intaleq_v1.code-workspace @@ -4,16 +4,16 @@ "path": "." }, { - "path": "../../../development/App/Intaleq" + "path": "../../../development/App/Siro" }, { - "path": "../../../development/App/intaleq_driver" + "path": "../../../development/App/siro_driver" }, { - "path": "../../../development/App/intaleq_admin" + "path": "../../../development/App/siro_admin" }, { - "path": "../../../development/App/service_intaleq" + "path": "../../../development/App/service_siro" } ], "settings": {} diff --git a/backend/intaleq_v1_secure_latest.md b/backend/intaleq_v1_secure_latest.md index 908030c..f2d4246 100644 --- a/backend/intaleq_v1_secure_latest.md +++ b/backend/intaleq_v1_secure_latest.md @@ -1,4 +1,4 @@ -# Intaleq V1 - Secure Latest Version +# Siro V1 - Secure Latest Version ## File: functions.php ``` @@ -12,7 +12,7 @@ use Firebase\JWT\SignatureInvalidException; use Firebase\JWT\BeforeValidException; -$INTERNAL_KEY = trim(file_get_contents('/home/intaleq-api/.internal_socket_key')); +$INTERNAL_KEY = trim(file_get_contents('/home/siro-api/.internal_socket_key')); /** @@ -27,7 +27,7 @@ $INTERNAL_KEY = trim(file_get_contents('/home/intaleq-api/.internal_socket_key') function sendToLocationServer($action, $data) { // رابط سيرفر اللوكيشن الداخلي أو العام $url = "http://location.intaleq.xyz:2021"; - $INTERNAL_KEY = trim(@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim(@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = [ 'action' => $action, @@ -48,7 +48,7 @@ function sendToLocationServer($action, $data) { function findBestDrivers($con, $lat, $lng, $carType) { // 1. الاتصال بـ Redis لجلب الأقرب $locationServerUrl = "https://location.intaleq.xyz/api_get_nearby.php"; - $INTERNAL_KEY = trim(@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim(@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = ['lat' => $lat, 'lng' => $lng, 'radius' => 5, 'limit' => 100]; @@ -162,7 +162,7 @@ function notifyDriversRideTaken($rideId, $winnerDriverId) { // رابط سيرفر السائقين الداخلي (نفس البورت المستخدم في driver_socket.php) $url = getenv('LOCATION_SOCKET_URL'); if (!$url) throw new RuntimeException('LOCATION_SOCKET_URL not configured'); - $INTERNAL_KEY = trim(@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim(@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = [ 'action' => 'ride_taken_event', // هذا الأكشن الجديد في السوكيت @@ -185,7 +185,7 @@ function notifyDriversOnLocationServer($drivers_ids_array, $payload, $rideId = n // رابط سيرفر اللوكيشن الخارجي $url = getenv('LOCATION_SOCKET_URL'); if (!$url) throw new RuntimeException('LOCATION_SOCKET_URL not configured'); - $INTERNAL_KEY = trim(@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim(@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = [ 'action' => 'dispatch_order', // اسم الحدث المتفق عليه في socket_server.php هناك @@ -225,7 +225,7 @@ function notifyPassengerOnRideServer($passenger_id, $payload) { error_log("[FATAL] PASSENGER_SOCKET_URL not configured"); throw new RuntimeException('PASSENGER_SOCKET_URL not configured'); } - $INTERNAL_KEY = trim(@file_get_contents('/home/intaleq-api/.internal_socket_key')); + $INTERNAL_KEY = trim(@file_get_contents('/home/siro-api/.internal_socket_key')); $postData = [ 'action' => 'update_ride_status', @@ -266,7 +266,7 @@ function dispatchRideToDrivers($driversData, $rideId, $payloadTemplate, $startNa $socketUrl = getenv('LOCATION_SOCKET_URL'); if (!$socketUrl) throw new RuntimeException('LOCATION_SOCKET_URL not configured'); - $internalKeyPath = '/home/intaleq-api/.internal_socket_key'; + $internalKeyPath = '/home/siro-api/.internal_socket_key'; $internalKey = file_exists($internalKeyPath) ? trim(file_get_contents($internalKeyPath)) : ''; foreach ($driversData as $driver) { @@ -377,15 +377,15 @@ function sendFcmNotification($token, $title, $body, $data, $category, $tone) { // authenticateJWT() — النسخة النهائية الكاملة // ─────────────────────────────────────────────────────────────── // قائمة allowedFiles مبنية على هيكل الملفات الفعلي: -// intaleq_v1/ ← الجذر -// intaleq_v1/auth/ ← مشترك راكب/سائق -// intaleq_v1/auth/syria/ ← تسجيل سوريا -// intaleq_v1/auth/captin/ ← تسجيل السائق +// siro_v1/ ← الجذر +// siro_v1/auth/ ← مشترك راكب/سائق +// siro_v1/auth/syria/ ← تسجيل سوريا +// siro_v1/auth/captin/ ← تسجيل السائق // ═══════════════════════════════════════════════════════════════ function authenticateJWT(): object { - $secretKey = trim(file_get_contents('/home/intaleq-api/.secret_key')); + $secretKey = trim(file_get_contents('/home/siro-api/.secret_key')); $hmacSecret = getenv('SECRET_KEY_HMAC'); $fpPepper = getenv('FP_PEPPER'); @@ -1250,7 +1250,7 @@ CREATE TABLE `car_locations` ( /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO' */ ; DELIMITER ;; -/*!50003 CREATE*/ /*!50017 DEFINER=`intaleqUserDB1`@`%`*/ /*!50003 TRIGGER `trg_before_insert_car_locations` BEFORE INSERT ON `car_locations` FOR EACH ROW BEGIN +/*!50003 CREATE*/ /*!50017 DEFINER=`siroUserDB1`@`%`*/ /*!50003 TRIGGER `trg_before_insert_car_locations` BEFORE INSERT ON `car_locations` FOR EACH ROW BEGIN SET NEW.location_point = ST_PointFromText(CONCAT('POINT(', NEW.longitude, ' ', NEW.latitude, ')'), 4326); END */;; DELIMITER ; @@ -1267,7 +1267,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO' */ ; DELIMITER ;; -/*!50003 CREATE*/ /*!50017 DEFINER=`intaleqUserDB1`@`%`*/ /*!50003 TRIGGER `trg_before_update_car_locations` BEFORE UPDATE ON `car_locations` FOR EACH ROW BEGIN +/*!50003 CREATE*/ /*!50017 DEFINER=`siroUserDB1`@`%`*/ /*!50003 TRIGGER `trg_before_update_car_locations` BEFORE UPDATE ON `car_locations` FOR EACH ROW BEGIN IF NEW.latitude <> OLD.latitude OR NEW.longitude <> OLD.longitude THEN SET NEW.location_point = ST_PointFromText(CONCAT('POINT(', NEW.longitude, ' ', NEW.latitude, ')'), 4326); END IF; @@ -2934,7 +2934,7 @@ try { -سياسة الخصوصية وشروط الخدمة – Intaleq Driver +سياسة الخصوصية وشروط الخدمة – Siro Driver