If active site is deleted set the following site as default

Author: givanz

admin/controller/settings/sites.php

@@ -39,6 +39,10 @@ function delete() {
 		$site_id    = $this->request->post['site_id'] ?? $this->request->get['site_id'] ?? false;
 
 		if ($site_id) {
+			$active_deleted = false;
+			$active_site_id = $this->session->get('site_id');
+
+			
 			if (is_numeric($site_id)) {
 				$site_id = [$site_id];
 			}
@@ -49,6 +53,10 @@ function delete() {
 				if ($site) {
 					SitesList::deleteSite($site);
 				}
+
+				if ($id == $active_site_id) {
+					$active_deleted = true;
+				}
 			}
 
 			$sites         = new SiteSQL();
@@ -60,6 +68,10 @@ function delete() {
 
 			if ($result && isset($result['site'])) {
 				$this->view->success[] = ucfirst(__('site')) . __(' deleted!');
+				//if active site was deleted set the next valid site as active
+				if ($active_deleted) {
+					$this->setSite();
+				}
 			} else {
 				$this->view->errors[] = sprintf(__('Error deleting %s!'),  __(' site'));
 			}
@@ -79,7 +91,7 @@ function index() {
 		} else {
 			$options['site_id'] = Admin :: siteAccess();
 		}
-
+		
 		$page    = $this->request->get['page'] ?? 1;
 		$limit   = $this->request->get['limit'] ?? 10;