From 9cc14864a3f84c5f80bd597fe91bc7c0f8830072 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Mon, 29 Jun 2026 00:26:08 +0300 Subject: [PATCH] Update: 2026-06-29 00:26:08 --- add_admin_country.php | 10 ++++++++++ backend/Admin/auth/login.php | 15 --------------- backend/Admin/auth/verify_login.php | 15 --------------- backend/schema_primary.sql | 1 + backend/serviceapp/login.php | 14 -------------- 5 files changed, 11 insertions(+), 44 deletions(-) create mode 100644 add_admin_country.php diff --git a/add_admin_country.php b/add_admin_country.php new file mode 100644 index 00000000..ad94989a --- /dev/null +++ b/add_admin_country.php @@ -0,0 +1,10 @@ +exec("ALTER TABLE adminUser ADD COLUMN country VARCHAR(100) DEFAULT 'Jordan'"); + echo "SUCCESS: Added country column to adminUser\n"; +} catch (Exception $e) { + echo "INFO: " . $e->getMessage() . "\n"; +} +unlink(__FILE__); diff --git a/backend/Admin/auth/login.php b/backend/Admin/auth/login.php index 5b5ac467..f3e9dd80 100644 --- a/backend/Admin/auth/login.php +++ b/backend/Admin/auth/login.php @@ -109,21 +109,6 @@ try { // فك تشفير البيانات للعرض $admin['name'] = $encryptionHelper->decryptData($admin['name']) ?: $admin['name']; - - // جلب الدولة من جدول kazan لتحديد السيرفر في التطبيق - $country = 'Jordan'; - try { - $stmtKazan = $con->prepare("SELECT country FROM kazan LIMIT 1"); - $stmtKazan->execute(); - $kazan = $stmtKazan->fetch(PDO::FETCH_ASSOC); - if ($kazan && !empty($kazan['country'])) { - $country = $kazan['country']; - } - } catch (Exception $e) { - // تجاهل - } - $admin['country'] = $country; - unset($admin['password']); printSuccess([ diff --git a/backend/Admin/auth/verify_login.php b/backend/Admin/auth/verify_login.php index 27503e66..65a86784 100644 --- a/backend/Admin/auth/verify_login.php +++ b/backend/Admin/auth/verify_login.php @@ -72,21 +72,6 @@ try { // فك تشفير البيانات للعرض $admin['name'] = $encryptionHelper->decryptData($admin['name']) ?: $admin['name']; - - // جلب الدولة من جدول kazan لتحديد السيرفر في التطبيق - $country = 'Jordan'; - try { - $stmtKazan = $con->prepare("SELECT country FROM kazan LIMIT 1"); - $stmtKazan->execute(); - $kazan = $stmtKazan->fetch(PDO::FETCH_ASSOC); - if ($kazan && !empty($kazan['country'])) { - $country = $kazan['country']; - } - } catch (Exception $e) { - // تجاهل - } - $admin['country'] = $country; - unset($admin['password']); printSuccess([ diff --git a/backend/schema_primary.sql b/backend/schema_primary.sql index 6f0870e2..5231a533 100644 --- a/backend/schema_primary.sql +++ b/backend/schema_primary.sql @@ -61,6 +61,7 @@ CREATE TABLE `adminUser` ( `email` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'البريد مشفر (AES-GCM)', `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'bcrypt', `role` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'admin' COMMENT 'admin | super_admin | service', + `country` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'Jordan' COMMENT 'اسم الدولة: Syria, Egypt, Jordan, Iraq, ...', `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), diff --git a/backend/serviceapp/login.php b/backend/serviceapp/login.php index a575110c..bdc4a055 100644 --- a/backend/serviceapp/login.php +++ b/backend/serviceapp/login.php @@ -74,20 +74,6 @@ try { $user['email'] = $encryptionHelper->decryptData($user['email']) ?: $user['email']; $user['phone'] = $encryptionHelper->decryptData($user['phone']) ?: $user['phone']; - // جلب الدولة من جدول kazan لتحديد السيرفر في التطبيق - $country = 'Jordan'; - try { - $stmtKazan = $con->prepare("SELECT country FROM kazan LIMIT 1"); - $stmtKazan->execute(); - $kazan = $stmtKazan->fetch(PDO::FETCH_ASSOC); - if ($kazan && !empty($kazan['country'])) { - $country = $kazan['country']; - } - } catch (Exception $e) { - // تجاهل الخطأ واستخدام الافتراضي - } - $user['country'] = $country; - unset($user['password']); // توليد التوكن أو استرجاع التوكن الحالي إذا كان صالحاً