-
-
User Information
+
+
+
+ User Information
+
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
Account Details
+
+ -
+
+ Email Verified:
+
+
+
+
+
+ -
+
+ Member Since:
+
+
+
+ -
+
+ Last Login:
+
+
+
+
+
+
+
+
+
+
-
diff --git a/app/Views/users/index.php b/app/Views/users/index.php
index 3a3b7d1..458994b 100644
--- a/app/Views/users/index.php
+++ b/app/Views/users/index.php
@@ -230,7 +230,18 @@ $pagination = $pagination ?? [
-
+
+
+
+
+ 2FA
+
+
+
+ No 2FA
+
+
+
|
find($domain['id']);
+
+ // --- External notifications (channels) ---
+ if ($domain['notification_group_id']) {
+ if (!$logModel->wasSentRecently($domain['id'], $statusNotificationType, 23)) {
+ $channels = $channelModel->getActiveByGroupId($domain['notification_group_id']);
+
+ if (!empty($channels)) {
+ logMessage(" 📤 Sending status change alerts to " . count($channels) . " channel(s)");
+
+ $results = $notificationService->sendDomainStatusAlert($domainData, $channels, $status, $oldStatus);
+
+ foreach ($results as $result) {
+ $success = $result['success'];
+ $channel = $result['channel'];
+
+ if ($success) {
+ logMessage(" ✓ Sent to $channel");
+ $stats['status_notifications_sent']++;
+ $stats['notifications_sent']++;
+ } else {
+ logMessage(" ✗ Failed to send to $channel");
+ }
+
+ $logModel->log(
+ $domain['id'],
+ $statusNotificationType,
+ $channel,
+ "Domain $domainName status changed: $oldStatus → $status",
+ $success,
+ $success ? null : "Failed to send notification"
+ );
+ }
+ }
+ } else {
+ logMessage(" → Status notification already sent recently (skipping external alerts)");
+ }
+ }
+
+ // --- In-app notifications (bell icon) ---
+ $isolationMode = $settingModel->getValue('user_isolation_mode', 'shared');
+ $usersToNotify = [];
+
+ if ($isolationMode === 'isolated') {
+ $notificationUserId = null;
+ if (!empty($domainData['user_id'])) {
+ $notificationUserId = $domainData['user_id'];
+ } elseif (!empty($domain['notification_group_id'])) {
+ $group = $groupModel->find($domain['notification_group_id']);
+ if ($group && !empty($group['user_id'])) {
+ $notificationUserId = $group['user_id'];
+ }
+ }
+ if ($notificationUserId) {
+ $usersToNotify[] = $notificationUserId;
+ }
+ } else {
+ $allUsers = $userModel->where('is_active', 1);
+ foreach ($allUsers as $user) {
+ $usersToNotify[] = $user['id'];
+ }
+ }
+
+ if (!empty($usersToNotify)) {
+ $notifiedCount = 0;
+
+ foreach ($usersToNotify as $userId) {
+ // Check for duplicate in-app notification
+ $db = \Core\Database::getConnection();
+ $stmt = $db->prepare(
+ "SELECT COUNT(*) as count FROM user_notifications
+ WHERE user_id = ? AND domain_id = ? AND type = ?
+ AND created_at >= DATE_SUB(NOW(), INTERVAL 23 HOUR)"
+ );
+ $stmt->execute([$userId, $domain['id'], $statusNotificationType]);
+ $result = $stmt->fetch();
+
+ if ($result && $result['count'] > 0) {
+ continue;
+ }
+
+ try {
+ match($statusNotificationType) {
+ 'domain_available' => $notificationService->notifyDomainAvailable($userId, $domainName, $domain['id']),
+ 'domain_registered' => $notificationService->notifyDomainRegistered($userId, $domainName, $domain['id']),
+ 'domain_expired_status' => $notificationService->notifyDomainExpired($userId, $domainName, $domain['id']),
+ 'domain_redemption' => $notificationService->notifyDomainRedemption($userId, $domainName, $domain['id']),
+ 'domain_pending_delete' => $notificationService->notifyDomainPendingDelete($userId, $domainName, $domain['id']),
+ default => null
+ };
+ $notifiedCount++;
+ } catch (Exception $e) {
+ logMessage(" ⚠ Failed to create status notification for user $userId: " . $e->getMessage());
+ }
+ }
+
+ if ($notifiedCount > 0) {
+ logMessage(" 🔔 Created status change notifications for $notifiedCount user(s)");
+ $stats['in_app_notifications_created'] += $notifiedCount;
+ $stats['domains_with_notifications']++;
+
+ $stats['domains_notified'][] = [
+ 'domain' => $domainName,
+ 'days_left' => null,
+ 'users_notified' => $notifiedCount,
+ 'has_group' => !empty($domain['notification_group_id']),
+ 'group_id' => $domain['notification_group_id'] ?? null,
+ 'status_change' => "$oldStatus → $status"
+ ];
+
+ if (!empty($domain['notification_group_id'])) {
+ $groupId = $domain['notification_group_id'];
+ if (!isset($stats['notification_groups_used'][$groupId])) {
+ $stats['notification_groups_used'][$groupId] = 0;
+ }
+ $stats['notification_groups_used'][$groupId]++;
+ }
+ }
+ }
+ }
+
+ // ============================================================
+ // EXPIRATION-BASED NOTIFICATIONS (existing logic)
+ // ============================================================
+ // Check if notifications should be sent based on days until expiration
$daysLeft = $whoisService->daysUntilExpiration($whoisData['expiration_date']);
if ($daysLeft === null) {
continue;
}
- // Check if this domain should trigger a notification
+ // Check if this domain should trigger an expiration notification
$shouldNotify = false;
$notificationType = '';
if ($daysLeft <= 0) {
- $shouldNotify = true;
- $notificationType = 'expired';
+ // Only send expiration notification if we didn't already send a status change expired notification
+ if ($statusNotificationType !== 'domain_expired_status') {
+ $shouldNotify = true;
+ $notificationType = 'expired';
+ }
} elseif (in_array($daysLeft, $notificationDays)) {
$shouldNotify = true;
$notificationType = "expiring_in_{$daysLeft}_days";
}
if (!$shouldNotify) {
- logMessage(" → No notification needed ($daysLeft days left)");
+ logMessage(" → No expiration notification needed ($daysLeft days left)");
continue;
}
@@ -646,6 +811,8 @@ $formattedTime = formatElapsedTime($elapsedTime);
logMessage("\n=== Cron job completed ===");
logMessage("Domains checked: {$stats['checked']}");
logMessage("Domains updated: {$stats['updated']}");
+logMessage("Status changes detected: {$stats['status_changes']}");
+logMessage("Status notifications sent: {$stats['status_notifications_sent']}");
logMessage("External notifications sent: {$stats['notifications_sent']}");
logMessage("In-app notifications created: {$stats['in_app_notifications_created']}");
logMessage("Domains with notifications: {$stats['domains_with_notifications']}");
diff --git a/database/migrations/000_initial_schema_v1.1.0.sql b/database/migrations/000_initial_schema_v1.1.0.sql
index 9636e73..3bf1c27 100644
--- a/database/migrations/000_initial_schema_v1.1.0.sql
+++ b/database/migrations/000_initial_schema_v1.1.0.sql
@@ -141,7 +141,7 @@ CREATE TABLE IF NOT EXISTS domains (
updated_date DATE,
abuse_email VARCHAR(255),
last_checked TIMESTAMP NULL,
- status ENUM('active', 'expiring_soon', 'expired', 'error', 'available') DEFAULT 'active',
+ status ENUM('active', 'expiring_soon', 'expired', 'error', 'available', 'redemption_period', 'pending_delete') DEFAULT 'active',
whois_data JSON,
notes TEXT,
is_active BOOLEAN DEFAULT TRUE,
@@ -362,7 +362,7 @@ INSERT INTO settings (setting_key, setting_value, `type`, `description`) VALUES
('app_name', 'Domain Monitor', 'string', 'Application name'),
('app_url', 'http://localhost:8000', 'string', 'Application URL'),
('app_timezone', 'UTC', 'string', 'Application timezone'),
-('app_version', '1.1.1', 'string', 'Application version number'),
+('app_version', '1.1.2', 'string', 'Application version number'),
-- Email settings
('mail_host', 'smtp.mailtrap.io', 'string', 'SMTP server host'),
@@ -375,6 +375,7 @@ INSERT INTO settings (setting_key, setting_value, `type`, `description`) VALUES
-- Monitoring settings
('notification_days_before', '60,30,21,14,7,5,3,2,1', 'string', 'Notification days before expiration'),
+('notification_status_triggers', 'available,registered,expired,redemption_period,pending_delete', 'string', 'Domain status changes that trigger notifications'),
('check_interval_hours', '24', 'string', 'Domain check interval in hours'),
('last_check_run', NULL, 'datetime', 'Last time cron job ran'),
diff --git a/database/migrations/024_add_status_notifications_v1.1.2.sql b/database/migrations/024_add_status_notifications_v1.1.2.sql
new file mode 100644
index 0000000..19f6c3b
--- /dev/null
+++ b/database/migrations/024_add_status_notifications_v1.1.2.sql
@@ -0,0 +1,20 @@
+-- Migration: Add status-based notifications and new domain lifecycle statuses
+-- Version: 1.1.2
+-- This migration adds support for notifications based on domain status changes:
+-- available, registered, expired, redemption_period, pending_delete
+
+-- 1. Expand domain status ENUM to include redemption_period and pending_delete
+ALTER TABLE domains MODIFY COLUMN status
+ ENUM('active', 'expiring_soon', 'expired', 'error', 'available', 'redemption_period', 'pending_delete')
+ DEFAULT 'active';
+
+-- 2. Add setting for notification status triggers (which status changes trigger notifications)
+INSERT INTO settings (setting_key, setting_value, created_at, updated_at)
+VALUES ('notification_status_triggers', 'available,registered,expired,redemption_period,pending_delete', NOW(), NOW())
+ON DUPLICATE KEY UPDATE setting_key = setting_key;
+
+-- 3. Update application version to 1.1.2
+UPDATE settings
+SET setting_value = '1.1.2'
+WHERE setting_key = 'app_version';
+
|