diff --git a/src/Cli/CommandInterface.php b/src/Cli/CommandInterface.php
index e443e87e..3865d64f 100644
--- a/src/Cli/CommandInterface.php
+++ b/src/Cli/CommandInterface.php
@@ -16,7 +16,6 @@ namespace XcVm\Cli;
  */
 
 interface CommandInterface {
-
 	/**
 	 * Уникальное имя команды.
 	 *
diff --git a/src/Cli/CommandRegistry.php b/src/Cli/CommandRegistry.php
index bda03752..9a200c89 100644
--- a/src/Cli/CommandRegistry.php
+++ b/src/Cli/CommandRegistry.php
@@ -20,7 +20,6 @@ namespace XcVm\Cli;
  */
 
 class CommandRegistry {
-
 	/** @var CommandInterface[] name → command */
 	private $rCommands = [];
 
diff --git a/src/Cli/Commands/ArchiveCommand.php b/src/Cli/Commands/ArchiveCommand.php
index 695df241..c08727b3 100644
--- a/src/Cli/Commands/ArchiveCommand.php
+++ b/src/Cli/Commands/ArchiveCommand.php
@@ -25,7 +25,6 @@ use XcVm\Domain\Stream\StreamProcess;
  */
 
 class ArchiveCommand implements CommandInterface {
-
 	/** @inheritDoc */
 	public function getName(): string {
 		return 'archive';
@@ -111,7 +110,7 @@ class ArchiveCommand implements CommandInterface {
 		// currently listed in the playlist to avoid reading a partial file.
 		$rPlaylistContent = @file_get_contents($rPlaylist);
 		preg_match_all('/_(\d+)\.ts/', ($rPlaylistContent ?: ''), $rSegMatches);
-		$rSegNum = !empty($rSegMatches[1]) ? (int)end($rSegMatches[1]) + 1 : 0;
+		$rSegNum = !empty($rSegMatches[1]) ? (int) end($rSegMatches[1]) + 1 : 0;
 		$this->logStatus('Starting from source segment #' . $rSegNum . '.');
 
 		// Open the first archive minute file; subsequent ones are opened on rotation.
@@ -165,7 +164,7 @@ class ArchiveCommand implements CommandInterface {
 				if ($rWaitCount % 300 === 0) {
 					$rFreshContent = @file_get_contents($rPlaylist);
 					preg_match_all('/_(\d+)\.ts/', ($rFreshContent ?: ''), $rFreshMatches);
-					$rFreshSeg = !empty($rFreshMatches[1]) ? (int)end($rFreshMatches[1]) : -1;
+					$rFreshSeg = !empty($rFreshMatches[1]) ? (int) end($rFreshMatches[1]) : -1;
 
 					if ($rFreshSeg >= 0 && $rFreshSeg > $rSegNum + 1) {
 						// Forward gap: ffmpeg skipped segment numbers (old files purged
@@ -269,7 +268,7 @@ class ArchiveCommand implements CommandInterface {
 	 *
 	 * @param string $rMessage Human-readable status message.
 	 */
-	private function logStatus($rMessage): void {
+	private function logStatus(string $rMessage): void {
 		echo '[archive][' . getmypid() . '][' . gmdate('Y-m-d H:i:s') . '] ' . $rMessage . "\n";
 	}
 
@@ -283,7 +282,7 @@ class ArchiveCommand implements CommandInterface {
 	 * @param int $rStreamID Stream identifier used to build the archive path.
 	 * @param int $rDuration Maximum retention duration in days.
 	 */
-	private function deleteSegments($rStreamID, $rDuration): void {
+	private function deleteSegments(int $rStreamID, int $rDuration): void {
 		$rSegmentCount = intval(count(scandir(ARCHIVE_PATH . $rStreamID . '/')) - 2);
 		if ($rDuration * 24 * 60 < $rSegmentCount) {
 			$rDelta = $rSegmentCount - $rDuration * 24 * 60;
@@ -308,7 +307,7 @@ class ArchiveCommand implements CommandInterface {
 	 *
 	 * @param int $rStreamID Stream identifier.
 	 */
-	private function checkRunning($rStreamID): void {
+	private function checkRunning(int $rStreamID): void {
 		clearstatcache(true);
 		$rPID = null;
 		if (file_exists(STREAMS_PATH . $rStreamID . '_.archive')) {
@@ -326,7 +325,7 @@ class ArchiveCommand implements CommandInterface {
 		file_put_contents(STREAMS_PATH . $rStreamID . '_.archive', getmypid());
 		$this->logStatus('Wrote current PID to archive marker file.');
 	}
-	
+
 	/**
 	 * Checks whether a given PID is an active TVArchive worker for this stream.
 	 *
@@ -337,7 +336,7 @@ class ArchiveCommand implements CommandInterface {
 	 * @param int $rStreamID Stream identifier to match against the process title.
 	 * @return bool True if the process is an archive worker for this stream.
 	 */
-	private function isArchiveProcessForStream($rPID, $rStreamID): bool {
+	private function isArchiveProcessForStream(int $rPID, int $rStreamID): bool {
 		if (!is_numeric($rPID) || 0 >= intval($rPID) || !file_exists('/proc/' . $rPID)) {
 			return false;
 		}
diff --git a/src/Cli/Commands/BinariesCommand.php b/src/Cli/Commands/BinariesCommand.php
index 63e79518..065f9afb 100644
--- a/src/Cli/Commands/BinariesCommand.php
+++ b/src/Cli/Commands/BinariesCommand.php
@@ -17,7 +17,6 @@ use XcVm\Core\Updates\UpdateChannels;
  */
 
 class BinariesCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'binaries';
 	}
@@ -101,7 +100,7 @@ class BinariesCommand implements CommandInterface {
 		$rLogFile = $rLogDir . 'binaries_update_' . date('Ymd_His') . '.log';
 		$rDetachedCommand = 'nohup ' . $rCommand . ' > ' . escapeshellarg($rLogFile) . ' 2>&1 < /dev/null & echo $!';
 		echo "Starting binaries updater in background...\n";
-		$rPid = trim((string)shell_exec($rDetachedCommand));
+		$rPid = trim((string) shell_exec($rDetachedCommand));
 
 		if (empty($rPid)) {
 			echo "Failed to start binaries updater in background.\n";
diff --git a/src/Cli/Commands/CacheHandlerCommand.php b/src/Cli/Commands/CacheHandlerCommand.php
index d950d896..b374abf1 100644
--- a/src/Cli/Commands/CacheHandlerCommand.php
+++ b/src/Cli/Commands/CacheHandlerCommand.php
@@ -73,7 +73,7 @@ class CacheHandlerCommand implements CommandInterface {
 			}
 
 			try {
-				$rUpdatedLines = array();
+				$rUpdatedLines = [];
 				foreach (SignalQueue::pending() as list($rFileMD5, $rKey, $rData)) {
 					list($rHeader) = explode('/', $rKey);
 					switch ($rHeader) {
diff --git a/src/Cli/Commands/CertbotCommand.php b/src/Cli/Commands/CertbotCommand.php
index 4d6dfa11..5253b005 100644
--- a/src/Cli/Commands/CertbotCommand.php
+++ b/src/Cli/Commands/CertbotCommand.php
@@ -17,7 +17,6 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class CertbotCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'certbot';
 	}
@@ -50,26 +49,26 @@ class CertbotCommand implements CommandInterface {
 			if (file_exists(BIN_PATH . 'certbot/logs/xc_vm.log')) {
 				unlink(BIN_PATH . 'certbot/logs/xc_vm.log');
 			}
-			foreach (array('logs', 'config', 'work') as $rPath) {
+			foreach (['logs', 'config', 'work'] as $rPath) {
 				if (file_exists(BIN_PATH . 'certbot/' . $rPath . '/.certbot.lock')) {
 					unlink(BIN_PATH . 'certbot/' . $rPath . '/.certbot.lock');
 				}
 			}
-			$rActiveDomains = array();
+			$rActiveDomains = [];
 			foreach ($rData['domain'] as $rDomain) {
 				if (!empty($rDomain) && !filter_var($rDomain, FILTER_VALIDATE_IP)) {
 					$rActiveDomains[] = $rDomain;
 				}
 			}
 			$rError = null;
-			$rOutput = array();
+			$rOutput = [];
 			$rResult = false;
 			if (0 < count($rActiveDomains)) {
 				$rCertbotWebroot = MAIN_HOME . 'certbot-webroot';
 				if (!is_dir($rCertbotWebroot)) {
 					mkdir($rCertbotWebroot, 0775, true);
 				}
-				foreach (array('--dry-run ', '') as $rDry) {
+				foreach (['--dry-run ', ''] as $rDry) {
 					if (ServerRepository::getAll()[SERVER_ID]['http_broadcast_port'] == 80) {
 						$rCommand = 'sudo certbot ' . $rDry . '--config-dir ' . BIN_PATH . 'certbot/config --work-dir ' . BIN_PATH . 'certbot/work --logs-dir ' . BIN_PATH . 'certbot/logs certonly --agree-tos --expand --non-interactive --register-unsafely-without-email --webroot -w ' . $rCertbotWebroot;
 					} else {
@@ -79,7 +78,7 @@ class CertbotCommand implements CommandInterface {
 						$rCommand .= ' -d ' . basename($rDomain);
 					}
 					$rCommand .= ' 2>&1';
-					$rOutput = array();
+					$rOutput = [];
 					exec($rCommand, $rOutput, $rReturn);
 
 					if (empty($rDry)) {
@@ -135,11 +134,11 @@ class CertbotCommand implements CommandInterface {
 			} else {
 				$rError = 3;
 			}
-			if (in_array($rError, array(0, 1))) {
+			if (in_array($rError, [0, 1])) {
 				$db->query('SELECT `certbot_ssl` FROM `servers` WHERE `id` = ?;', SERVER_ID);
 				$rCertInfo = json_decode($db->get_row()['certbot_ssl'], true);
 				if (!$rCertInfo) {
-					$rSelectedDomain = array(null, null);
+					$rSelectedDomain = [null, null];
 					foreach (scandir(BIN_PATH . 'certbot/config/live/') as $rDir) {
 						if ($rDir != '.' && $rDir != '..') {
 							$rSplit = explode('-', $rDir);
@@ -151,7 +150,7 @@ class CertbotCommand implements CommandInterface {
 							if (in_array(strtolower($rDomain), array_map('strtolower', $rActiveDomains))) {
 								$rInfo = DiagnosticsService::getCertificateInfo(BIN_PATH . 'certbot/config/live/' . $rDir . '/fullchain.pem');
 								if (($rInfo['serial'] && $rSelectedDomain[0] < $rInfo['expiration']) && !$rSelectedDomain[0]) {
-									$rSelectedDomain = array($rInfo['expiration'], $rInfo);
+									$rSelectedDomain = [$rInfo['expiration'], $rInfo];
 								}
 							}
 						}
@@ -171,7 +170,7 @@ class CertbotCommand implements CommandInterface {
 					}
 				}
 			}
-			$rReturn = array('status' => $rResult, 'error' => $rError, 'output' => $rOutput);
+			$rReturn = ['status' => $rResult, 'error' => $rError, 'output' => $rOutput];
 			if (!is_dir(BIN_PATH . 'certbot/logs')) {
 				mkdir(BIN_PATH . 'certbot/logs', 0775, true);
 			}
diff --git a/src/Cli/Commands/CreatedCommand.php b/src/Cli/Commands/CreatedCommand.php
index 80fb6326..71d0387b 100644
--- a/src/Cli/Commands/CreatedCommand.php
+++ b/src/Cli/Commands/CreatedCommand.php
@@ -20,7 +20,6 @@ use XcVm\Streaming\Codec\FFprobeRunner;
  */
 
 class CreatedCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'created';
 	}
@@ -71,7 +70,7 @@ class CreatedCommand implements CommandInterface {
 		$rServerInfo['cchannel_rsources'] = json_decode($rServerInfo['cchannel_rsources'], true);
 
 		if (!$rServerInfo['cchannel_rsources']) {
-			$rServerInfo['cchannel_rsources'] = array();
+			$rServerInfo['cchannel_rsources'] = [];
 		}
 
 		$rSourcesLeft = array_diff($rStreamInfo['stream_source'], $rServerInfo['cchannel_rsources']);
@@ -133,13 +132,14 @@ class CreatedCommand implements CommandInterface {
 						. (isset($rEncode['speed']) ? ' @ ' . $rEncode['speed'] : '') . "\n";
 
 					$db->db_connect();
-					$db->query('UPDATE `streams_servers` SET `progress_info` = ? WHERE `server_stream_id` = ?', json_encode(array('cc_encode' => array(
+					$db->query('UPDATE `streams_servers` SET `progress_info` = ? WHERE `server_stream_id` = ?', json_encode(['cc_encode' => [
 						'source'   => $rDone + 1,
 						'total'    => $rTotal,
 						'pct'      => $rPct,
 						'out_time' => gmdate('H:i:s', (int) $rOutSecs),
 						'speed'    => ($rEncode['speed'] ?? null),
-					))), $rServerInfo['server_stream_id']);
+					]
+					]), $rServerInfo['server_stream_id']);
 					$db->close_mysql();
 				}
 			}
@@ -187,17 +187,19 @@ class CreatedCommand implements CommandInterface {
 
 		$rInt = $rSeconds = 0;
 		$rList = explode("\n", file_get_contents(CREATED_PATH . $rStreamID . '_.list'));
-		$rReturn = array();
+		$rReturn = [];
 
 		foreach ($rList as $rItem) {
 			$parts = explode("'", $rItem);
-			if (!isset($parts[1])) continue;
+			if (!isset($parts[1])) {
+				continue;
+			}
 
 			$rFilename = $parts[1];
 
 			if (file_exists($rFilename)) {
 				$rFileInfo = FFprobeRunner::probeStream($rFilename);
-				$rReturn[] = array(
+				$rReturn[] = [
 					'position' => $rInt,
 					'filename' => basename($rFilename),
 					'path' => $rFilename,
@@ -205,7 +207,7 @@ class CreatedCommand implements CommandInterface {
 					'seconds' => $rFileInfo['of_duration'],
 					'start' => $rSeconds,
 					'finish' => $rSeconds + $rFileInfo['of_duration']
-				);
+				];
 
 				$rSeconds += $rFileInfo['of_duration'];
 				$rInt++;
@@ -227,12 +229,12 @@ class CreatedCommand implements CommandInterface {
 	 */
 	private function readEncodeProgress(string $rFile): array {
 		if (!is_file($rFile)) {
-			return array();
+			return [];
 		}
 
 		$rHandle = @fopen($rFile, 'r');
 		if (!$rHandle) {
-			return array();
+			return [];
 		}
 		if (filesize($rFile) > 4096) {
 			fseek($rHandle, -4096, SEEK_END);
@@ -240,7 +242,7 @@ class CreatedCommand implements CommandInterface {
 		$rTail = stream_get_contents($rHandle);
 		fclose($rHandle);
 
-		$rOutput = array();
+		$rOutput = [];
 		foreach (array_filter(array_map('trim', explode("\n", (string) $rTail))) as $rRow) {
 			$rParts = explode('=', $rRow, 2);
 			if (count($rParts) == 2) {
diff --git a/src/Cli/Commands/DbMigrateCommand.php b/src/Cli/Commands/DbMigrateCommand.php
index 565e8f8f..75551bd3 100644
--- a/src/Cli/Commands/DbMigrateCommand.php
+++ b/src/Cli/Commands/DbMigrateCommand.php
@@ -16,7 +16,6 @@ use XcVm\Core\Database\MigrationRunner;
  */
 
 class DbMigrateCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'db:migrate';
 	}
diff --git a/src/Cli/Commands/DelayCommand.php b/src/Cli/Commands/DelayCommand.php
index 88b4a1e9..56ae8b08 100644
--- a/src/Cli/Commands/DelayCommand.php
+++ b/src/Cli/Commands/DelayCommand.php
@@ -19,7 +19,6 @@ use XcVm\Streaming\Fanout\IngestFeeder;
  */
 
 class DelayCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'delay';
 	}
@@ -72,9 +71,9 @@ class DelayCommand implements CommandInterface {
 		$db->close_mysql();
 		$rDelayDuration = intval($rStreamInfo['delay_minutes']) + 5;
 		$this->cleanUpSegments($rStreamID, $rDelayDuration);
-		$rSegmentSettings = array('seg_time' => intval(SettingsManager::get('seg_time')), 'seg_list_size' => intval(SettingsManager::get('seg_list_size')), 'seg_delete_threshold' => intval(SettingsManager::get('seg_delete_threshold')));
+		$rSegmentSettings = ['seg_time' => intval(SettingsManager::get('seg_time')), 'seg_list_size' => intval(SettingsManager::get('seg_list_size')), 'seg_delete_threshold' => intval(SettingsManager::get('seg_delete_threshold'))];
 		$rTotalSegments = intval($rSegmentSettings['seg_list_size']) + 5;
-		$rOldSegments = array();
+		$rOldSegments = [];
 		if (file_exists($rPlaylistOld)) {
 			$rOldSegments = $this->getSegments($rPlaylistOld, -1);
 		}
@@ -89,7 +88,7 @@ class DelayCommand implements CommandInterface {
 		});
 		$rFeeder->connect();
 		$rFedSegment = null;
-		$rFeedQueue = array();
+		$rFeedQueue = [];
 		$rFeedCurrent = null;
 
 		$rPrevMD5 = null;
@@ -102,7 +101,7 @@ class DelayCommand implements CommandInterface {
 						$rSegmentSettings['seg_time'] = $rDuration;
 					}
 				}
-				$rM3U8 = array('vars' => array('#EXTM3U' => '', '#EXT-X-VERSION' => 3, '#EXT-X-MEDIA-SEQUENCE' => '0', '#EXT-X-TARGETDURATION' => $rSegmentSettings['seg_time']), 'segments' => $this->getData($rPlaylistDelay, $rOldSegments, $rTotalSegments, $rPlaylistOld));
+				$rM3U8 = ['vars' => ['#EXTM3U' => '', '#EXT-X-VERSION' => 3, '#EXT-X-MEDIA-SEQUENCE' => '0', '#EXT-X-TARGETDURATION' => $rSegmentSettings['seg_time']], 'segments' => $this->getData($rPlaylistDelay, $rOldSegments, $rTotalSegments, $rPlaylistOld)];
 				if (!empty($rM3U8['segments'])) {
 					$rData = '';
 					$rSequence = 0;
@@ -152,7 +151,7 @@ class DelayCommand implements CommandInterface {
 	 * @return void
 	 */
 	private function queueForDaemon(array $rSegments, ?int &$rFedSegment, array &$rQueue): void {
-		$rNew = array();
+		$rNew = [];
 		foreach ($rSegments as $rSegment) {
 			if (preg_match('/_(\d+)\.ts$/', (string) ($rSegment['file'] ?? ''), $rMatch)) {
 				$rNumber = intval($rMatch[1]);
@@ -176,7 +175,7 @@ class DelayCommand implements CommandInterface {
 			}
 			if (is_string($rData) && strlen($rData) >= 188) {
 				$rData = substr($rData, 0, strlen($rData) - strlen($rData) % 188); // whole packets
-				$rQueue[] = array('data' => $rData, 'dur' => max(0.5, floatval($rSegment['seconds'])), 'burst' => $rSeed);
+				$rQueue[] = ['data' => $rData, 'dur' => max(0.5, floatval($rSegment['seconds'])), 'burst' => $rSeed];
 			}
 			$rFedSegment = $rNumber;
 		}
@@ -196,7 +195,7 @@ class DelayCommand implements CommandInterface {
 		$rNow = microtime(true);
 		if ($rCurrent === null && count($rQueue) > 0) {
 			$rItem = array_shift($rQueue);
-			$rCurrent = array('data' => $rItem['data'], 'sent' => 0, 'start' => $rNow, 'dur' => $rItem['dur'], 'burst' => $rItem['burst']);
+			$rCurrent = ['data' => $rItem['data'], 'sent' => 0, 'start' => $rNow, 'dur' => $rItem['dur'], 'burst' => $rItem['burst']];
 		}
 		if ($rCurrent === null) {
 			$rFeeder->flush();
@@ -236,7 +235,7 @@ class DelayCommand implements CommandInterface {
 	}
 
 	private function getData($rPlaylistDelay, &$rOldSegments, $rTotalSegments, $rPlaylistOld): array {
-		$rSegments = array();
+		$rSegments = [];
 		if (!empty($rOldSegments)) {
 			$rSegments = array_shift($rOldSegments);
 			unlink(DELAY_PATH . $rSegments['file']);
@@ -268,7 +267,7 @@ class DelayCommand implements CommandInterface {
 	}
 
 	private function getSegments($rPlaylist, $rCounter = 0): array {
-		$rSegments = array();
+		$rSegments = [];
 		if (file_exists($rPlaylist)) {
 			$rFP = fopen($rPlaylist, 'r');
 			while (!feof($rFP) && count($rSegments) != $rCounter) {
@@ -278,7 +277,7 @@ class DelayCommand implements CommandInterface {
 					$rSeconds = rtrim($rSeconds, ',');
 					$rSegmentFile = trim(fgets($rFP));
 					if (file_exists(DELAY_PATH . $rSegmentFile)) {
-						$rSegments[] = array('seconds' => $rSeconds, 'file' => $rSegmentFile);
+						$rSegments[] = ['seconds' => $rSeconds, 'file' => $rSegmentFile];
 					}
 				}
 			}
diff --git a/src/Cli/Commands/FanoutSyncCommand.php b/src/Cli/Commands/FanoutSyncCommand.php
index 02183c50..02de2575 100644
--- a/src/Cli/Commands/FanoutSyncCommand.php
+++ b/src/Cli/Commands/FanoutSyncCommand.php
@@ -41,7 +41,7 @@ class FanoutSyncCommand implements CommandInterface {
 	private const INTERVAL = 10;
 
 	/** @var array<string,int> Daemon viewer uuid => when it was first seen without a row. */
-	private array $rOrphanSince = array();
+	private array $rOrphanSince = [];
 
 	public function getName(): string {
 		return 'fanout_sync';
@@ -151,7 +151,7 @@ class FanoutSyncCommand implements CommandInterface {
 	 * @return string[] The uuids dropped on this pass.
 	 */
 	public function dropOrphans(array $rActive, array $rConns, ?int $rNow = null, ?callable $rDrop = null): array {
-		$rKnown = array();
+		$rKnown = [];
 		foreach ($rConns as $rConn) {
 			if (is_array($rConn) && !empty($rConn['uuid']) && empty($rConn['hls_end'])) {
 				$rKnown[$rConn['uuid']] = true;
@@ -162,8 +162,8 @@ class FanoutSyncCommand implements CommandInterface {
 		$rDrop = $rDrop ?? static function (string $rUUID): void {
 			FanoutClient::dropConnection($rUUID);
 		};
-		$rSeen = array();
-		$rDropped = array();
+		$rSeen = [];
+		$rDropped = [];
 		foreach ($rActive as $rUUID) {
 			$rUUID = (string) $rUUID;
 			if ($rUUID === '' || isset($rKnown[$rUUID])) {
@@ -290,7 +290,7 @@ class FanoutSyncCommand implements CommandInterface {
 			if (!is_array($rKeys)) {
 				return null;
 			}
-			$rOut = array();
+			$rOut = [];
 			foreach ($rKeys as $rUUID) {
 				$rConn = ConnectionTracker::getConnection($rUUID);
 				if (is_array($rConn)) {
diff --git a/src/Cli/Commands/LbInstallFlow.php b/src/Cli/Commands/LbInstallFlow.php
index a4546d5b..da31f8e3 100644
--- a/src/Cli/Commands/LbInstallFlow.php
+++ b/src/Cli/Commands/LbInstallFlow.php
@@ -7,19 +7,18 @@ use XcVm\Core\Updates\GitHubReleases;
 use XcVm\Core\Updates\UpdateChannels;
 
 class LbInstallFlow {
-
 	// Per-distribution package lists, mirrored from the MAIN installer (install -> PACKAGES),
 	// with the mariadb-server/client/common packages removed (LB nodes use the main server's DB).
 	public static function getPackages(string $rDistID = 'debian', string $rVersion = ''): array {
-		$rLists = array(
-			'debian' => array('iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4', 'libgeoip-dev', 'libxslt1-dev', 'libonig-dev', 'e2fsprogs', 'wget', 'sysstat', 'alsa-utils', 'v4l-utils', 'certbot', 'iptables-persistent', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libogg0', 'libnuma1', 'xz-utils', 'zip', 'unzip', 'libssh2-1', 'libsodium23', 'cpufrequtils', 'mcrypt', 'cron', 'git', 'curl'),
-			'debian11' => array('iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4', 'libgeoip-dev', 'libxslt1-dev', 'libonig-dev', 'e2fsprogs', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'alsa-utils', 'v4l-utils', 'certbot', 'iptables-persistent', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libogg0', 'libnuma1', 'libssh2-1', 'libssh2-1-dev', 'libsodium23', 'cpufrequtils', 'mcrypt'),
-			'debian13' => array('iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'perl', 'gawk', 'socat', 'libxml2-dev', 'libxslt1-dev', 'libonig5', 'libonig-dev', 'zlib1g-dev', 'libssl-dev', 'pkg-config', 'autoconf', 'automake', 'alsa-utils', 'v4l-utils', 'e2fsprogs', 'certbot', 'iptables-persistent', 'libssh2-1', 'libssh2-1-dev', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libgeoip1', 'geoip-bin', 'libsodium23', 'cpufrequtils', 'mcrypt', 'libogg0', 'libnuma1'),
-			'ubuntu20' => array('iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'ca-certificates', 'libcurl3-gnutls', 'libcurl4-gnutls-dev', 'libxml2-dev', 'libxslt1-dev', 'libonig5', 'libonig-dev', 'libjpeg-dev', 'libpng-dev', 'zlib1g-dev', 'alsa-utils', 'v4l-utils', 'e2fsprogs', 'iptables-persistent', 'certbot', 'python3-certbot', 'libssh2-1', 'libssh2-1-dev', 'libsodium23', 'cpufrequtils', 'mcrypt', 'libogg0', 'libnuma1'),
-			'ubuntu22' => array('iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4', 'libcurl3-gnutls', 'libgeoip-dev', 'libxslt1-dev', 'libonig-dev', 'e2fsprogs', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'ca-certificates', 'libxml2-dev', 'libonig5', 'zlib1g-dev', 'alsa-utils', 'v4l-utils', 'certbot', 'python3-certbot', 'iptables-persistent', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libogg0', 'libnuma1', 'libssh2-1', 'libssh2-1-dev', 'libsodium23', 'cpufrequtils', 'mcrypt'),
-			'ubuntu24' => array('iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4t64', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'perl', 'gawk', 'socat', 'libxml2-dev', 'libxslt1-dev', 'libonig5', 'libonig-dev', 'zlib1g-dev', 'libssl-dev', 'pkg-config', 'autoconf', 'automake', 'alsa-utils', 'v4l-utils', 'e2fsprogs', 'certbot', 'python3-certbot', 'ufw', 'libssh2-1t64', 'libssh2-1-dev', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libgeoip1t64', 'geoip-bin', 'libsodium23', 'cpufrequtils', 'mcrypt', 'libogg0', 'libnuma1'),
-			'redhat' => array('epel-release', 'wget', 'sysstat', 'alsa-utils', 'v4l-utils', 'libcurl-devel', 'geoip-devel', 'libxslt-devel', 'oniguruma-devel', 'e2fsprogs', 'libjpeg-turbo-devel', 'libpng-devel', 'harfbuzz-devel', 'fribidi-devel', 'libogg', 'xz', 'zip', 'unzip', 'libssh2-devel', 'cronie', 'certbot', 'iptables-services', 'GeoIP-update', 'git', 'curl', 'libsodium', 'numactl', 'kernel-tools'),
-		);
+		$rLists = [
+			'debian' => ['iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4', 'libgeoip-dev', 'libxslt1-dev', 'libonig-dev', 'e2fsprogs', 'wget', 'sysstat', 'alsa-utils', 'v4l-utils', 'certbot', 'iptables-persistent', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libogg0', 'libnuma1', 'xz-utils', 'zip', 'unzip', 'libssh2-1', 'libsodium23', 'cpufrequtils', 'mcrypt', 'cron', 'git', 'curl'],
+			'debian11' => ['iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4', 'libgeoip-dev', 'libxslt1-dev', 'libonig-dev', 'e2fsprogs', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'alsa-utils', 'v4l-utils', 'certbot', 'iptables-persistent', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libogg0', 'libnuma1', 'libssh2-1', 'libssh2-1-dev', 'libsodium23', 'cpufrequtils', 'mcrypt'],
+			'debian13' => ['iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'perl', 'gawk', 'socat', 'libxml2-dev', 'libxslt1-dev', 'libonig5', 'libonig-dev', 'zlib1g-dev', 'libssl-dev', 'pkg-config', 'autoconf', 'automake', 'alsa-utils', 'v4l-utils', 'e2fsprogs', 'certbot', 'iptables-persistent', 'libssh2-1', 'libssh2-1-dev', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libgeoip1', 'geoip-bin', 'libsodium23', 'cpufrequtils', 'mcrypt', 'libogg0', 'libnuma1'],
+			'ubuntu20' => ['iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'ca-certificates', 'libcurl3-gnutls', 'libcurl4-gnutls-dev', 'libxml2-dev', 'libxslt1-dev', 'libonig5', 'libonig-dev', 'libjpeg-dev', 'libpng-dev', 'zlib1g-dev', 'alsa-utils', 'v4l-utils', 'e2fsprogs', 'iptables-persistent', 'certbot', 'python3-certbot', 'libssh2-1', 'libssh2-1-dev', 'libsodium23', 'cpufrequtils', 'mcrypt', 'libogg0', 'libnuma1'],
+			'ubuntu22' => ['iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4', 'libcurl3-gnutls', 'libgeoip-dev', 'libxslt1-dev', 'libonig-dev', 'e2fsprogs', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'ca-certificates', 'libxml2-dev', 'libonig5', 'zlib1g-dev', 'alsa-utils', 'v4l-utils', 'certbot', 'python3-certbot', 'iptables-persistent', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libogg0', 'libnuma1', 'libssh2-1', 'libssh2-1-dev', 'libsodium23', 'cpufrequtils', 'mcrypt'],
+			'ubuntu24' => ['iproute2', 'net-tools', 'dirmngr', 'gpg-agent', 'software-properties-common', 'libcurl4t64', 'wget', 'curl', 'unzip', 'zip', 'xz-utils', 'cron', 'git', 'sysstat', 'perl', 'gawk', 'socat', 'libxml2-dev', 'libxslt1-dev', 'libonig5', 'libonig-dev', 'zlib1g-dev', 'libssl-dev', 'pkg-config', 'autoconf', 'automake', 'alsa-utils', 'v4l-utils', 'e2fsprogs', 'certbot', 'python3-certbot', 'ufw', 'libssh2-1t64', 'libssh2-1-dev', 'libjpeg-dev', 'libpng-dev', 'libharfbuzz-dev', 'libfribidi-dev', 'libgeoip1t64', 'geoip-bin', 'libsodium23', 'cpufrequtils', 'mcrypt', 'libogg0', 'libnuma1'],
+			'redhat' => ['epel-release', 'wget', 'sysstat', 'alsa-utils', 'v4l-utils', 'libcurl-devel', 'geoip-devel', 'libxslt-devel', 'oniguruma-devel', 'e2fsprogs', 'libjpeg-turbo-devel', 'libpng-devel', 'harfbuzz-devel', 'fribidi-devel', 'libogg', 'xz', 'zip', 'unzip', 'libssh2-devel', 'cronie', 'certbot', 'iptables-services', 'GeoIP-update', 'git', 'curl', 'libsodium', 'numactl', 'kernel-tools'],
+		];
 
 		$rKey = self::resolvePackageKey(strtolower(trim($rDistID)), explode('.', $rVersion)[0]);
 		return $rLists[$rKey] ?? $rLists['debian'];
@@ -27,26 +26,26 @@ class LbInstallFlow {
 
 	// Mirrors the MAIN installer's _PACKAGE_KEY_MAP: (dist_id, major_version) -> package list key.
 	private static function resolvePackageKey(string $rDistID, string $rMajor): string {
-		if (in_array($rDistID, array('rocky', 'almalinux', 'rhel', 'centos', 'redhat', 'fedora'), true)) {
+		if (in_array($rDistID, ['rocky', 'almalinux', 'rhel', 'centos', 'redhat', 'fedora'], true)) {
 			return 'redhat';
 		}
-		$rMap = array(
-			'ubuntu' => array('18' => 'ubuntu20', '20' => 'ubuntu20', '22' => 'ubuntu22', '24' => 'ubuntu24'),
-			'debian' => array('11' => 'debian11', '12' => 'debian', '13' => 'debian13'),
-		);
+		$rMap = [
+			'ubuntu' => ['18' => 'ubuntu20', '20' => 'ubuntu20', '22' => 'ubuntu22', '24' => 'ubuntu24'],
+			'debian' => ['11' => 'debian11', '12' => 'debian', '13' => 'debian13'],
+		];
 		return $rMap[$rDistID][$rMajor] ?? 'debian';
 	}
 
 	public static function resolveUpdateData(GitHubReleases $gitRelease): array {
 		$rUpdateData = $gitRelease->getUpdateFile("lb", XC_VM_VERSION);
-		return array(
+		return [
 			'url' => $rUpdateData['url'],
 			'md5' => $rUpdateData['md5'],
-		);
+		];
 	}
 
 	public static function writeInstallMetadata(string $rInstallDir, int $rServerID, string $rUsername, string $rPassword, int $rPort): void {
-		file_put_contents($rInstallDir . $rServerID . '.json', json_encode(array('root_username' => $rUsername, 'root_password' => $rPassword, 'ssh_port' => $rPort)));
+		file_put_contents($rInstallDir . $rServerID . '.json', json_encode(['root_username' => $rUsername, 'root_password' => $rPassword, 'ssh_port' => $rPort]));
 	}
 
 	public static function installArchive($rConn, callable $rRunSSH, string $rInstallFiles, string $rHash, int $rServerID, $db): bool {
@@ -152,13 +151,13 @@ class LbInstallFlow {
 
 		// Pack config.enc targeted at the node's install_id. Credentials are
 		// read from MAIN's config.enc inside the extension, never exposed here.
-		$rBlob = \XC_VM::config_pack($rInstallId, array(
+		$rBlob = \XC_VM::config_pack($rInstallId, [
 			'hostname'  => $rServers[SERVER_ID]['server_ip'],
 			'database'  => 'xc_vm',
 			'port'      => intval(ConfigReader::get('port')),
 			'server_id' => $rServerID,
 			'is_lb'     => 1,
-		));
+		]);
 		if (empty($rBlob)) {
 			$db->query('UPDATE `servers` SET `status` = 4 WHERE `id` = ?;', $rServerID);
 			echo "Failed to pack node configuration! Exiting\n";
@@ -264,14 +263,14 @@ class LbInstallFlow {
 	 */
 	private static function latestReleaseTagViaRedirect(string $rOwner, string $rRepo): string {
 		$rCurl = curl_init('https://github.com/' . $rOwner . '/' . $rRepo . '/releases/latest');
-		curl_setopt_array($rCurl, array(
+		curl_setopt_array($rCurl, [
 			CURLOPT_NOBODY         => true,
 			CURLOPT_FOLLOWLOCATION => false,
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_CONNECTTIMEOUT => 10,
 			CURLOPT_TIMEOUT        => 20,
 			CURLOPT_USERAGENT      => 'XC_VM',
-		));
+		]);
 		$rHeaders = (string) curl_exec($rCurl);
 		$rLocation = (string) curl_getinfo($rCurl, CURLINFO_REDIRECT_URL);
 		curl_close($rCurl);
@@ -391,7 +390,7 @@ class LbInstallFlow {
 		call_user_func($rRunSSH, $rConn, 'sudo chmod 0750 ' . MAIN_HOME . 'bin/nginx_rtmp/sbin/nginx_rtmp');
 
 		$rVersionFile = BIN_PATH . 'bin_version.json';
-		$rVersionData = array(
+		$rVersionData = [
 			'owner' => GIT_OWNER,
 			'repository' => GIT_REPO_BIN,
 			'release' => $rTag,
@@ -399,7 +398,7 @@ class LbInstallFlow {
 			'distribution' => $rDistID,
 			'distribution_version' => $rVersion,
 			'updated_at_utc' => gmdate('Y-m-d\TH:i:s\Z'),
-		);
+		];
 		$rVersionJson = json_encode($rVersionData, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 		if ($rVersionJson !== false) {
 			$rEncodedVersion = base64_encode($rVersionJson);
diff --git a/src/Cli/Commands/LlodCommand.php b/src/Cli/Commands/LlodCommand.php
index c1f8e4e9..5d6bd689 100644
--- a/src/Cli/Commands/LlodCommand.php
+++ b/src/Cli/Commands/LlodCommand.php
@@ -20,7 +20,6 @@ use XcVm\Streaming\Fanout\IngestFeeder;
  */
 
 class LlodCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'llod';
 	}
@@ -56,16 +55,36 @@ class LlodCommand implements CommandInterface {
 		echo "Stream arguments count: " . count($rStreamArguments) . "\n";
 		echo "====================\n\n";
 
-		if (!defined('MAIN_HOME')) define('MAIN_HOME', '/home/xc_vm/');
-		if (!defined('STREAMS_PATH')) define('STREAMS_PATH', MAIN_HOME . 'content/streams/');
-		if (!defined('CACHE_TMP_PATH')) define('CACHE_TMP_PATH', MAIN_HOME . 'tmp/cache/');
-		if (!defined('CONS_TMP_PATH')) define('CONS_TMP_PATH', MAIN_HOME . 'tmp/opened_cons/');
-		if (!defined('FFMPEG')) define('FFMPEG', FfmpegPaths::cpu() ?: FFMPEG_BIN_40);
-		if (!defined('FFPROBE')) define('FFPROBE', FfmpegPaths::probe() ?: FFPROBE_BIN_40);
-		if (!defined('PACKET_SIZE')) define('PACKET_SIZE', 188);
-		if (!defined('BUFFER_SIZE')) define('BUFFER_SIZE', 12032);
-		if (!defined('TIMEOUT')) define('TIMEOUT', 20);
-		if (!defined('SEGMENT_DURATION')) define('SEGMENT_DURATION', 4);
+		if (!defined('MAIN_HOME')) {
+			define('MAIN_HOME', '/home/xc_vm/');
+		}
+		if (!defined('STREAMS_PATH')) {
+			define('STREAMS_PATH', MAIN_HOME . 'content/streams/');
+		}
+		if (!defined('CACHE_TMP_PATH')) {
+			define('CACHE_TMP_PATH', MAIN_HOME . 'tmp/cache/');
+		}
+		if (!defined('CONS_TMP_PATH')) {
+			define('CONS_TMP_PATH', MAIN_HOME . 'tmp/opened_cons/');
+		}
+		if (!defined('FFMPEG')) {
+			define('FFMPEG', FfmpegPaths::cpu() ?: FFMPEG_BIN_40);
+		}
+		if (!defined('FFPROBE')) {
+			define('FFPROBE', FfmpegPaths::probe() ?: FFPROBE_BIN_40);
+		}
+		if (!defined('PACKET_SIZE')) {
+			define('PACKET_SIZE', 188);
+		}
+		if (!defined('BUFFER_SIZE')) {
+			define('BUFFER_SIZE', 12032);
+		}
+		if (!defined('TIMEOUT')) {
+			define('TIMEOUT', 20);
+		}
+		if (!defined('SEGMENT_DURATION')) {
+			define('SEGMENT_DURATION', 4);
+		}
 
 		if (!file_exists(CACHE_TMP_PATH . 'settings')) {
 			echo "Settings not cached!\n";
@@ -78,7 +97,7 @@ class LlodCommand implements CommandInterface {
 
 		$rFP = null;
 		$rSegmentFile = null;
-		$rSegmentStatus = array();
+		$rSegmentStatus = [];
 
 		register_shutdown_function(function () use (&$rFP, &$rSegmentFile) {
 			if (is_resource($rSegmentFile)) {
@@ -177,7 +196,7 @@ class LlodCommand implements CommandInterface {
 		$segment           = 0;
 		$segmentOpen       = false;
 		$segmentStart      = microtime(true);
-		$rSegmentDurations = array();
+		$rSegmentDurations = [];
 
 		$lastData    = time();
 		$firstDataAt = microtime(true);
@@ -316,7 +335,7 @@ class LlodCommand implements CommandInterface {
 	 * @param string|null $pmtPacket Raw 188-byte PMT packet, or null if not seen yet.
 	 * @return resource|false The open file handle, or false on failure.
 	 */
-	private function openSegment($rStreamID, $segment, $patPacket, $pmtPacket) {
+	private function openSegment(int|string $rStreamID, int $segment, ?string $patPacket, ?string $pmtPacket) {
 		$file = fopen(STREAMS_PATH . $rStreamID . "_{$segment}.ts", 'wb');
 		if (!$file) {
 			return false;
@@ -337,7 +356,7 @@ class LlodCommand implements CommandInterface {
 	 * @param string $pkt A 188-byte TS packet.
 	 * @return array{pid:int,pusi:bool,random_access:bool,payload_offset:int}
 	 */
-	private function parseTsHeader($pkt) {
+	private function parseTsHeader(string $pkt) {
 		$b1 = ord($pkt[1]);
 		$b2 = ord($pkt[2]);
 		$b3 = ord($pkt[3]);
@@ -377,7 +396,7 @@ class LlodCommand implements CommandInterface {
 	 * @param int    $payloadOffset Offset of the payload within the packet.
 	 * @return int|null program_map_PID, or null if not resolvable in this packet.
 	 */
-	private function parsePat($pkt, $payloadOffset) {
+	private function parsePat(string $pkt, int $payloadOffset) {
 		if ($payloadOffset >= PACKET_SIZE) {
 			return null;
 		}
@@ -408,7 +427,7 @@ class LlodCommand implements CommandInterface {
 	 * @param int    $payloadOffset Offset of the payload within the packet.
 	 * @return int|null Video/PCR PID, or null if not resolvable in this packet.
 	 */
-	private function parsePmt($pkt, $payloadOffset) {
+	private function parsePmt(string $pkt, int $payloadOffset) {
 		if ($payloadOffset >= PACKET_SIZE) {
 			return null;
 		}
@@ -450,7 +469,7 @@ class LlodCommand implements CommandInterface {
 	 * @param mixed  $rRequestPrebuffer The request_prebuffer setting.
 	 * @return resource
 	 */
-	private function sourceContext($rURL, $rStreamArguments, $rRequestPrebuffer) {
+	private function sourceContext(string $rURL, array $rStreamArguments, mixed $rRequestPrebuffer) {
 		$rArg = static function (string $rKey) use ($rStreamArguments): string {
 			// `??` already maps a missing or null value to '': an empty value
 			// (after trimming) falls back to the argument's default.
@@ -461,7 +480,7 @@ class LlodCommand implements CommandInterface {
 			return $rValue;
 		};
 
-		$rHeaders = array();
+		$rHeaders = [];
 		foreach (preg_split('/\r\n|\r|\n/', $rArg('headers')) as $rLine) {
 			if (trim($rLine) !== '' && strpos($rLine, ':') !== false) {
 				$rHeaders[] = trim($rLine);
@@ -474,10 +493,10 @@ class LlodCommand implements CommandInterface {
 			$rHeaders[] = 'X-XC_VM-Prebuffer: 1';
 		}
 
-		$rHTTP = array(
+		$rHTTP = [
 			'timeout'    => TIMEOUT,
 			'user_agent' => ($rArg('user_agent') !== '' ? $rArg('user_agent') : 'Mozilla/5.0'),
-		);
+		];
 		if (count($rHeaders) > 0) {
 			$rHTTP['header'] = implode("\r\n", $rHeaders);
 		}
@@ -487,10 +506,10 @@ class LlodCommand implements CommandInterface {
 			$rHTTP['request_fulluri'] = true;
 		}
 
-		return stream_context_create(array(
+		return stream_context_create([
 			'http' => $rHTTP,
-			'ssl'  => array('verify_peer' => false, 'verify_peer_name' => false),
-		));
+			'ssl'  => ['verify_peer' => false, 'verify_peer_name' => false],
+		]);
 	}
 
 	/**
@@ -534,7 +553,7 @@ class LlodCommand implements CommandInterface {
 				$rMetadata = stream_get_meta_data($rFP);
 				echo "Stream metadata obtained\n";
 
-				$rHeaders = array();
+				$rHeaders = [];
 
 				if (!empty($rMetadata['wrapper_data']) && is_array($rMetadata['wrapper_data'])) {
 					foreach ($rMetadata['wrapper_data'] as $rLine) {
@@ -605,12 +624,12 @@ class LlodCommand implements CommandInterface {
 		return false;
 	}
 
-	private function deleteOldSegments($rStreamID, $rKeep, $rThreshold, &$rSegmentStatus, &$rSegmentDurations = array()): array {
+	private function deleteOldSegments($rStreamID, $rKeep, $rThreshold, &$rSegmentStatus, &$rSegmentDurations = []): array {
 		echo "Stream ID: $rStreamID\n";
 		echo "Keep segments: $rKeep\n";
 		echo "Delete threshold: $rThreshold\n";
 
-		$rReturn = array();
+		$rReturn = [];
 
 		if (empty($rSegmentStatus)) {
 			return $rReturn;
@@ -650,7 +669,7 @@ class LlodCommand implements CommandInterface {
 		return $rReturn;
 	}
 
-	private function updateSegments($rStreamID, $segments, $rSegmentDurations = array(), $rSegTime = SEGMENT_DURATION): void {
+	private function updateSegments($rStreamID, $segments, $rSegmentDurations = [], $rSegTime = SEGMENT_DURATION): void {
 		if (empty($segments)) {
 			return;
 		}
@@ -705,7 +724,7 @@ class LlodCommand implements CommandInterface {
 	 */
 	private function checkRunning($rStreamID): void {
 		echo "Checking for existing process for stream $rStreamID\n";
-		$rTerms = array('LLOD[' . intval($rStreamID) . ']', 'console.php llod ' . intval($rStreamID) . ' ');
+		$rTerms = ['LLOD[' . intval($rStreamID) . ']', 'console.php llod ' . intval($rStreamID) . ' '];
 		foreach (ProcessManager::findProcessPIDs($rTerms) as $rPID) {
 			echo "Killing existing LLOD process PID: $rPID\n";
 			@posix_kill($rPID, 9);
diff --git a/src/Cli/Commands/LoopbackCommand.php b/src/Cli/Commands/LoopbackCommand.php
index 0631c351..893e3474 100644
--- a/src/Cli/Commands/LoopbackCommand.php
+++ b/src/Cli/Commands/LoopbackCommand.php
@@ -19,7 +19,6 @@ use XcVm\Streaming\Fanout\IngestFeeder;
  */
 
 class LoopbackCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'loopback';
 	}
@@ -44,29 +43,59 @@ class LoopbackCommand implements CommandInterface {
 		$rStreamID = intval($rArgs[0]);
 		$rServerID = intval($rArgs[1]);
 
-		if (!defined('MAIN_HOME')) define('MAIN_HOME', '/home/xc_vm/');
-		if (!defined('STREAMS_PATH')) define('STREAMS_PATH', MAIN_HOME . 'content/streams/');
-		if (!defined('FFMPEG')) define('FFMPEG', FfmpegPaths::cpu() ?: FFMPEG_BIN_40);
-		if (!defined('FFPROBE')) define('FFPROBE', FfmpegPaths::probe() ?: FFPROBE_BIN_40);
-		if (!defined('CACHE_TMP_PATH')) define('CACHE_TMP_PATH', MAIN_HOME . 'tmp/cache/');
-		if (!defined('CONFIG_PATH')) define('CONFIG_PATH', MAIN_HOME . 'config/');
+		if (!defined('MAIN_HOME')) {
+			define('MAIN_HOME', '/home/xc_vm/');
+		}
+		if (!defined('STREAMS_PATH')) {
+			define('STREAMS_PATH', MAIN_HOME . 'content/streams/');
+		}
+		if (!defined('FFMPEG')) {
+			define('FFMPEG', FfmpegPaths::cpu() ?: FFMPEG_BIN_40);
+		}
+		if (!defined('FFPROBE')) {
+			define('FFPROBE', FfmpegPaths::probe() ?: FFPROBE_BIN_40);
+		}
+		if (!defined('CACHE_TMP_PATH')) {
+			define('CACHE_TMP_PATH', MAIN_HOME . 'tmp/cache/');
+		}
+		if (!defined('CONFIG_PATH')) {
+			define('CONFIG_PATH', MAIN_HOME . 'config/');
+		}
 		// PAT_HEADER restored to the real PAT header bytes (0xB0 0x0D) derived from the stream.
 		// The value was corrupted (byte 0xB0 → space/U+FFFD) by a non-binary-safe editor.
-		if (!defined('PAT_HEADER')) define('PAT_HEADER', "\xB0\x0D");
-		if (!defined('KEYFRAME_HEADER')) define('KEYFRAME_HEADER', "\x07P");
-		if (!defined('PACKET_SIZE')) define('PACKET_SIZE', 188);
-		if (!defined('BUFFER_SIZE')) define('BUFFER_SIZE', 12032);
-		if (!defined('PAT_PERIOD')) define('PAT_PERIOD', 2);
+		if (!defined('PAT_HEADER')) {
+			define('PAT_HEADER', "\xB0\x0D");
+		}
+		if (!defined('KEYFRAME_HEADER')) {
+			define('KEYFRAME_HEADER', "\x07P");
+		}
+		if (!defined('PACKET_SIZE')) {
+			define('PACKET_SIZE', 188);
+		}
+		if (!defined('BUFFER_SIZE')) {
+			define('BUFFER_SIZE', 12032);
+		}
+		if (!defined('PAT_PERIOD')) {
+			define('PAT_PERIOD', 2);
+		}
 		// Minimum VIDEO duration per segment (90 kHz ticks). ~1.5s guarantees one cut per 2s GOP
 		// and prevents sub-GOP cuts that were producing 8 KB .ts files. Measured in PTS (video time),
 		// so it stays correct even when the source bursts at 400+ Mbps.
-		if (!defined('MIN_SEG_PTS')) define('MIN_SEG_PTS', 135000);
+		if (!defined('MIN_SEG_PTS')) {
+			define('MIN_SEG_PTS', 135000);
+		}
 		// Segment size safety cap. If the source stops delivering keyframes with an advancing PCR
 		// (e.g. re-serving the same chunk to a consumer), we still rotate on the next keyframe to
 		// avoid writing a giant .ts that fills the disk. ~16 MB ≈ ~20s, well above a normal segment (~800 KB).
-		if (!defined('MAX_SEG_BYTES')) define('MAX_SEG_BYTES', 16777216);
-		if (!defined('TIMEOUT')) define('TIMEOUT', 20);
-		if (!defined('TIMEOUT_READ')) define('TIMEOUT_READ', 1);
+		if (!defined('MAX_SEG_BYTES')) {
+			define('MAX_SEG_BYTES', 16777216);
+		}
+		if (!defined('TIMEOUT')) {
+			define('TIMEOUT', 20);
+		}
+		if (!defined('TIMEOUT_READ')) {
+			define('TIMEOUT_READ', 1);
+		}
 
 		if (!file_exists(CACHE_TMP_PATH . 'settings')) {
 			echo "Settings not cached!\n";
@@ -77,7 +106,9 @@ class LoopbackCommand implements CommandInterface {
 			return 0;
 		}
 
-		if (!defined('SERVER_ID')) define('SERVER_ID', intval(ConfigReader::get('server_id')));
+		if (!defined('SERVER_ID')) {
+			define('SERVER_ID', intval(ConfigReader::get('server_id')));
+		}
 		$this->checkRunning($rStreamID);
 
 		// Single-instance lock per stream. The monitor/watchdog (StreamProcess::startLoopback) can
@@ -92,8 +123,8 @@ class LoopbackCommand implements CommandInterface {
 
 		$rFP = null;
 		$rSegmentFile = null;
-		$rSegmentDuration = array();
-		$rSegmentStatus = array();
+		$rSegmentDuration = [];
+		$rSegmentStatus = [];
 		$rLastPTS = null;
 		$rCurPTS = null;
 		$rSegStartPTS = null;
@@ -143,7 +174,7 @@ class LoopbackCommand implements CommandInterface {
 		$rFeeder->connect();
 
 		$rExcessBuffer = $rPrebuffer = $rBuffer = $rPacket = '';
-		$rPATHeaders = array();
+		$rPATHeaders = [];
 		$rNewSegment = $rPAT = false;
 		$rFirstWrite = true;
 		$rLastPacket = time();
@@ -214,7 +245,7 @@ class LoopbackCommand implements CommandInterface {
 					if ($rSync == 71) {
 						if (substr($rPacket, 6, 2) == PAT_HEADER) {
 							$rPAT = true;
-							$rPATHeaders = array();
+							$rPATHeaders = [];
 						} else {
 							$rAdaptationField = $rHeader >> 4 & 3;
 							if (($rAdaptationField & 2) === 2) {
@@ -246,14 +277,14 @@ class LoopbackCommand implements CommandInterface {
 										$rPrebuffer = implode('', $rPATHeaders);
 										$rNewSegment = true;
 										$rPAT = false;
-										$rPATHeaders = array();
+										$rPATHeaders = [];
 										$rLastPTS = $rSegStartPTS;
 										$rCurPTS = $rKfPTS;
 										$rSegStartPTS = $rKfPTS;
 									} else {
 										// Still within the current segment duration: consume the PAT/keyframe pair without rotating.
 										$rPAT = false;
-										$rPATHeaders = array();
+										$rPATHeaders = [];
 									}
 								}
 							}
@@ -335,7 +366,7 @@ class LoopbackCommand implements CommandInterface {
 	}
 
 	private function deleteOldSegments($rStreamID, $rKeep, $rThreshold, &$rSegmentStatus): array {
-		$rReturn = array();
+		$rReturn = [];
 		$rCurrentSegment = max(array_keys($rSegmentStatus));
 		foreach ($rSegmentStatus as $rSegmentID => $rStatus) {
 			if ($rStatus) {
diff --git a/src/Cli/Commands/MigrateCommand.php b/src/Cli/Commands/MigrateCommand.php
index b60801cc..5a1db976 100644
--- a/src/Cli/Commands/MigrateCommand.php
+++ b/src/Cli/Commands/MigrateCommand.php
@@ -15,7 +15,6 @@ use XcVm\Cli\CommandInterface;
  */
 
 class MigrateCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'migrate';
 	}
diff --git a/src/Cli/Commands/ModuleDeleteCommand.php b/src/Cli/Commands/ModuleDeleteCommand.php
index 6f1c4149..cf216d47 100644
--- a/src/Cli/Commands/ModuleDeleteCommand.php
+++ b/src/Cli/Commands/ModuleDeleteCommand.php
@@ -22,40 +22,39 @@ use XcVm\Core\Module\ModuleManager;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ModuleDeleteCommand implements CommandInterface {
+	public function getName(): string {
+		return 'module:delete';
+	}
 
-    public function getName(): string {
-        return 'module:delete';
-    }
+	public function getDescription(): string {
+		return 'Delete a module on a load balancer (files only)';
+	}
 
-    public function getDescription(): string {
-        return 'Delete a module on a load balancer (files only)';
-    }
+	public function execute(array $rArgs): int {
+		register_shutdown_function(function () {
+			global $db;
+			if (is_object($db)) {
+				$db->close_mysql();
+			}
+		});
 
-    public function execute(array $rArgs): int {
-        register_shutdown_function(function () {
-            global $db;
-            if (is_object($db)) {
-                $db->close_mysql();
-            }
-        });
+		$rArg  = trim((string) ($rArgs[0] ?? ''), "'\" ");
+		$rJson = $rArg !== '' ? base64_decode($rArg, true) : false;
+		$rData = $rJson !== false ? json_decode($rJson, true) : null;
+		$rName = is_array($rData) ? (string) ($rData['name'] ?? '') : '';
 
-        $rArg  = trim((string) ($rArgs[0] ?? ''), "'\" ");
-        $rJson = $rArg !== '' ? base64_decode($rArg, true) : false;
-        $rData = $rJson !== false ? json_decode($rJson, true) : null;
-        $rName = is_array($rData) ? (string) ($rData['name'] ?? '') : '';
+		if ($rName === '') {
+			echo "module:delete: missing module name.\n";
+			return 1;
+		}
 
-        if ($rName === '') {
-            echo "module:delete: missing module name.\n";
-            return 1;
-        }
-
-        try {
-            (new ModuleManager())->deleteModuleFilesOnly($rName);
-            echo "module:delete: '{$rName}' removed.\n";
-            return 0;
-        } catch (\Throwable $e) {
-            echo "module:delete failed for '{$rName}': " . $e->getMessage() . "\n";
-            return 1;
-        }
-    }
+		try {
+			(new ModuleManager())->deleteModuleFilesOnly($rName);
+			echo "module:delete: '{$rName}' removed.\n";
+			return 0;
+		} catch (\Throwable $e) {
+			echo "module:delete failed for '{$rName}': " . $e->getMessage() . "\n";
+			return 1;
+		}
+	}
 }
diff --git a/src/Cli/Commands/ModuleInstallCommand.php b/src/Cli/Commands/ModuleInstallCommand.php
index 25a22b1a..24ce976d 100644
--- a/src/Cli/Commands/ModuleInstallCommand.php
+++ b/src/Cli/Commands/ModuleInstallCommand.php
@@ -30,146 +30,145 @@ use XcVm\Domain\Server\ServerRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ModuleInstallCommand implements CommandInterface {
+	public function getName(): string {
+		return 'module:install';
+	}
 
-    public function getName(): string {
-        return 'module:install';
-    }
+	public function getDescription(): string {
+		return 'Install a module distributed from MAIN (load balancer, files only)';
+	}
 
-    public function getDescription(): string {
-        return 'Install a module distributed from MAIN (load balancer, files only)';
-    }
+	public function execute(array $rArgs): int {
+		register_shutdown_function(function () {
+			global $db;
+			if (is_object($db)) {
+				$db->close_mysql();
+			}
+		});
 
-    public function execute(array $rArgs): int {
-        register_shutdown_function(function () {
-            global $db;
-            if (is_object($db)) {
-                $db->close_mysql();
-            }
-        });
+		$rPayload = $this->decodePayload($rArgs[0] ?? '');
+		if ($rPayload === null) {
+			echo "Invalid module:install payload.\n";
+			return 1;
+		}
 
-        $rPayload = $this->decodePayload($rArgs[0] ?? '');
-        if ($rPayload === null) {
-            echo "Invalid module:install payload.\n";
-            return 1;
-        }
+		$rName    = (string) ($rPayload['name'] ?? '');
+		$rVersion = (string) ($rPayload['version'] ?? '');
+		$rSource  = ($rPayload['source'] ?? 'platform') === 'local' ? 'local' : 'platform';
 
-        $rName    = (string) ($rPayload['name'] ?? '');
-        $rVersion = (string) ($rPayload['version'] ?? '');
-        $rSource  = ($rPayload['source'] ?? 'platform') === 'local' ? 'local' : 'platform';
+		if ($rName === '') {
+			echo "module:install: missing module name.\n";
+			return 1;
+		}
 
-        if ($rName === '') {
-            echo "module:install: missing module name.\n";
-            return 1;
-        }
+		$rManager = new ModuleManager();
 
-        $rManager = new ModuleManager();
+		try {
+			if ($rSource === 'platform') {
+				$rApiKey = (string) (SettingsManager::get('platform_api_key') ?? '');
+				if ($rApiKey === '') {
+					echo "module:install: platform_api_key is not set in settings.\n";
+					return 1;
+				}
+				echo "Installing store module '{$rName}' v{$rVersion} from platform...\n";
+				$rManager->deployFromPlatformFilesOnly($rName, $rVersion, $rApiKey);
+			} else {
+				echo "Installing custom module '{$rName}' v{$rVersion} from MAIN...\n";
+				$rArchive = $this->fetchArchiveFromMain($rManager->archivePathFor($rName, $rVersion));
+				try {
+					$rManager->deployFromArchiveFilesOnly($rArchive);
+				} finally {
+					@unlink($rArchive);
+				}
+			}
 
-        try {
-            if ($rSource === 'platform') {
-                $rApiKey = (string) (SettingsManager::get('platform_api_key') ?? '');
-                if ($rApiKey === '') {
-                    echo "module:install: platform_api_key is not set in settings.\n";
-                    return 1;
-                }
-                echo "Installing store module '{$rName}' v{$rVersion} from platform...\n";
-                $rManager->deployFromPlatformFilesOnly($rName, $rVersion, $rApiKey);
-            } else {
-                echo "Installing custom module '{$rName}' v{$rVersion} from MAIN...\n";
-                $rArchive = $this->fetchArchiveFromMain($rManager->archivePathFor($rName, $rVersion));
-                try {
-                    $rManager->deployFromArchiveFilesOnly($rArchive);
-                } finally {
-                    @unlink($rArchive);
-                }
-            }
+			$this->fixOwnership($rName);
+			echo "module:install: '{$rName}' installed.\n";
+			return 0;
+		} catch (\Throwable $e) {
+			echo "module:install failed for '{$rName}': " . $e->getMessage() . "\n";
+			return 1;
+		}
+	}
 
-            $this->fixOwnership($rName);
-            echo "module:install: '{$rName}' installed.\n";
-            return 0;
-        } catch (\Throwable $e) {
-            echo "module:install failed for '{$rName}': " . $e->getMessage() . "\n";
-            return 1;
-        }
-    }
+	/** Decode + validate the base64 JSON payload. */
+	private function decodePayload(string $rArg): ?array {
+		$rArg = trim($rArg, "'\" ");
+		if ($rArg === '') {
+			return null;
+		}
+		$rJson = base64_decode($rArg, true);
+		if ($rJson === false) {
+			return null;
+		}
+		$rData = json_decode($rJson, true);
+		return is_array($rData) ? $rData : null;
+	}
 
-    /** Decode + validate the base64 JSON payload. */
-    private function decodePayload(string $rArg): ?array {
-        $rArg = trim($rArg, "'\" ");
-        if ($rArg === '') {
-            return null;
-        }
-        $rJson = base64_decode($rArg, true);
-        if ($rJson === false) {
-            return null;
-        }
-        $rData = json_decode($rJson, true);
-        return is_array($rData) ? $rData : null;
-    }
+	/**
+	 * Pull a custom module archive from MAIN over the internal system API
+	 * (action=getFile). Returns the path to a downloaded temp file.
+	 *
+	 * @throws \RuntimeException If MAIN cannot be located or the download fails.
+	 */
+	private function fetchArchiveFromMain(string $rArchivePath): string {
+		$rMain = null;
+		foreach (ServerRepository::getAll() as $rServer) {
+			if (!empty($rServer['is_main'])) {
+				$rMain = $rServer;
+				break;
+			}
+		}
 
-    /**
-     * Pull a custom module archive from MAIN over the internal system API
-     * (action=getFile). Returns the path to a downloaded temp file.
-     *
-     * @throws \RuntimeException If MAIN cannot be located or the download fails.
-     */
-    private function fetchArchiveFromMain(string $rArchivePath): string {
-        $rMain = null;
-        foreach (ServerRepository::getAll() as $rServer) {
-            if (!empty($rServer['is_main'])) {
-                $rMain = $rServer;
-                break;
-            }
-        }
+		if (!$rMain || empty($rMain['server_ip'])) {
+			throw new \RuntimeException('Could not locate the MAIN server to fetch the module archive.');
+		}
 
-        if (!$rMain || empty($rMain['server_ip'])) {
-            throw new \RuntimeException('Could not locate the MAIN server to fetch the module archive.');
-        }
+		$rPass = (string) (SettingsManager::get('live_streaming_pass') ?? '');
+		$rUrl  = 'http://' . $rMain['server_ip'] . ':' . intval($rMain['http_broadcast_port'])
+			. '/api?password=' . urlencode($rPass)
+			. '&action=getFile&filename=' . urlencode($rArchivePath);
 
-        $rPass = (string) (SettingsManager::get('live_streaming_pass') ?? '');
-        $rUrl  = 'http://' . $rMain['server_ip'] . ':' . intval($rMain['http_broadcast_port'])
-            . '/api?password=' . urlencode($rPass)
-            . '&action=getFile&filename=' . urlencode($rArchivePath);
+		$rTmp = rtrim(sys_get_temp_dir(), '/') . '/xc_lbmod_' . bin2hex(random_bytes(8)) . '.zip';
+		$rFp  = @fopen($rTmp, 'wb');
+		if (!$rFp) {
+			throw new \RuntimeException('Unable to create temporary archive file.');
+		}
 
-        $rTmp = rtrim(sys_get_temp_dir(), '/') . '/xc_lbmod_' . bin2hex(random_bytes(8)) . '.zip';
-        $rFp  = @fopen($rTmp, 'wb');
-        if (!$rFp) {
-            throw new \RuntimeException('Unable to create temporary archive file.');
-        }
+		$rCh = curl_init();
+		curl_setopt($rCh, CURLOPT_URL, $rUrl);
+		curl_setopt($rCh, CURLOPT_FILE, $rFp);
+		curl_setopt($rCh, CURLOPT_FOLLOWLOCATION, false);
+		curl_setopt($rCh, CURLOPT_CONNECTTIMEOUT, 10);
+		curl_setopt($rCh, CURLOPT_TIMEOUT, 120);
+		$rOk   = curl_exec($rCh);
+		$rCode = curl_getinfo($rCh, CURLINFO_RESPONSE_CODE);
+		curl_close($rCh);
+		fclose($rFp);
 
-        $rCh = curl_init();
-        curl_setopt($rCh, CURLOPT_URL, $rUrl);
-        curl_setopt($rCh, CURLOPT_FILE, $rFp);
-        curl_setopt($rCh, CURLOPT_FOLLOWLOCATION, false);
-        curl_setopt($rCh, CURLOPT_CONNECTTIMEOUT, 10);
-        curl_setopt($rCh, CURLOPT_TIMEOUT, 120);
-        $rOk   = curl_exec($rCh);
-        $rCode = curl_getinfo($rCh, CURLINFO_RESPONSE_CODE);
-        curl_close($rCh);
-        fclose($rFp);
+		// serveFile() answers with a JSON {"result":false,...} body (HTTP 200)
+		// when the file is missing/invalid — detect that by checking the zip
+		// magic bytes instead of trusting the status code alone.
+		$rMagic = @file_get_contents($rTmp, false, null, 0, 2);
+		if (!$rOk || $rCode < 200 || $rCode >= 300 || $rMagic !== 'PK') {
+			@unlink($rTmp);
+			throw new \RuntimeException("Failed to download module archive from MAIN (HTTP {$rCode}).");
+		}
 
-        // serveFile() answers with a JSON {"result":false,...} body (HTTP 200)
-        // when the file is missing/invalid — detect that by checking the zip
-        // magic bytes instead of trusting the status code alone.
-        $rMagic = @file_get_contents($rTmp, false, null, 0, 2);
-        if (!$rOk || $rCode < 200 || $rCode >= 300 || $rMagic !== 'PK') {
-            @unlink($rTmp);
-            throw new \RuntimeException("Failed to download module archive from MAIN (HTTP {$rCode}).");
-        }
+		return $rTmp;
+	}
 
-        return $rTmp;
-    }
-
-    /**
-     * Hand the freshly installed module directory back to the panel user, since
-     * this command runs as root from the signals cron.
-     */
-    private function fixOwnership(string $rName): void {
-        if (!preg_match('/^[a-z0-9][a-z0-9\-]*$/', $rName)) {
-            return;
-        }
-        $rDir = (defined('MAIN_HOME') ? MAIN_HOME : '') . 'Modules/' . $rName;
-        if (is_dir($rDir)) {
-            shell_exec('sudo chown -R xc_vm:xc_vm ' . escapeshellarg($rDir) . ' 2>/dev/null');
-        }
-    }
+	/**
+	 * Hand the freshly installed module directory back to the panel user, since
+	 * this command runs as root from the signals cron.
+	 */
+	private function fixOwnership(string $rName): void {
+		if (!preg_match('/^[a-z0-9][a-z0-9\-]*$/', $rName)) {
+			return;
+		}
+		$rDir = (defined('MAIN_HOME') ? MAIN_HOME : '') . 'Modules/' . $rName;
+		if (is_dir($rDir)) {
+			shell_exec('sudo chown -R xc_vm:xc_vm ' . escapeshellarg($rDir) . ' 2>/dev/null');
+		}
+	}
 }
diff --git a/src/Cli/Commands/MonitorCommand.php b/src/Cli/Commands/MonitorCommand.php
index c3055000..2413420a 100644
--- a/src/Cli/Commands/MonitorCommand.php
+++ b/src/Cli/Commands/MonitorCommand.php
@@ -34,7 +34,6 @@ use XcVm\Streaming\Fanout\FanoutClient;
  */
 
 class MonitorCommand implements CommandInterface {
-
 	/** {@inheritDoc} */
 	public function getName(): string {
 		return 'monitor';
@@ -103,7 +102,7 @@ class MonitorCommand implements CommandInterface {
 		$rDelayPID = $rStreamInfo['delay_pid'];
 		$rParentID = $rStreamInfo['parent_id'];
 		$rStreamProbe = false;
-		$rSources = array();
+		$rSources = [];
 		$rSegmentTime = intval(SettingsManager::get('seg_time'));
 		$rPrioritySwitch = false;
 		$rMaxFails = 0;
@@ -349,7 +348,7 @@ class MonitorCommand implements CommandInterface {
 							if ($rStreamInfo['parent_id']) {
 								$rForceSource = (!is_null(ServerRepository::getAll()[SERVER_ID]['private_url_ip']) && !is_null(ServerRepository::getAll()[$rStreamInfo['parent_id']]['private_url_ip']) ? ServerRepository::getAll()[$rStreamInfo['parent_id']]['private_url_ip'] : ServerRepository::getAll()[$rStreamInfo['parent_id']]['public_url_ip']) . 'admin/live?stream=' . intval($rStreamID) . '&password=' . urlencode(SettingsManager::get('live_streaming_pass')) . '&extension=ts';
 							}
-							$rData = StreamProcess::startLLOD($rStreamID, $rStreamInfo, $rStreamInfo['parent_id'] ? array() : $rStreamArguments, $rForceSource);
+							$rData = StreamProcess::startLLOD($rStreamID, $rStreamInfo, $rStreamInfo['parent_id'] ? [] : $rStreamArguments, $rForceSource);
 						}
 					} elseif ($rStreamInfo['type'] == 3) {
 						if ((0 < $rPID) && !$rStreamInfo['parent_id'] && (0 < $rStreamInfo['stream_started'])) {
@@ -512,7 +511,7 @@ class MonitorCommand implements CommandInterface {
 	 * @param mixed $rThreshold fps_threshold percentage (1..100), or empty.
 	 * @return bool
 	 */
-	public static function isFpsBelowThreshold($rFps, $rBaseline, $rThreshold): bool {
+	public static function isFpsBelowThreshold(float $rFps, float $rBaseline, mixed $rThreshold): bool {
 		$rPercent = min(100, max(1, intval($rThreshold) ?: 90));
 		return 0 < $rBaseline && $rFps < $rBaseline * $rPercent / 100;
 	}
@@ -526,7 +525,7 @@ class MonitorCommand implements CommandInterface {
 	 * @param mixed $rCurrentSource The source in use.
 	 * @return array
 	 */
-	public static function higherPrioritySources(array $rSources, $rCurrentSource): array {
+	public static function higherPrioritySources(array $rSources, mixed $rCurrentSource): array {
 		$rKey = array_search($rCurrentSource, $rSources);
 		if (!is_numeric($rKey)) {
 			return array_values($rSources); // current is not in the list (e.g. it was edited): all are candidates
@@ -541,7 +540,7 @@ class MonitorCommand implements CommandInterface {
 	 * @param mixed $rRate Raw avg_frame_rate / r_frame_rate value.
 	 * @return float Frames per second; 0.0 for empty/zero/malformed input.
 	 */
-	private static function parseFrameRate($rRate): float {
+	private static function parseFrameRate(mixed $rRate): float {
 		$rRate = (string) $rRate;
 		if (strpos($rRate, '/') !== false) {
 			list($rNum, $rDen) = array_map('floatval', explode('/', $rRate));
@@ -558,7 +557,7 @@ class MonitorCommand implements CommandInterface {
 	 * @param int|null $rNow         Timestamp to test against (defaults to now).
 	 * @return bool
 	 */
-	private static function isAutoRestartDue($rAutoRestart, $rNow = null): bool {
+	private static function isAutoRestartDue(mixed $rAutoRestart, ?int $rNow = null): bool {
 		if (empty($rAutoRestart['days']) || empty($rAutoRestart['at'])) {
 			return false;
 		}
@@ -578,7 +577,7 @@ class MonitorCommand implements CommandInterface {
 	 * @param mixed $rAllowHevc      player_allow_hevc setting.
 	 * @return array{0:int,1:?string,2:?string,3:mixed} [compatible, audio, video, resolution]
 	 */
-	private static function resolveStreamCodecMeta($rStreamInfoJson, $rAllowHevc): array {
+	private static function resolveStreamCodecMeta(mixed $rStreamInfoJson, mixed $rAllowHevc): array {
 		$rCompatible = 0;
 		$rAudioCodec = $rVideoCodec = $rResolution = null;
 		if ($rStreamInfoJson) {
@@ -590,10 +589,10 @@ class MonitorCommand implements CommandInterface {
 				$rResolution = isset($rStreamJSON['codecs']['video']['height']) ? $rStreamJSON['codecs']['video']['height'] : null;
 			}
 			if ($rResolution) {
-				$rResolution = StreamSorter::getNearest(array(240, 360, 480, 576, 720, 1080, 1440, 2160), $rResolution);
+				$rResolution = StreamSorter::getNearest([240, 360, 480, 576, 720, 1080, 1440, 2160], $rResolution);
 			}
 		}
-		return array($rCompatible, $rAudioCodec, $rVideoCodec, $rResolution);
+		return [$rCompatible, $rAudioCodec, $rVideoCodec, $rResolution];
 	}
 
 	/**
@@ -606,7 +605,7 @@ class MonitorCommand implements CommandInterface {
 	 * @param mixed $rSegmentTime Current segment time.
 	 * @return array{0:mixed,1:mixed} [clamped probe, updated segment time]
 	 */
-	private static function persistSegmentDuration($rProbe, $rStreamID, $rSegmentTime): array {
+	private static function persistSegmentDuration(mixed $rProbe, mixed $rStreamID, mixed $rSegmentTime): array {
 		if (10 < intval($rProbe['of_duration'])) {
 			$rProbe['of_duration'] = 10;
 		}
@@ -614,7 +613,7 @@ class MonitorCommand implements CommandInterface {
 		if ($rSegmentTime < intval($rProbe['of_duration'])) {
 			$rSegmentTime = intval($rProbe['of_duration']);
 		}
-		return array($rProbe, $rSegmentTime);
+		return [$rProbe, $rSegmentTime];
 	}
 
 	/**
diff --git a/src/Cli/Commands/OndemandCommand.php b/src/Cli/Commands/OndemandCommand.php
index ccd4a51b..715d3033 100644
--- a/src/Cli/Commands/OndemandCommand.php
+++ b/src/Cli/Commands/OndemandCommand.php
@@ -22,7 +22,6 @@ use XcVm\Streaming\Fanout\FanoutClient;
  */
 
 class OndemandCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'ondemand';
 	}
@@ -51,7 +50,7 @@ class OndemandCommand implements CommandInterface {
 		// Kill any OTHER running ondemand instance (dedupe). findProcessPIDs()
 		// skips our own PID and matches both the retitled process and the raw
 		// command line (covers the window before a sibling sets its title).
-		foreach (ProcessManager::findProcessPIDs(array('XC_VM[Ondemand]', 'console.php ondemand')) as $rOtherPID) {
+		foreach (ProcessManager::findProcessPIDs(['XC_VM[Ondemand]', 'console.php ondemand']) as $rOtherPID) {
 			@posix_kill($rOtherPID, 9);
 		}
 
@@ -111,15 +110,17 @@ class OndemandCommand implements CommandInterface {
 			}
 
 			foreach ($rRows as $rRow) {
-				if ($rRow['online_clients'] > 0 || $rRow['attached'] > 0)
+				if ($rRow['online_clients'] > 0 || $rRow['attached'] > 0) {
 					continue;
+				}
 
 				$rStreamID = $rRow['stream_id'];
 				$pidFile = STREAMS_PATH . $rStreamID . '_.pid';
 				$monitorFile = STREAMS_PATH . $rStreamID . '_.monitor';
 
-				if (!file_exists($pidFile))
+				if (!file_exists($pidFile)) {
 					continue;
+				}
 
 				$rPID = (int) @file_get_contents($pidFile);
 				$rMonitorPID = file_exists($monitorFile) ? (int) @file_get_contents($monitorFile) : 0;
@@ -129,8 +130,9 @@ class OndemandCommand implements CommandInterface {
 				if (file_exists($queueFile)) {
 					$queue = @igbinary_unserialize(@file_get_contents($queueFile)) ?: [];
 					foreach ($queue as $pid) {
-						if (ProcessManager::isRunning($pid, 'php-fpm'))
+						if (ProcessManager::isRunning($pid, 'php-fpm')) {
 							$rQueue++;
+						}
 					}
 				}
 
@@ -150,10 +152,12 @@ class OndemandCommand implements CommandInterface {
 				FanoutClient::release($rStreamID);
 				FanoutClient::unregister($rStreamID);
 
-				if ($rMonitorPID > 0)
+				if ($rMonitorPID > 0) {
 					@posix_kill($rMonitorPID, 9);
-				if ($rPID > 0)
+				}
+				if ($rPID > 0) {
 					@posix_kill($rPID, 9);
+				}
 
 				@shell_exec('rm -f ' . STREAMS_PATH . $rStreamID . '_*');
 				@unlink($queueFile);
@@ -169,8 +173,9 @@ class OndemandCommand implements CommandInterface {
 			usleep(800000);
 		}
 
-		if (is_object($db))
+		if (is_object($db)) {
 			$db->close_mysql();
+		}
 		shell_exec('(sleep 2; ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php ondemand) > /dev/null 2>&1 &');
 
 		return 0;
diff --git a/src/Cli/Commands/ProxyInstallFlow.php b/src/Cli/Commands/ProxyInstallFlow.php
index 7c68da37..784f9573 100644
--- a/src/Cli/Commands/ProxyInstallFlow.php
+++ b/src/Cli/Commands/ProxyInstallFlow.php
@@ -3,9 +3,8 @@
 namespace XcVm\Cli\Commands;
 
 class ProxyInstallFlow {
-
 	public static function getPackages(): array {
-		return array('iproute2', 'net-tools', 'libcurl4', 'libcurl3-gnutls', 'libxslt1-dev', 'libonig-dev', 'e2fsprogs', 'wget', 'sysstat', 'mcrypt', 'python3', 'certbot', 'iptables-persistent', 'libjpeg-dev', 'libpng-dev', 'libssh2-1', 'xz-utils', 'zip', 'unzip', 'cron');
+		return ['iproute2', 'net-tools', 'libcurl4', 'libcurl3-gnutls', 'libxslt1-dev', 'libonig-dev', 'e2fsprogs', 'wget', 'sysstat', 'mcrypt', 'python3', 'certbot', 'iptables-persistent', 'libjpeg-dev', 'libpng-dev', 'libssh2-1', 'xz-utils', 'zip', 'unzip', 'cron'];
 	}
 
 	public static function getInstallFile(): string {
@@ -13,7 +12,7 @@ class ProxyInstallFlow {
 	}
 
 	public static function writeInstallMetadata(string $rInstallDir, int $rServerID, string $rUsername, string $rPassword, int $rPort, int $rHTTPPort, int $rHTTPSPort, array $rParentIDs): void {
-		file_put_contents($rInstallDir . $rServerID . '.json', json_encode(array('root_username' => $rUsername, 'root_password' => $rPassword, 'ssh_port' => $rPort, 'http_broadcast_port' => $rHTTPPort, 'https_broadcast_port' => $rHTTPSPort, 'parent_id' => $rParentIDs)));
+		file_put_contents($rInstallDir . $rServerID . '.json', json_encode(['root_username' => $rUsername, 'root_password' => $rPassword, 'ssh_port' => $rPort, 'http_broadcast_port' => $rHTTPPort, 'https_broadcast_port' => $rHTTPSPort, 'parent_id' => $rParentIDs]));
 	}
 
 	public static function installArchive($rConn, callable $rSendFileSSH, callable $rRunSSH, string $rInstallDir, string $rInstallFile, int $rServerID, $db): bool {
diff --git a/src/Cli/Commands/QueueCommand.php b/src/Cli/Commands/QueueCommand.php
index 2c7bb442..1c894992 100644
--- a/src/Cli/Commands/QueueCommand.php
+++ b/src/Cli/Commands/QueueCommand.php
@@ -58,7 +58,7 @@ class QueueCommand implements CommandInterface {
 
 			// ── Movie queue ──────────────────────────────────────
 			if ($db->query("SELECT `id`, `pid` FROM `queue` WHERE `server_id` = ? AND `pid` IS NOT NULL AND `type` = 'movie' ORDER BY `added` ASC;", SERVER_ID)) {
-				$rDelete = $rInProgress = array();
+				$rDelete = $rInProgress = [];
 				if ($db->num_rows() > 0) {
 					foreach ($db->get_rows() as $rRow) {
 						if ($rRow['pid'] && (ProcessManager::isRunning($rRow['pid'], 'ffmpeg') || ProcessManager::isRunning($rRow['pid'], PHP_BIN))) {
@@ -86,7 +86,7 @@ class QueueCommand implements CommandInterface {
 
 				// ── Channel queue ────────────────────────────────
 				if ($db->query("SELECT `id`, `pid` FROM `queue` WHERE `server_id` = ? AND `pid` IS NOT NULL AND `type` = 'channel' ORDER BY `added` ASC;", SERVER_ID)) {
-					$rInProgress = array();
+					$rInProgress = [];
 					if ($db->num_rows() > 0) {
 						foreach ($db->get_rows() as $rRow) {
 							if ($rRow['pid'] && ProcessManager::isRunning($rRow['pid'], PHP_BIN)) {
diff --git a/src/Cli/Commands/RecordCommand.php b/src/Cli/Commands/RecordCommand.php
index f13a8e4a..64b1a316 100644
--- a/src/Cli/Commands/RecordCommand.php
+++ b/src/Cli/Commands/RecordCommand.php
@@ -20,7 +20,6 @@ use XcVm\Streaming\Codec\FfmpegPaths;
  */
 
 class RecordCommand implements CommandInterface {
-
 	use DatabaseAware;
 
 	public function getName(): string {
@@ -170,7 +169,7 @@ class RecordCommand implements CommandInterface {
 		$rImportArray['target_container'] = 'mp4';
 		$rImportArray['stream_display_name'] = $recordingData['title'];
 		$rImportArray['year'] = date('Y');
-		$rImportArray['movie_properties'] = array('kinopoisk_url' => null, 'tmdb_id' => null, 'name' => $recordingData['title'], 'o_name' => $recordingData['title'], 'cover_big' => $recordingData['stream_icon'], 'movie_image' => $recordingData['stream_icon'], 'release_date' => date('Y-m-d', $recordingData['start']), 'episode_run_time' => intval($rSeconds / 60), 'youtube_trailer' => null, 'director' => '', 'actors' => '', 'cast' => '', 'description' => trim($recordingData['description']), 'plot' => trim($recordingData['description']), 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => '', 'genre' => '', 'backdrop_path' => array(), 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => 0);
+		$rImportArray['movie_properties'] = ['kinopoisk_url' => null, 'tmdb_id' => null, 'name' => $recordingData['title'], 'o_name' => $recordingData['title'], 'cover_big' => $recordingData['stream_icon'], 'movie_image' => $recordingData['stream_icon'], 'release_date' => date('Y-m-d', $recordingData['start']), 'episode_run_time' => intval($rSeconds / 60), 'youtube_trailer' => null, 'director' => '', 'actors' => '', 'cast' => '', 'description' => trim($recordingData['description']), 'plot' => trim($recordingData['description']), 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => '', 'genre' => '', 'backdrop_path' => [], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => [], 'audio' => [], 'bitrate' => 0, 'rating' => 0];
 		$rImportArray['rating'] = 0;
 		$rImportArray['read_native'] = 0;
 		$rImportArray['movie_symlink'] = 0;
@@ -200,7 +199,7 @@ class RecordCommand implements CommandInterface {
 		foreach (json_decode($recordingData['bouquets'], true) as $rBouquet) {
 			$this->addToBouquet($rBouquet, $rInsertID);
 		}
-		$db->query('UPDATE `streams` SET `stream_source` = ? WHERE `id` = ?;', json_encode(array(VOD_PATH . $rInsertID . '.mp4')), $rInsertID);
+		$db->query('UPDATE `streams` SET `stream_source` = ? WHERE `id` = ?;', json_encode([VOD_PATH . $rInsertID . '.mp4']), $rInsertID);
 		$db->query('INSERT INTO `streams_servers`(`stream_id`, `server_id`, `parent_id`, `pid`, `to_analyze`) VALUES(?, ?, NULL, 1, 1);', $rInsertID, SERVER_ID);
 		$db->query('UPDATE `recordings` SET `status` = 2, `created_id` = ? WHERE `id` = ?;', $rInsertID, $recordingID);
 	}
@@ -278,7 +277,7 @@ class RecordCommand implements CommandInterface {
 	}
 
 	private function prepareArray($rArray): array {
-		$UpdateData = $rColumns = $rPlaceholder = $rData = array();
+		$UpdateData = $rColumns = $rPlaceholder = $rData = [];
 		foreach (array_keys($rArray) as $rKey) {
 			$rColumns[] = '`' . $this->preparecolumn($rKey) . '`';
 			$UpdateData[] = '`' . $this->preparecolumn($rKey) . '` = ?';
@@ -290,12 +289,12 @@ class RecordCommand implements CommandInterface {
 			$rPlaceholder[] = '?';
 			$rData[] = $rValue;
 		}
-		return array('placeholder' => implode(',', $rPlaceholder), 'columns' => implode(',', $rColumns), 'data' => $rData, 'update' => implode(',', $UpdateData));
+		return ['placeholder' => implode(',', $rPlaceholder), 'columns' => implode(',', $rColumns), 'data' => $rData, 'update' => implode(',', $UpdateData)];
 	}
 
-	private function verifyPostTable($rTable, $rData = array(), $rOnlyExisting = false): array {
+	private function verifyPostTable($rTable, $rData = [], $rOnlyExisting = false): array {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `column_name`, `column_default`, `is_nullable`, `data_type` FROM `information_schema`.`columns` WHERE `table_schema` = (SELECT DATABASE()) AND `table_name` = ? ORDER BY `ordinal_position`;', $rTable);
 		foreach ($db->get_rows() as $rRow) {
 			if ($rRow['column_default'] == 'NULL') {
@@ -303,7 +302,7 @@ class RecordCommand implements CommandInterface {
 			}
 			$rForceDefault = false;
 			if (!($rRow['is_nullable'] != 'NO' || $rRow['column_default'])) {
-				if (in_array($rRow['data_type'], array('int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'))) {
+				if (in_array($rRow['data_type'], ['int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'])) {
 					$rRow['column_default'] = 0;
 				} else {
 					$rRow['column_default'] = '';
@@ -332,7 +331,7 @@ class RecordCommand implements CommandInterface {
 			$rPID = intval(file_get_contents(ARCHIVE_PATH . $recordingID . '_.record'));
 		}
 		if (empty($rPID)) {
-			$rPIDs = array();
+			$rPIDs = [];
 			exec("ps -ef | grep 'Record\\[" . intval($recordingID) . "\\]' | grep -v grep | awk '{print \$2}'", $rPIDs);
 			foreach ($rPIDs as $rKillPID) {
 				$rKillPID = intval(trim($rKillPID));
diff --git a/src/Cli/Commands/ScannerCommand.php b/src/Cli/Commands/ScannerCommand.php
index bab4a254..f30ef1a6 100644
--- a/src/Cli/Commands/ScannerCommand.php
+++ b/src/Cli/Commands/ScannerCommand.php
@@ -123,7 +123,7 @@ class ScannerCommand implements CommandInterface {
 						$rProcessed = true;
 					}
 					if (!$rProcessed) {
-						$rStreamArguments[] = array('value' => 'X-XC_VM-Detect:1', 'argument_key' => 'headers', 'argument_cat' => 'fetch', 'argument_wprotocol' => 'http', 'argument_type' => 'text', 'argument_cmd' => "-headers '%s" . "\r\n" . "'");
+						$rStreamArguments[] = ['value' => 'X-XC_VM-Detect:1', 'argument_key' => 'headers', 'argument_cat' => 'fetch', 'argument_wprotocol' => 'http', 'argument_type' => 'text', 'argument_cmd' => "-headers '%s" . "\r\n" . "'"];
 					}
 				}
 
@@ -137,7 +137,7 @@ class ScannerCommand implements CommandInterface {
 						$rProcessed = true;
 					}
 					if (!$rProcessed) {
-						$rStreamArguments[] = array('value' => 'X-XC_VM-Prebuffer:1', 'argument_key' => 'headers', 'argument_cat' => 'fetch', 'argument_wprotocol' => 'http', 'argument_type' => 'text', 'argument_cmd' => "-headers '%s" . "\r\n" . "'");
+						$rStreamArguments[] = ['value' => 'X-XC_VM-Prebuffer:1', 'argument_key' => 'headers', 'argument_cat' => 'fetch', 'argument_wprotocol' => 'http', 'argument_type' => 'text', 'argument_cmd' => "-headers '%s" . "\r\n" . "'"];
 					}
 				}
 
@@ -156,7 +156,7 @@ class ScannerCommand implements CommandInterface {
 				}
 
 				$rTime = round(microtime(true) * 1000);
-				$rFFProbeOutput = json_decode(shell_exec(str_replace(array('{FETCH_OPTIONS}', '{STREAM_SOURCE}'), array($rFetchOptions, escapeshellarg($rStreamSource)), $rFFProbee)), true);
+				$rFFProbeOutput = json_decode(shell_exec(str_replace(['{FETCH_OPTIONS}', '{STREAM_SOURCE}'], [$rFetchOptions, escapeshellarg($rStreamSource)], $rFFProbee)), true);
 				$rTimeTaken = round(microtime(true) * 1000) - $rTime;
 
 				if (file_exists(STREAMS_TMP_PATH . $rRow['id'] . '._errors') && 0 < filesize(STREAMS_TMP_PATH . $rRow['id'] . '._errors')) {
@@ -192,7 +192,7 @@ class ScannerCommand implements CommandInterface {
 					$rFPS = intval($rFPS / 1000);
 				}
 				if ($rResolution) {
-					$rResolution = StreamSorter::getNearest(array(240, 360, 480, 576, 720, 1080, 1440, 2160), $rResolution);
+					$rResolution = StreamSorter::getNearest([240, 360, 480, 576, 720, 1080, 1440, 2160], $rResolution);
 				}
 				$rStatus = 1;
 			} else {
diff --git a/src/Cli/Commands/ServerDiagnoseCommand.php b/src/Cli/Commands/ServerDiagnoseCommand.php
index c797975d..138faca4 100644
--- a/src/Cli/Commands/ServerDiagnoseCommand.php
+++ b/src/Cli/Commands/ServerDiagnoseCommand.php
@@ -93,7 +93,7 @@ class ServerDiagnoseCommand implements CommandInterface {
 
 		echo "Diagnosing node #{$rServerID} FROM the main — " . ($rServer['server_name'] ?? '(no name)') . " @ {$rIP}:{$rPort}\n";
 		echo str_repeat('-', 64) . "\n";
-		$rProblems = array();
+		$rProblems = [];
 
 		$this->heartbeatSection($rServer, $rNow, $rProblems);
 
@@ -132,7 +132,7 @@ class ServerDiagnoseCommand implements CommandInterface {
 
 		echo "Self-diagnosis on node #" . SERVER_ID . " — " . ($rMe['server_name'] ?? '(no name)') . " (type " . ($rMe['server_type'] ?? '?') . ")\n";
 		echo str_repeat('-', 64) . "\n";
-		$rProblems = array();
+		$rProblems = [];
 
 		// 1. How the main currently sees me (my own row in the shared DB).
 		$this->heartbeatSection($rMe, $rNow, $rProblems);
@@ -259,8 +259,8 @@ class ServerDiagnoseCommand implements CommandInterface {
 	private function signalSection(int $rServerID, int $rNow, array &$rProblems): void {
 		$db = self::db();
 		$db->query('SELECT COUNT(*) AS `c`, MIN(`time`) AS `oldest` FROM `signals` WHERE `server_id` = ?;', $rServerID);
-		$rRows    = $db->get_rows() ?: array();
-		$rSig     = $rRows[0] ?? array();
+		$rRows    = $db->get_rows() ?: [];
+		$rSig     = $rRows[0] ?? [];
 		$rBacklog = intval($rSig['c'] ?? 0);
 		$rOldest  = $rBacklog > 0 ? ($rNow - intval($rSig['oldest'])) : 0;
 		$rOk      = ($rBacklog === 0) || ($rOldest < self::SIGNAL_STUCK_AFTER);
@@ -295,7 +295,7 @@ class ServerDiagnoseCommand implements CommandInterface {
 	}
 
 	private function icmpPing(string $rIP): bool {
-		$rOut = array();
+		$rOut = [];
 		$rCode = 1;
 		exec('ping -c1 -W2 ' . escapeshellarg($rIP) . ' 2>/dev/null', $rOut, $rCode);
 		return $rCode === 0;
@@ -316,22 +316,22 @@ class ServerDiagnoseCommand implements CommandInterface {
 	/** @return array{0:int,1:string} [http_code, curl_error]; code 0 = no response. */
 	private function httpApi(string $rURL): array {
 		$ch = curl_init($rURL);
-		curl_setopt_array($ch, array(
+		curl_setopt_array($ch, [
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_CONNECTTIMEOUT => 3,
 			CURLOPT_TIMEOUT        => 6,
 			CURLOPT_SSL_VERIFYPEER => false,
 			CURLOPT_SSL_VERIFYHOST => 0,
-		));
+		]);
 		curl_exec($ch);
 		$rCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
 		$rErr  = curl_error($ch);
 		curl_close($ch);
-		return array($rCode, $rErr);
+		return [$rCode, $rErr];
 	}
 
 	private function svcActive(string $rName): bool {
-		$rOut = array();
+		$rOut = [];
 		$rCode = 1;
 		exec('systemctl is-active ' . escapeshellarg($rName) . ' 2>/dev/null', $rOut, $rCode);
 		return trim(implode('', $rOut)) === 'active';
@@ -339,7 +339,7 @@ class ServerDiagnoseCommand implements CommandInterface {
 
 	/** @return true|false|string true=blocked, false=not, string=could not check. */
 	private function iptablesBlocks(string $rIP) {
-		$rOut = array();
+		$rOut = [];
 		$rCode = 1;
 		exec('sudo -n iptables -nL INPUT 2>/dev/null', $rOut, $rCode);
 		if ($rCode !== 0) {
@@ -356,7 +356,7 @@ class ServerDiagnoseCommand implements CommandInterface {
 	private function crontabHas(string $rNeedle): bool {
 		// Panel crons live in the xc_vm USER's crontab (LegacyInitializer::generateCron),
 		// not root's. `-u xc_vm` needs root; fall back to the caller's own crontab.
-		$rOut = array();
+		$rOut = [];
 		$rCode = 1;
 		exec('crontab -u xc_vm -l 2>/dev/null', $rOut, $rCode);
 		if ($rCode !== 0) {
@@ -370,7 +370,7 @@ class ServerDiagnoseCommand implements CommandInterface {
 
 	/** Whether a process whose command line matches the ERE $rPattern is running. */
 	private function processRunning(string $rPattern): bool {
-		$rOut = array();
+		$rOut = [];
 		$rCode = 1;
 		exec('pgrep -f ' . escapeshellarg($rPattern) . ' 2>/dev/null', $rOut, $rCode);
 		return $rCode === 0 && count($rOut) > 0;
diff --git a/src/Cli/Commands/ServerInstallCommand.php b/src/Cli/Commands/ServerInstallCommand.php
index 6608cc92..885181e2 100644
--- a/src/Cli/Commands/ServerInstallCommand.php
+++ b/src/Cli/Commands/ServerInstallCommand.php
@@ -25,7 +25,6 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class ServerInstallCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'server:install';
 	}
@@ -54,7 +53,7 @@ class ServerInstallCommand implements CommandInterface {
 			return 0;
 		}
 
-		shell_exec("kill -9 `ps -ef | grep 'XC_VM Install\\[" . $rServerID . "\\]' | grep -v grep | awk '{print \$2}'`;" );
+		shell_exec("kill -9 `ps -ef | grep 'XC_VM Install\\[" . $rServerID . "\\]' | grep -v grep | awk '{print \$2}'`;");
 		set_time_limit(0);
 		cli_set_process_title('XC_VM Install[' . $rServerID . ']');
 		register_shutdown_function(function () use ($db) {
@@ -73,7 +72,7 @@ class ServerInstallCommand implements CommandInterface {
 		$rHTTPSPort = (empty($rArgs[6]) ? 443 : intval($rArgs[6]));
 		$rUpdateSysctl = (empty($rArgs[7]) ? 0 : intval($rArgs[7]));
 		$rPrivateIP = (empty($rArgs[8]) ? 0 : intval($rArgs[8]));
-		$rParentIDs = (empty($rArgs[9]) ? array() : json_decode($rArgs[9], true));
+		$rParentIDs = (empty($rArgs[9]) ? [] : json_decode($rArgs[9], true));
 		$rSysCtl = '# XC_VM' . PHP_EOL . PHP_EOL . 'net.ipv4.tcp_congestion_control = bbr' . PHP_EOL . 'net.core.default_qdisc = fq' . PHP_EOL . 'net.ipv4.tcp_rmem = 8192 87380 134217728' . PHP_EOL . 'net.ipv4.udp_rmem_min = 16384' . PHP_EOL . 'net.core.rmem_default = 262144' . PHP_EOL . 'net.core.rmem_max = 268435456' . PHP_EOL . 'net.ipv4.tcp_wmem = 8192 65536 134217728' . PHP_EOL . 'net.ipv4.udp_wmem_min = 16384' . PHP_EOL . 'net.core.wmem_default = 262144' . PHP_EOL . 'net.core.wmem_max = 268435456' . PHP_EOL . 'net.core.somaxconn = 1000000' . PHP_EOL . 'net.core.netdev_max_backlog = 250000' . PHP_EOL . 'net.core.optmem_max = 65535' . PHP_EOL . 'net.ipv4.tcp_max_tw_buckets = 1440000' . PHP_EOL . 'net.ipv4.tcp_max_orphans = 16384' . PHP_EOL . 'net.ipv4.ip_local_port_range = 2000 65000' . PHP_EOL . 'net.ipv4.tcp_no_metrics_save = 1' . PHP_EOL . 'net.ipv4.tcp_slow_start_after_idle = 0' . PHP_EOL . 'net.ipv4.tcp_fin_timeout = 15' . PHP_EOL . 'net.ipv4.tcp_keepalive_time = 300' . PHP_EOL . 'net.ipv4.tcp_keepalive_probes = 5' . PHP_EOL . 'net.ipv4.tcp_keepalive_intvl = 15' . PHP_EOL . 'fs.file-max=20970800' . PHP_EOL . 'fs.nr_open=20970800' . PHP_EOL . 'fs.aio-max-nr=20970800' . PHP_EOL . 'net.ipv4.tcp_timestamps = 1' . PHP_EOL . 'net.ipv4.tcp_window_scaling = 1' . PHP_EOL . 'net.ipv4.tcp_mtu_probing = 1' . PHP_EOL . 'net.ipv4.route.flush = 1' . PHP_EOL . 'net.ipv6.route.flush = 1';
 		$rInstallDir = BIN_PATH . 'install/';
 
@@ -188,7 +187,7 @@ class ServerInstallCommand implements CommandInterface {
 			ProxyInstallFlow::runStartup($rConn, $rRunSSH);
 		}
 
-		if (in_array($rType, array(1, 2))) {
+		if (in_array($rType, [1, 2])) {
 			$db->query('UPDATE `servers` SET `status` = 1, `http_broadcast_port` = ?, `https_broadcast_port` = ?, `total_services` = ? WHERE `id` = ?;', $rHTTPPort, $rHTTPSPort, $rServices, $rServerID);
 		} else {
 			$db->query('UPDATE `servers` SET `status` = 1 WHERE `id` = ?;', $rServerID);
@@ -228,7 +227,7 @@ class ServerInstallCommand implements CommandInterface {
 	}
 
 	private function prepareInstallRoot($rConn, callable $rRunSSH, int $rType): void {
-		if (!in_array($rType, array(1, 2))) {
+		if (!in_array($rType, [1, 2])) {
 			return;
 		}
 
@@ -315,6 +314,6 @@ class ServerInstallCommand implements CommandInterface {
 		$rError = ssh2_fetch_stream($rStream, SSH2_STREAM_STDERR);
 		stream_set_blocking($rError, true);
 		stream_set_blocking($rStream, true);
-		return array('output' => stream_get_contents($rStream), 'error' => stream_get_contents($rError));
+		return ['output' => stream_get_contents($rStream), 'error' => stream_get_contents($rError)];
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Cli/Commands/ServiceCommand.php b/src/Cli/Commands/ServiceCommand.php
index 16551737..0d1a76a0 100644
--- a/src/Cli/Commands/ServiceCommand.php
+++ b/src/Cli/Commands/ServiceCommand.php
@@ -21,7 +21,6 @@ use XcVm\Cli\CommandInterface;
  */
 
 class ServiceCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'service';
 	}
diff --git a/src/Cli/Commands/SignalsCommand.php b/src/Cli/Commands/SignalsCommand.php
index 0c8aac55..51bf9148 100644
--- a/src/Cli/Commands/SignalsCommand.php
+++ b/src/Cli/Commands/SignalsCommand.php
@@ -80,7 +80,7 @@ class SignalsCommand implements CommandInterface {
 			// ── Kill-сигналы из БД ──────────────────────────────
 			if ($db->query('SELECT `signal_id`, `pid`, `rtmp` FROM `signals` WHERE `server_id` = ? AND `pid` IS NOT NULL ORDER BY `signal_id` ASC LIMIT 100', SERVER_ID)) {
 				if ($db->num_rows() > 0) {
-					$rIDs = array();
+					$rIDs = [];
 					foreach ($db->get_rows() as $rRow) {
 						$rIDs[] = $rRow['signal_id'];
 						$rPID = $rRow['pid'];
@@ -100,7 +100,7 @@ class SignalsCommand implements CommandInterface {
 				// ── Cache-сигналы из БД ─────────────────────────
 				if ($db->query('SELECT `signal_id`, `custom_data` FROM `signals` WHERE `server_id` = ? AND `cache` = 1 ORDER BY `signal_id` ASC LIMIT 1000;', SERVER_ID)) {
 					if ($db->num_rows() > 0) {
-						$rUpdatedStreams = $rUpdatedLines = $rIDs = array();
+						$rUpdatedStreams = $rUpdatedLines = $rIDs = [];
 						foreach ($db->get_rows() as $rRow) {
 							$rCustomData = json_decode($rRow['custom_data'], true);
 							$rIDs[] = $rRow['signal_id'];
@@ -163,13 +163,13 @@ class SignalsCommand implements CommandInterface {
 
 					// ── Redis kill-сигналы ──────────────────────
 					if (SettingsManager::get('redis_handler')) {
-						$rSignals = array();
+						$rSignals = [];
 						foreach (RedisManager::instance()->sMembers('SIGNALS#' . SERVER_ID) as $rKey) {
 							$rSignals[] = $rKey;
 						}
 						if (count($rSignals) > 0) {
 							$rSignalData = RedisManager::instance()->mGet($rSignals);
-							$rIDs = array();
+							$rIDs = [];
 							foreach ($rSignalData as $rData) {
 								$rRow = igbinary_unserialize($rData);
 								$rIDs[] = $rRow['key'];
diff --git a/src/Cli/Commands/StartupCommand.php b/src/Cli/Commands/StartupCommand.php
index 5784543b..2c0d2593 100644
--- a/src/Cli/Commands/StartupCommand.php
+++ b/src/Cli/Commands/StartupCommand.php
@@ -95,7 +95,7 @@ class StartupCommand implements CommandInterface {
 	}
 
 	private function installRootCrontab(): void {
-		$rCrons = array();
+		$rCrons = [];
 		$rCrons[] = '* * * * * ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:root_signals # XC_VM';
 		if (file_exists(MAIN_HOME . 'Cli/CronJobs/RootMysqlCronJob.php')) {
 			$rCrons[] = '* * * * * ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:root_mysql # XC_VM';
@@ -112,13 +112,13 @@ class StartupCommand implements CommandInterface {
 		}
 
 		$rWrite = false;
-		$rOutput = array();
+		$rOutput = [];
 		exec('sudo crontab -l', $rOutput);
 
 		// Удаляем старые записи XC_VM: путь v1.x.x (crons/root_) и любые
 		// строки с нашим маркером — включая старый '# \XC_VM' от прошлой
 		// миграции — чтобы при апгрейде не появлялись дубликаты.
-		$rFiltered = array();
+		$rFiltered = [];
 		foreach ($rOutput as $rLine) {
 			if (strpos($rLine, MAIN_HOME . 'crons/root_') !== false
 				|| strpos($rLine, '# XC_VM') !== false
diff --git a/src/Cli/Commands/StatusCommand.php b/src/Cli/Commands/StatusCommand.php
index 2a8553f9..ac93c213 100644
--- a/src/Cli/Commands/StatusCommand.php
+++ b/src/Cli/Commands/StatusCommand.php
@@ -28,7 +28,6 @@ use XcVm\Infrastructure\Database\DatabaseFactory;
  */
 
 class StatusCommand implements CommandInterface {
-
 	use DatabaseAware;
 
 	public function getName(): string {
@@ -149,14 +148,14 @@ class StatusCommand implements CommandInterface {
 	private function getServers(): array {
 		$db = self::db();
 		$db->query('SELECT * FROM `servers`');
-		$rServers = array();
-		$rOnlineStatus = array(1);
+		$rServers = [];
+		$rOnlineStatus = [1];
 
 		foreach ($db->get_rows() as $rRow) {
 			if (empty($rRow['domain_name'])) {
 				$rURL = escapeshellcmd($rRow['server_ip']);
 			} else {
-				$rURL = str_replace(array('http://', '/', 'https://'), '', escapeshellcmd(explode(',', $rRow['domain_name'])[0]));
+				$rURL = str_replace(['http://', '/', 'https://'], '', escapeshellcmd(explode(',', $rRow['domain_name'])[0]));
 			}
 
 			$rProtocol = ($rRow['enable_https'] == 1) ? 'https' : 'http';
@@ -186,7 +185,7 @@ class StatusCommand implements CommandInterface {
 			$rReload = true;
 		}
 
-		foreach (array('http', 'https') as $rType) {
+		foreach (['http', 'https'] as $rType) {
 			$rPortConfig = file_get_contents(MAIN_HOME . 'bin/nginx/conf/ports/' . $rType . '.conf');
 
 			if (stripos($rPortConfig, ' reuseport') !== false) {
@@ -199,7 +198,7 @@ class StatusCommand implements CommandInterface {
 	}
 
 	private function installRootCrontab(): void {
-		$rCrons = array();
+		$rCrons = [];
 
 		$rCrons[] = '* * * * * ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:root_signals # XC_VM';
 		if (file_exists(MAIN_HOME . 'Cli/CronJobs/RootMysqlCronJob.php')) {
@@ -211,12 +210,12 @@ class StatusCommand implements CommandInterface {
 		}
 
 		$rWrite = false;
-		$rOutput = array();
+		$rOutput = [];
 		exec('sudo crontab -l', $rOutput);
 
 		// Удаляем старые строки с нашим маркером (включая '# \XC_VM' от
 		// прошлой миграции), чтобы при апгрейде не появлялись дубликаты.
-		$rFiltered = array();
+		$rFiltered = [];
 		foreach ($rOutput as $rLine) {
 			if (strpos($rLine, '# XC_VM') !== false || strpos($rLine, '# \XC_VM') !== false) {
 				$rWrite = true;
@@ -285,8 +284,8 @@ class StatusCommand implements CommandInterface {
 	private function broadcastUpdateBinaries(array $rServers): void {
 		$db = self::db();
 		foreach ($rServers as $rServerID => $rServerArray) {
-			$db->query('DELETE FROM `signals` WHERE `custom_data` = ?;', json_encode(array('action' => 'update_binaries')));
-			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(array('action' => 'update_binaries')));
+			$db->query('DELETE FROM `signals` WHERE `custom_data` = ?;', json_encode(['action' => 'update_binaries']));
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(['action' => 'update_binaries']));
 		}
 	}
 
diff --git a/src/Cli/Commands/ThumbnailCommand.php b/src/Cli/Commands/ThumbnailCommand.php
index 9bb10283..8990172b 100644
--- a/src/Cli/Commands/ThumbnailCommand.php
+++ b/src/Cli/Commands/ThumbnailCommand.php
@@ -18,7 +18,6 @@ use XcVm\Streaming\Codec\FfmpegPaths;
  */
 
 class ThumbnailCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'thumbnail';
 	}
diff --git a/src/Cli/Commands/ToolsCommand.php b/src/Cli/Commands/ToolsCommand.php
index 3e8da77c..89b21fa9 100644
--- a/src/Cli/Commands/ToolsCommand.php
+++ b/src/Cli/Commands/ToolsCommand.php
@@ -24,7 +24,6 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  */
 
 class ToolsCommand implements CommandInterface {
-
 	use DatabaseAware;
 
 	public function getName(): string {
@@ -43,8 +42,8 @@ class ToolsCommand implements CommandInterface {
 		$rMethod = (!empty($rArgs[0]) ? $rArgs[0] : null);
 		$rUser = posix_getpwuid(posix_geteuid())['name'];
 
-		$rRootMethods = array('rescue', 'recaptcha', 'access', 'ports', 'migration', 'user', 'mysql', 'database', 'flush');
-		$rUserMethods = array('images', 'duplicates', 'bouquets');
+		$rRootMethods = ['rescue', 'recaptcha', 'access', 'ports', 'migration', 'user', 'mysql', 'database', 'flush'];
+		$rUserMethods = ['images', 'duplicates', 'bouquets'];
 
 		// No or unknown subcommand → show the full help to any user (root or xc_vm)
 		if ($rMethod === null || (!in_array($rMethod, $rRootMethods, true) && !in_array($rMethod, $rUserMethods, true))) {
@@ -257,21 +256,21 @@ class ToolsCommand implements CommandInterface {
 
 	private function processPorts(array $rServers): int {
 		echo "Generating port configuration...\n\n";
-		$rConfig = array(
+		$rConfig = [
 			'http' => array_unique(array_merge(
-				array($rServers[SERVER_ID]['http_broadcast_port']),
-				(explode(',', $rServers[SERVER_ID]['http_ports_add']) ?: array())
+				[$rServers[SERVER_ID]['http_broadcast_port']],
+				(explode(',', $rServers[SERVER_ID]['http_ports_add']) ?: [])
 			)),
 			'https' => array_unique(array_merge(
-				array($rServers[SERVER_ID]['https_broadcast_port']),
-				(explode(',', $rServers[SERVER_ID]['https_ports_add']) ?: array())
+				[$rServers[SERVER_ID]['https_broadcast_port']],
+				(explode(',', $rServers[SERVER_ID]['https_ports_add']) ?: [])
 			)),
 			'rtmp' => $rServers[SERVER_ID]['rtmp_port'],
-		);
+		];
 
 		foreach ($rConfig as $rKey => $rPorts) {
 			if ($rKey === 'http') {
-				$rListen = array();
+				$rListen = [];
 				foreach ($rPorts as $rPort) {
 					if (is_numeric($rPort) && 80 <= $rPort && $rPort <= 65535) {
 						$rListen[] = 'listen ' . intval($rPort) . ';';
@@ -280,7 +279,7 @@ class ToolsCommand implements CommandInterface {
 				file_put_contents(MAIN_HOME . 'bin/nginx/conf/ports/http.conf', implode(' ', $rListen));
 				file_put_contents(MAIN_HOME . 'bin/nginx_rtmp/conf/live.conf', 'on_play http://127.0.0.1:' . intval($rPorts[0]) . '/stream/rtmp; on_publish http://127.0.0.1:' . intval($rPorts[0]) . '/stream/rtmp; on_play_done http://127.0.0.1:' . intval($rPorts[0]) . '/stream/rtmp;');
 			} elseif ($rKey === 'https') {
-				$rListen = array();
+				$rListen = [];
 				foreach ($rPorts as $rPort) {
 					if (is_numeric($rPort) && 80 <= $rPort && $rPort <= 65535) {
 						$rListen[] = 'listen ' . intval($rPort) . ' ssl;';
@@ -309,13 +308,13 @@ class ToolsCommand implements CommandInterface {
 
 	private function processImages(): void {
 		$db = self::db();
-		$rImages = array();
+		$rImages = [];
 		$db->query('SELECT COUNT(*) AS `count` FROM `streams`;');
 		$rCount = $db->get_row()['count'];
 		if ($rCount > 0) {
 			$rSteps = range(0, $rCount, 1000);
 			if (!$rSteps) {
-				$rSteps = array(0);
+				$rSteps = [0];
 			}
 			foreach ($rSteps as $rStep) {
 				try {
@@ -346,7 +345,7 @@ class ToolsCommand implements CommandInterface {
 		if ($rCount > 0) {
 			$rSteps = range(0, $rCount, 1000);
 			if (!$rSteps) {
-				$rSteps = array(0);
+				$rSteps = [0];
 			}
 			foreach ($rSteps as $rStep) {
 				try {
@@ -389,7 +388,7 @@ class ToolsCommand implements CommandInterface {
 
 	private function processDuplicates(): void {
 		$db = self::db();
-		$rGroups = $rStreamIDs = array();
+		$rGroups = $rStreamIDs = [];
 		$db->query('SELECT `a`.`id`, `a`.`stream_source` FROM `streams` `a` INNER JOIN (SELECT  `stream_source`, COUNT(*) `totalCount` FROM `streams` WHERE `type` IN (2,5) GROUP BY `stream_source`) `b` ON `a`.`stream_source` = `b`.`stream_source` WHERE `b`.`totalCount` > 1;');
 		foreach ($db->get_rows() as $rRow) {
 			$rGroups[md5($rRow['stream_source'])][] = $rRow['id'];
@@ -409,7 +408,7 @@ class ToolsCommand implements CommandInterface {
 
 	private function processBouquets(): void {
 		$db = self::db();
-		$rStreamIDs = array(array(), array());
+		$rStreamIDs = [[], []];
 		$db->query('SELECT `id` FROM `streams`;');
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rRow) {
@@ -425,23 +424,23 @@ class ToolsCommand implements CommandInterface {
 		$db->query('SELECT * FROM `bouquets` ORDER BY `bouquet_order` ASC;');
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rBouquet) {
-				$UpdateData = array(array(), array(), array(), array());
-				foreach ((json_decode($rBouquet['bouquet_channels'], true) ?: array()) as $rID) {
+				$UpdateData = [[], [], [], []];
+				foreach ((json_decode($rBouquet['bouquet_channels'], true) ?: []) as $rID) {
 					if (0 < intval($rID) && in_array(intval($rID), $rStreamIDs[0])) {
 						$UpdateData[0][] = intval($rID);
 					}
 				}
-				foreach ((json_decode($rBouquet['bouquet_movies'], true) ?: array()) as $rID) {
+				foreach ((json_decode($rBouquet['bouquet_movies'], true) ?: []) as $rID) {
 					if (0 < intval($rID) && in_array(intval($rID), $rStreamIDs[0])) {
 						$UpdateData[1][] = intval($rID);
 					}
 				}
-				foreach ((json_decode($rBouquet['bouquet_radios'], true) ?: array()) as $rID) {
+				foreach ((json_decode($rBouquet['bouquet_radios'], true) ?: []) as $rID) {
 					if (0 < intval($rID) && in_array(intval($rID), $rStreamIDs[0])) {
 						$UpdateData[2][] = intval($rID);
 					}
 				}
-				foreach ((json_decode($rBouquet['bouquet_series'], true) ?: array()) as $rID) {
+				foreach ((json_decode($rBouquet['bouquet_series'], true) ?: []) as $rID) {
 					if (0 < intval($rID) && in_array(intval($rID), $rStreamIDs[1])) {
 						$UpdateData[3][] = intval($rID);
 					}
@@ -468,9 +467,9 @@ class ToolsCommand implements CommandInterface {
 		$db->query('SELECT `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rIDs) . ');');
 		$db->query('DELETE FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rIDs) . ');');
 		$db->query('DELETE FROM `streams_servers` WHERE `parent_id` IS NOT NULL AND `parent_id` > 0 AND `parent_id` NOT IN (SELECT `id` FROM `servers` WHERE `server_type` = 0);');
-		$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(array('type' => 'update_streams', 'id' => $rIDs)));
+		$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(['type' => 'update_streams', 'id' => $rIDs]));
 		foreach (array_keys(ServerRepository::getAll()) as $rServerID) {
-			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', $rServerID, time(), json_encode(array('type' => 'delete_vods', 'id' => $rIDs)));
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', $rServerID, time(), json_encode(['type' => 'delete_vods', 'id' => $rIDs]));
 		}
 		return true;
 	}
diff --git a/src/Cli/Commands/UpdateCommand.php b/src/Cli/Commands/UpdateCommand.php
index f7e112ad..f8f6154c 100644
--- a/src/Cli/Commands/UpdateCommand.php
+++ b/src/Cli/Commands/UpdateCommand.php
@@ -22,7 +22,6 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class UpdateCommand implements CommandInterface {
-
 	public function getName(): string {
 		return 'update';
 	}
@@ -282,7 +281,7 @@ class UpdateCommand implements CommandInterface {
 					UpdateLogger::info('Broadcasting update signal to LB servers');
 					foreach (ServerRepository::getAll() as $rServer) {
 						if (($rServer['enabled'] && $rServer['status'] == 1 && time() - $rServer['last_check_ago'] <= 180) || !$rServer['is_main']) {
-							$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(array('action' => 'update')));
+							$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(['action' => 'update']));
 						}
 					}
 				}
@@ -291,7 +290,7 @@ class UpdateCommand implements CommandInterface {
 				$db->query('UPDATE `settings` SET `update_data` = NULL;');
 				UpdateLogger::info('Server status set to 1 (online), version=' . XC_VM_VERSION);
 
-				foreach (array('http', 'https') as $rType) {
+				foreach (['http', 'https'] as $rType) {
 					$rPortConfig = file_get_contents(MAIN_HOME . 'bin/nginx/conf/ports/' . $rType . '.conf');
 					if (stripos($rPortConfig, ' reuseport') !== false) {
 						file_put_contents(MAIN_HOME . 'bin/nginx/conf/ports/' . $rType . '.conf', str_replace(' reuseport', '', $rPortConfig));
@@ -338,7 +337,9 @@ class UpdateCommand implements CommandInterface {
 
 	private function downloadFile($url, $targetPath): bool {
 		$rData = @fopen($url, 'rb');
-		if (!$rData) return false;
+		if (!$rData) {
+			return false;
+		}
 		$rOutput = fopen($targetPath, 'wb');
 		stream_copy_to_stream($rData, $rOutput);
 		fclose($rData);
diff --git a/src/Cli/Commands/WatchdogCommand.php b/src/Cli/Commands/WatchdogCommand.php
index 085cbf5f..81a8c8b9 100644
--- a/src/Cli/Commands/WatchdogCommand.php
+++ b/src/Cli/Commands/WatchdogCommand.php
@@ -113,13 +113,13 @@ class WatchdogCommand implements CommandInterface {
 			$rInfoA = explode(' ', preg_replace('!cpu +!', '', $rPrevStat[0]));
 			$rInfoB = explode(' ', preg_replace('!cpu +!', '', $rStat[0]));
 			$rPrevStat = $rStat;
-			$rDiff = array();
+			$rDiff = [];
 			$rDiff['user'] = intval($rInfoB[0]) - intval($rInfoA[0]);
 			$rDiff['nice'] = intval($rInfoB[1]) - intval($rInfoA[1]);
 			$rDiff['sys'] = intval($rInfoB[2]) - intval($rInfoA[2]);
 			$rDiff['idle'] = intval($rInfoB[3]) - intval($rInfoA[3]);
 			$rTotal = array_sum($rDiff);
-			$rCPU = array();
+			$rCPU = [];
 			foreach ($rDiff as $x => $y) {
 				$rCPU[$x] = round($y / $rTotal * 100, 2);
 			}
@@ -134,8 +134,8 @@ class WatchdogCommand implements CommandInterface {
 			$rStats['fanout'] = FanoutClient::status();
 
 			// ── PHP PIDs ─────────────────────────────────────────
-			$rPHPPIDs = array();
-			foreach (glob(MAIN_HOME . 'bin/php/sockets/*.pid') ?: array() as $rPidFile) {
+			$rPHPPIDs = [];
+			foreach (glob(MAIN_HOME . 'bin/php/sockets/*.pid') ?: [] as $rPidFile) {
 				$rPid = trim(@file_get_contents($rPidFile) ?: '');
 				if (is_numeric($rPid) && 0 < intval($rPid)) {
 					$rPHPPIDs[] = intval($rPid);
@@ -165,11 +165,11 @@ class WatchdogCommand implements CommandInterface {
 								foreach (array_keys($rServers) as $rServerID) {
 									if ($rServers[$rServerID]['server_online']) {
 										$rMulti->zCard('SERVER#' . $rServerID);
-										$rMulti->zRangeByScore('SERVER_LINES#' . $rServerID, '-inf', '+inf', array('withscores' => true));
+										$rMulti->zRangeByScore('SERVER_LINES#' . $rServerID, '-inf', '+inf', ['withscores' => true]);
 									}
 								}
 								$rResults = $rMulti->exec();
-								$rTotalUsers = array();
+								$rTotalUsers = [];
 								$i = 0;
 								foreach (array_keys($rServers) as $rServerID) {
 									if ($rServers[$rServerID]['server_online']) {
diff --git a/src/Cli/Commands/XcvmCoreCommand.php b/src/Cli/Commands/XcvmCoreCommand.php
index b4298043..761d6bf2 100644
--- a/src/Cli/Commands/XcvmCoreCommand.php
+++ b/src/Cli/Commands/XcvmCoreCommand.php
@@ -38,7 +38,6 @@ use XcVm\Core\Updates\UpdateChannels;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class XcvmCoreCommand implements CommandInterface {
-
 	/** Branch of the binaries repo that carries the committed extension tree. */
 	private const BIN_BRANCH = 'main';
 
diff --git a/src/Cli/CronJobs/ActivityCronJob.php b/src/Cli/CronJobs/ActivityCronJob.php
index 7ec45be2..d55aca78 100644
--- a/src/Cli/CronJobs/ActivityCronJob.php
+++ b/src/Cli/CronJobs/ActivityCronJob.php
@@ -17,96 +17,96 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  */
 
 class ActivityCronJob implements CommandInterface {
-    use DatabaseAware;
-    use CronTrait;
+	use DatabaseAware;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:activity';
-    }
+	public function getName(): string {
+		return 'cron:activity';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: import user activity logs into DB';
-    }
+	public function getDescription(): string {
+		return 'Cron: import user activity logs into DB';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Activity]');
-        $this->loadCron();
+		$this->initCron('XC_VM[Activity]');
+		$this->loadCron();
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function loadCron(): void {
-        $db = self::db();
+	private function loadCron(): void {
+		$db = self::db();
 
-        $rLogFile = LOGS_TMP_PATH . 'activity';
-        $rUpdateQuery = $rQuery = '';
-        $rUpdates = array();
-        $rCount = 0;
+		$rLogFile = LOGS_TMP_PATH . 'activity';
+		$rUpdateQuery = $rQuery = '';
+		$rUpdates = [];
+		$rCount = 0;
 
-        if (!file_exists($rLogFile)) {
-            return;
-        }
+		if (!file_exists($rLogFile)) {
+			return;
+		}
 
-        list($rQuery, $rUpdates, $rCount) = $this->parseLog($rLogFile);
-        unlink($rLogFile);
+		list($rQuery, $rUpdates, $rCount) = $this->parseLog($rLogFile);
+		unlink($rLogFile);
 
-        if (0 >= $rCount) {
-            return;
-        }
+		if (0 >= $rCount) {
+			return;
+		}
 
-        $rQuery = rtrim($rQuery, ',');
-        if (empty($rQuery)) {
-            return;
-        }
+		$rQuery = rtrim($rQuery, ',');
+		if (empty($rQuery)) {
+			return;
+		}
 
-        if (!$db->query('INSERT INTO `lines_activity` (`server_id`,`proxy_id`,`user_id`,`isp`,`external_device`,`stream_id`,`date_start`,`user_agent`,`user_ip`,`date_end`,`container`,`geoip_country_code`,`divergence`,`hmac_id`,`hmac_identifier`) VALUES ' . $rQuery)) {
-            return;
-        }
+		if (!$db->query('INSERT INTO `lines_activity` (`server_id`,`proxy_id`,`user_id`,`isp`,`external_device`,`stream_id`,`date_start`,`user_agent`,`user_ip`,`date_end`,`container`,`geoip_country_code`,`divergence`,`hmac_id`,`hmac_identifier`) VALUES ' . $rQuery)) {
+			return;
+		}
 
-        $rFirstID = $db->last_insert_id();
-        $i = 0;
-        while ($i < $rCount) {
-            $rUpdateQuery .= '(' . $rUpdates[$i][0] . ',' . $db->escape($rUpdates[$i][1]) . ',' . ($rFirstID + $i) . ',' . $db->escape($rUpdates[$i][2]) . '),';
-            $i++;
-        }
+		$rFirstID = $db->last_insert_id();
+		$i = 0;
+		while ($i < $rCount) {
+			$rUpdateQuery .= '(' . $rUpdates[$i][0] . ',' . $db->escape($rUpdates[$i][1]) . ',' . ($rFirstID + $i) . ',' . $db->escape($rUpdates[$i][2]) . '),';
+			$i++;
+		}
 
-        $rUpdateQuery = rtrim($rUpdateQuery, ',');
-        if (!empty($rUpdateQuery)) {
-            $db->query('INSERT INTO `lines`(`id`,`last_ip`,`last_activity`,`last_activity_array`) VALUES ' . $rUpdateQuery . ' ON DUPLICATE KEY UPDATE `id`=VALUES(`id`), `last_ip`=VALUES(`last_ip`), `last_activity`=VALUES(`last_activity`), `last_activity_array`=VALUES(`last_activity_array`);');
-        }
-    }
+		$rUpdateQuery = rtrim($rUpdateQuery, ',');
+		if (!empty($rUpdateQuery)) {
+			$db->query('INSERT INTO `lines`(`id`,`last_ip`,`last_activity`,`last_activity_array`) VALUES ' . $rUpdateQuery . ' ON DUPLICATE KEY UPDATE `id`=VALUES(`id`), `last_ip`=VALUES(`last_ip`), `last_activity`=VALUES(`last_activity`), `last_activity_array`=VALUES(`last_activity_array`);');
+		}
+	}
 
-    private function parseLog(string $rFile): array {
-        $db = self::db();
-        $rQuery = '';
-        $rUpdates = array();
-        $rCount = 0;
+	private function parseLog(string $rFile): array {
+		$db = self::db();
+		$rQuery = '';
+		$rUpdates = [];
+		$rCount = 0;
 
-        if (!file_exists($rFile)) {
-            return array($rQuery, $rUpdates, $rCount);
-        }
+		if (!file_exists($rFile)) {
+			return [$rQuery, $rUpdates, $rCount];
+		}
 
-        $rFP = fopen($rFile, 'r');
-        while (!feof($rFP)) {
-            $rLine = trim(fgets($rFP));
-            if (!empty($rLine)) {
-                $rLine = json_decode(base64_decode($rLine), true);
-                if (!($rLine['server_id'] && $rLine['user_id'] && $rLine['stream_id'] && $rLine['user_ip'])) {
-                    break;
-                }
-                $rUpdates[] = array($rLine['user_id'], $rLine['user_ip'], json_encode(array('date_end' => $rLine['date_end'], 'stream_id' => $rLine['stream_id'])));
-                $rLine = array_map(array($db, 'escape'), $rLine);
-                $rQuery .= '(' . $rLine['server_id'] . ',' . $rLine['proxy_id'] . ',' . $rLine['user_id'] . ',' . $rLine['isp'] . ',' . $rLine['external_device'] . ',' . $rLine['stream_id'] . ',' . $rLine['date_start'] . ',' . $rLine['user_agent'] . ',' . $rLine['user_ip'] . ',' . $rLine['date_end'] . ',' . $rLine['container'] . ',' . $rLine['geoip_country_code'] . ',' . $rLine['divergence'] . ',' . $rLine['hmac_id'] . ',' . $rLine['hmac_identifier'] . '),';
-                $rCount++;
-                break;
-            }
-        }
-        fclose($rFP);
+		$rFP = fopen($rFile, 'r');
+		while (!feof($rFP)) {
+			$rLine = trim(fgets($rFP));
+			if (!empty($rLine)) {
+				$rLine = json_decode(base64_decode($rLine), true);
+				if (!($rLine['server_id'] && $rLine['user_id'] && $rLine['stream_id'] && $rLine['user_ip'])) {
+					break;
+				}
+				$rUpdates[] = [$rLine['user_id'], $rLine['user_ip'], json_encode(['date_end' => $rLine['date_end'], 'stream_id' => $rLine['stream_id']])];
+				$rLine = array_map([$db, 'escape'], $rLine);
+				$rQuery .= '(' . $rLine['server_id'] . ',' . $rLine['proxy_id'] . ',' . $rLine['user_id'] . ',' . $rLine['isp'] . ',' . $rLine['external_device'] . ',' . $rLine['stream_id'] . ',' . $rLine['date_start'] . ',' . $rLine['user_agent'] . ',' . $rLine['user_ip'] . ',' . $rLine['date_end'] . ',' . $rLine['container'] . ',' . $rLine['geoip_country_code'] . ',' . $rLine['divergence'] . ',' . $rLine['hmac_id'] . ',' . $rLine['hmac_identifier'] . '),';
+				$rCount++;
+				break;
+			}
+		}
+		fclose($rFP);
 
-        return array($rQuery, $rUpdates, $rCount);
-    }
+		return [$rQuery, $rUpdates, $rCount];
+	}
 }
diff --git a/src/Cli/CronJobs/BackupsCronJob.php b/src/Cli/CronJobs/BackupsCronJob.php
index 2ced3f5d..261ca786 100644
--- a/src/Cli/CronJobs/BackupsCronJob.php
+++ b/src/Cli/CronJobs/BackupsCronJob.php
@@ -19,113 +19,113 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class BackupsCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:backups';
-    }
+	public function getName(): string {
+		return 'cron:backups';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: automatic database backup (local + Dropbox)';
-    }
+	public function getDescription(): string {
+		return 'Cron: automatic database backup (local + Dropbox)';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        ini_set('display_errors', 1);
-        ini_set('display_startup_errors', 1);
-        error_reporting(32757);
+		ini_set('display_errors', 1);
+		ini_set('display_startup_errors', 1);
+		error_reporting(32757);
 
-        if (!ServerRepository::getAll()[SERVER_ID]['is_main']) {
-            echo 'Please run on main server.' . "\n";
-            return 1;
-        }
+		if (!ServerRepository::getAll()[SERVER_ID]['is_main']) {
+			echo 'Please run on main server.' . "\n";
+			return 1;
+		}
 
-        $this->setProcessTitle('XC_VM[Backups]');
-        $this->acquireCronLock();
+		$this->setProcessTitle('XC_VM[Backups]');
+		$this->acquireCronLock();
 
-        global $db;
+		global $db;
 
-        $rForce = false;
-        if (!empty($rArgs[0]) && intval($rArgs[0]) == 1) {
-            $rForce = true;
-        }
+		$rForce = false;
+		if (!empty($rArgs[0]) && intval($rArgs[0]) == 1) {
+			$rForce = true;
+		}
 
-        $rBackups = SettingsManager::get('automatic_backups');
-        $rLastBackup = intval(SettingsManager::get('last_backup'));
-        $rPeriod = array('hourly' => 3600, 'daily' => 86400, 'weekly' => 604800, 'monthly' => 2419200);
+		$rBackups = SettingsManager::get('automatic_backups');
+		$rLastBackup = intval(SettingsManager::get('last_backup'));
+		$rPeriod = ['hourly' => 3600, 'daily' => 86400, 'weekly' => 604800, 'monthly' => 2419200];
 
-        if (!$rForce) {
-            $rPID = getmypid();
-            if (file_exists('/proc/' . SettingsManager::get('backups_pid')) && 0 < strlen(SettingsManager::get('backups_pid'))) {
-                return 0;
-            }
-            $db->query('UPDATE `settings` SET `backups_pid` = ?;', $rPID);
-        }
+		if (!$rForce) {
+			$rPID = getmypid();
+			if (file_exists('/proc/' . SettingsManager::get('backups_pid')) && 0 < strlen(SettingsManager::get('backups_pid'))) {
+				return 0;
+			}
+			$db->query('UPDATE `settings` SET `backups_pid` = ?;', $rPID);
+		}
 
-        if (isset($rBackups) && $rBackups != 'off' || $rForce) {
-            if ($rLastBackup + $rPeriod[$rBackups] <= time() || $rForce) {
-                if (!$rForce) {
-                    $db->query('UPDATE `settings` SET `last_backup` = ?;', time());
-                }
-                $db->close_mysql();
-                $rFilename = MAIN_HOME . 'backups/backup_' . date('Y-m-d_H:i:s') . '.sql';
+		if (isset($rBackups) && $rBackups != 'off' || $rForce) {
+			if ($rLastBackup + $rPeriod[$rBackups] <= time() || $rForce) {
+				if (!$rForce) {
+					$db->query('UPDATE `settings` SET `last_backup` = ?;', time());
+				}
+				$db->close_mysql();
+				$rFilename = MAIN_HOME . 'backups/backup_' . date('Y-m-d_H:i:s') . '.sql';
 
-                BackupService::create($rFilename);
+				BackupService::create($rFilename);
 
-                if (0 < filesize($rFilename)) {
-                    if (SettingsManager::get('dropbox_remote')) {
-                        file_put_contents($rFilename . '.uploading', time());
-                        $rResponse = BackupService::uploadRemote(basename($rFilename), $rFilename);
-                        if (!isset($rResponse->error)) {
-                            $rResponse = json_decode(json_encode($rResponse, JSON_UNESCAPED_UNICODE), true);
-                            if (!(isset($rResponse['size']) && intval($rResponse['size']) == filesize($rFilename))) {
-                                $rError = 'Failed to upload';
-                                file_put_contents($rFilename . '.error', $rError);
-                            }
-                        } else {
-                            try {
-                                $rError = json_decode(explode(', in apiCall', $rResponse->error->getMessage())[0], true)['error_summary'];
-                            } catch (\exception $e) {
-                                $rError = 'Unknown error';
-                            }
-                            file_put_contents($rFilename . '.error', $rError);
-                        }
-                        unlink($rFilename . '.uploading');
-                    }
-                } else {
-                    unlink($rFilename);
-                }
-            }
-        }
+				if (0 < filesize($rFilename)) {
+					if (SettingsManager::get('dropbox_remote')) {
+						file_put_contents($rFilename . '.uploading', time());
+						$rResponse = BackupService::uploadRemote(basename($rFilename), $rFilename);
+						if (!isset($rResponse->error)) {
+							$rResponse = json_decode(json_encode($rResponse, JSON_UNESCAPED_UNICODE), true);
+							if (!(isset($rResponse['size']) && intval($rResponse['size']) == filesize($rFilename))) {
+								$rError = 'Failed to upload';
+								file_put_contents($rFilename . '.error', $rError);
+							}
+						} else {
+							try {
+								$rError = json_decode(explode(', in apiCall', $rResponse->error->getMessage())[0], true)['error_summary'];
+							} catch (\exception $e) {
+								$rError = 'Unknown error';
+							}
+							file_put_contents($rFilename . '.error', $rError);
+						}
+						unlink($rFilename . '.uploading');
+					}
+				} else {
+					unlink($rFilename);
+				}
+			}
+		}
 
-        $rBackups = BackupService::getLocal();
-        if (intval(SettingsManager::get('backups_to_keep')) < count($rBackups) && 0 < intval(SettingsManager::get('backups_to_keep'))) {
-            $rDelete = array_slice($rBackups, 0, count($rBackups) - intval(SettingsManager::get('backups_to_keep')));
-            foreach ($rDelete as $rItem) {
-                if (file_exists(MAIN_HOME . 'backups/' . $rItem['filename'])) {
-                    unlink(MAIN_HOME . 'backups/' . $rItem['filename']);
-                }
-            }
-        }
+		$rBackups = BackupService::getLocal();
+		if (intval(SettingsManager::get('backups_to_keep')) < count($rBackups) && 0 < intval(SettingsManager::get('backups_to_keep'))) {
+			$rDelete = array_slice($rBackups, 0, count($rBackups) - intval(SettingsManager::get('backups_to_keep')));
+			foreach ($rDelete as $rItem) {
+				if (file_exists(MAIN_HOME . 'backups/' . $rItem['filename'])) {
+					unlink(MAIN_HOME . 'backups/' . $rItem['filename']);
+				}
+			}
+		}
 
-        if (SettingsManager::get('dropbox_remote')) {
-            $rRemoteBackups = BackupService::getRemote();
-            if (intval(SettingsManager::get('dropbox_keep')) < count($rRemoteBackups) && 0 < intval(SettingsManager::get('dropbox_keep'))) {
-                $rDelete = array_slice($rRemoteBackups, 0, count($rRemoteBackups) - intval(SettingsManager::get('dropbox_keep')));
-                foreach ($rDelete as $rItem) {
-                    try {
-                        BackupService::deleteRemote($rItem['path']);
-                    } catch (\exception $e) {
-                    }
-                }
-            }
-        }
+		if (SettingsManager::get('dropbox_remote')) {
+			$rRemoteBackups = BackupService::getRemote();
+			if (intval(SettingsManager::get('dropbox_keep')) < count($rRemoteBackups) && 0 < intval(SettingsManager::get('dropbox_keep'))) {
+				$rDelete = array_slice($rRemoteBackups, 0, count($rRemoteBackups) - intval(SettingsManager::get('dropbox_keep')));
+				foreach ($rDelete as $rItem) {
+					try {
+						BackupService::deleteRemote($rItem['path']);
+					} catch (\exception $e) {
+					}
+				}
+			}
+		}
 
-        @unlink($this->rIdentifier);
+		@unlink($this->rIdentifier);
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/src/Cli/CronJobs/CacheCronJob.php b/src/Cli/CronJobs/CacheCronJob.php
index 3edc4b77..6acca718 100644
--- a/src/Cli/CronJobs/CacheCronJob.php
+++ b/src/Cli/CronJobs/CacheCronJob.php
@@ -24,279 +24,287 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  */
 
 class CacheCronJob implements CommandInterface {
-    use DatabaseAware;
-    use CronTrait;
+	use DatabaseAware;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:cache';
-    }
+	public function getName(): string {
+		return 'cron:cache';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: generate file cache (settings, bouquets, servers, blocked, categories, etc.)';
-    }
+	public function getDescription(): string {
+		return 'Cron: generate file cache (settings, bouquets, servers, blocked, categories, etc.)';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        ini_set('memory_limit', -1);
+		ini_set('memory_limit', -1);
 
-        $rStartup = false;
-        if (!empty($rArgs[0])) {
-            $rStartup = true;
-        }
+		$rStartup = false;
+		if (!empty($rArgs[0])) {
+			$rStartup = true;
+		}
 
-        $this->setProcessTitle('XC_VM[Cache Builder]');
-        $this->acquireCronLock();
+		$this->setProcessTitle('XC_VM[Cache Builder]');
+		$this->acquireCronLock();
 
-        $this->loadCron($rStartup);
+		$this->loadCron($rStartup);
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function loadCron(bool $rStartup): void {
-        $db = self::db();
-        if (!defined('CACHE_TMP_PATH')) {
-            exit();
-        }
+	private function loadCron(bool $rStartup): void {
+		$db = self::db();
+		if (!defined('CACHE_TMP_PATH')) {
+			exit();
+		}
 
-        // Atomic tmp+rename writes: a direct file_put_contents cannot replace a
-        // cache file left behind by a root-context run (Permission denied spam),
-        // while rename() only needs a writable directory.
-        $rCache = new FileCache(CACHE_TMP_PATH);
+		// Atomic tmp+rename writes: a direct file_put_contents cannot replace a
+		// cache file left behind by a root-context run (Permission denied spam),
+		// while rename() only needs a writable directory.
+		$rCache = new FileCache(CACHE_TMP_PATH);
 
-        if ($rStartup && file_exists(CACHE_TMP_PATH . 'settings')) {
-            echo 'Checking cache readability...' . "\n";
-            $rSerialize = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'settings'));
-            if (!(is_array($rSerialize) && isset($rSerialize['server_name']))) {
-                echo 'Clearing cache...' . "\n\n";
-                foreach (array(STREAMS_TMP_PATH, LINES_TMP_PATH, SERIES_TMP_PATH) as $rTmpPath) {
-                    foreach (scandir($rTmpPath) as $rFile) {
-                        unlink($rTmpPath . $rFile);
-                    }
-                }
-                // No sudo: this runs as xc_vm (service boot chowns tmp/ first),
-                // and xc_vm has no sudoers entry — sudo here would fail silently.
-                exec('rm -rf ' . TMP_PATH . '*');
-                exec('rm -rf ' . SIGNALS_PATH . '*');
-            }
-        }
+		if ($rStartup && file_exists(CACHE_TMP_PATH . 'settings')) {
+			echo 'Checking cache readability...' . "\n";
+			$rSerialize = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'settings'));
+			if (!(is_array($rSerialize) && isset($rSerialize['server_name']))) {
+				echo 'Clearing cache...' . "\n\n";
+				foreach ([STREAMS_TMP_PATH, LINES_TMP_PATH, SERIES_TMP_PATH] as $rTmpPath) {
+					foreach (scandir($rTmpPath) as $rFile) {
+						unlink($rTmpPath . $rFile);
+					}
+				}
+				// No sudo: this runs as xc_vm (service boot chowns tmp/ first),
+				// and xc_vm has no sudoers entry — sudo here would fail silently.
+				exec('rm -rf ' . TMP_PATH . '*');
+				exec('rm -rf ' . SIGNALS_PATH . '*');
+			}
+		}
 
-        foreach (array(EPG_PATH, VOD_PATH, ARCHIVE_PATH, CREATED_PATH, DELAY_PATH, VIDEO_PATH, PLAYLIST_PATH, CONS_TMP_PATH, CRONS_TMP_PATH, PLAYER_TMP_PATH, CACHE_TMP_PATH, DIVERGENCE_TMP_PATH, FLOOD_TMP_PATH, MINISTRA_TMP_PATH, SIGNALS_TMP_PATH, LOGS_TMP_PATH, WATCH_TMP_PATH, CIDR_TMP_PATH, STREAMS_TMP_PATH, LINES_TMP_PATH, SERIES_TMP_PATH) as $rPath) {
-            if (!file_exists($rPath)) {
-                @mkdir($rPath, 0755, true);
-                if (is_dir($rPath) && function_exists('posix_getpwnam')) {
-                    $rUser = posix_getpwnam('xc_vm');
-                    if ($rUser) {
-                        chown($rPath, $rUser['uid']);
-                        chgrp($rPath, $rUser['gid']);
-                    }
-                }
-            }
-        }
+		foreach ([EPG_PATH, VOD_PATH, ARCHIVE_PATH, CREATED_PATH, DELAY_PATH, VIDEO_PATH, PLAYLIST_PATH, CONS_TMP_PATH, CRONS_TMP_PATH, PLAYER_TMP_PATH, CACHE_TMP_PATH, DIVERGENCE_TMP_PATH, FLOOD_TMP_PATH, MINISTRA_TMP_PATH, SIGNALS_TMP_PATH, LOGS_TMP_PATH, WATCH_TMP_PATH, CIDR_TMP_PATH, STREAMS_TMP_PATH, LINES_TMP_PATH, SERIES_TMP_PATH] as $rPath) {
+			if (!file_exists($rPath)) {
+				@mkdir($rPath, 0755, true);
+				if (is_dir($rPath) && function_exists('posix_getpwnam')) {
+					$rUser = posix_getpwnam('xc_vm');
+					if ($rUser) {
+						chown($rPath, $rUser['uid']);
+						chgrp($rPath, $rUser['gid']);
+					}
+				}
+			}
+		}
 
-        FileCache::setCache('settings', SettingsRepository::getAll(true));
-        FileCache::setCache('bouquets', BouquetService::getAll(true));
-        $rServers = ServerRepository::getAll(true);
-        unset($rServers['php_pids']);
-        FileCache::setCache('servers', $rServers);
-        FileCache::setCache('proxy_servers', BlocklistService::getProxyIPs(true));
-        FileCache::setCache('blocked_servers', BlocklistService::getBlockedServers(true));
-        FileCache::setCache('blocked_isp', BlocklistService::getBlockedISP(true));
-        FileCache::setCache('blocked_ua', BlocklistService::getBlockedUA(true));
-        FileCache::setCache('blocked_ips', BlocklistService::getBlockedIPs(true));
-        FileCache::setCache('allowed_ips', ServerRepository::getAllowedIPs(true));
-        FileCache::setCache('categories', CategoryService::getFromDatabase(null, true));
+		FileCache::setCache('settings', SettingsRepository::getAll(true));
+		FileCache::setCache('bouquets', BouquetService::getAll(true));
+		$rServers = ServerRepository::getAll(true);
+		unset($rServers['php_pids']);
+		FileCache::setCache('servers', $rServers);
+		FileCache::setCache('proxy_servers', BlocklistService::getProxyIPs(true));
+		FileCache::setCache('blocked_servers', BlocklistService::getBlockedServers(true));
+		FileCache::setCache('blocked_isp', BlocklistService::getBlockedISP(true));
+		FileCache::setCache('blocked_ua', BlocklistService::getBlockedUA(true));
+		FileCache::setCache('blocked_ips', BlocklistService::getBlockedIPs(true));
+		FileCache::setCache('allowed_ips', ServerRepository::getAllowedIPs(true));
+		FileCache::setCache('categories', CategoryService::getFromDatabase(null, true));
 
-        $rAllServers = ServerRepository::getAll();
-        if (!isset($rAllServers[SERVER_ID]) || !$rAllServers[SERVER_ID]['is_main']) {
-            return;
-        }
+		$rAllServers = ServerRepository::getAll();
+		if (!isset($rAllServers[SERVER_ID]) || !$rAllServers[SERVER_ID]['is_main']) {
+			return;
+		}
 
-        // Skip expensive heavy cache rebuild for 5 minutes; lightweight caches above still refresh every run.
-        $rHeavyMarker = CACHE_TMP_PATH . 'heavy_cache_built';
-        if (!$rStartup && file_exists($rHeavyMarker) && (time() - filemtime($rHeavyMarker)) < 300) {
-            return;
-        }
+		// Skip expensive heavy cache rebuild for 5 minutes; lightweight caches above still refresh every run.
+		$rHeavyMarker = CACHE_TMP_PATH . 'heavy_cache_built';
+		if (!$rStartup && file_exists($rHeavyMarker) && (time() - filemtime($rHeavyMarker)) < 300) {
+			return;
+		}
 
-        $rOutputFormats = array();
-        $db->query('SELECT `access_output_id`, `output_key` FROM `output_formats`;');
-        foreach ($db->get_rows() as $rRow) {
-            $rOutputFormats[] = $rRow;
-        }
-        $rCache->set('output_formats', $rOutputFormats);
+		$rOutputFormats = [];
+		$db->query('SELECT `access_output_id`, `output_key` FROM `output_formats`;');
+		foreach ($db->get_rows() as $rRow) {
+			$rOutputFormats[] = $rRow;
+		}
+		$rCache->set('output_formats', $rOutputFormats);
 
-        $rHMACKeys = array();
-        $db->query('SELECT `id`, `key` FROM `hmac_keys` WHERE `enabled` = 1;');
-        foreach ($db->get_rows() as $rRow) {
-            $rHMACKeys[] = $rRow;
-        }
-        $rCache->set('hmac_keys', $rHMACKeys);
+		$rHMACKeys = [];
+		$db->query('SELECT `id`, `key` FROM `hmac_keys` WHERE `enabled` = 1;');
+		foreach ($db->get_rows() as $rRow) {
+			$rHMACKeys[] = $rRow;
+		}
+		$rCache->set('hmac_keys', $rHMACKeys);
 
-        $rRTMPIPs = array();
-        $db->query('SELECT `ip`, `password`, `push`, `pull` FROM `rtmp_ips`');
-        foreach ($db->get_rows() as $rRow) {
-            $rRTMPIPs[gethostbyname($rRow['ip'])] = array('password' => $rRow['password'], 'push' => boolval($rRow['push']), 'pull' => boolval($rRow['pull']));
-        }
-        $rCache->set('rtmp_ips', $rRTMPIPs);
+		$rRTMPIPs = [];
+		$db->query('SELECT `ip`, `password`, `push`, `pull` FROM `rtmp_ips`');
+		foreach ($db->get_rows() as $rRow) {
+			$rRTMPIPs[gethostbyname($rRow['ip'])] = ['password' => $rRow['password'], 'push' => boolval($rRow['push']), 'pull' => boolval($rRow['pull'])];
+		}
+		$rCache->set('rtmp_ips', $rRTMPIPs);
 
-        if (file_exists(BIN_PATH . 'maxmind/cidr.db')) {
-            exec('ls ' . CIDR_TMP_PATH . ' | wc -l', $rOutput);
-            if (intval($rOutput[0]) == 0) {
-                $rDatabase = json_decode(file_get_contents(BIN_PATH . 'maxmind/cidr.db'), true);
-                foreach ($rDatabase as $rASN => $rData) {
-                    file_put_contents(CIDR_TMP_PATH . $rASN, json_encode($rData));
-                }
-            }
-        }
+		if (file_exists(BIN_PATH . 'maxmind/cidr.db')) {
+			exec('ls ' . CIDR_TMP_PATH . ' | wc -l', $rOutput);
+			if (intval($rOutput[0]) == 0) {
+				$rDatabase = json_decode(file_get_contents(BIN_PATH . 'maxmind/cidr.db'), true);
+				foreach ($rDatabase as $rASN => $rData) {
+					file_put_contents(CIDR_TMP_PATH . $rASN, json_encode($rData));
+				}
+			}
+		}
 
-        $rChannelOrder = array();
-        if (SettingsManager::get('channel_number_type') == 'manual') {
-            $db->query('SELECT `id`, `order` FROM `streams` ORDER BY `order` ASC;');
-            foreach ($db->get_rows() as $rRow) {
-                $rChannelOrder[] = intval($rRow['id']);
-            }
-        }
+		$rChannelOrder = [];
+		if (SettingsManager::get('channel_number_type') == 'manual') {
+			$db->query('SELECT `id`, `order` FROM `streams` ORDER BY `order` ASC;');
+			foreach ($db->get_rows() as $rRow) {
+				$rChannelOrder[] = intval($rRow['id']);
+			}
+		}
 
-        $rCategoryMap = array();
-        $rBouquetMap = array();
-        $rStreamIDs = array('channels' => array(), 'radios' => array(), 'movies' => array(), 'episodes' => array(), 'series' => array());
+		$rCategoryMap = [];
+		$rBouquetMap = [];
+		$rStreamIDs = ['channels' => [], 'radios' => [], 'movies' => [], 'episodes' => [], 'series' => []];
 
-        $db->query('SELECT *, IF(`bouquet_order` > 0, `bouquet_order`, 999) AS `order` FROM `bouquets` ORDER BY `order` ASC;');
-        foreach ($db->get_rows(true, 'id') as $rID => $rChannels) {
-            $rAllowedCategories = array();
+		$db->query('SELECT *, IF(`bouquet_order` > 0, `bouquet_order`, 999) AS `order` FROM `bouquets` ORDER BY `order` ASC;');
+		foreach ($db->get_rows(true, 'id') as $rID => $rChannels) {
+			$rAllowedCategories = [];
 
-            foreach ((json_decode($rChannels['bouquet_channels'], true) ?: array()) as $rStreamID) {
-                if (!(0 >= intval($rStreamID) || in_array($rStreamID, $rStreamIDs['channels']))) {
-                    $rStreamIDs['channels'][] = $rStreamID;
-                }
-                if (!isset($rBouquetMap[intval($rStreamID)])) {
-                    $rBouquetMap[intval($rStreamID)] = array();
-                }
-                $rBouquetMap[intval($rStreamID)][] = $rID;
-            }
+			foreach ((json_decode($rChannels['bouquet_channels'], true) ?: []) as $rStreamID) {
+				if (!(0 >= intval($rStreamID) || in_array($rStreamID, $rStreamIDs['channels']))) {
+					$rStreamIDs['channels'][] = $rStreamID;
+				}
+				if (!isset($rBouquetMap[intval($rStreamID)])) {
+					$rBouquetMap[intval($rStreamID)] = [];
+				}
+				$rBouquetMap[intval($rStreamID)][] = $rID;
+			}
 
-            foreach ((json_decode($rChannels['bouquet_radios'], true) ?: array()) as $rStreamID) {
-                if (!(0 >= intval($rStreamID) || in_array($rStreamID, $rStreamIDs['radios']))) {
-                    $rStreamIDs['radios'][] = $rStreamID;
-                }
-                if (!isset($rBouquetMap[intval($rStreamID)])) {
-                    $rBouquetMap[intval($rStreamID)] = array();
-                }
-                $rBouquetMap[intval($rStreamID)][] = $rID;
-            }
+			foreach ((json_decode($rChannels['bouquet_radios'], true) ?: []) as $rStreamID) {
+				if (!(0 >= intval($rStreamID) || in_array($rStreamID, $rStreamIDs['radios']))) {
+					$rStreamIDs['radios'][] = $rStreamID;
+				}
+				if (!isset($rBouquetMap[intval($rStreamID)])) {
+					$rBouquetMap[intval($rStreamID)] = [];
+				}
+				$rBouquetMap[intval($rStreamID)][] = $rID;
+			}
 
-            foreach ((json_decode($rChannels['bouquet_movies'], true) ?: array()) as $rStreamID) {
-                if (!(0 >= intval($rStreamID) || in_array($rStreamID, $rStreamIDs['movies']))) {
-                    $rStreamIDs['movies'][] = $rStreamID;
-                }
-                if (!isset($rBouquetMap[intval($rStreamID)])) {
-                    $rBouquetMap[intval($rStreamID)] = array();
-                }
-                $rBouquetMap[intval($rStreamID)][] = $rID;
-            }
+			foreach ((json_decode($rChannels['bouquet_movies'], true) ?: []) as $rStreamID) {
+				if (!(0 >= intval($rStreamID) || in_array($rStreamID, $rStreamIDs['movies']))) {
+					$rStreamIDs['movies'][] = $rStreamID;
+				}
+				if (!isset($rBouquetMap[intval($rStreamID)])) {
+					$rBouquetMap[intval($rStreamID)] = [];
+				}
+				$rBouquetMap[intval($rStreamID)][] = $rID;
+			}
 
-            foreach ((json_decode($rChannels['bouquet_series'], true) ?: array()) as $rSeriesID) {
-                if (!(0 >= intval($rSeriesID) || in_array($rSeriesID, $rStreamIDs['series']))) {
-                    $db->query('SELECT `stream_id` FROM `streams_episodes` WHERE `series_id` = ? ORDER BY `season_num` ASC, `episode_num` ASC;', $rSeriesID);
-                    foreach ($db->get_rows() as $rEpisode) {
-                        if (0 < intval($rEpisode['stream_id'])) {
-                            $rStreamIDs['episodes'][] = $rEpisode['stream_id'];
-                        }
-                        if (!isset($rBouquetMap[intval($rEpisode['stream_id'])])) {
-                            $rBouquetMap[intval($rEpisode['stream_id'])] = array();
-                        }
-                        $rBouquetMap[intval($rEpisode['stream_id'])][] = $rID;
-                    }
-                }
-            }
+			foreach ((json_decode($rChannels['bouquet_series'], true) ?: []) as $rSeriesID) {
+				if (!(0 >= intval($rSeriesID) || in_array($rSeriesID, $rStreamIDs['series']))) {
+					$db->query('SELECT `stream_id` FROM `streams_episodes` WHERE `series_id` = ? ORDER BY `season_num` ASC, `episode_num` ASC;', $rSeriesID);
+					foreach ($db->get_rows() as $rEpisode) {
+						if (0 < intval($rEpisode['stream_id'])) {
+							$rStreamIDs['episodes'][] = $rEpisode['stream_id'];
+						}
+						if (!isset($rBouquetMap[intval($rEpisode['stream_id'])])) {
+							$rBouquetMap[intval($rEpisode['stream_id'])] = [];
+						}
+						$rBouquetMap[intval($rEpisode['stream_id'])][] = $rID;
+					}
+				}
+			}
 
-            $rAllChannels = array_map('intval', array_unique(array_merge((json_decode($rChannels['bouquet_channels'], true) ?: array()), (json_decode($rChannels['bouquet_radios'], true) ?: array()), (json_decode($rChannels['bouquet_movies'], true) ?: array()))));
-            $rAllSeries = array_map('intval', array_unique((json_decode($rChannels['bouquet_series'], true) ?: array())));
+			$rAllChannels = array_map('intval', array_unique(array_merge((json_decode($rChannels['bouquet_channels'], true) ?: []), (json_decode($rChannels['bouquet_radios'], true) ?: []), (json_decode($rChannels['bouquet_movies'], true) ?: []))));
+			$rAllSeries = array_map('intval', array_unique((json_decode($rChannels['bouquet_series'], true) ?: [])));
 
-            if (count($rAllChannels) > 0) {
-                $db->query('SELECT DISTINCT(`category_id`) AS `category_id` FROM `streams` WHERE `id` IN (' . implode(',', $rAllChannels) . ');');
-                foreach ($db->get_rows() as $rRow) {
-                    $rAllowedCategories = array_merge($rAllowedCategories, (json_decode($rRow['category_id'], true) ?: array()));
-                }
-            }
+			if (count($rAllChannels) > 0) {
+				$db->query('SELECT DISTINCT(`category_id`) AS `category_id` FROM `streams` WHERE `id` IN (' . implode(',', $rAllChannels) . ');');
+				foreach ($db->get_rows() as $rRow) {
+					$rAllowedCategories = array_merge($rAllowedCategories, (json_decode($rRow['category_id'], true) ?: []));
+				}
+			}
 
-            if (count($rAllSeries) > 0) {
-                $db->query('SELECT DISTINCT(`category_id`) AS `category_id` FROM `streams_series` WHERE `id` IN (' . implode(',', $rAllSeries) . ');');
-                foreach ($db->get_rows() as $rRow) {
-                    $rAllowedCategories = array_merge($rAllowedCategories, (json_decode($rRow['category_id'], true) ?: array()));
-                }
-            }
+			if (count($rAllSeries) > 0) {
+				$db->query('SELECT DISTINCT(`category_id`) AS `category_id` FROM `streams_series` WHERE `id` IN (' . implode(',', $rAllSeries) . ');');
+				foreach ($db->get_rows() as $rRow) {
+					$rAllowedCategories = array_merge($rAllowedCategories, (json_decode($rRow['category_id'], true) ?: []));
+				}
+			}
 
-            $rCategoryMap[$rID] = array_unique($rAllowedCategories);
-        }
+			$rCategoryMap[$rID] = array_unique($rAllowedCategories);
+		}
 
-        if (SettingsManager::get('channel_number_type') != 'manual') {
-            foreach (array('channels', 'radios', 'movies', 'episodes') as $rKey) {
-                if (0 < count($rStreamIDs[$rKey])) {
-                    $rWhere = 'AND `id` NOT IN (' . implode(',', array_map('intval', $rStreamIDs[$rKey])) . ')';
-                } else {
-                    $rWhere = '';
-                }
-                switch ($rKey) {
-                    case 'channels': $rType = array(1, 3); break;
-                    case 'radios': $rType = array(4); break;
-                    case 'movies': $rType = array(2); break;
-                    case 'episodes': $rType = array(5); break;
-                }
-                if (count($rType) > 0) {
-                    $db->query('SELECT `id` FROM `streams` WHERE `type` IN (' . implode(',', $rType) . ') ' . $rWhere . ' ORDER BY `order` ASC;');
-                    foreach ($db->get_rows() as $rRow) {
-                        $rStreamIDs[$rKey][] = $rRow['id'];
-                    }
-                }
-            }
+		if (SettingsManager::get('channel_number_type') != 'manual') {
+			foreach (['channels', 'radios', 'movies', 'episodes'] as $rKey) {
+				if (0 < count($rStreamIDs[$rKey])) {
+					$rWhere = 'AND `id` NOT IN (' . implode(',', array_map('intval', $rStreamIDs[$rKey])) . ')';
+				} else {
+					$rWhere = '';
+				}
+				switch ($rKey) {
+					case 'channels':
+						$rType = [1, 3];
+						break;
+					case 'radios':
+						$rType = [4];
+						break;
+					case 'movies':
+						$rType = [2];
+						break;
+					case 'episodes':
+						$rType = [5];
+						break;
+				}
+				if (count($rType) > 0) {
+					$db->query('SELECT `id` FROM `streams` WHERE `type` IN (' . implode(',', $rType) . ') ' . $rWhere . ' ORDER BY `order` ASC;');
+					foreach ($db->get_rows() as $rRow) {
+						$rStreamIDs[$rKey][] = $rRow['id'];
+					}
+				}
+			}
 
-            if (SettingsManager::get('vod_sort_newest')) {
-                $rStreamIDs['movies'] = array();
-                $rStreamIDs['episodes'] = array();
-                $db->query('SELECT `type`, `id` FROM `streams` WHERE `type` IN (2,5) ORDER BY `added` DESC, `id` DESC;');
-                foreach ($db->get_rows() as $rRow) {
-                    $rStreamIDs[array(2 => 'movies', 5 => 'episodes')[$rRow['type']]][] = $rRow['id'];
-                }
-                $rSeriesOrder = array();
-                $db->query('SELECT `id`, (SELECT MAX(`streams`.`added`) FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` WHERE `streams_episodes`.`series_id` = `streams_series`.`id`) AS `last_modified_stream` FROM `streams_series` ORDER BY `last_modified_stream` DESC, `last_modified` DESC, `id` DESC;');
-                foreach ($db->get_rows() as $rRow) {
-                    $rSeriesOrder[] = intval($rRow['id']);
-                }
-                $rCache->set('series_order', $rSeriesOrder);
-            }
+			if (SettingsManager::get('vod_sort_newest')) {
+				$rStreamIDs['movies'] = [];
+				$rStreamIDs['episodes'] = [];
+				$db->query('SELECT `type`, `id` FROM `streams` WHERE `type` IN (2,5) ORDER BY `added` DESC, `id` DESC;');
+				foreach ($db->get_rows() as $rRow) {
+					$rStreamIDs[[2 => 'movies', 5 => 'episodes'][$rRow['type']]][] = $rRow['id'];
+				}
+				$rSeriesOrder = [];
+				$db->query('SELECT `id`, (SELECT MAX(`streams`.`added`) FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` WHERE `streams_episodes`.`series_id` = `streams_series`.`id`) AS `last_modified_stream` FROM `streams_series` ORDER BY `last_modified_stream` DESC, `last_modified` DESC, `id` DESC;');
+				foreach ($db->get_rows() as $rRow) {
+					$rSeriesOrder[] = intval($rRow['id']);
+				}
+				$rCache->set('series_order', $rSeriesOrder);
+			}
 
-            foreach (array('channels', 'radios', 'movies', 'episodes') as $rKey) {
-                foreach ($rStreamIDs[$rKey] as $rStreamID) {
-                    $rChannelOrder[] = intval($rStreamID);
-                }
-            }
-            $rChannelOrder = array_unique($rChannelOrder);
-        }
+			foreach (['channels', 'radios', 'movies', 'episodes'] as $rKey) {
+				foreach ($rStreamIDs[$rKey] as $rStreamID) {
+					$rChannelOrder[] = intval($rStreamID);
+				}
+			}
+			$rChannelOrder = array_unique($rChannelOrder);
+		}
 
-        $rCategoryChannels = array();
-        $db->query('SELECT `id`, `category_id` FROM `streams`;');
-        if ($db->dbh && $db->result) {
-            if ($db->result->rowCount() > 0) {
-                foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rStreamInfo) {
-                    $rCategoryChannels[$rStreamInfo['id']] = json_decode($rStreamInfo['category_id'] ?? '[]', true);
-                }
-            }
-        }
+		$rCategoryChannels = [];
+		$db->query('SELECT `id`, `category_id` FROM `streams`;');
+		if ($db->dbh && $db->result) {
+			if ($db->result->rowCount() > 0) {
+				foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rStreamInfo) {
+					$rCategoryChannels[$rStreamInfo['id']] = json_decode($rStreamInfo['category_id'] ?? '[]', true);
+				}
+			}
+		}
 
-        $rResellerDomains = array();
-        $db->query('SELECT `reseller_dns` FROM `users` WHERE `status` = 1 AND `reseller_dns` IS NOT NULL;');
-        foreach ($db->get_rows() as $rRow) {
-            $rResellerDomains[] = strtolower($rRow['reseller_dns']);
-        }
+		$rResellerDomains = [];
+		$db->query('SELECT `reseller_dns` FROM `users` WHERE `status` = 1 AND `reseller_dns` IS NOT NULL;');
+		foreach ($db->get_rows() as $rRow) {
+			$rResellerDomains[] = strtolower($rRow['reseller_dns']);
+		}
 
-        $rCache->set('reseller_domains', $rResellerDomains);
-        $rCache->set('channel_order', $rChannelOrder);
-        $rCache->set('bouquet_map', $rBouquetMap);
-        $rCache->set('category_map', $rCategoryMap);
-        (new FileCache(STREAMS_TMP_PATH))->set('channels_categories', $rCategoryChannels);
-        @touch($rHeavyMarker);
-    }
+		$rCache->set('reseller_domains', $rResellerDomains);
+		$rCache->set('channel_order', $rChannelOrder);
+		$rCache->set('bouquet_map', $rBouquetMap);
+		$rCache->set('category_map', $rCategoryMap);
+		(new FileCache(STREAMS_TMP_PATH))->set('channels_categories', $rCategoryChannels);
+		@touch($rHeavyMarker);
+	}
 }
diff --git a/src/Cli/CronJobs/CacheEngineCronJob.php b/src/Cli/CronJobs/CacheEngineCronJob.php
index e4159d20..fde4f2ba 100644
--- a/src/Cli/CronJobs/CacheEngineCronJob.php
+++ b/src/Cli/CronJobs/CacheEngineCronJob.php
@@ -20,618 +20,621 @@ use XcVm\Core\Process\ProcessManager;
  */
 
 class CacheEngineCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    private $rPID;
-    private $rSplit = 10000;
-    private $rThreadCount;
-    private $rUpdateIDs = [];
+	private $rPID;
 
-    public function getName(): string {
-        return 'cron:cache_engine';
-    }
+	private $rSplit = 10000;
 
-    public function getDescription(): string {
-        return 'Cron: generate cache for lines, streams, series, groups';
-    }
+	private $rThreadCount;
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	private $rUpdateIDs = [];
 
-        $this->rPID = getmypid();
-        register_shutdown_function([$this, 'shutdown']);
+	public function getName(): string {
+		return 'cron:cache_engine';
+	}
 
-        ini_set('memory_limit', -1);
-        ini_set('max_execution_time', 0);
+	public function getDescription(): string {
+		return 'Cron: generate cache for lines, streams, series, groups';
+	}
 
-        SettingsManager::set(SettingsRepository::getAll(true));
-        $this->rThreadCount = (SettingsManager::get('cache_thread_count') ?: 10);
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $rType = null;
-        $rGroupStart = $rGroupMax = null;
+		$this->rPID = getmypid();
+		register_shutdown_function([$this, 'shutdown']);
 
-        if (!empty($rArgs[0])) {
-            $rType = $rArgs[0];
-            if ($rType == 'streams_update' || $rType == 'lines_update') {
-                $this->rUpdateIDs = array_map('intval', explode(',', $rArgs[1] ?? ''));
-            } else {
-                if (isset($rArgs[1]) && isset($rArgs[2])) {
-                    $rGroupStart = intval($rArgs[1]);
-                    $rGroupMax = intval($rArgs[2]);
-                }
-            }
-            if ($rType == 'force') {
-                echo 'Forcing cache regen...' . "\n";
-                SettingsManager::update('cache_changes', false);
-            }
-        } else {
-            shell_exec("kill -9 \$(ps aux | grep 'cache_engine' | grep -v grep | grep -v " . $this->rPID . " | awk '{print \$2}')");
-        }
+		ini_set('memory_limit', -1);
+		ini_set('max_execution_time', 0);
 
-        $this->loadCron($rType, $rGroupStart, $rGroupMax);
+		SettingsManager::set(SettingsRepository::getAll(true));
+		$this->rThreadCount = (SettingsManager::get('cache_thread_count') ?: 10);
 
-        return 0;
-    }
+		$rType = null;
+		$rGroupStart = $rGroupMax = null;
 
-    private function getChangedStreams(): array {
-        global $db;
-        $rReturn = ['changes' => [], 'delete' => []];
-        $rExisting = [];
-        $db->query('SELECT `id`, GREATEST(IFNULL(UNIX_TIMESTAMP(`streams`.`updated`), 0), IFNULL(MAX(UNIX_TIMESTAMP(`streams_servers`.`updated`)), 0)) AS `updated` FROM `streams` LEFT JOIN `streams_servers` ON `streams`.`id` = `streams_servers`.`stream_id` GROUP BY `id`;');
-        if ($db->dbh && $db->result) {
-            if ($db->result->rowCount() > 0) {
-                foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rRow) {
-                    if (!file_exists(STREAMS_TMP_PATH . 'stream_' . $rRow['id']) || (filemtime(STREAMS_TMP_PATH . 'stream_' . $rRow['id']) ?: 0) < $rRow['updated']) {
-                        $rReturn['changes'][] = $rRow['id'];
-                    }
-                    $rExisting[] = $rRow['id'];
-                }
-            }
-        }
-        $rExisting = array_flip($rExisting);
-        foreach (glob(STREAMS_TMP_PATH . 'stream_*') as $rFile) {
-            $rParts = explode('_', $rFile);
-            $rStreamID = intval(end($rParts));
-            if (!isset($rExisting[$rStreamID])) {
-                $rReturn['delete'][] = $rStreamID;
-            }
-        }
-        return $rReturn;
-    }
+		if (!empty($rArgs[0])) {
+			$rType = $rArgs[0];
+			if ($rType == 'streams_update' || $rType == 'lines_update') {
+				$this->rUpdateIDs = array_map('intval', explode(',', $rArgs[1] ?? ''));
+			} else {
+				if (isset($rArgs[1]) && isset($rArgs[2])) {
+					$rGroupStart = intval($rArgs[1]);
+					$rGroupMax = intval($rArgs[2]);
+				}
+			}
+			if ($rType == 'force') {
+				echo 'Forcing cache regen...' . "\n";
+				SettingsManager::update('cache_changes', false);
+			}
+		} else {
+			shell_exec("kill -9 \$(ps aux | grep 'cache_engine' | grep -v grep | grep -v " . $this->rPID . " | awk '{print \$2}')");
+		}
 
-    private function getChangedLines(): array {
-        global $db;
-        $rReturn = ['changes' => [], 'delete_i' => [], 'delete_c' => [], 'delete_t' => []];
-        $cacheMemoryAllocation = glob(LINES_TMP_PATH . 'line_i_*');
-        $cacheFailureHandler = glob(LINES_TMP_PATH . 'line_c_*');
-        $cacheSuccessIndicator = glob(LINES_TMP_PATH . 'line_t_*');
-        $cacheRevalidationCheck = $cacheDataCompression = $cacheDataDecompression = [];
-        $db->query('SELECT `id`, `username`, `password`, `access_token`, UNIX_TIMESTAMP(`updated`) AS `updated` FROM `lines`;');
-        if ($db->dbh && $db->result) {
-            if ($db->result->rowCount() > 0) {
-                foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rRow) {
-                    if (!file_exists(LINES_TMP_PATH . 'line_i_' . $rRow['id']) || (filemtime(LINES_TMP_PATH . 'line_i_' . $rRow['id']) ?: 0) < $rRow['updated']) {
-                        $rReturn['changes'][] = $rRow['id'];
-                    }
-                    $cacheRevalidationCheck[] = $rRow['id'];
-                    $cacheDataCompression[] = (SettingsManager::get('case_sensitive_line') ? $rRow['username'] . '_' . $rRow['password'] : strtolower($rRow['username'] . '_' . $rRow['password']));
-                    if ($rRow['access_token']) {
-                        $cacheDataDecompression[] = $rRow['access_token'];
-                    }
-                }
-            }
-        }
-        $cacheRevalidationCheck = array_flip($cacheRevalidationCheck);
-        foreach ($cacheMemoryAllocation as $rFile) {
-            $rUserID = (intval(explode('line_i_', $rFile, 2)[1]) ?: null);
-            if ($rUserID && !isset($cacheRevalidationCheck[$rUserID])) {
-                $rReturn['delete_i'][] = $rUserID;
-            }
-        }
-        $cacheDataCompression = array_flip($cacheDataCompression);
-        foreach ($cacheFailureHandler as $rFile) {
-            $cacheExpirationTime = (explode('line_c_', $rFile, 2)[1] ?: null);
-            if ($cacheExpirationTime && !isset($cacheDataCompression[$cacheExpirationTime])) {
-                $rReturn['delete_c'][] = $cacheExpirationTime;
-            }
-        }
-        $cacheDataDecompression = array_flip($cacheDataDecompression);
-        foreach ($cacheSuccessIndicator as $rFile) {
-            $rToken = (explode('line_t_', $rFile, 2)[1] ?: null);
-            if ($rToken && !isset($cacheDataDecompression[$rToken])) {
-                $rReturn['delete_t'][] = $rToken;
-            }
-        }
-        return $rReturn;
-    }
+		$this->loadCron($rType, $rGroupStart, $rGroupMax);
 
-    private function loadCron($rType, $rGroupStart, $rGroupMax): void {
-        global $db;
-        $rStartTime = time();
-        if (ProcessManager::isNginxRunning()) {
-            if (SettingsManager::get('enable_cache') || !empty($this->rUpdateIDs)) {
-                switch ($rType) {
-                    case 'lines':
-                        $this->generateLines($rGroupStart, $rGroupMax);
-                        break;
-                    case 'lines_update':
-                        $this->generateLines(null, null, $this->rUpdateIDs);
-                        break;
-                    case 'series':
-                        $this->generateSeries($rGroupStart, $rGroupMax);
-                        break;
-                    case 'streams':
-                        $this->generateStreams($rGroupStart, $rGroupMax);
-                        break;
-                    case 'streams_update':
-                        $this->generateStreams(null, null, $this->rUpdateIDs);
-                        break;
-                    case 'groups':
-                        $this->generateGroups();
-                        break;
-                    case 'lines_per_ip':
-                        $this->generateLinesPerIP();
-                        break;
-                    case 'theft_detection':
-                        $this->generateTheftDetection();
-                        break;
-                    default:
-                        $cacheInitTime = $rSeriesCategories = [];
-                        $db->query('SELECT `series_id`, MAX(`streams`.`added`) AS `last_modified` FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` GROUP BY `series_id`;');
-                        foreach ($db->get_rows() as $rRow) {
-                            $cacheInitTime[$rRow['series_id']] = $rRow['last_modified'];
-                        }
-                        $db->query('SELECT * FROM `streams_series`;');
-                        if ($db->result) {
-                            if ($db->result->rowCount() > 0) {
-                                foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rRow) {
-                                    if (isset($cacheInitTime[$rRow['id']])) {
-                                        $rRow['last_modified'] = $cacheInitTime[$rRow['id']];
-                                    }
-                                    $rSeriesCategories[$rRow['id']] = json_decode($rRow['category_id'], true);
-                                    file_put_contents(SERIES_TMP_PATH . 'series_' . $rRow['id'], igbinary_serialize($rRow));
-                                }
-                            }
-                        }
-                        file_put_contents(SERIES_TMP_PATH . 'series_categories', igbinary_serialize($rSeriesCategories));
-                        $rDelete = ['streams' => [], 'lines_i' => [], 'lines_c' => [], 'lines_t' => []];
-                        $cacheDataKey = [];
-                        if (SettingsManager::get('cache_changes')) {
-                            $rChanges = $this->getChangedLines();
-                            $rDelete['lines_i'] = $rChanges['delete_i'];
-                            $rDelete['lines_c'] = $rChanges['delete_c'];
-                            $rDelete['lines_t'] = $rChanges['delete_t'];
-                            if (count($rChanges['changes']) > 0) {
-                                foreach (array_chunk($rChanges['changes'], $this->rSplit) as $rChunk) {
-                                    $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "lines_update" "' . implode(',', $rChunk) . '"';
-                                }
-                            }
-                        } else {
-                            $db->query('SELECT COUNT(*) AS `count` FROM `lines`;');
-                            $rLinesCount = $db->get_row()['count'];
-                            $cacheValidityCheck = array();
-                            if ($this->rSplit > 0) {
-                                for ($rStart = 0; $rStart <= $rLinesCount; $rStart += $this->rSplit) {
-                                    $cacheValidityCheck[] = $rStart;
-                                }
-                            }
-                            if (!$cacheValidityCheck) {
-                                $cacheValidityCheck = array(0);
-                            }
-                            foreach ($cacheValidityCheck as $rStart) {
-                                $rMax = $this->rSplit;
-                                if ($rLinesCount < $rStart + $rMax) {
-                                    $rMax = $rLinesCount - $rStart;
-                                }
-                                $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "lines" ' . $rStart . ' ' . $rMax;
-                            }
-                        }
-                        $db->query('SELECT COUNT(*) AS `count` FROM `streams_episodes` WHERE `stream_id` IN (SELECT `id` FROM `streams` WHERE `type` = 5);');
-                        $cacheRetrieveMethod = (int) $db->get_row()['count'];
-                        $cacheStoreMethod = [];
-                        if ($cacheRetrieveMethod > 0) {
-                            for ($rStart = 0; $rStart < $cacheRetrieveMethod; $rStart += $this->rSplit) {
-                                $rMax = min($this->rSplit, $cacheRetrieveMethod - $rStart);
-                                $cacheStoreMethod[] = $rStart;
-                                $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "series" ' . $rStart . ' ' . $rMax;
-                            }
-                        } else {
-                            $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "series" 0 0';
-                        }
-                        if (SettingsManager::get('cache_changes')) {
-                            $rChanges = $this->getChangedStreams();
-                            $rDelete['streams'] = $rChanges['delete'];
-                            if (count($rChanges['changes']) > 0) {
-                                foreach (array_chunk($rChanges['changes'], $this->rSplit) as $rChunk) {
-                                    $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "streams_update" "' . implode(',', $rChunk) . '"';
-                                }
-                            }
-                        } else {
-                            $db->query('SELECT COUNT(*) AS `count` FROM `streams`;');
-                            $cacheDeleteMethod = (int) $db->get_row()['count'];
-                            $cacheCleanupTrigger = array();
-                            if ($this->rSplit > 0) {
-                                for ($rStart = 0; $rStart <= $cacheDeleteMethod; $rStart += $this->rSplit) {
-                                    $cacheCleanupTrigger[] = $rStart;
-                                }
-                            }
-                            if (!$cacheCleanupTrigger) {
-                                $cacheCleanupTrigger = array(0);
-                            }
-                            foreach ($cacheCleanupTrigger as $rStart) {
-                                $rMax = $this->rSplit;
-                                if ($cacheDeleteMethod < $rStart + $rMax) {
-                                    $rMax = $cacheDeleteMethod - $rStart;
-                                }
-                                $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "streams" ' . $rStart . ' ' . $rMax;
-                            }
-                        }
-                        $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "groups"';
-                        $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "lines_per_ip"';
-                        $cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "theft_detection"';
-                        $cacheMetadataKey = new Multithread($cacheDataKey, $this->rThreadCount);
-                        $cacheMetadataKey->run();
-                        unset($cacheDataKey);
-                        $rSeriesEpisodes = $rSeriesMap = [];
-                        foreach ($cacheStoreMethod as $rStart) {
-                            if (file_exists(SERIES_TMP_PATH . 'series_map_' . $rStart)) {
-                                foreach (igbinary_unserialize(file_get_contents(SERIES_TMP_PATH . 'series_map_' . $rStart)) as $rStreamID => $rSeriesID) {
-                                    $rSeriesMap[$rStreamID] = $rSeriesID;
-                                }
-                                unlink(SERIES_TMP_PATH . 'series_map_' . $rStart);
-                            }
-                            if (file_exists(SERIES_TMP_PATH . 'series_episodes_' . $rStart)) {
-                                $rSeasonData = igbinary_unserialize(file_get_contents(SERIES_TMP_PATH . 'series_episodes_' . $rStart));
-                                foreach (array_keys($rSeasonData) as $rSeriesID) {
-                                    if (!isset($rSeriesEpisodes[$rSeriesID])) {
-                                        $rSeriesEpisodes[$rSeriesID] = [];
-                                    }
-                                    foreach (array_keys($rSeasonData[$rSeriesID]) as $rSeasonNum) {
-                                        foreach ($rSeasonData[$rSeriesID][$rSeasonNum] as $rEpisode) {
-                                            $rSeriesEpisodes[$rSeriesID][$rSeasonNum][] = $rEpisode;
-                                        }
-                                    }
-                                }
-                                unlink(SERIES_TMP_PATH . 'series_episodes_' . $rStart);
-                            }
-                        }
-                        file_put_contents(SERIES_TMP_PATH . 'series_map', igbinary_serialize($rSeriesMap));
-                        foreach ($rSeriesEpisodes as $rSeriesID => $rSeasons) {
-                            file_put_contents(SERIES_TMP_PATH . 'episodes_' . $rSeriesID, igbinary_serialize($rSeasons));
-                        }
-                        if (SettingsManager::get('cache_changes')) {
-                            foreach ($rDelete['streams'] as $rStreamID) {
-                                @unlink(STREAMS_TMP_PATH . 'stream_' . $rStreamID);
-                            }
-                            foreach ($rDelete['lines_i'] as $rUserID) {
-                                @unlink(LINES_TMP_PATH . 'line_i_' . $rUserID);
-                            }
-                            foreach ($rDelete['lines_c'] as $cacheExpirationTime) {
-                                @unlink(LINES_TMP_PATH . 'line_c_' . $cacheExpirationTime);
-                            }
-                            foreach ($rDelete['lines_t'] as $rToken) {
-                                @unlink(LINES_TMP_PATH . 'line_t_' . $rToken);
-                            }
-                        } else {
-                            foreach ([STREAMS_TMP_PATH, LINES_TMP_PATH, SERIES_TMP_PATH] as $rTmpPath) {
-                                foreach (scandir($rTmpPath) as $rFile) {
-                                    if ($rFile === '.' || $rFile === '..') {
-                                        continue;
-                                    }
-                                    $rFilePath = $rTmpPath . $rFile;
-                                    if (is_file($rFilePath) && filemtime($rFilePath) < $rStartTime - 1) {
-                                        unlink($rFilePath);
-                                    }
-                                }
-                            }
-                        }
-                        echo 'Cache updated!' . "\n";
-                        file_put_contents(CACHE_TMP_PATH . 'cache_complete', time());
-                        $db->query('UPDATE `settings` SET `last_cache` = ?, `last_cache_taken` = ?;', time(), time() - $rStartTime);
-                        break;
-                }
-            } else {
-                echo 'Cache is disabled.' . "\n";
-                echo 'Generating group permissions...' . "\n";
-                $this->generateGroups();
-                echo 'Generating lines per ip...' . "\n";
-                $this->generateLinesPerIP();
-                echo 'Detecting theft of VOD...' . "\n";
-                $this->generateTheftDetection();
-                echo 'Clearing old data...' . "\n";
-                foreach ([STREAMS_TMP_PATH, LINES_TMP_PATH, SERIES_TMP_PATH] as $rTmpPath) {
-                    foreach (scandir($rTmpPath) as $rFile) {
-                        if ($rFile === '.' || $rFile === '..') {
-                            continue;
-                        }
-                        $rFilePath = $rTmpPath . $rFile;
-                        if (is_file($rFilePath)) {
-                            unlink($rFilePath);
-                        }
-                    }
-                }
-                file_put_contents(CACHE_TMP_PATH . 'cache_complete', time());
-                exit();
-            }
-        } else {
-            echo 'XC_VM not running...' . "\n";
-            exit();
-        }
-    }
+		return 0;
+	}
 
-    private function generateLines($rStart = null, $rCount = null, $cacheLockMechanism = []): void {
-        global $db;
-        if (is_null($rCount)) {
-            $rCount = count($cacheLockMechanism);
-        }
-        if ($rCount > 0) {
-            $rSteps = [];
-            if (!is_null($rStart)) {
-                $rEnd = $rStart + $rCount - 1;
-                if ($this->rSplit >= ($rEnd - $rStart + 1)) {
-                    $rSteps = [$rStart];
-                }
-            } else {
-                $rSteps = [null];
-            }
-            $rExists = [];
-            foreach ($rSteps as $rStep) {
-                if (!is_null($rStep)) {
-                    if ($rStart + $rCount < $rStep + $this->rSplit) {
-                        $rMax = ($rStart + $rCount) - $rStep;
-                    } else {
-                        $rMax = $this->rSplit;
-                    }
-                    $db->query('SELECT `id`, `username`, `password`, `exp_date`, `created_at`, `admin_enabled`, `enabled`, `bouquet`, `allowed_outputs`, `max_connections`, `is_trial`, `is_restreamer`, `is_stalker`, `is_mag`, `is_e2`, `is_isplock`, `allowed_ips`, `allowed_ua`, `pair_id`, `force_server_id`, `isp_desc`, `forced_country`, `bypass_ua`, `last_expiration_video`, `access_token`, `mag_devices`.`token` AS `mag_token`, `admin_notes`, `reseller_notes` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` LIMIT ' . $rStep . ', ' . $rMax . ';');
-                } else {
-                    $db->query('SELECT `id`, `username`, `password`, `exp_date`, `created_at`, `admin_enabled`, `enabled`, `bouquet`, `allowed_outputs`, `max_connections`, `is_trial`, `is_restreamer`, `is_stalker`, `is_mag`, `is_e2`, `is_isplock`, `allowed_ips`, `allowed_ua`, `pair_id`, `force_server_id`, `isp_desc`, `forced_country`, `bypass_ua`, `last_expiration_video`, `access_token`, `mag_devices`.`token` AS `mag_token`, `admin_notes`, `reseller_notes` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` WHERE `id` IN (' . implode(',', $cacheLockMechanism) . ');');
-                }
-                if ($db->result) {
-                    if ($db->result->rowCount() > 0) {
-                        foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rUserInfo) {
-                            $rExists[] = $rUserInfo['id'];
-                            file_put_contents(LINES_TMP_PATH . 'line_i_' . $rUserInfo['id'], igbinary_serialize($rUserInfo));
-                            $rKey = (SettingsManager::get('case_sensitive_line') ? $rUserInfo['username'] . '_' . $rUserInfo['password'] : strtolower($rUserInfo['username'] . '_' . $rUserInfo['password']));
-                            file_put_contents(LINES_TMP_PATH . 'line_c_' . $rKey, $rUserInfo['id']);
-                            if (!empty($rUserInfo['access_token'])) {
-                                file_put_contents(LINES_TMP_PATH . 'line_t_' . $rUserInfo['access_token'], $rUserInfo['id']);
-                            }
-                        }
-                    }
-                    $db->result = null;
-                }
-            }
-            if (count($cacheLockMechanism) > 0) {
-                foreach ($cacheLockMechanism as $rForceID) {
-                    if (!in_array($rForceID, $rExists) && file_exists(LINES_TMP_PATH . 'line_i_' . $rForceID)) {
-                        unlink(LINES_TMP_PATH . 'line_i_' . $rForceID);
-                    }
-                }
-            }
-        }
-    }
+	private function getChangedStreams(): array {
+		global $db;
+		$rReturn = ['changes' => [], 'delete' => []];
+		$rExisting = [];
+		$db->query('SELECT `id`, GREATEST(IFNULL(UNIX_TIMESTAMP(`streams`.`updated`), 0), IFNULL(MAX(UNIX_TIMESTAMP(`streams_servers`.`updated`)), 0)) AS `updated` FROM `streams` LEFT JOIN `streams_servers` ON `streams`.`id` = `streams_servers`.`stream_id` GROUP BY `id`;');
+		if ($db->dbh && $db->result) {
+			if ($db->result->rowCount() > 0) {
+				foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rRow) {
+					if (!file_exists(STREAMS_TMP_PATH . 'stream_' . $rRow['id']) || (filemtime(STREAMS_TMP_PATH . 'stream_' . $rRow['id']) ?: 0) < $rRow['updated']) {
+						$rReturn['changes'][] = $rRow['id'];
+					}
+					$rExisting[] = $rRow['id'];
+				}
+			}
+		}
+		$rExisting = array_flip($rExisting);
+		foreach (glob(STREAMS_TMP_PATH . 'stream_*') as $rFile) {
+			$rParts = explode('_', $rFile);
+			$rStreamID = intval(end($rParts));
+			if (!isset($rExisting[$rStreamID])) {
+				$rReturn['delete'][] = $rStreamID;
+			}
+		}
+		return $rReturn;
+	}
 
-    private function generateStreams($rStart = null, $rCount = null, $cacheLockMechanism = []): void {
-        global $db;
-        if (is_null($rCount)) {
-            $rCount = count($cacheLockMechanism);
-        }
-        if ($rCount > 0) {
-            $rBouquetMap = [];
-            $rBouquetMapPath = CACHE_TMP_PATH . 'bouquet_map';
-            if (file_exists($rBouquetMapPath) && 0 < filesize($rBouquetMapPath)) {
-                $rBouquetData = @igbinary_unserialize(file_get_contents($rBouquetMapPath));
-                if (is_array($rBouquetData)) {
-                    $rBouquetMap = $rBouquetData;
-                }
-            }
-            $rSteps = [];
-            if (!is_null($rStart)) {
-                $rEnd = $rStart + $rCount - 1;
-                if ($this->rSplit >= ($rEnd - $rStart + 1)) {
-                    $rSteps = [$rStart];
-                }
-            } else {
-                $rSteps = [null];
-            }
-            $rExists = [];
-            foreach ($rSteps as $rStep) {
-                if (!is_null($rStep)) {
-                    if ($rStart + $rCount < $rStep + $this->rSplit) {
-                        $rMax = ($rStart + $rCount) - $rStep;
-                    } else {
-                        $rMax = $this->rSplit;
-                    }
-                    $db->query('SELECT t1.id,t1.epg_id,t1.added,t1.allow_record,t1.year,t1.channel_id,t1.movie_properties,t1.stream_source,t1.tv_archive_server_id,t1.vframes_server_id,t1.tv_archive_duration,t1.stream_icon,t1.custom_sid,t1.category_id,t1.stream_display_name,t1.series_no,t1.direct_source,t1.direct_proxy,t2.type_output,t1.target_container,t2.live,t1.rtmp_output,t1.order,t2.type_key,t1.tmdb_id,t1.adaptive_link FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type LIMIT ' . $rStep . ', ' . $rMax . ';');
-                } else {
-                    $db->query('SELECT t1.id,t1.epg_id,t1.added,t1.allow_record,t1.year,t1.channel_id,t1.movie_properties,t1.stream_source,t1.tv_archive_server_id,t1.vframes_server_id,t1.tv_archive_duration,t1.stream_icon,t1.custom_sid,t1.category_id,t1.stream_display_name,t1.series_no,t1.direct_source,t1.direct_proxy,t2.type_output,t1.target_container,t2.live,t1.rtmp_output,t1.order,t2.type_key,t1.tmdb_id,t1.adaptive_link FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type WHERE `t1`.`id` IN (' . implode(',', $cacheLockMechanism) . ');');
-                }
-                if ($db->result) {
-                    if ($db->result->rowCount() > 0) {
-                        $rRows = $db->result->fetchAll(\PDO::FETCH_ASSOC);
-                        $rStreamMap = $rStreamIDs = [];
-                        foreach ($rRows as $rRow) {
-                            $rStreamIDs[] = $rRow['id'];
-                        }
-                        if (count($rStreamIDs) > 0) {
-                            if ($db->query('SELECT `stream_id`, `server_id`, `pid`, `to_analyze`, `stream_status`, `monitor_pid`, `on_demand`, `delay_available_at`, `bitrate`, `parent_id`, `on_demand`, `stream_info`, `video_codec`, `audio_codec`, `resolution`, `compatible` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ')')) {
-                                if ($db->result->rowCount() > 0) {
-                                    foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rRow) {
-                                        $rStreamMap[intval($rRow['stream_id'])][intval($rRow['server_id'])] = $rRow;
-                                    }
-                                }
-                                $db->result = null;
-                            }
-                        }
-                        foreach ($rRows as $rStreamInfo) {
-                            $rExists[] = $rStreamInfo['id'];
-                            if (!$rStreamInfo['direct_source']) {
-                                unset($rStreamInfo['stream_source']);
-                            }
-                            $rOutput = ['info' => $rStreamInfo, 'bouquets' => ($rBouquetMap[intval($rStreamInfo['id'])] ?? []), 'servers' => ($rStreamMap[intval($rStreamInfo['id'])] ?? [])];
-                            file_put_contents(STREAMS_TMP_PATH . 'stream_' . $rStreamInfo['id'], igbinary_serialize($rOutput));
-                        }
-                        unset($rRows, $rStreamMap, $rStreamIDs);
-                    }
-                    $db->result = null;
-                }
-            }
-            if (count($cacheLockMechanism) > 0) {
-                foreach ($cacheLockMechanism as $rForceID) {
-                    if (!in_array($rForceID, $rExists) && file_exists(STREAMS_TMP_PATH . 'stream_' . $rForceID)) {
-                        unlink(STREAMS_TMP_PATH . 'stream_' . $rForceID);
-                    }
-                }
-            }
-        }
-    }
+	private function getChangedLines(): array {
+		global $db;
+		$rReturn = ['changes' => [], 'delete_i' => [], 'delete_c' => [], 'delete_t' => []];
+		$cacheMemoryAllocation = glob(LINES_TMP_PATH . 'line_i_*');
+		$cacheFailureHandler = glob(LINES_TMP_PATH . 'line_c_*');
+		$cacheSuccessIndicator = glob(LINES_TMP_PATH . 'line_t_*');
+		$cacheRevalidationCheck = $cacheDataCompression = $cacheDataDecompression = [];
+		$db->query('SELECT `id`, `username`, `password`, `access_token`, UNIX_TIMESTAMP(`updated`) AS `updated` FROM `lines`;');
+		if ($db->dbh && $db->result) {
+			if ($db->result->rowCount() > 0) {
+				foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rRow) {
+					if (!file_exists(LINES_TMP_PATH . 'line_i_' . $rRow['id']) || (filemtime(LINES_TMP_PATH . 'line_i_' . $rRow['id']) ?: 0) < $rRow['updated']) {
+						$rReturn['changes'][] = $rRow['id'];
+					}
+					$cacheRevalidationCheck[] = $rRow['id'];
+					$cacheDataCompression[] = (SettingsManager::get('case_sensitive_line') ? $rRow['username'] . '_' . $rRow['password'] : strtolower($rRow['username'] . '_' . $rRow['password']));
+					if ($rRow['access_token']) {
+						$cacheDataDecompression[] = $rRow['access_token'];
+					}
+				}
+			}
+		}
+		$cacheRevalidationCheck = array_flip($cacheRevalidationCheck);
+		foreach ($cacheMemoryAllocation as $rFile) {
+			$rUserID = (intval(explode('line_i_', $rFile, 2)[1]) ?: null);
+			if ($rUserID && !isset($cacheRevalidationCheck[$rUserID])) {
+				$rReturn['delete_i'][] = $rUserID;
+			}
+		}
+		$cacheDataCompression = array_flip($cacheDataCompression);
+		foreach ($cacheFailureHandler as $rFile) {
+			$cacheExpirationTime = (explode('line_c_', $rFile, 2)[1] ?: null);
+			if ($cacheExpirationTime && !isset($cacheDataCompression[$cacheExpirationTime])) {
+				$rReturn['delete_c'][] = $cacheExpirationTime;
+			}
+		}
+		$cacheDataDecompression = array_flip($cacheDataDecompression);
+		foreach ($cacheSuccessIndicator as $rFile) {
+			$rToken = (explode('line_t_', $rFile, 2)[1] ?: null);
+			if ($rToken && !isset($cacheDataDecompression[$rToken])) {
+				$rReturn['delete_t'][] = $rToken;
+			}
+		}
+		return $rReturn;
+	}
 
-    private function generateSeries($rStart, $rCount): void {
-        global $db;
-        $rSeriesMap = [];
-        $rSeriesEpisodes = [];
-        if ($rCount > 0) {
-            if (is_null($rStart)) {
-                $rSteps = [null];
-            } else {
-                $rEnd = $rStart + $rCount - 1;
-                $rangeLength = $rEnd - $rStart + 1;
-                if ($this->rSplit >= $rangeLength) {
-                    $rSteps = [$rStart];
-                } else {
-                    $rSteps = range($rStart, $rEnd, $this->rSplit);
-                }
-            }
-            foreach ($rSteps as $rStep) {
-                if ($rStart + $rCount < $rStep + $this->rSplit) {
-                    $rMax = ($rStart + $rCount) - $rStep;
-                } else {
-                    $rMax = $this->rSplit;
-                }
-                $db->query('SELECT `stream_id`, `series_id`, `season_num`, `episode_num` FROM `streams_episodes` WHERE `stream_id` IN (SELECT `id` FROM `streams` WHERE `type` = 5) ORDER BY `series_id` ASC, `season_num` ASC, `episode_num` ASC LIMIT ' . $rStep . ', ' . $rMax . ';');
-                foreach ($db->get_rows() as $rRow) {
-                    if ($rRow['stream_id'] && $rRow['series_id']) {
-                        $rSeriesMap[intval($rRow['stream_id'])] = intval($rRow['series_id']);
-                        if (!isset($rSeriesEpisodes[$rRow['series_id']])) {
-                            $rSeriesEpisodes[$rRow['series_id']] = [];
-                        }
-                        $rSeriesEpisodes[$rRow['series_id']][$rRow['season_num']][] = ['episode_num' => $rRow['episode_num'], 'stream_id' => $rRow['stream_id']];
-                    }
-                }
-            }
-        }
-        file_put_contents(SERIES_TMP_PATH . 'series_episodes_' . $rStart, igbinary_serialize($rSeriesEpisodes));
-        file_put_contents(SERIES_TMP_PATH . 'series_map_' . $rStart, igbinary_serialize($rSeriesMap));
-        unset($rSeriesMap);
-    }
+	private function loadCron($rType, $rGroupStart, $rGroupMax): void {
+		global $db;
+		$rStartTime = time();
+		if (ProcessManager::isNginxRunning()) {
+			if (SettingsManager::get('enable_cache') || !empty($this->rUpdateIDs)) {
+				switch ($rType) {
+					case 'lines':
+						$this->generateLines($rGroupStart, $rGroupMax);
+						break;
+					case 'lines_update':
+						$this->generateLines(null, null, $this->rUpdateIDs);
+						break;
+					case 'series':
+						$this->generateSeries($rGroupStart, $rGroupMax);
+						break;
+					case 'streams':
+						$this->generateStreams($rGroupStart, $rGroupMax);
+						break;
+					case 'streams_update':
+						$this->generateStreams(null, null, $this->rUpdateIDs);
+						break;
+					case 'groups':
+						$this->generateGroups();
+						break;
+					case 'lines_per_ip':
+						$this->generateLinesPerIP();
+						break;
+					case 'theft_detection':
+						$this->generateTheftDetection();
+						break;
+					default:
+						$cacheInitTime = $rSeriesCategories = [];
+						$db->query('SELECT `series_id`, MAX(`streams`.`added`) AS `last_modified` FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` GROUP BY `series_id`;');
+						foreach ($db->get_rows() as $rRow) {
+							$cacheInitTime[$rRow['series_id']] = $rRow['last_modified'];
+						}
+						$db->query('SELECT * FROM `streams_series`;');
+						if ($db->result) {
+							if ($db->result->rowCount() > 0) {
+								foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rRow) {
+									if (isset($cacheInitTime[$rRow['id']])) {
+										$rRow['last_modified'] = $cacheInitTime[$rRow['id']];
+									}
+									$rSeriesCategories[$rRow['id']] = json_decode($rRow['category_id'], true);
+									file_put_contents(SERIES_TMP_PATH . 'series_' . $rRow['id'], igbinary_serialize($rRow));
+								}
+							}
+						}
+						file_put_contents(SERIES_TMP_PATH . 'series_categories', igbinary_serialize($rSeriesCategories));
+						$rDelete = ['streams' => [], 'lines_i' => [], 'lines_c' => [], 'lines_t' => []];
+						$cacheDataKey = [];
+						if (SettingsManager::get('cache_changes')) {
+							$rChanges = $this->getChangedLines();
+							$rDelete['lines_i'] = $rChanges['delete_i'];
+							$rDelete['lines_c'] = $rChanges['delete_c'];
+							$rDelete['lines_t'] = $rChanges['delete_t'];
+							if (count($rChanges['changes']) > 0) {
+								foreach (array_chunk($rChanges['changes'], $this->rSplit) as $rChunk) {
+									$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "lines_update" "' . implode(',', $rChunk) . '"';
+								}
+							}
+						} else {
+							$db->query('SELECT COUNT(*) AS `count` FROM `lines`;');
+							$rLinesCount = $db->get_row()['count'];
+							$cacheValidityCheck = [];
+							if ($this->rSplit > 0) {
+								for ($rStart = 0; $rStart <= $rLinesCount; $rStart += $this->rSplit) {
+									$cacheValidityCheck[] = $rStart;
+								}
+							}
+							if (!$cacheValidityCheck) {
+								$cacheValidityCheck = [0];
+							}
+							foreach ($cacheValidityCheck as $rStart) {
+								$rMax = $this->rSplit;
+								if ($rLinesCount < $rStart + $rMax) {
+									$rMax = $rLinesCount - $rStart;
+								}
+								$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "lines" ' . $rStart . ' ' . $rMax;
+							}
+						}
+						$db->query('SELECT COUNT(*) AS `count` FROM `streams_episodes` WHERE `stream_id` IN (SELECT `id` FROM `streams` WHERE `type` = 5);');
+						$cacheRetrieveMethod = (int) $db->get_row()['count'];
+						$cacheStoreMethod = [];
+						if ($cacheRetrieveMethod > 0) {
+							for ($rStart = 0; $rStart < $cacheRetrieveMethod; $rStart += $this->rSplit) {
+								$rMax = min($this->rSplit, $cacheRetrieveMethod - $rStart);
+								$cacheStoreMethod[] = $rStart;
+								$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "series" ' . $rStart . ' ' . $rMax;
+							}
+						} else {
+							$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "series" 0 0';
+						}
+						if (SettingsManager::get('cache_changes')) {
+							$rChanges = $this->getChangedStreams();
+							$rDelete['streams'] = $rChanges['delete'];
+							if (count($rChanges['changes']) > 0) {
+								foreach (array_chunk($rChanges['changes'], $this->rSplit) as $rChunk) {
+									$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "streams_update" "' . implode(',', $rChunk) . '"';
+								}
+							}
+						} else {
+							$db->query('SELECT COUNT(*) AS `count` FROM `streams`;');
+							$cacheDeleteMethod = (int) $db->get_row()['count'];
+							$cacheCleanupTrigger = [];
+							if ($this->rSplit > 0) {
+								for ($rStart = 0; $rStart <= $cacheDeleteMethod; $rStart += $this->rSplit) {
+									$cacheCleanupTrigger[] = $rStart;
+								}
+							}
+							if (!$cacheCleanupTrigger) {
+								$cacheCleanupTrigger = [0];
+							}
+							foreach ($cacheCleanupTrigger as $rStart) {
+								$rMax = $this->rSplit;
+								if ($cacheDeleteMethod < $rStart + $rMax) {
+									$rMax = $cacheDeleteMethod - $rStart;
+								}
+								$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "streams" ' . $rStart . ' ' . $rMax;
+							}
+						}
+						$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "groups"';
+						$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "lines_per_ip"';
+						$cacheDataKey[] = PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "theft_detection"';
+						$cacheMetadataKey = new Multithread($cacheDataKey, $this->rThreadCount);
+						$cacheMetadataKey->run();
+						unset($cacheDataKey);
+						$rSeriesEpisodes = $rSeriesMap = [];
+						foreach ($cacheStoreMethod as $rStart) {
+							if (file_exists(SERIES_TMP_PATH . 'series_map_' . $rStart)) {
+								foreach (igbinary_unserialize(file_get_contents(SERIES_TMP_PATH . 'series_map_' . $rStart)) as $rStreamID => $rSeriesID) {
+									$rSeriesMap[$rStreamID] = $rSeriesID;
+								}
+								unlink(SERIES_TMP_PATH . 'series_map_' . $rStart);
+							}
+							if (file_exists(SERIES_TMP_PATH . 'series_episodes_' . $rStart)) {
+								$rSeasonData = igbinary_unserialize(file_get_contents(SERIES_TMP_PATH . 'series_episodes_' . $rStart));
+								foreach (array_keys($rSeasonData) as $rSeriesID) {
+									if (!isset($rSeriesEpisodes[$rSeriesID])) {
+										$rSeriesEpisodes[$rSeriesID] = [];
+									}
+									foreach (array_keys($rSeasonData[$rSeriesID]) as $rSeasonNum) {
+										foreach ($rSeasonData[$rSeriesID][$rSeasonNum] as $rEpisode) {
+											$rSeriesEpisodes[$rSeriesID][$rSeasonNum][] = $rEpisode;
+										}
+									}
+								}
+								unlink(SERIES_TMP_PATH . 'series_episodes_' . $rStart);
+							}
+						}
+						file_put_contents(SERIES_TMP_PATH . 'series_map', igbinary_serialize($rSeriesMap));
+						foreach ($rSeriesEpisodes as $rSeriesID => $rSeasons) {
+							file_put_contents(SERIES_TMP_PATH . 'episodes_' . $rSeriesID, igbinary_serialize($rSeasons));
+						}
+						if (SettingsManager::get('cache_changes')) {
+							foreach ($rDelete['streams'] as $rStreamID) {
+								@unlink(STREAMS_TMP_PATH . 'stream_' . $rStreamID);
+							}
+							foreach ($rDelete['lines_i'] as $rUserID) {
+								@unlink(LINES_TMP_PATH . 'line_i_' . $rUserID);
+							}
+							foreach ($rDelete['lines_c'] as $cacheExpirationTime) {
+								@unlink(LINES_TMP_PATH . 'line_c_' . $cacheExpirationTime);
+							}
+							foreach ($rDelete['lines_t'] as $rToken) {
+								@unlink(LINES_TMP_PATH . 'line_t_' . $rToken);
+							}
+						} else {
+							foreach ([STREAMS_TMP_PATH, LINES_TMP_PATH, SERIES_TMP_PATH] as $rTmpPath) {
+								foreach (scandir($rTmpPath) as $rFile) {
+									if ($rFile === '.' || $rFile === '..') {
+										continue;
+									}
+									$rFilePath = $rTmpPath . $rFile;
+									if (is_file($rFilePath) && filemtime($rFilePath) < $rStartTime - 1) {
+										unlink($rFilePath);
+									}
+								}
+							}
+						}
+						echo 'Cache updated!' . "\n";
+						file_put_contents(CACHE_TMP_PATH . 'cache_complete', time());
+						$db->query('UPDATE `settings` SET `last_cache` = ?, `last_cache_taken` = ?;', time(), time() - $rStartTime);
+						break;
+				}
+			} else {
+				echo 'Cache is disabled.' . "\n";
+				echo 'Generating group permissions...' . "\n";
+				$this->generateGroups();
+				echo 'Generating lines per ip...' . "\n";
+				$this->generateLinesPerIP();
+				echo 'Detecting theft of VOD...' . "\n";
+				$this->generateTheftDetection();
+				echo 'Clearing old data...' . "\n";
+				foreach ([STREAMS_TMP_PATH, LINES_TMP_PATH, SERIES_TMP_PATH] as $rTmpPath) {
+					foreach (scandir($rTmpPath) as $rFile) {
+						if ($rFile === '.' || $rFile === '..') {
+							continue;
+						}
+						$rFilePath = $rTmpPath . $rFile;
+						if (is_file($rFilePath)) {
+							unlink($rFilePath);
+						}
+					}
+				}
+				file_put_contents(CACHE_TMP_PATH . 'cache_complete', time());
+				exit();
+			}
+		} else {
+			echo 'XC_VM not running...' . "\n";
+			exit();
+		}
+	}
 
-    private function generateGroups(): void {
-        global $db;
-        $db->query('SELECT `group_id` FROM `users_groups`;');
-        foreach ($db->get_rows() as $rGroup) {
-            $rBouquets = $rReturn = [];
-            $db->query("SELECT * FROM `users_packages` WHERE JSON_CONTAINS(`groups`, ?, '\$');", $rGroup['group_id']);
-            foreach ($db->get_rows() as $rRow) {
-                foreach (json_decode($rRow['bouquets'], true) as $rID) {
-                    if (!in_array($rID, $rBouquets)) {
-                        $rBouquets[] = $rID;
-                    }
-                }
-                if ($rRow['is_line']) {
-                    $rReturn['create_line'] = true;
-                }
-                if ($rRow['is_mag']) {
-                    $rReturn['create_mag'] = true;
-                }
-                if ($rRow['is_e2']) {
-                    $rReturn['create_enigma'] = true;
-                }
-            }
-            if (count($rBouquets) > 0) {
-                $db->query('SELECT * FROM `bouquets` WHERE `id` IN (' . implode(',', array_map('intval', $rBouquets)) . ');');
-                $rSeriesIDs = [];
-                $rStreamIDs = [];
-                foreach ($db->get_rows() as $rRow) {
-                    if ($rRow['bouquet_channels']) {
-                        $rStreamIDs = array_merge($rStreamIDs, json_decode($rRow['bouquet_channels'], true));
-                    }
-                    if ($rRow['bouquet_movies']) {
-                        $rStreamIDs = array_merge($rStreamIDs, json_decode($rRow['bouquet_movies'], true));
-                    }
-                    if ($rRow['bouquet_radios']) {
-                        $rStreamIDs = array_merge($rStreamIDs, json_decode($rRow['bouquet_radios'], true));
-                    }
-                    foreach (json_decode($rRow['bouquet_series'], true) as $rSeriesID) {
-                        $rSeriesIDs[] = $rSeriesID;
-                        $db->query('SELECT `stream_id` FROM `streams_episodes` WHERE `series_id` = ?;', $rSeriesID);
-                        foreach ($db->get_rows() as $rEpisode) {
-                            $rStreamIDs[] = $rEpisode['stream_id'];
-                        }
-                    }
-                }
-                $rReturn['stream_ids'] = array_unique($rStreamIDs);
-                $rReturn['series_ids'] = array_unique($rSeriesIDs);
-                $rCategories = [];
-                if (count($rReturn['stream_ids']) > 0) {
-                    $db->query('SELECT DISTINCT(`category_id`) AS `category_id` FROM `streams` WHERE `id` IN (' . implode(',', array_map('intval', $rReturn['stream_ids'])) . ');');
-                    foreach ($db->get_rows() as $rRow) {
-                        if ($rRow['category_id']) {
-                            $rCategories = array_merge($rCategories, json_decode($rRow['category_id'], true));
-                        }
-                    }
-                }
-                if (count($rReturn['series_ids']) > 0) {
-                    $db->query('SELECT DISTINCT(`category_id`) AS `category_id` FROM `streams_series` WHERE `id` IN (' . implode(',', array_map('intval', $rReturn['series_ids'])) . ');');
-                    foreach ($db->get_rows() as $rRow) {
-                        if ($rRow['category_id']) {
-                            $rCategories = array_merge($rCategories, json_decode($rRow['category_id'], true));
-                        }
-                    }
-                }
-                $rReturn['category_ids'] = array_unique($rCategories);
-            }
-            file_put_contents(CACHE_TMP_PATH . 'permissions_' . intval($rGroup['group_id']), igbinary_serialize($rReturn));
-        }
-    }
+	private function generateLines($rStart = null, $rCount = null, $cacheLockMechanism = []): void {
+		global $db;
+		if (is_null($rCount)) {
+			$rCount = count($cacheLockMechanism);
+		}
+		if ($rCount > 0) {
+			$rSteps = [];
+			if (!is_null($rStart)) {
+				$rEnd = $rStart + $rCount - 1;
+				if ($this->rSplit >= ($rEnd - $rStart + 1)) {
+					$rSteps = [$rStart];
+				}
+			} else {
+				$rSteps = [null];
+			}
+			$rExists = [];
+			foreach ($rSteps as $rStep) {
+				if (!is_null($rStep)) {
+					if ($rStart + $rCount < $rStep + $this->rSplit) {
+						$rMax = ($rStart + $rCount) - $rStep;
+					} else {
+						$rMax = $this->rSplit;
+					}
+					$db->query('SELECT `id`, `username`, `password`, `exp_date`, `created_at`, `admin_enabled`, `enabled`, `bouquet`, `allowed_outputs`, `max_connections`, `is_trial`, `is_restreamer`, `is_stalker`, `is_mag`, `is_e2`, `is_isplock`, `allowed_ips`, `allowed_ua`, `pair_id`, `force_server_id`, `isp_desc`, `forced_country`, `bypass_ua`, `last_expiration_video`, `access_token`, `mag_devices`.`token` AS `mag_token`, `admin_notes`, `reseller_notes` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` LIMIT ' . $rStep . ', ' . $rMax . ';');
+				} else {
+					$db->query('SELECT `id`, `username`, `password`, `exp_date`, `created_at`, `admin_enabled`, `enabled`, `bouquet`, `allowed_outputs`, `max_connections`, `is_trial`, `is_restreamer`, `is_stalker`, `is_mag`, `is_e2`, `is_isplock`, `allowed_ips`, `allowed_ua`, `pair_id`, `force_server_id`, `isp_desc`, `forced_country`, `bypass_ua`, `last_expiration_video`, `access_token`, `mag_devices`.`token` AS `mag_token`, `admin_notes`, `reseller_notes` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` WHERE `id` IN (' . implode(',', $cacheLockMechanism) . ');');
+				}
+				if ($db->result) {
+					if ($db->result->rowCount() > 0) {
+						foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rUserInfo) {
+							$rExists[] = $rUserInfo['id'];
+							file_put_contents(LINES_TMP_PATH . 'line_i_' . $rUserInfo['id'], igbinary_serialize($rUserInfo));
+							$rKey = (SettingsManager::get('case_sensitive_line') ? $rUserInfo['username'] . '_' . $rUserInfo['password'] : strtolower($rUserInfo['username'] . '_' . $rUserInfo['password']));
+							file_put_contents(LINES_TMP_PATH . 'line_c_' . $rKey, $rUserInfo['id']);
+							if (!empty($rUserInfo['access_token'])) {
+								file_put_contents(LINES_TMP_PATH . 'line_t_' . $rUserInfo['access_token'], $rUserInfo['id']);
+							}
+						}
+					}
+					$db->result = null;
+				}
+			}
+			if (count($cacheLockMechanism) > 0) {
+				foreach ($cacheLockMechanism as $rForceID) {
+					if (!in_array($rForceID, $rExists) && file_exists(LINES_TMP_PATH . 'line_i_' . $rForceID)) {
+						unlink(LINES_TMP_PATH . 'line_i_' . $rForceID);
+					}
+				}
+			}
+		}
+	}
 
-    private function generateLinesPerIP(): void {
-        global $db;
-        $rLinesPerIP = [3600 => [], 86400 => [], 604800 => [], 0 => []];
-        foreach (array_keys($rLinesPerIP) as $rTime) {
-            if ($rTime > 0) {
-                $db->query('SELECT `lines_activity`.`user_id`, COUNT(DISTINCT(`lines_activity`.`user_ip`)) AS `ip_count`, `lines`.`username` FROM `lines_activity` LEFT JOIN `lines` ON `lines`.`id` = `lines_activity`.`user_id` WHERE `date_start` >= ? AND `lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0 AND `lines`.`is_restreamer` = 0 GROUP BY `lines_activity`.`user_id` ORDER BY `ip_count` DESC LIMIT 1000;', time() - $rTime);
-            } else {
-                $db->query('SELECT `lines_activity`.`user_id`, COUNT(DISTINCT(`lines_activity`.`user_ip`)) AS `ip_count`, `lines`.`username` FROM `lines_activity` LEFT JOIN `lines` ON `lines`.`id` = `lines_activity`.`user_id` WHERE `lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0 AND `lines`.`is_restreamer` = 0 GROUP BY `lines_activity`.`user_id` ORDER BY `ip_count` DESC LIMIT 1000;');
-            }
-            foreach ($db->get_rows() as $rRow) {
-                $rLinesPerIP[$rTime][] = $rRow;
-            }
-        }
-        file_put_contents(CACHE_TMP_PATH . 'lines_per_ip', igbinary_serialize($rLinesPerIP));
-    }
+	private function generateStreams($rStart = null, $rCount = null, $cacheLockMechanism = []): void {
+		global $db;
+		if (is_null($rCount)) {
+			$rCount = count($cacheLockMechanism);
+		}
+		if ($rCount > 0) {
+			$rBouquetMap = [];
+			$rBouquetMapPath = CACHE_TMP_PATH . 'bouquet_map';
+			if (file_exists($rBouquetMapPath) && 0 < filesize($rBouquetMapPath)) {
+				$rBouquetData = @igbinary_unserialize(file_get_contents($rBouquetMapPath));
+				if (is_array($rBouquetData)) {
+					$rBouquetMap = $rBouquetData;
+				}
+			}
+			$rSteps = [];
+			if (!is_null($rStart)) {
+				$rEnd = $rStart + $rCount - 1;
+				if ($this->rSplit >= ($rEnd - $rStart + 1)) {
+					$rSteps = [$rStart];
+				}
+			} else {
+				$rSteps = [null];
+			}
+			$rExists = [];
+			foreach ($rSteps as $rStep) {
+				if (!is_null($rStep)) {
+					if ($rStart + $rCount < $rStep + $this->rSplit) {
+						$rMax = ($rStart + $rCount) - $rStep;
+					} else {
+						$rMax = $this->rSplit;
+					}
+					$db->query('SELECT t1.id,t1.epg_id,t1.added,t1.allow_record,t1.year,t1.channel_id,t1.movie_properties,t1.stream_source,t1.tv_archive_server_id,t1.vframes_server_id,t1.tv_archive_duration,t1.stream_icon,t1.custom_sid,t1.category_id,t1.stream_display_name,t1.series_no,t1.direct_source,t1.direct_proxy,t2.type_output,t1.target_container,t2.live,t1.rtmp_output,t1.order,t2.type_key,t1.tmdb_id,t1.adaptive_link FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type LIMIT ' . $rStep . ', ' . $rMax . ';');
+				} else {
+					$db->query('SELECT t1.id,t1.epg_id,t1.added,t1.allow_record,t1.year,t1.channel_id,t1.movie_properties,t1.stream_source,t1.tv_archive_server_id,t1.vframes_server_id,t1.tv_archive_duration,t1.stream_icon,t1.custom_sid,t1.category_id,t1.stream_display_name,t1.series_no,t1.direct_source,t1.direct_proxy,t2.type_output,t1.target_container,t2.live,t1.rtmp_output,t1.order,t2.type_key,t1.tmdb_id,t1.adaptive_link FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type WHERE `t1`.`id` IN (' . implode(',', $cacheLockMechanism) . ');');
+				}
+				if ($db->result) {
+					if ($db->result->rowCount() > 0) {
+						$rRows = $db->result->fetchAll(\PDO::FETCH_ASSOC);
+						$rStreamMap = $rStreamIDs = [];
+						foreach ($rRows as $rRow) {
+							$rStreamIDs[] = $rRow['id'];
+						}
+						if (count($rStreamIDs) > 0) {
+							if ($db->query('SELECT `stream_id`, `server_id`, `pid`, `to_analyze`, `stream_status`, `monitor_pid`, `on_demand`, `delay_available_at`, `bitrate`, `parent_id`, `on_demand`, `stream_info`, `video_codec`, `audio_codec`, `resolution`, `compatible` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ')')) {
+								if ($db->result->rowCount() > 0) {
+									foreach ($db->result->fetchAll(\PDO::FETCH_ASSOC) as $rRow) {
+										$rStreamMap[intval($rRow['stream_id'])][intval($rRow['server_id'])] = $rRow;
+									}
+								}
+								$db->result = null;
+							}
+						}
+						foreach ($rRows as $rStreamInfo) {
+							$rExists[] = $rStreamInfo['id'];
+							if (!$rStreamInfo['direct_source']) {
+								unset($rStreamInfo['stream_source']);
+							}
+							$rOutput = ['info' => $rStreamInfo, 'bouquets' => ($rBouquetMap[intval($rStreamInfo['id'])] ?? []), 'servers' => ($rStreamMap[intval($rStreamInfo['id'])] ?? [])];
+							file_put_contents(STREAMS_TMP_PATH . 'stream_' . $rStreamInfo['id'], igbinary_serialize($rOutput));
+						}
+						unset($rRows, $rStreamMap, $rStreamIDs);
+					}
+					$db->result = null;
+				}
+			}
+			if (count($cacheLockMechanism) > 0) {
+				foreach ($cacheLockMechanism as $rForceID) {
+					if (!in_array($rForceID, $rExists) && file_exists(STREAMS_TMP_PATH . 'stream_' . $rForceID)) {
+						unlink(STREAMS_TMP_PATH . 'stream_' . $rForceID);
+					}
+				}
+			}
+		}
+	}
 
-    private function generateTheftDetection(): void {
-        global $db;
-        $rTheftDetection = [3600 => [], 86400 => [], 604800 => [], 0 => []];
-        foreach (array_keys($rTheftDetection) as $rTime) {
-            if ($rTime > 0) {
-                $db->query('SELECT `lines_activity`.`user_id`, COUNT(DISTINCT(`lines_activity`.`stream_id`)) AS `vod_count`, `lines`.`username` FROM `lines_activity` LEFT JOIN `lines` ON `lines`.`id` = `lines_activity`.`user_id` WHERE `date_start` >= ? AND `lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0 AND `lines`.`is_restreamer` = 0 AND `stream_id` IN (SELECT `id` FROM `streams` WHERE `type` IN (2,5)) GROUP BY `lines_activity`.`user_id` ORDER BY `vod_count` DESC LIMIT 1000;', time() - $rTime);
-            } else {
-                $db->query('SELECT `lines_activity`.`user_id`, COUNT(DISTINCT(`lines_activity`.`stream_id`)) AS `vod_count`, `lines`.`username` FROM `lines_activity` LEFT JOIN `lines` ON `lines`.`id` = `lines_activity`.`user_id` WHERE `lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0 AND `lines`.`is_restreamer` = 0 AND `stream_id` IN (SELECT `id` FROM `streams` WHERE `type` IN (2,5)) GROUP BY `lines_activity`.`user_id` ORDER BY `vod_count` DESC LIMIT 1000;');
-            }
-            foreach ($db->get_rows() as $rRow) {
-                $rTheftDetection[$rTime][] = $rRow;
-            }
-        }
-        file_put_contents(CACHE_TMP_PATH . 'theft_detection', igbinary_serialize($rTheftDetection));
-    }
+	private function generateSeries($rStart, $rCount): void {
+		global $db;
+		$rSeriesMap = [];
+		$rSeriesEpisodes = [];
+		if ($rCount > 0) {
+			if (is_null($rStart)) {
+				$rSteps = [null];
+			} else {
+				$rEnd = $rStart + $rCount - 1;
+				$rangeLength = $rEnd - $rStart + 1;
+				if ($this->rSplit >= $rangeLength) {
+					$rSteps = [$rStart];
+				} else {
+					$rSteps = range($rStart, $rEnd, $this->rSplit);
+				}
+			}
+			foreach ($rSteps as $rStep) {
+				if ($rStart + $rCount < $rStep + $this->rSplit) {
+					$rMax = ($rStart + $rCount) - $rStep;
+				} else {
+					$rMax = $this->rSplit;
+				}
+				$db->query('SELECT `stream_id`, `series_id`, `season_num`, `episode_num` FROM `streams_episodes` WHERE `stream_id` IN (SELECT `id` FROM `streams` WHERE `type` = 5) ORDER BY `series_id` ASC, `season_num` ASC, `episode_num` ASC LIMIT ' . $rStep . ', ' . $rMax . ';');
+				foreach ($db->get_rows() as $rRow) {
+					if ($rRow['stream_id'] && $rRow['series_id']) {
+						$rSeriesMap[intval($rRow['stream_id'])] = intval($rRow['series_id']);
+						if (!isset($rSeriesEpisodes[$rRow['series_id']])) {
+							$rSeriesEpisodes[$rRow['series_id']] = [];
+						}
+						$rSeriesEpisodes[$rRow['series_id']][$rRow['season_num']][] = ['episode_num' => $rRow['episode_num'], 'stream_id' => $rRow['stream_id']];
+					}
+				}
+			}
+		}
+		file_put_contents(SERIES_TMP_PATH . 'series_episodes_' . $rStart, igbinary_serialize($rSeriesEpisodes));
+		file_put_contents(SERIES_TMP_PATH . 'series_map_' . $rStart, igbinary_serialize($rSeriesMap));
+		unset($rSeriesMap);
+	}
 
-    public function shutdown(): void {
-        global $db;
-        if (is_object($db)) {
-            $db->close_mysql();
-        }
-    }
+	private function generateGroups(): void {
+		global $db;
+		$db->query('SELECT `group_id` FROM `users_groups`;');
+		foreach ($db->get_rows() as $rGroup) {
+			$rBouquets = $rReturn = [];
+			$db->query("SELECT * FROM `users_packages` WHERE JSON_CONTAINS(`groups`, ?, '\$');", $rGroup['group_id']);
+			foreach ($db->get_rows() as $rRow) {
+				foreach (json_decode($rRow['bouquets'], true) as $rID) {
+					if (!in_array($rID, $rBouquets)) {
+						$rBouquets[] = $rID;
+					}
+				}
+				if ($rRow['is_line']) {
+					$rReturn['create_line'] = true;
+				}
+				if ($rRow['is_mag']) {
+					$rReturn['create_mag'] = true;
+				}
+				if ($rRow['is_e2']) {
+					$rReturn['create_enigma'] = true;
+				}
+			}
+			if (count($rBouquets) > 0) {
+				$db->query('SELECT * FROM `bouquets` WHERE `id` IN (' . implode(',', array_map('intval', $rBouquets)) . ');');
+				$rSeriesIDs = [];
+				$rStreamIDs = [];
+				foreach ($db->get_rows() as $rRow) {
+					if ($rRow['bouquet_channels']) {
+						$rStreamIDs = array_merge($rStreamIDs, json_decode($rRow['bouquet_channels'], true));
+					}
+					if ($rRow['bouquet_movies']) {
+						$rStreamIDs = array_merge($rStreamIDs, json_decode($rRow['bouquet_movies'], true));
+					}
+					if ($rRow['bouquet_radios']) {
+						$rStreamIDs = array_merge($rStreamIDs, json_decode($rRow['bouquet_radios'], true));
+					}
+					foreach (json_decode($rRow['bouquet_series'], true) as $rSeriesID) {
+						$rSeriesIDs[] = $rSeriesID;
+						$db->query('SELECT `stream_id` FROM `streams_episodes` WHERE `series_id` = ?;', $rSeriesID);
+						foreach ($db->get_rows() as $rEpisode) {
+							$rStreamIDs[] = $rEpisode['stream_id'];
+						}
+					}
+				}
+				$rReturn['stream_ids'] = array_unique($rStreamIDs);
+				$rReturn['series_ids'] = array_unique($rSeriesIDs);
+				$rCategories = [];
+				if (count($rReturn['stream_ids']) > 0) {
+					$db->query('SELECT DISTINCT(`category_id`) AS `category_id` FROM `streams` WHERE `id` IN (' . implode(',', array_map('intval', $rReturn['stream_ids'])) . ');');
+					foreach ($db->get_rows() as $rRow) {
+						if ($rRow['category_id']) {
+							$rCategories = array_merge($rCategories, json_decode($rRow['category_id'], true));
+						}
+					}
+				}
+				if (count($rReturn['series_ids']) > 0) {
+					$db->query('SELECT DISTINCT(`category_id`) AS `category_id` FROM `streams_series` WHERE `id` IN (' . implode(',', array_map('intval', $rReturn['series_ids'])) . ');');
+					foreach ($db->get_rows() as $rRow) {
+						if ($rRow['category_id']) {
+							$rCategories = array_merge($rCategories, json_decode($rRow['category_id'], true));
+						}
+					}
+				}
+				$rReturn['category_ids'] = array_unique($rCategories);
+			}
+			file_put_contents(CACHE_TMP_PATH . 'permissions_' . intval($rGroup['group_id']), igbinary_serialize($rReturn));
+		}
+	}
+
+	private function generateLinesPerIP(): void {
+		global $db;
+		$rLinesPerIP = [3600 => [], 86400 => [], 604800 => [], 0 => []];
+		foreach (array_keys($rLinesPerIP) as $rTime) {
+			if ($rTime > 0) {
+				$db->query('SELECT `lines_activity`.`user_id`, COUNT(DISTINCT(`lines_activity`.`user_ip`)) AS `ip_count`, `lines`.`username` FROM `lines_activity` LEFT JOIN `lines` ON `lines`.`id` = `lines_activity`.`user_id` WHERE `date_start` >= ? AND `lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0 AND `lines`.`is_restreamer` = 0 GROUP BY `lines_activity`.`user_id` ORDER BY `ip_count` DESC LIMIT 1000;', time() - $rTime);
+			} else {
+				$db->query('SELECT `lines_activity`.`user_id`, COUNT(DISTINCT(`lines_activity`.`user_ip`)) AS `ip_count`, `lines`.`username` FROM `lines_activity` LEFT JOIN `lines` ON `lines`.`id` = `lines_activity`.`user_id` WHERE `lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0 AND `lines`.`is_restreamer` = 0 GROUP BY `lines_activity`.`user_id` ORDER BY `ip_count` DESC LIMIT 1000;');
+			}
+			foreach ($db->get_rows() as $rRow) {
+				$rLinesPerIP[$rTime][] = $rRow;
+			}
+		}
+		file_put_contents(CACHE_TMP_PATH . 'lines_per_ip', igbinary_serialize($rLinesPerIP));
+	}
+
+	private function generateTheftDetection(): void {
+		global $db;
+		$rTheftDetection = [3600 => [], 86400 => [], 604800 => [], 0 => []];
+		foreach (array_keys($rTheftDetection) as $rTime) {
+			if ($rTime > 0) {
+				$db->query('SELECT `lines_activity`.`user_id`, COUNT(DISTINCT(`lines_activity`.`stream_id`)) AS `vod_count`, `lines`.`username` FROM `lines_activity` LEFT JOIN `lines` ON `lines`.`id` = `lines_activity`.`user_id` WHERE `date_start` >= ? AND `lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0 AND `lines`.`is_restreamer` = 0 AND `stream_id` IN (SELECT `id` FROM `streams` WHERE `type` IN (2,5)) GROUP BY `lines_activity`.`user_id` ORDER BY `vod_count` DESC LIMIT 1000;', time() - $rTime);
+			} else {
+				$db->query('SELECT `lines_activity`.`user_id`, COUNT(DISTINCT(`lines_activity`.`stream_id`)) AS `vod_count`, `lines`.`username` FROM `lines_activity` LEFT JOIN `lines` ON `lines`.`id` = `lines_activity`.`user_id` WHERE `lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0 AND `lines`.`is_restreamer` = 0 AND `stream_id` IN (SELECT `id` FROM `streams` WHERE `type` IN (2,5)) GROUP BY `lines_activity`.`user_id` ORDER BY `vod_count` DESC LIMIT 1000;');
+			}
+			foreach ($db->get_rows() as $rRow) {
+				$rTheftDetection[$rTime][] = $rRow;
+			}
+		}
+		file_put_contents(CACHE_TMP_PATH . 'theft_detection', igbinary_serialize($rTheftDetection));
+	}
+
+	public function shutdown(): void {
+		global $db;
+		if (is_object($db)) {
+			$db->close_mysql();
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/CertbotCronJob.php b/src/Cli/CronJobs/CertbotCronJob.php
index bb4f79b4..0f345494 100644
--- a/src/Cli/CronJobs/CertbotCronJob.php
+++ b/src/Cli/CronJobs/CertbotCronJob.php
@@ -19,80 +19,80 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  */
 
 class CertbotCronJob implements CommandInterface {
-    use DatabaseAware;
-    use CronTrait;
+	use DatabaseAware;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:certbot';
-    }
+	public function getName(): string {
+		return 'cron:certbot';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: check/renew SSL certificates via certbot';
-    }
+	public function getDescription(): string {
+		return 'Cron: check/renew SSL certificates via certbot';
+	}
 
-    public function execute(array $rArgs): int {
-        $this->registerShutdown();
-        $rCheck = !empty($rArgs[0]);
-        $this->loadCron($rCheck);
-        return 0;
-    }
+	public function execute(array $rArgs): int {
+		$this->registerShutdown();
+		$rCheck = !empty($rArgs[0]);
+		$this->loadCron($rCheck);
+		return 0;
+	}
 
-    private function loadCron(bool $rCheck): void {
-        $db = self::db();
-        $rCertInfo = null;
+	private function loadCron(bool $rCheck): void {
+		$db = self::db();
+		$rCertInfo = null;
 
-        if (!$rCheck) {
-            if (!PHP_ERRORS) {
-                DiagnosticsService::submitPanelLogs();
-            }
-            $rCertInfo = DiagnosticsService::getCertificateInfo();
-            if (ServerRepository::getAll()[SERVER_ID]['enable_https'] && $rCertInfo) {
-                if ($rCertInfo['expiration'] - time() < 604800) {
-                    echo 'Certificate due for renewal.' . "\n";
-                    $rData = array('action' => 'certbot_generate', 'domain' => array());
-                    foreach (explode(',', ServerRepository::getAll()[SERVER_ID]['domain_name']) as $rDomain) {
-                        if (!filter_var($rDomain, FILTER_VALIDATE_IP)) {
-                            $rData['domain'][] = $rDomain;
-                        }
-                    }
-                    if (count($rData['domain']) > 0) {
-                        $db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', SERVER_ID, time(), json_encode($rData));
-                    }
-                } else {
-                    echo 'Certificate valid, not due for renewal.' . "\n";
-                }
-            }
-        }
+		if (!$rCheck) {
+			if (!PHP_ERRORS) {
+				DiagnosticsService::submitPanelLogs();
+			}
+			$rCertInfo = DiagnosticsService::getCertificateInfo();
+			if (ServerRepository::getAll()[SERVER_ID]['enable_https'] && $rCertInfo) {
+				if ($rCertInfo['expiration'] - time() < 604800) {
+					echo 'Certificate due for renewal.' . "\n";
+					$rData = ['action' => 'certbot_generate', 'domain' => []];
+					foreach (explode(',', ServerRepository::getAll()[SERVER_ID]['domain_name']) as $rDomain) {
+						if (!filter_var($rDomain, FILTER_VALIDATE_IP)) {
+							$rData['domain'][] = $rDomain;
+						}
+					}
+					if (count($rData['domain']) > 0) {
+						$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', SERVER_ID, time(), json_encode($rData));
+					}
+				} else {
+					echo 'Certificate valid, not due for renewal.' . "\n";
+				}
+			}
+		}
 
-        $db->query('SELECT `certbot_ssl` FROM `servers` WHERE `id` = ?;', SERVER_ID);
-        $rDBCertInfo = json_decode($db->get_row()['certbot_ssl'], true);
-        $rLines = explode("\n", file_get_contents(MAIN_HOME . 'bin/nginx/conf/ssl.conf'));
+		$db->query('SELECT `certbot_ssl` FROM `servers` WHERE `id` = ?;', SERVER_ID);
+		$rDBCertInfo = json_decode($db->get_row()['certbot_ssl'], true);
+		$rLines = explode("\n", file_get_contents(MAIN_HOME . 'bin/nginx/conf/ssl.conf'));
 
-        foreach ($rLines as $rLine) {
-            if (explode(' ', $rLine)[0] == 'ssl_certificate') {
-                list($rCertificate) = explode(';', explode(' ', $rLine)[1]);
-                if ($rCertificate != 'server.crt') {
-                    $rCertInfoFile = DiagnosticsService::getCertificateInfo($rCertificate);
-                    if ($rCertInfoFile && ($rCertInfo === null || $rCertInfo['serial'] != $rCertInfoFile['serial'] || !ServerRepository::getAll()[SERVER_ID]['certbot_ssl'] || $rDBCertInfo['serial'] != $rCertInfoFile['serial'])) {
-                        $db->query('UPDATE `servers` SET `certbot_ssl` = ? WHERE `id` = ?;', json_encode($rCertInfoFile), SERVER_ID);
-                        echo 'Updated ssl configuration in database' . "\n";
-                        $db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', SERVER_ID, time(), json_encode(array('action' => 'reload_nginx')));
-                    }
-                } else {
-                    if (ServerRepository::getAll()[SERVER_ID]['certbot_ssl']) {
-                        $rCertInfo = json_decode(ServerRepository::getAll()[SERVER_ID]['certbot_ssl'], true);
-                        if (file_exists($rCertInfo['path'] . '/fullchain.pem')) {
-                            $rCertificate = $rCertInfo['path'] . '/fullchain.pem';
-                            $rChain = $rCertInfo['path'] . '/chain.pem';
-                            $rPrivateKey = $rCertInfo['path'] . '/privkey.pem';
-                            $rSSLConfig = 'ssl_certificate ' . $rCertificate . ';' . "\n" . 'ssl_certificate_key ' . $rPrivateKey . ';' . "\n" . 'ssl_trusted_certificate ' . $rChain . ';' . "\n" . 'ssl_protocols TLSv1.2 TLSv1.3;' . "\n" . 'ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;' . "\n" . 'ssl_prefer_server_ciphers off;' . "\n" . 'ssl_ecdh_curve auto;' . "\n" . 'ssl_session_timeout 10m;' . "\n" . 'ssl_session_cache shared:MozSSL:10m;' . "\n" . 'ssl_session_tickets off;';
-                            file_put_contents(BIN_PATH . 'nginx/conf/ssl.conf', $rSSLConfig);
-                            echo 'Fixed ssl configuration file' . "\n";
-                            $db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', SERVER_ID, time(), json_encode(array('action' => 'reload_nginx')));
-                        }
-                    }
-                }
-            }
-        }
-    }
+		foreach ($rLines as $rLine) {
+			if (explode(' ', $rLine)[0] == 'ssl_certificate') {
+				list($rCertificate) = explode(';', explode(' ', $rLine)[1]);
+				if ($rCertificate != 'server.crt') {
+					$rCertInfoFile = DiagnosticsService::getCertificateInfo($rCertificate);
+					if ($rCertInfoFile && ($rCertInfo === null || $rCertInfo['serial'] != $rCertInfoFile['serial'] || !ServerRepository::getAll()[SERVER_ID]['certbot_ssl'] || $rDBCertInfo['serial'] != $rCertInfoFile['serial'])) {
+						$db->query('UPDATE `servers` SET `certbot_ssl` = ? WHERE `id` = ?;', json_encode($rCertInfoFile), SERVER_ID);
+						echo 'Updated ssl configuration in database' . "\n";
+						$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', SERVER_ID, time(), json_encode(['action' => 'reload_nginx']));
+					}
+				} else {
+					if (ServerRepository::getAll()[SERVER_ID]['certbot_ssl']) {
+						$rCertInfo = json_decode(ServerRepository::getAll()[SERVER_ID]['certbot_ssl'], true);
+						if (file_exists($rCertInfo['path'] . '/fullchain.pem')) {
+							$rCertificate = $rCertInfo['path'] . '/fullchain.pem';
+							$rChain = $rCertInfo['path'] . '/chain.pem';
+							$rPrivateKey = $rCertInfo['path'] . '/privkey.pem';
+							$rSSLConfig = 'ssl_certificate ' . $rCertificate . ';' . "\n" . 'ssl_certificate_key ' . $rPrivateKey . ';' . "\n" . 'ssl_trusted_certificate ' . $rChain . ';' . "\n" . 'ssl_protocols TLSv1.2 TLSv1.3;' . "\n" . 'ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;' . "\n" . 'ssl_prefer_server_ciphers off;' . "\n" . 'ssl_ecdh_curve auto;' . "\n" . 'ssl_session_timeout 10m;' . "\n" . 'ssl_session_cache shared:MozSSL:10m;' . "\n" . 'ssl_session_tickets off;';
+							file_put_contents(BIN_PATH . 'nginx/conf/ssl.conf', $rSSLConfig);
+							echo 'Fixed ssl configuration file' . "\n";
+							$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', SERVER_ID, time(), json_encode(['action' => 'reload_nginx']));
+						}
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/CleanupCronJob.php b/src/Cli/CronJobs/CleanupCronJob.php
index 501333a5..121d2802 100644
--- a/src/Cli/CronJobs/CleanupCronJob.php
+++ b/src/Cli/CronJobs/CleanupCronJob.php
@@ -22,196 +22,196 @@ use XcVm\Streaming\Codec\FFprobeRunner;
  */
 
 class CleanupCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:cleanup';
-    }
+	public function getName(): string {
+		return 'cron:cleanup';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: cleanup streams, archives, VOD, rotate tables';
-    }
+	public function getDescription(): string {
+		return 'Cron: cleanup streams, archives, VOD, rotate tables';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Cleanup]');
+		$this->initCron('XC_VM[Cleanup]');
 
-        $rTimeout = 3600;
-        set_time_limit($rTimeout);
-        ini_set('max_execution_time', $rTimeout);
+		$rTimeout = 3600;
+		set_time_limit($rTimeout);
+		ini_set('max_execution_time', $rTimeout);
 
-        $this->loadCron();
+		$this->loadCron();
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function loadCron(): void {
-        global $db;
+	private function loadCron(): void {
+		global $db;
 
-        if (intval(SettingsManager::get('cleanup')) == 1) {
-            $rStreams = array();
-            $db->query('SELECT `id` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`type` IN (1,3,4) AND `streams_servers`.`server_id` = ?;', SERVER_ID);
-            foreach ($db->get_rows() as $rRow) {
-                $rStreams[] = intval($rRow['id']);
-            }
-            foreach (glob(STREAMS_PATH . '*') as $rFilename) {
-                $rID = intval(rtrim(explode('.', basename($rFilename))[0], '_')) . "\n";
-                if (0 < $rID && !in_array($rID, $rStreams)) {
-                    echo 'Deleting: ' . $rFilename . "\n";
-                    unlink($rFilename);
-                }
-            }
-            $rArchive = array();
-            $db->query('SELECT `id`, `tv_archive_duration` FROM `streams` WHERE `type` = 1 AND `tv_archive_server_id` = ? AND `tv_archive_duration` > 0;', SERVER_ID);
-            foreach ($db->get_rows() as $rRow) {
-                $rArchive[intval($rRow['id'])] = $rRow['tv_archive_duration'];
-            }
-            date_default_timezone_set('UTC');
-            foreach (glob(ARCHIVE_PATH . '*') as $rStreamID) {
-                $rID = intval(basename($rStreamID));
-                if (0 < $rID && is_dir(ARCHIVE_PATH . $rID)) {
-                    if (!isset($rArchive[$rID])) {
-                        echo 'Deleting: ' . $rStreamID . "\n";
-                        exec('rm -rf ' . $rStreamID);
-                    } else {
-                        $rDuration = $rArchive[$rID];
-                        $rDeleteBefore = time() - $rDuration * 86400 + 3600;
-                        foreach (glob(ARCHIVE_PATH . $rID . '/*') as $rArchiveFile) {
-                            list($rDate, $rTime) = explode(':', explode('.', basename($rArchiveFile))[0]);
-                            list($rHour, $rMinute) = explode('-', $rTime);
-                            $rFileTime = strtotime($rDate . ' ' . $rHour . ':' . $rMinute . ':00');
-                            if ($rFileTime < $rDeleteBefore) {
-                                echo 'Deleting: ' . $rArchiveFile . "\n";
-                                unlink($rArchiveFile);
-                            }
-                        }
-                    }
-                }
-            }
-            $rCreated = array();
-            $db->query('SELECT `id` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`type` = 3 AND `streams_servers`.`server_id` = ?;', SERVER_ID);
-            foreach ($db->get_rows() as $rRow) {
-                $rCreated[] = intval($rRow['id']);
-            }
-            foreach (glob(CREATED_PATH . '*') as $rFilename) {
-                $rID = intval(rtrim(explode('.', basename($rFilename))[0], '_')) . "\n";
-                if (0 < $rID && !in_array($rID, $rCreated)) {
-                    echo 'Deleting: ' . $rFilename . "\n";
-                    unlink($rFilename);
-                }
-            }
-        }
+		if (intval(SettingsManager::get('cleanup')) == 1) {
+			$rStreams = [];
+			$db->query('SELECT `id` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`type` IN (1,3,4) AND `streams_servers`.`server_id` = ?;', SERVER_ID);
+			foreach ($db->get_rows() as $rRow) {
+				$rStreams[] = intval($rRow['id']);
+			}
+			foreach (glob(STREAMS_PATH . '*') as $rFilename) {
+				$rID = intval(rtrim(explode('.', basename($rFilename))[0], '_')) . "\n";
+				if (0 < $rID && !in_array($rID, $rStreams)) {
+					echo 'Deleting: ' . $rFilename . "\n";
+					unlink($rFilename);
+				}
+			}
+			$rArchive = [];
+			$db->query('SELECT `id`, `tv_archive_duration` FROM `streams` WHERE `type` = 1 AND `tv_archive_server_id` = ? AND `tv_archive_duration` > 0;', SERVER_ID);
+			foreach ($db->get_rows() as $rRow) {
+				$rArchive[intval($rRow['id'])] = $rRow['tv_archive_duration'];
+			}
+			date_default_timezone_set('UTC');
+			foreach (glob(ARCHIVE_PATH . '*') as $rStreamID) {
+				$rID = intval(basename($rStreamID));
+				if (0 < $rID && is_dir(ARCHIVE_PATH . $rID)) {
+					if (!isset($rArchive[$rID])) {
+						echo 'Deleting: ' . $rStreamID . "\n";
+						exec('rm -rf ' . $rStreamID);
+					} else {
+						$rDuration = $rArchive[$rID];
+						$rDeleteBefore = time() - $rDuration * 86400 + 3600;
+						foreach (glob(ARCHIVE_PATH . $rID . '/*') as $rArchiveFile) {
+							list($rDate, $rTime) = explode(':', explode('.', basename($rArchiveFile))[0]);
+							list($rHour, $rMinute) = explode('-', $rTime);
+							$rFileTime = strtotime($rDate . ' ' . $rHour . ':' . $rMinute . ':00');
+							if ($rFileTime < $rDeleteBefore) {
+								echo 'Deleting: ' . $rArchiveFile . "\n";
+								unlink($rArchiveFile);
+							}
+						}
+					}
+				}
+			}
+			$rCreated = [];
+			$db->query('SELECT `id` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`type` = 3 AND `streams_servers`.`server_id` = ?;', SERVER_ID);
+			foreach ($db->get_rows() as $rRow) {
+				$rCreated[] = intval($rRow['id']);
+			}
+			foreach (glob(CREATED_PATH . '*') as $rFilename) {
+				$rID = intval(rtrim(explode('.', basename($rFilename))[0], '_')) . "\n";
+				if (0 < $rID && !in_array($rID, $rCreated)) {
+					echo 'Deleting: ' . $rFilename . "\n";
+					unlink($rFilename);
+				}
+			}
+		}
 
-        if (intval(SettingsManager::get('check_vod')) == 1) {
-            $db->query('SELECT `server_stream_id`, `id`, `target_container`, `movie_properties`, `stream_status` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `server_id` = ? AND `type` IN (2,5) AND `streams`.`direct_source` = 0 AND `streams_servers`.`pid` > 0;', SERVER_ID);
-            if ($db->num_rows() > 0) {
-                $rRows = $db->get_rows();
-                foreach ($rRows as $rRow) {
-                    $rMoviePath = VOD_PATH . $rRow['id'] . '.' . $rRow['target_container'];
-                    if ($rRow['stream_status'] == 0) {
-                        if (!file_exists($rMoviePath)) {
-                            echo 'BAD MOVIE' . "\n";
-                            $db->query('UPDATE `streams_servers` SET `stream_status` = 1 WHERE `server_stream_id` = ?', $rRow['server_stream_id']);
-                            StreamProcess::updateStream($rRow['id']);
-                        }
-                    } elseif ($rRow['stream_status'] == 1) {
-                        if (file_exists($rMoviePath) && ($rFFProbee = FFprobeRunner::probeStream($rMoviePath))) {
-                            $rDuration = (isset($rFFProbee['duration']) ? $rFFProbee['duration'] : 0);
-                            sscanf($rDuration, '%d:%d:%d', $rHours, $rMinutes, $rSeconds);
-                            $rSeconds = (isset($rSeconds) ? $rHours * 3600 + $rMinutes * 60 + $rSeconds : $rHours * 60 + $rMinutes);
-                            $rSize = filesize($rMoviePath);
-                            $rBitrate = round(($rSize * 0.008) / $rSeconds);
-                            $rMovieProperties = json_decode($rRow['movie_properties'], true);
-                            if (!is_array($rMovieProperties)) {
-                                $rMovieProperties = array();
-                            }
-                            if (!(isset($rMovieProperties['duration_secs']) && $rSeconds == $rMovieProperties['duration_secs'])) {
-                                $rMovieProperties['duration_secs'] = $rSeconds;
-                                $rMovieProperties['duration'] = $rDuration;
-                            }
-                            if (!(isset($rMovieProperties['video']) && $rFFProbee['codecs']['video']['codec_name'] == $rMovieProperties['video'])) {
-                                $rMovieProperties['video'] = $rFFProbee['codecs']['video'];
-                            }
-                            if (!(isset($rMovieProperties['audio']) && $rFFProbee['codecs']['audio']['codec_name'] == $rMovieProperties['audio'])) {
-                                $rMovieProperties['audio'] = $rFFProbee['codecs']['audio'];
-                            }
-                            if (SettingsManager::get('extract_subtitles')) {
-                                if (!(isset($rMovieProperties['subtitle']) && $rFFProbee['codecs']['subtitle']['codec_name'] == $rMovieProperties['subtitle'])) {
-                                    $rMovieProperties['subtitle'] = $rFFProbee['codecs']['subtitle'];
-                                }
-                            }
-                            if (!(isset($rMovieProperties['bitrate']) && $rBitrate == $rMovieProperties['bitrate'])) {
-                                if (0 < $rBitrate) {
-                                    $rMovieProperties['bitrate'] = $rBitrate;
-                                } else {
-                                    $rBitrate = $rMovieProperties['bitrate'];
-                                }
-                            }
-                            if (isset($rFFProbee['codecs']['subtitle']) && SettingsManager::get('extract_subtitles')) {
-                                $i = 0;
-                                foreach ($rFFProbee['codecs']['subtitle'] as $rSubtitle) {
-                                    FFmpegCommand::extractSubtitle($rRow['stream_id'], $rMoviePath, $i);
-                                    $i++;
-                                }
-                            }
-                            $rCompatible = intval(DiagnosticsService::checkCompatibility($rFFProbee, SettingsManager::get('player_allow_hevc')));
-                            $rAudioCodec = ($rFFProbee['codecs']['audio']['codec_name'] ?: null);
-                            $rVideoCodec = ($rFFProbee['codecs']['video']['codec_name'] ?: null);
-                            $rResolution = ($rFFProbee['codecs']['video']['height'] ?: null);
-                            if ($rResolution) {
-                                $rResolution = StreamSorter::getNearest(array(240, 360, 480, 576, 720, 1080, 1440, 2160), $rResolution);
-                            }
-                            $db->query('UPDATE `streams` SET `movie_properties` = ? WHERE `id` = ?', json_encode($rMovieProperties, JSON_UNESCAPED_UNICODE), $rRow['id']);
-                            $db->query('UPDATE `streams_servers` SET `bitrate` = ?,`to_analyze` = 0,`stream_status` = 0,`stream_info` = ?, `audio_codec` = ?, `video_codec` = ?, `resolution` = ?, `compatible` = ? WHERE `server_stream_id` = ?', $rBitrate, json_encode($rFFProbee, JSON_UNESCAPED_UNICODE), $rAudioCodec, $rVideoCodec, $rResolution, $rCompatible, $rRow['server_stream_id']);
-                            StreamProcess::updateStream($rRow['id']);
-                            echo 'VALID MOVIE' . "\n";
-                        }
-                    }
-                }
-            }
-            $db->query("SELECT `id`, `stream_display_name`, `server_stream_id` FROM `streams` t1 INNER JOIN `streams_servers` t3 ON t3.stream_id = t1.id LEFT JOIN `profiles` t2 ON t2.profile_id = t1.transcode_profile_id WHERE t1.type = 3 AND t3.server_id = ? AND JSON_CONTAINS(t3.cchannel_rsources, t1.stream_source) AND JSON_CONTAINS(t1.stream_source, t3.cchannel_rsources) AND t3.pids_create_channel = '[]';", SERVER_ID);
-            if ($db->num_rows() > 0) {
-                $rStreams = $db->get_rows();
-                foreach ($rStreams as $rStream) {
-                    echo "\n\n" . '[*] Checking Channel ' . $rStream['stream_display_name'] . "\n";
-                    if (file_exists(CREATED_PATH . $rStream['id'] . '_.list')) {
-                        $rList = explode("\n", file_get_contents(CREATED_PATH . $rStream['id'] . '_.list'));
-                        $rExisting = glob(CREATED_PATH . $rStream['id'] . '*.*');
-                        $rFailure = false;
-                        $rActualFiles = array();
-                        foreach ($rList as $rItem) {
-                            $rFilename = trim(explode("'", explode("'", $rItem)[1])[0]);
-                            if (0 < strlen($rFilename)) {
-                                if (in_array($rFilename, $rExisting)) {
-                                    $rActualFiles[] = $rFilename;
-                                } else {
-                                    $rFailure = true;
-                                }
-                            }
-                        }
-                        if ($rFailure) {
-                            echo 'BAD CHANNEL' . "\n";
-                            $db->query('UPDATE `streams_servers` SET `cchannel_rsources` = ? WHERE `server_stream_id` = ?;', json_encode($rActualFiles, JSON_UNESCAPED_UNICODE), $rStream['server_stream_id']);
-                            StreamProcess::updateStream($rStream['id']);
-                        }
-                    } else {
-                        echo 'BAD CHANNEL' . "\n";
-                        $db->query("UPDATE `streams_servers` SET `cchannel_rsources` = '[]' WHERE `server_stream_id` = ?;", $rStream['server_stream_id']);
-                        StreamProcess::updateStream($rStream['id']);
-                    }
-                }
-            }
-        }
+		if (intval(SettingsManager::get('check_vod')) == 1) {
+			$db->query('SELECT `server_stream_id`, `id`, `target_container`, `movie_properties`, `stream_status` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `server_id` = ? AND `type` IN (2,5) AND `streams`.`direct_source` = 0 AND `streams_servers`.`pid` > 0;', SERVER_ID);
+			if ($db->num_rows() > 0) {
+				$rRows = $db->get_rows();
+				foreach ($rRows as $rRow) {
+					$rMoviePath = VOD_PATH . $rRow['id'] . '.' . $rRow['target_container'];
+					if ($rRow['stream_status'] == 0) {
+						if (!file_exists($rMoviePath)) {
+							echo 'BAD MOVIE' . "\n";
+							$db->query('UPDATE `streams_servers` SET `stream_status` = 1 WHERE `server_stream_id` = ?', $rRow['server_stream_id']);
+							StreamProcess::updateStream($rRow['id']);
+						}
+					} elseif ($rRow['stream_status'] == 1) {
+						if (file_exists($rMoviePath) && ($rFFProbee = FFprobeRunner::probeStream($rMoviePath))) {
+							$rDuration = (isset($rFFProbee['duration']) ? $rFFProbee['duration'] : 0);
+							sscanf($rDuration, '%d:%d:%d', $rHours, $rMinutes, $rSeconds);
+							$rSeconds = (isset($rSeconds) ? $rHours * 3600 + $rMinutes * 60 + $rSeconds : $rHours * 60 + $rMinutes);
+							$rSize = filesize($rMoviePath);
+							$rBitrate = round(($rSize * 0.008) / $rSeconds);
+							$rMovieProperties = json_decode($rRow['movie_properties'], true);
+							if (!is_array($rMovieProperties)) {
+								$rMovieProperties = [];
+							}
+							if (!(isset($rMovieProperties['duration_secs']) && $rSeconds == $rMovieProperties['duration_secs'])) {
+								$rMovieProperties['duration_secs'] = $rSeconds;
+								$rMovieProperties['duration'] = $rDuration;
+							}
+							if (!(isset($rMovieProperties['video']) && $rFFProbee['codecs']['video']['codec_name'] == $rMovieProperties['video'])) {
+								$rMovieProperties['video'] = $rFFProbee['codecs']['video'];
+							}
+							if (!(isset($rMovieProperties['audio']) && $rFFProbee['codecs']['audio']['codec_name'] == $rMovieProperties['audio'])) {
+								$rMovieProperties['audio'] = $rFFProbee['codecs']['audio'];
+							}
+							if (SettingsManager::get('extract_subtitles')) {
+								if (!(isset($rMovieProperties['subtitle']) && $rFFProbee['codecs']['subtitle']['codec_name'] == $rMovieProperties['subtitle'])) {
+									$rMovieProperties['subtitle'] = $rFFProbee['codecs']['subtitle'];
+								}
+							}
+							if (!(isset($rMovieProperties['bitrate']) && $rBitrate == $rMovieProperties['bitrate'])) {
+								if (0 < $rBitrate) {
+									$rMovieProperties['bitrate'] = $rBitrate;
+								} else {
+									$rBitrate = $rMovieProperties['bitrate'];
+								}
+							}
+							if (isset($rFFProbee['codecs']['subtitle']) && SettingsManager::get('extract_subtitles')) {
+								$i = 0;
+								foreach ($rFFProbee['codecs']['subtitle'] as $rSubtitle) {
+									FFmpegCommand::extractSubtitle($rRow['stream_id'], $rMoviePath, $i);
+									$i++;
+								}
+							}
+							$rCompatible = intval(DiagnosticsService::checkCompatibility($rFFProbee, SettingsManager::get('player_allow_hevc')));
+							$rAudioCodec = ($rFFProbee['codecs']['audio']['codec_name'] ?: null);
+							$rVideoCodec = ($rFFProbee['codecs']['video']['codec_name'] ?: null);
+							$rResolution = ($rFFProbee['codecs']['video']['height'] ?: null);
+							if ($rResolution) {
+								$rResolution = StreamSorter::getNearest([240, 360, 480, 576, 720, 1080, 1440, 2160], $rResolution);
+							}
+							$db->query('UPDATE `streams` SET `movie_properties` = ? WHERE `id` = ?', json_encode($rMovieProperties, JSON_UNESCAPED_UNICODE), $rRow['id']);
+							$db->query('UPDATE `streams_servers` SET `bitrate` = ?,`to_analyze` = 0,`stream_status` = 0,`stream_info` = ?, `audio_codec` = ?, `video_codec` = ?, `resolution` = ?, `compatible` = ? WHERE `server_stream_id` = ?', $rBitrate, json_encode($rFFProbee, JSON_UNESCAPED_UNICODE), $rAudioCodec, $rVideoCodec, $rResolution, $rCompatible, $rRow['server_stream_id']);
+							StreamProcess::updateStream($rRow['id']);
+							echo 'VALID MOVIE' . "\n";
+						}
+					}
+				}
+			}
+			$db->query("SELECT `id`, `stream_display_name`, `server_stream_id` FROM `streams` t1 INNER JOIN `streams_servers` t3 ON t3.stream_id = t1.id LEFT JOIN `profiles` t2 ON t2.profile_id = t1.transcode_profile_id WHERE t1.type = 3 AND t3.server_id = ? AND JSON_CONTAINS(t3.cchannel_rsources, t1.stream_source) AND JSON_CONTAINS(t1.stream_source, t3.cchannel_rsources) AND t3.pids_create_channel = '[]';", SERVER_ID);
+			if ($db->num_rows() > 0) {
+				$rStreams = $db->get_rows();
+				foreach ($rStreams as $rStream) {
+					echo "\n\n" . '[*] Checking Channel ' . $rStream['stream_display_name'] . "\n";
+					if (file_exists(CREATED_PATH . $rStream['id'] . '_.list')) {
+						$rList = explode("\n", file_get_contents(CREATED_PATH . $rStream['id'] . '_.list'));
+						$rExisting = glob(CREATED_PATH . $rStream['id'] . '*.*');
+						$rFailure = false;
+						$rActualFiles = [];
+						foreach ($rList as $rItem) {
+							$rFilename = trim(explode("'", explode("'", $rItem)[1])[0]);
+							if (0 < strlen($rFilename)) {
+								if (in_array($rFilename, $rExisting)) {
+									$rActualFiles[] = $rFilename;
+								} else {
+									$rFailure = true;
+								}
+							}
+						}
+						if ($rFailure) {
+							echo 'BAD CHANNEL' . "\n";
+							$db->query('UPDATE `streams_servers` SET `cchannel_rsources` = ? WHERE `server_stream_id` = ?;', json_encode($rActualFiles, JSON_UNESCAPED_UNICODE), $rStream['server_stream_id']);
+							StreamProcess::updateStream($rStream['id']);
+						}
+					} else {
+						echo 'BAD CHANNEL' . "\n";
+						$db->query("UPDATE `streams_servers` SET `cchannel_rsources` = '[]' WHERE `server_stream_id` = ?;", $rStream['server_stream_id']);
+						StreamProcess::updateStream($rStream['id']);
+					}
+				}
+			}
+		}
 
-        $rTables = array('lines_activity' => array('keep_activity', 'date_end'), 'lines_logs' => array('keep_client', 'date'), 'login_logs' => array('keep_login', 'date'), 'streams_errors' => array('keep_errors', 'date'), 'streams_logs' => array('keep_restarts', 'date'), 'ondemand_check' => array('on_demand_scan_keep', 'date'));
-        foreach ($rTables as $rTable => $rArray) {
-            if (SettingsManager::getAll()[$rArray[0]] && 0 < SettingsManager::getAll()[$rArray[0]]) {
-                $rDeleteBefore = time() - intval(SettingsManager::getAll()[$rArray[0]]);
-                $db->query('DELETE FROM `' . $rTable . '` WHERE `' . $rArray[1] . '` < ?;', $rDeleteBefore);
-            }
-        }
-    }
+		$rTables = ['lines_activity' => ['keep_activity', 'date_end'], 'lines_logs' => ['keep_client', 'date'], 'login_logs' => ['keep_login', 'date'], 'streams_errors' => ['keep_errors', 'date'], 'streams_logs' => ['keep_restarts', 'date'], 'ondemand_check' => ['on_demand_scan_keep', 'date']];
+		foreach ($rTables as $rTable => $rArray) {
+			if (SettingsManager::getAll()[$rArray[0]] && 0 < SettingsManager::getAll()[$rArray[0]]) {
+				$rDeleteBefore = time() - intval(SettingsManager::getAll()[$rArray[0]]);
+				$db->query('DELETE FROM `' . $rTable . '` WHERE `' . $rArray[1] . '` < ?;', $rDeleteBefore);
+			}
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/EpgCronJob.php b/src/Cli/CronJobs/EpgCronJob.php
index f6a430d1..d1262a80 100644
--- a/src/Cli/CronJobs/EpgCronJob.php
+++ b/src/Cli/CronJobs/EpgCronJob.php
@@ -19,348 +19,354 @@ use XcVm\Domain\Epg\EPG;
  */
 
 class EpgCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:epg';
-    }
+	public function getName(): string {
+		return 'cron:epg';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: import EPG data, generate XMLTV, per-stream cache';
-    }
+	public function getDescription(): string {
+		return 'Cron: import EPG data, generate XMLTV, per-stream cache';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $rEPGID = null;
-        if (!empty($rArgs[0])) {
-            $rEPGID = intval($rArgs[0]);
-        }
+		$rEPGID = null;
+		if (!empty($rArgs[0])) {
+			$rEPGID = intval($rArgs[0]);
+		}
 
-        $this->printLog("=== XC_VM[EPG] Process started ===");
-        $this->printLog("Mode: " . ($rEPGID ? "Single EPG ID: $rEPGID" : "Full update"));
+		$this->printLog("=== XC_VM[EPG] Process started ===");
+		$this->printLog("Mode: " . ($rEPGID ? "Single EPG ID: $rEPGID" : "Full update"));
 
-        set_time_limit(0);
-        ini_set('memory_limit', -1);
+		set_time_limit(0);
+		ini_set('memory_limit', -1);
 
-        shell_exec('kill -9 `ps -ef | grep \'XC_VM\\[EPG\\]\' | grep -v grep | awk \'{print $2}\'`;');
-        cli_set_process_title('XC_VM[EPG]');
+		shell_exec('kill -9 `ps -ef | grep \'XC_VM\\[EPG\\]\' | grep -v grep | awk \'{print $2}\'`;');
+		cli_set_process_title('XC_VM[EPG]');
 
-        global $db;
+		global $db;
 
-        if (SettingsManager::get('force_epg_timezone')) {
-            date_default_timezone_set('UTC');
-            $this->printLog("[SYSTEM] Forced timezone to UTC");
-        }
+		if (SettingsManager::get('force_epg_timezone')) {
+			date_default_timezone_set('UTC');
+			$this->printLog("[SYSTEM] Forced timezone to UTC");
+		}
 
-        $this->printLog("[EPG] Clearing old channel mappings...");
-        if ($rEPGID) {
-            $db->query('DELETE FROM `epg_channels` WHERE `epg_id` = ?;', $rEPGID);
-            $db->query('SELECT * FROM `epg` WHERE `id` = ?;', $rEPGID);
-        } else {
-            $db->query('TRUNCATE `epg_channels`;');
-            $db->query('SELECT * FROM `epg`;');
-        }
+		$this->printLog("[EPG] Clearing old channel mappings...");
+		if ($rEPGID) {
+			$db->query('DELETE FROM `epg_channels` WHERE `epg_id` = ?;', $rEPGID);
+			$db->query('SELECT * FROM `epg` WHERE `id` = ?;', $rEPGID);
+		} else {
+			$db->query('TRUNCATE `epg_channels`;');
+			$db->query('SELECT * FROM `epg`;');
+		}
 
-        $epgSources = $db->get_rows();
-        $this->printLog("[EPG] Found " . count($epgSources) . " EPG sources to process");
+		$epgSources = $db->get_rows();
+		$this->printLog("[EPG] Found " . count($epgSources) . " EPG sources to process");
 
-        foreach ($epgSources as $rRow) {
-            $this->printLog("[EPG] Processing source ID: {$rRow['id']} | File: {$rRow['epg_file']}");
-            $rEPG = new EPG($rRow['epg_file']);
+		foreach ($epgSources as $rRow) {
+			$this->printLog("[EPG] Processing source ID: {$rRow['id']} | File: {$rRow['epg_file']}");
+			$rEPG = new EPG($rRow['epg_file']);
 
-            if ($rEPG->rValid) {
-                $rData = $rEPG->getData();
+			if ($rEPG->rValid) {
+				$rData = $rEPG->getData();
 
-                $this->reconnectDb();
+				$this->reconnectDb();
 
-                $db->query('UPDATE `epg` SET `data` = ?, `last_updated` = ? WHERE `id` = ?', json_encode($rData, JSON_UNESCAPED_UNICODE), time(), $rRow['id']);
+				$db->query('UPDATE `epg` SET `data` = ?, `last_updated` = ? WHERE `id` = ?', json_encode($rData, JSON_UNESCAPED_UNICODE), time(), $rRow['id']);
 
-                $this->printLog("[EPG] Updated metadata for EPG ID {$rRow['id']}, found " . count($rData) . " channels");
+				$this->printLog("[EPG] Updated metadata for EPG ID {$rRow['id']}, found " . count($rData) . " channels");
 
-                foreach ($rData as $rID => $rArray) {
-                    $db->query('INSERT INTO `epg_channels`(`epg_id`, `channel_id`, `name`, `langs`) VALUES(?, ?, ?, ?);', $rRow['id'], $rID, $rArray['display_name'], json_encode($rArray['langs']));
-                }
-            } else {
-                $this->printLog("[EPG] Failed to load EPG source ID {$rRow['id']}");
-            }
-        }
+				foreach ($rData as $rID => $rArray) {
+					$db->query('INSERT INTO `epg_channels`(`epg_id`, `channel_id`, `name`, `langs`) VALUES(?, ?, ?, ?);', $rRow['id'], $rID, $rArray['display_name'], json_encode($rArray['langs']));
+				}
+			} else {
+				$this->printLog("[EPG] Failed to load EPG source ID {$rRow['id']}");
+			}
+		}
 
-        $this->printLog("[EPG] Starting full programme data import...");
+		$this->printLog("[EPG] Starting full programme data import...");
 
-        if ($rEPGID) {
-            $db->query('SELECT DISTINCT(t1.`epg_id`), t2.* FROM `streams` t1 INNER JOIN `epg` t2 ON t2.id = t1.epg_id WHERE t1.`epg_id` IS NOT NULL AND t2.id = ?;', $rEPGID);
-        } else {
-            $db->query('SELECT DISTINCT(t1.`epg_id`), t2.* FROM `streams` t1 INNER JOIN `epg` t2 ON t2.id = t1.epg_id WHERE t1.`epg_id` IS NOT NULL;');
-        }
+		if ($rEPGID) {
+			$db->query('SELECT DISTINCT(t1.`epg_id`), t2.* FROM `streams` t1 INNER JOIN `epg` t2 ON t2.id = t1.epg_id WHERE t1.`epg_id` IS NOT NULL AND t2.id = ?;', $rEPGID);
+		} else {
+			$db->query('SELECT DISTINCT(t1.`epg_id`), t2.* FROM `streams` t1 INNER JOIN `epg` t2 ON t2.id = t1.epg_id WHERE t1.`epg_id` IS NOT NULL;');
+		}
 
-        foreach ($db->get_rows() as $rData) {
-            $this->printLog("[EPG] === Processing EPG ID: {$rData['epg_id']} ===");
+		foreach ($db->get_rows() as $rData) {
+			$this->printLog("[EPG] === Processing EPG ID: {$rData['epg_id']} ===");
 
-            if ($rData['days_keep'] == 0) {
-                $this->printLog("[EPG] Clearing all existing data for EPG ID {$rData['epg_id']}");
-                $db->query('DELETE FROM `epg_data` WHERE `epg_id` = ?', $rData['epg_id']);
-            }
+			if ($rData['days_keep'] == 0) {
+				$this->printLog("[EPG] Clearing all existing data for EPG ID {$rData['epg_id']}");
+				$db->query('DELETE FROM `epg_data` WHERE `epg_id` = ?', $rData['epg_id']);
+			}
 
-            $rEPG = new EPG($rData['epg_file'], true);
-            if ($rEPG->rValid) {
-                $db->query('SELECT t1.`channel_id`, t1.`epg_lang`, t1.`epg_offset`, last_row.start 
+			$rEPG = new EPG($rData['epg_file'], true);
+			if ($rEPG->rValid) {
+				$db->query('SELECT t1.`channel_id`, t1.`epg_lang`, t1.`epg_offset`, last_row.start 
                     FROM `streams` t1 
                     LEFT JOIN (SELECT channel_id, MAX(`start`) as start FROM epg_data WHERE epg_id = ? GROUP BY channel_id) last_row 
                     ON last_row.channel_id = t1.channel_id 
                     WHERE `epg_id` = ?;', $rData['epg_id'], $rData['epg_id']);
-                $channelMap = $db->get_rows(true, 'channel_id');
+				$channelMap = $db->get_rows(true, 'channel_id');
 
-                $batches = $rEPG->parseEPG($rData['epg_id'], $channelMap, intval($rData['offset']) ?: 0);
+				$batches = $rEPG->parseEPG($rData['epg_id'], $channelMap, intval($rData['offset']) ?: 0);
 
-                $this->reconnectDb();
+				$this->reconnectDb();
 
-                if ($batches) {
-                    $totalInserted = 0;
-                    foreach ($batches as $insertBatch) {
-                        if (!empty($insertBatch)) {
-                            $db->simple_query('INSERT INTO `epg_data` (`epg_id`,`channel_id`,`start`,`end`,`lang`,`title`,`description`) VALUES ' . $insertBatch);
-                            $totalInserted += substr_count($insertBatch, '),(') + 1;
-                        }
-                    }
-                    $this->printLog("[EPG] Inserted $totalInserted programmes for EPG ID {$rData['epg_id']}");
-                } else {
-                    $this->printLog("[EPG] No new programmes found for EPG ID {$rData['epg_id']}");
-                }
+				if ($batches) {
+					$totalInserted = 0;
+					foreach ($batches as $insertBatch) {
+						if (!empty($insertBatch)) {
+							$db->simple_query('INSERT INTO `epg_data` (`epg_id`,`channel_id`,`start`,`end`,`lang`,`title`,`description`) VALUES ' . $insertBatch);
+							$totalInserted += substr_count($insertBatch, '),(') + 1;
+						}
+					}
+					$this->printLog("[EPG] Inserted $totalInserted programmes for EPG ID {$rData['epg_id']}");
+				} else {
+					$this->printLog("[EPG] No new programmes found for EPG ID {$rData['epg_id']}");
+				}
 
-                $db->query('UPDATE `epg` SET `last_updated` = ? WHERE `id` = ?', time(), $rData['epg_id']);
-            } else {
-                $this->printLog("[EPG] Failed to parse EPG file for ID {$rData['epg_id']}");
-            }
+				$db->query('UPDATE `epg` SET `last_updated` = ? WHERE `id` = ?', time(), $rData['epg_id']);
+			} else {
+				$this->printLog("[EPG] Failed to parse EPG file for ID {$rData['epg_id']}");
+			}
 
-            if ($rData['days_keep'] > 0) {
-                $cleanupTime = strtotime('-' . (int)$rData['days_keep'] . ' days');
-                if ($cleanupTime !== false) {
-                    $db->query('DELETE FROM `epg_data` WHERE `epg_id` = ? AND `start` < ?', $rData['epg_id'], $cleanupTime);
-                    echo "[EPG] Cleaned up old data (older than {$rData['days_keep']} days)\n";
-                } else {
-                    echo "[EPG] Invalid days_keep value, skipping cleanup\n";
-                }
-            }
-        }
+			if ($rData['days_keep'] > 0) {
+				$cleanupTime = strtotime('-' . (int) $rData['days_keep'] . ' days');
+				if ($cleanupTime !== false) {
+					$db->query('DELETE FROM `epg_data` WHERE `epg_id` = ? AND `start` < ?', $rData['epg_id'], $cleanupTime);
+					echo "[EPG] Cleaned up old data (older than {$rData['days_keep']} days)\n";
+				} else {
+					echo "[EPG] Invalid days_keep value, skipping cleanup\n";
+				}
+			}
+		}
 
-        $this->printLog("[EPG] Removing duplicate EPG entries...");
-        $db->query('DELETE n1 FROM `epg_data` n1, `epg_data` n2 WHERE n1.id < n2.id AND n1.epg_id = n2.epg_id AND n1.channel_id = n2.channel_id AND n1.start = n2.start;');
+		$this->printLog("[EPG] Removing duplicate EPG entries...");
+		$db->query('DELETE n1 FROM `epg_data` n1, `epg_data` n2 WHERE n1.id < n2.id AND n1.epg_id = n2.epg_id AND n1.channel_id = n2.channel_id AND n1.start = n2.start;');
 
-        $this->printLog("[EPG] Cleaning temporary XML files...");
-        shell_exec('rm -f ' . TMP_PATH . '*.xml');
+		$this->printLog("[EPG] Cleaning temporary XML files...");
+		shell_exec('rm -f ' . TMP_PATH . '*.xml');
 
-        // Marks the start of recording files. Everything that is (re)recorded in this
-        // execution will have mtime >= $runStart; cleanup at the end only removes what doesn't
-        // was played in this round (orphans of old executions). Without this, the
-        // old "time () - 10" erased the caches written at the beginning of the loop
-        // (which takes well over 10s), leaving most channels without EPG.
-        $runStart = time();
+		// Marks the start of recording files. Everything that is (re)recorded in this
+		// execution will have mtime >= $runStart; cleanup at the end only removes what doesn't
+		// was played in this round (orphans of old executions). Without this, the
+		// old "time () - 10" erased the caches written at the beginning of the loop
+		// (which takes well over 10s), leaving most channels without EPG.
+		$runStart = time();
 
-        $this->printLog("[XMLTV] Starting XMLTV generation...");
-        $ApiDependencyIdentifier = $this->getBouquetGroups();
+		$this->printLog("[XMLTV] Starting XMLTV generation...");
+		$ApiDependencyIdentifier = $this->getBouquetGroups();
 
-        $totalBouquets = count($ApiDependencyIdentifier);
-        $this->printLog("[XMLTV] Generating XMLTV for $totalBouquets bouquet(s)");
+		$totalBouquets = count($ApiDependencyIdentifier);
+		$this->printLog("[XMLTV] Generating XMLTV for $totalBouquets bouquet(s)");
 
-        foreach ($ApiDependencyIdentifier as $rBouquet => $BatchProcessId) {
-            if (!(strlen($rBouquet) > 0 && (count($BatchProcessId['streams']) > 0 || $rBouquet == 'all'))) {
-                continue;
-            }
+		foreach ($ApiDependencyIdentifier as $rBouquet => $BatchProcessId) {
+			if (!(strlen($rBouquet) > 0 && (count($BatchProcessId['streams']) > 0 || $rBouquet == 'all'))) {
+				continue;
+			}
 
-            $this->printLog("[XMLTV] Generating EPG for bouquet: " . ($rBouquet === 'all' ? 'ALL' : $rBouquet));
+			$this->printLog("[XMLTV] Generating EPG for bouquet: " . ($rBouquet === 'all' ? 'ALL' : $rBouquet));
 
-            $rOutput = '';
-            $rServerName = htmlspecialchars(SettingsManager::get('server_name'), ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
-            $rOutput .= '<?xml version="1.0" encoding="utf-8" ?><!DOCTYPE tv SYSTEM "xmltv.dtd">' . "\n";
-            $rOutput .= '<tv generator-info-name="' . $rServerName . '">' . "\n";
+			$rOutput = '';
+			$rServerName = htmlspecialchars(SettingsManager::get('server_name'), ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
+			$rOutput .= '<?xml version="1.0" encoding="utf-8" ?><!DOCTYPE tv SYSTEM "xmltv.dtd">' . "\n";
+			$rOutput .= '<tv generator-info-name="' . $rServerName . '">' . "\n";
 
-            if ($rBouquet == 'all') {
-                $db->query('SELECT `stream_display_name`,`stream_icon`,`channel_id`,`epg_id`,`tv_archive_duration` FROM `streams` WHERE `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL;');
-            } else {
-                $db->query('SELECT `stream_display_name`,`stream_icon`,`channel_id`,`epg_id`,`tv_archive_duration` FROM `streams` WHERE `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL AND `id` IN (' . implode(',', array_map('intval', $BatchProcessId['streams'])) . ');');
-            }
+			if ($rBouquet == 'all') {
+				$db->query('SELECT `stream_display_name`,`stream_icon`,`channel_id`,`epg_id`,`tv_archive_duration` FROM `streams` WHERE `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL;');
+			} else {
+				$db->query('SELECT `stream_display_name`,`stream_icon`,`channel_id`,`epg_id`,`tv_archive_duration` FROM `streams` WHERE `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL AND `id` IN (' . implode(',', array_map('intval', $BatchProcessId['streams'])) . ');');
+			}
 
-            $channels = $db->get_rows();
-            $channelCount = count($channels);
-            $this->printLog("[XMLTV] Found $channelCount channels in this bouquet");
+			$channels = $db->get_rows();
+			$channelCount = count($channels);
+			$this->printLog("[XMLTV] Found $channelCount channels in this bouquet");
 
-            $fa4629d757fa3640 = [];
-            $hasArchive = 0;
+			$fa4629d757fa3640 = [];
+			$hasArchive = 0;
 
-            foreach ($channels as $rRow) {
-                if ($rRow['tv_archive_duration'] > 0) $hasArchive++;
+			foreach ($channels as $rRow) {
+				if ($rRow['tv_archive_duration'] > 0) {
+					$hasArchive++;
+				}
 
-                $displayName = htmlspecialchars($rRow['stream_display_name'], ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
-                $icon = htmlspecialchars(ImageUtils::validateURL($rRow['stream_icon']), ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
-                $channelID = htmlspecialchars($rRow['channel_id'], ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
+				$displayName = htmlspecialchars($rRow['stream_display_name'], ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
+				$icon = htmlspecialchars(ImageUtils::validateURL($rRow['stream_icon']), ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
+				$channelID = htmlspecialchars($rRow['channel_id'], ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
 
-                $rOutput .= "\t<channel id=\"$channelID\">";
-                $rOutput .= "\t\t<display-name>$displayName</display-name>";
-                if (!empty($rRow['stream_icon'])) {
-                    $rOutput .= "\t\t<icon src=\"$icon\" />";
-                }
-                $rOutput .= "\t</channel>";
+				$rOutput .= "\t<channel id=\"$channelID\">";
+				$rOutput .= "\t\t<display-name>$displayName</display-name>";
+				if (!empty($rRow['stream_icon'])) {
+					$rOutput .= "\t\t<icon src=\"$icon\" />";
+				}
+				$rOutput .= "\t</channel>";
 
-                $fa4629d757fa3640[] = $rRow['epg_id'];
-            }
+				$fa4629d757fa3640[] = $rRow['epg_id'];
+			}
 
-            $fa4629d757fa3640 = array_unique($fa4629d757fa3640);
+			$fa4629d757fa3640 = array_unique($fa4629d757fa3640);
 
-            if (count($fa4629d757fa3640) > 0) {
-                if ($hasArchive > 0) {
-                    $this->printLog("[XMLTV] Archive channels detected ($hasArchive), including all historical programmes");
-                    $db->query('SELECT * FROM `epg_data` WHERE `epg_id` IN (' . implode(',', array_map('intval', $fa4629d757fa3640)) . ');');
-                } else {
-                    $this->printLog("[XMLTV] No archive channels, filtering only current/future programmes");
-                    $db->query('SELECT * FROM `epg_data` WHERE `epg_id` IN (' . implode(',', array_map('intval', $fa4629d757fa3640)) . ') AND `end` >= UNIX_TIMESTAMP();');
-                }
+			if (count($fa4629d757fa3640) > 0) {
+				if ($hasArchive > 0) {
+					$this->printLog("[XMLTV] Archive channels detected ($hasArchive), including all historical programmes");
+					$db->query('SELECT * FROM `epg_data` WHERE `epg_id` IN (' . implode(',', array_map('intval', $fa4629d757fa3640)) . ');');
+				} else {
+					$this->printLog("[XMLTV] No archive channels, filtering only current/future programmes");
+					$db->query('SELECT * FROM `epg_data` WHERE `epg_id` IN (' . implode(',', array_map('intval', $fa4629d757fa3640)) . ') AND `end` >= UNIX_TIMESTAMP();');
+				}
 
-                $programmes = $db->get_rows();
-                $progCount = count($programmes);
-                $this->printLog("[XMLTV] Adding $progCount programmes to XML");
+				$programmes = $db->get_rows();
+				$progCount = count($programmes);
+				$this->printLog("[XMLTV] Adding $progCount programmes to XML");
 
-                $seen = [];
-                foreach ($programmes as $rRow) {
-                    $key = $rRow['channel_id'] . '|' . $rRow['start'];
-                    if (isset($seen[$key])) continue;
-                    $seen[$key] = true;
+				$seen = [];
+				foreach ($programmes as $rRow) {
+					$key = $rRow['channel_id'] . '|' . $rRow['start'];
+					if (isset($seen[$key])) {
+						continue;
+					}
+					$seen[$key] = true;
 
-                    $rTitle = htmlspecialchars($rRow['title'] ?? '', ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
-                    $rDescription = htmlspecialchars($rRow['description'] ?? '', ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
-                    $rChannelID = htmlspecialchars($rRow['channel_id'], ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
-                    $rStart = date('YmdHis', $rRow['start']) . ' ' . str_replace(':', '', date('P', $rRow['start']));
-                    $rEnd = date('YmdHis', $rRow['end']) . ' ' . str_replace(':', '', date('P', $rRow['end']));
+					$rTitle = htmlspecialchars($rRow['title'] ?? '', ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
+					$rDescription = htmlspecialchars($rRow['description'] ?? '', ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
+					$rChannelID = htmlspecialchars($rRow['channel_id'], ENT_XML1 | ENT_QUOTES | ENT_DISALLOWED, 'UTF-8');
+					$rStart = date('YmdHis', $rRow['start']) . ' ' . str_replace(':', '', date('P', $rRow['start']));
+					$rEnd = date('YmdHis', $rRow['end']) . ' ' . str_replace(':', '', date('P', $rRow['end']));
 
-                    $rOutput .= "\t<programme start=\"$rStart\" stop=\"$rEnd\" channel=\"$rChannelID\">";
-                    $rOutput .= "\t\t<title>$rTitle</title>";
-                    $rOutput .= "\t\t<desc>$rDescription</desc>";
-                    $rOutput .= "\t</programme>";
-                }
-            }
+					$rOutput .= "\t<programme start=\"$rStart\" stop=\"$rEnd\" channel=\"$rChannelID\">";
+					$rOutput .= "\t\t<title>$rTitle</title>";
+					$rOutput .= "\t\t<desc>$rDescription</desc>";
+					$rOutput .= "\t</programme>";
+				}
+			}
 
-            $rOutput .= '</tv>';
-            $fileName = ($rBouquet == 'all' ? 'all' : md5($rBouquet));
-            $xmlPath = EPG_PATH . 'epg_' . $fileName . '.xml';
-            $gzPath  = EPG_PATH . 'epg_' . $fileName . '.xml.gz';
+			$rOutput .= '</tv>';
+			$fileName = ($rBouquet == 'all' ? 'all' : md5($rBouquet));
+			$xmlPath = EPG_PATH . 'epg_' . $fileName . '.xml';
+			$gzPath  = EPG_PATH . 'epg_' . $fileName . '.xml.gz';
 
-            file_put_contents($xmlPath, $rOutput);
-            $gz = gzopen($gzPath, 'w9');
-            gzwrite($gz, $rOutput);
-            gzclose($gz);
+			file_put_contents($xmlPath, $rOutput);
+			$gz = gzopen($gzPath, 'w9');
+			gzwrite($gz, $rOutput);
+			gzclose($gz);
 
-            $this->printLog("[XMLTV] Saved epg_$fileName.xml.gz (" . number_format(strlen($rOutput)) . " bytes)");
-        }
+			$this->printLog("[XMLTV] Saved epg_$fileName.xml.gz (" . number_format(strlen($rOutput)) . " bytes)");
+		}
 
-        $this->printLog("[CACHE] Building per-stream EPG cache...");
-        $db->query('SELECT `id`, `epg_id`, `channel_id` FROM `streams` WHERE `type` = 1 AND `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL;');
-        $streams = $db->get_rows();
-        $this->printLog("[CACHE] Caching EPG for " . count($streams) . " live streams");
+		$this->printLog("[CACHE] Building per-stream EPG cache...");
+		$db->query('SELECT `id`, `epg_id`, `channel_id` FROM `streams` WHERE `type` = 1 AND `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL;');
+		$streams = $db->get_rows();
+		$this->printLog("[CACHE] Caching EPG for " . count($streams) . " live streams");
 
-        foreach ($streams as $rRow) {
-            $rEPGData = [];
-            $seen = [];
+		foreach ($streams as $rRow) {
+			$rEPGData = [];
+			$seen = [];
 
-            $db->query('SELECT * FROM `epg_data` WHERE `epg_id` = ? AND `channel_id` = ? ORDER BY `start` ASC;', $rRow['epg_id'], $rRow['channel_id']);
-            foreach ($db->get_rows() as $prog) {
-                if (!in_array($prog['start'], $seen)) {
-                    $seen[] = $prog['start'];
-                    $rEPGData[] = $prog;
-                }
-            }
+			$db->query('SELECT * FROM `epg_data` WHERE `epg_id` = ? AND `channel_id` = ? ORDER BY `start` ASC;', $rRow['epg_id'], $rRow['channel_id']);
+			foreach ($db->get_rows() as $prog) {
+				if (!in_array($prog['start'], $seen)) {
+					$seen[] = $prog['start'];
+					$rEPGData[] = $prog;
+				}
+			}
 
-            if (count($rEPGData) > 0) {
-                file_put_contents(EPG_PATH . 'stream_' . $rRow['id'], igbinary_serialize($rEPGData));
-            }
-        }
+			if (count($rEPGData) > 0) {
+				file_put_contents(EPG_PATH . 'stream_' . $rRow['id'], igbinary_serialize($rEPGData));
+			}
+		}
 
-        $this->printLog("[CLEANUP] Removing orphan cache files...");
-        $deleted = 0;
-        clearstatcache();
-        foreach (scandir(EPG_PATH) as $rFile) {
-            if ($rFile === '.' || $rFile === '..') continue;
-            $fullPath = EPG_PATH . $rFile;
-            // Only removes files that were not rewritten in this run
-            // (mtime before the start of the Round = old execution orphan).
-            if (filemtime($fullPath) < $runStart) {
-                unlink($fullPath);
-                $deleted++;
-            }
-        }
-        $this->printLog("[CLEANUP] Deleted $deleted orphan cache files");
+		$this->printLog("[CLEANUP] Removing orphan cache files...");
+		$deleted = 0;
+		clearstatcache();
+		foreach (scandir(EPG_PATH) as $rFile) {
+			if ($rFile === '.' || $rFile === '..') {
+				continue;
+			}
+			$fullPath = EPG_PATH . $rFile;
+			// Only removes files that were not rewritten in this run
+			// (mtime before the start of the Round = old execution orphan).
+			if (filemtime($fullPath) < $runStart) {
+				unlink($fullPath);
+				$deleted++;
+			}
+		}
+		$this->printLog("[CLEANUP] Deleted $deleted orphan cache files");
 
-        $this->printLog("=== EPG processing completed successfully! ===");
+		$this->printLog("=== EPG processing completed successfully! ===");
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function printLog(string $message): void {
-        echo "[" . date('Y-m-d H:i:s') . "] " . $message . "\n";
-    }
+	private function printLog(string $message): void {
+		echo "[" . date('Y-m-d H:i:s') . "] " . $message . "\n";
+	}
 
-    private function reconnectDb(): void {
-        global $db;
-        if ($db->ping()) {
-            $this->printLog("[EPG] Database connection is alive.");
-        } else {
-            $this->printLog("[EPG] Database connection lost. Attempting to reconnect...");
-            $db->db_connect();
-            if ($db->ping()) {
-                $this->printLog("[EPG] Reconnected to the database successfully.");
-            } else {
-                $this->printLog("[EPG] Failed to reconnect to the database. Exiting.");
-                exit(1);
-            }
-        }
-    }
+	private function reconnectDb(): void {
+		global $db;
+		if ($db->ping()) {
+			$this->printLog("[EPG] Database connection is alive.");
+		} else {
+			$this->printLog("[EPG] Database connection lost. Attempting to reconnect...");
+			$db->db_connect();
+			if ($db->ping()) {
+				$this->printLog("[EPG] Reconnected to the database successfully.");
+			} else {
+				$this->printLog("[EPG] Failed to reconnect to the database. Exiting.");
+				exit(1);
+			}
+		}
+	}
 
-    private function getBouquetGroups(): array {
-        global $db;
-        $this->printLog("[XMLTV] Building bouquet groups...");
-        $db->query('SELECT DISTINCT(`bouquet`) AS `bouquet` FROM `lines`;');
-        $ApiDependencyIdentifier = [
-            'all' => [
-                'streams'  => [],
-                'bouquets' => []
-            ]
-        ];
+	private function getBouquetGroups(): array {
+		global $db;
+		$this->printLog("[XMLTV] Building bouquet groups...");
+		$db->query('SELECT DISTINCT(`bouquet`) AS `bouquet` FROM `lines`;');
+		$ApiDependencyIdentifier = [
+			'all' => [
+				'streams'  => [],
+				'bouquets' => []
+			]
+		];
 
-        foreach ($db->get_rows() as $rRow) {
-            $rBouquets = json_decode($rRow['bouquet'] ?? null, true);
+		foreach ($db->get_rows() as $rRow) {
+			$rBouquets = json_decode($rRow['bouquet'] ?? null, true);
 
-            if (!is_array($rBouquets) || empty($rBouquets)) {
-                $this->printLog("[XMLTV] Skipping invalid/empty bouquet value: " . var_export($rBouquets, true));
-                continue;
-            }
+			if (!is_array($rBouquets) || empty($rBouquets)) {
+				$this->printLog("[XMLTV] Skipping invalid/empty bouquet value: " . var_export($rBouquets, true));
+				continue;
+			}
 
-            sort($rBouquets);
-            $ApiDependencyIdentifier[implode('_', $rBouquets)] = [
-                'streams'  => [],
-                'bouquets' => $rBouquets
-            ];
-        }
-        $count = count($ApiDependencyIdentifier);
-        $this->printLog("[XMLTV] Found $count bouquet groups (including 'all')");
+			sort($rBouquets);
+			$ApiDependencyIdentifier[implode('_', $rBouquets)] = [
+				'streams'  => [],
+				'bouquets' => $rBouquets
+			];
+		}
+		$count = count($ApiDependencyIdentifier);
+		$this->printLog("[XMLTV] Found $count bouquet groups (including 'all')");
 
-        foreach ($ApiDependencyIdentifier as $rGroup => $CacheFlushInterval) {
-            $FileReference = [];
+		foreach ($ApiDependencyIdentifier as $rGroup => $CacheFlushInterval) {
+			$FileReference = [];
 
-            foreach ($CacheFlushInterval['bouquets'] as $rBouquetID) {
-                $db->query('SELECT `bouquet_channels` FROM `bouquets` WHERE `id` = ?;', $rBouquetID);
+			foreach ($CacheFlushInterval['bouquets'] as $rBouquetID) {
+				$db->query('SELECT `bouquet_channels` FROM `bouquets` WHERE `id` = ?;', $rBouquetID);
 
-                foreach ($db->get_rows() as $rRow) {
-                    $FileReference[] = $rBouquetID;
-                    $ApiDependencyIdentifier[$rGroup]['streams'] = array_merge($ApiDependencyIdentifier[$rGroup]['streams'], json_decode($rRow['bouquet_channels'], true));
-                }
+				foreach ($db->get_rows() as $rRow) {
+					$FileReference[] = $rBouquetID;
+					$ApiDependencyIdentifier[$rGroup]['streams'] = array_merge($ApiDependencyIdentifier[$rGroup]['streams'], json_decode($rRow['bouquet_channels'], true));
+				}
 
-                $ApiDependencyIdentifier[$rGroup]['streams'] = array_unique($ApiDependencyIdentifier[$rGroup]['streams']);
-            }
+				$ApiDependencyIdentifier[$rGroup]['streams'] = array_unique($ApiDependencyIdentifier[$rGroup]['streams']);
+			}
 
-            $ApiDependencyIdentifier[$rGroup]['bouquets'] = $FileReference;
-        }
+			$ApiDependencyIdentifier[$rGroup]['bouquets'] = $FileReference;
+		}
 
-        return $ApiDependencyIdentifier;
-    }
+		return $ApiDependencyIdentifier;
+	}
 }
diff --git a/src/Cli/CronJobs/ErrorsCronJob.php b/src/Cli/CronJobs/ErrorsCronJob.php
index a9678f2b..5d142864 100644
--- a/src/Cli/CronJobs/ErrorsCronJob.php
+++ b/src/Cli/CronJobs/ErrorsCronJob.php
@@ -17,183 +17,187 @@ use XcVm\Core\Config\SettingsManager;
  */
 
 class ErrorsCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:errors';
-    }
+	public function getName(): string {
+		return 'cron:errors';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: collect stream and panel errors from logs';
-    }
+	public function getDescription(): string {
+		return 'Cron: collect stream and panel errors from logs';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Errors]');
+		$this->initCron('XC_VM[Errors]');
 
-        $rIgnoreErrors = array('the user-agent option is deprecated', 'last message repeated', 'deprecated', 'packets poorly interleaved', 'invalid timestamps', 'timescale not set', 'frame size not set', 'non-monotonous dts in output stream', 'invalid dts', 'no trailing crlf', 'failed to parse extradata', 'truncated', 'missing picture', 'non-existing pps', 'clipping', 'out of range', 'cannot use rename on non file protocol', 'end of file', 'stream ends prematurely');
+		$rIgnoreErrors = ['the user-agent option is deprecated', 'last message repeated', 'deprecated', 'packets poorly interleaved', 'invalid timestamps', 'timescale not set', 'frame size not set', 'non-monotonous dts in output stream', 'invalid dts', 'no trailing crlf', 'failed to parse extradata', 'truncated', 'missing picture', 'non-existing pps', 'clipping', 'out of range', 'cannot use rename on non file protocol', 'end of file', 'stream ends prematurely'];
 
-        $this->loadCron($rIgnoreErrors);
+		$this->loadCron($rIgnoreErrors);
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function sqlValue($value, bool $isNumeric = false): string {
-        global $db;
+	private function sqlValue($value, bool $isNumeric = false): string {
+		global $db;
 
-        if ($value === null || $value === '') {
-            return 'NULL';
-        }
-        if ($isNumeric) {
-            if (!is_numeric($value)) {
-                return 'NULL';
-            }
-            return (string) ((int) $value);
-        }
-        return $db->escape($value);
-    }
+		if ($value === null || $value === '') {
+			return 'NULL';
+		}
+		if ($isNumeric) {
+			if (!is_numeric($value)) {
+				return 'NULL';
+			}
+			return (string) ((int) $value);
+		}
+		return $db->escape($value);
+	}
 
-    private function parseLog(string $logFile): string {
-        global $db;
+	private function parseLog(string $logFile): string {
+		global $db;
 
-        if (!file_exists($logFile)) {
-            return '';
-        }
+		if (!file_exists($logFile)) {
+			return '';
+		}
 
-        $fp = fopen($logFile, 'r');
-        if (!$fp) {
-            return '';
-        }
+		$fp = fopen($logFile, 'r');
+		if (!$fp) {
+			return '';
+		}
 
-        $hashes = [];
-        $query = '';
+		$hashes = [];
+		$query = '';
 
-        while (!feof($fp)) {
-            $line = trim(fgets($fp));
-            if ($line === '') continue;
+		while (!feof($fp)) {
+			$line = trim(fgets($fp));
+			if ($line === '') {
+				continue;
+			}
 
-            $row = json_decode(base64_decode($line), true);
-            if (!is_array($row)) continue;
+			$row = json_decode(base64_decode($line), true);
+			if (!is_array($row)) {
+				continue;
+			}
 
-            // Поддержка обоих форматов: legacy (log_*) и текущий (message/extra)
-            $rLogMessage = (string) ($row['log_message'] ?? ($row['message'] ?? ''));
-            $rLogExtra = (string) ($row['log_extra'] ?? ($row['extra'] ?? ''));
-            $rLogType = (string) ($row['type'] ?? 'unknown');
-            $rLogLine = (int) ($row['line'] ?? 0);
-            $rLogTime = (int) ($row['time'] ?? time());
-            $rLogFile = (string) ($row['file'] ?? '');
-            $rLogEnv = (string) ($row['env'] ?? php_sapi_name());
-            // Panel version frozen when the error occurred (Logger::log). Empty for
-            // legacy records written before the field existed.
-            $rLogVersion = (string) ($row['version'] ?? '');
-            // Prefer the origin server stamped into the record (FileLogger); fall
-            // back to this node's SERVER_ID for legacy files written before the
-            // field existed. This is what lets a panel_logs row show LB vs MAIN.
-            $rLogServerID = (isset($row['server_id']) && is_numeric($row['server_id']))
-                ? (int) $row['server_id']
-                : SERVER_ID;
+			// Поддержка обоих форматов: legacy (log_*) и текущий (message/extra)
+			$rLogMessage = (string) ($row['log_message'] ?? ($row['message'] ?? ''));
+			$rLogExtra = (string) ($row['log_extra'] ?? ($row['extra'] ?? ''));
+			$rLogType = (string) ($row['type'] ?? 'unknown');
+			$rLogLine = (int) ($row['line'] ?? 0);
+			$rLogTime = (int) ($row['time'] ?? time());
+			$rLogFile = (string) ($row['file'] ?? '');
+			$rLogEnv = (string) ($row['env'] ?? php_sapi_name());
+			// Panel version frozen when the error occurred (Logger::log). Empty for
+			// legacy records written before the field existed.
+			$rLogVersion = (string) ($row['version'] ?? '');
+			// Prefer the origin server stamped into the record (FileLogger); fall
+			// back to this node's SERVER_ID for legacy files written before the
+			// field existed. This is what lets a panel_logs row show LB vs MAIN.
+			$rLogServerID = (isset($row['server_id']) && is_numeric($row['server_id']))
+				? (int) $row['server_id']
+				: SERVER_ID;
 
-            if (
-                stripos($rLogMessage, 'server has gone away') !== false ||
-                stripos($rLogMessage, 'socket error on read socket') !== false ||
-                stripos($rLogMessage, 'connection lost') !== false
-            ) {
-                continue;
-            }
+			if (
+				stripos($rLogMessage, 'server has gone away') !== false ||
+				stripos($rLogMessage, 'socket error on read socket') !== false ||
+				stripos($rLogMessage, 'connection lost') !== false
+			) {
+				continue;
+			}
 
-            // server_id is part of the key so the SAME error from LB and MAIN keeps
-            // two distinct panel_logs rows — INSERT IGNORE on `unique` would
-            // otherwise collapse them into one and lose the per-server attribution.
-            $hash = md5(
-                $rLogServerID .
-                $rLogType .
-                $rLogMessage .
-                $rLogExtra .
-                $rLogFile .
-                $rLogLine
-            );
+			// server_id is part of the key so the SAME error from LB and MAIN keeps
+			// two distinct panel_logs rows — INSERT IGNORE on `unique` would
+			// otherwise collapse them into one and lose the per-server attribution.
+			$hash = md5(
+				$rLogServerID .
+				$rLogType .
+				$rLogMessage .
+				$rLogExtra .
+				$rLogFile .
+				$rLogLine
+			);
 
-            if (isset($hashes[$hash])) {
-                continue;
-            }
-            $hashes[$hash] = true;
+			if (isset($hashes[$hash])) {
+				continue;
+			}
+			$hashes[$hash] = true;
 
-            $query .= sprintf(
-                "(%d,%s,%s,%s,%s,%s,%s,%s,%s,%s),",
-                $rLogServerID,
-                $this->sqlValue($rLogType),
-                $this->sqlValue($rLogMessage),
-                $this->sqlValue($rLogExtra),
-                $this->sqlValue($rLogLine, true),
-                $this->sqlValue($rLogTime, true),
-                $this->sqlValue($rLogFile),
-                $this->sqlValue($rLogEnv),
-                $this->sqlValue($rLogVersion),
-                $this->sqlValue($hash)
-            );
-        }
+			$query .= sprintf(
+				"(%d,%s,%s,%s,%s,%s,%s,%s,%s,%s),",
+				$rLogServerID,
+				$this->sqlValue($rLogType),
+				$this->sqlValue($rLogMessage),
+				$this->sqlValue($rLogExtra),
+				$this->sqlValue($rLogLine, true),
+				$this->sqlValue($rLogTime, true),
+				$this->sqlValue($rLogFile),
+				$this->sqlValue($rLogEnv),
+				$this->sqlValue($rLogVersion),
+				$this->sqlValue($hash)
+			);
+		}
 
-        fclose($fp);
+		fclose($fp);
 
-        return rtrim($query, ',');
-    }
+		return rtrim($query, ',');
+	}
 
-    private function inArray(array $needles, string $haystack): bool {
-        foreach ($needles as $needle) {
-            if (stristr($haystack, $needle)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	private function inArray(array $needles, string $haystack): bool {
+		foreach ($needles as $needle) {
+			if (stristr($haystack, $needle)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    private function loadCron(array $rIgnoreErrors): void {
-        global $db;
+	private function loadCron(array $rIgnoreErrors): void {
+		global $db;
 
-        $rQuery = '';
-        foreach (array(STREAMS_PATH) as $rPath) {
-            if ($rHandle = opendir($rPath)) {
-                while (false !== ($fileEntry = readdir($rHandle))) {
-                    if ($fileEntry != '.' && $fileEntry != '..' && is_file($rPath . $fileEntry)) {
-                        $rFile = $rPath . $fileEntry;
-                        $rPathInfo = pathinfo($fileEntry);
-                        $rStreamID = (int) ($rPathInfo['filename'] ?? 0);
-                        $rExtension = $rPathInfo['extension'] ?? '';
-                        if ($rExtension == 'errors' && 0 < $rStreamID) {
-                            $rErrors = preg_split('/\r\n|\r|\n/', (string) file_get_contents($rFile));
-                            foreach ($rErrors as $rError) {
-                                $rError = trim((string) $rError);
-                                if (!(empty($rError) || $this->inArray($rIgnoreErrors, $rError))) {
-                                    if (SettingsManager::get('stream_logs_save')) {
-                                        $rQuery .= '(' . $rStreamID . ',' . SERVER_ID . ',' . time() . ',' . $db->escape($rError) . '),';
-                                    }
-                                }
-                            }
-                            unlink($rFile);
-                        }
-                    }
-                }
-                closedir($rHandle);
-            }
-        }
+		$rQuery = '';
+		foreach ([STREAMS_PATH] as $rPath) {
+			if ($rHandle = opendir($rPath)) {
+				while (false !== ($fileEntry = readdir($rHandle))) {
+					if ($fileEntry != '.' && $fileEntry != '..' && is_file($rPath . $fileEntry)) {
+						$rFile = $rPath . $fileEntry;
+						$rPathInfo = pathinfo($fileEntry);
+						$rStreamID = (int) ($rPathInfo['filename'] ?? 0);
+						$rExtension = $rPathInfo['extension'] ?? '';
+						if ($rExtension == 'errors' && 0 < $rStreamID) {
+							$rErrors = preg_split('/\r\n|\r|\n/', (string) file_get_contents($rFile));
+							foreach ($rErrors as $rError) {
+								$rError = trim((string) $rError);
+								if (!(empty($rError) || $this->inArray($rIgnoreErrors, $rError))) {
+									if (SettingsManager::get('stream_logs_save')) {
+										$rQuery .= '(' . $rStreamID . ',' . SERVER_ID . ',' . time() . ',' . $db->escape($rError) . '),';
+									}
+								}
+							}
+							unlink($rFile);
+						}
+					}
+				}
+				closedir($rHandle);
+			}
+		}
 
-        if (SettingsManager::get('stream_logs_save') && !empty($rQuery)) {
-            $rQuery = rtrim($rQuery, ',');
-            $db->query('INSERT INTO `streams_errors` (`stream_id`,`server_id`,`date`,`error`) VALUES ' . $rQuery . ';');
-        }
+		if (SettingsManager::get('stream_logs_save') && !empty($rQuery)) {
+			$rQuery = rtrim($rQuery, ',');
+			$db->query('INSERT INTO `streams_errors` (`stream_id`,`server_id`,`date`,`error`) VALUES ' . $rQuery . ';');
+		}
 
-        $rLog = LOGS_TMP_PATH . 'error_log.log';
-        if (file_exists($rLog)) {
-            $rQuery = $this->parseLog(LOGS_TMP_PATH . 'error_log.log');
-            if ($rQuery !== '') {
-                $rInserted = $db->query("INSERT IGNORE INTO panel_logs(server_id, type, log_message, log_extra, line, date, file, env, version, `unique`) VALUES {$rQuery};");
-                if ($rInserted) {
-                    unlink($rLog);
-                }
-            }
-        }
-    }
+		$rLog = LOGS_TMP_PATH . 'error_log.log';
+		if (file_exists($rLog)) {
+			$rQuery = $this->parseLog(LOGS_TMP_PATH . 'error_log.log');
+			if ($rQuery !== '') {
+				$rInserted = $db->query("INSERT IGNORE INTO panel_logs(server_id, type, log_message, log_extra, line, date, file, env, version, `unique`) VALUES {$rQuery};");
+				if ($rInserted) {
+					unlink($rLog);
+				}
+			}
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/LinesLogsCronJob.php b/src/Cli/CronJobs/LinesLogsCronJob.php
index 482df46a..a47cd683 100644
--- a/src/Cli/CronJobs/LinesLogsCronJob.php
+++ b/src/Cli/CronJobs/LinesLogsCronJob.php
@@ -17,57 +17,57 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  */
 
 class LinesLogsCronJob implements CommandInterface {
-    use DatabaseAware;
-    use CronTrait;
+	use DatabaseAware;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:lines_logs';
-    }
+	public function getName(): string {
+		return 'cron:lines_logs';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: import client request logs into DB';
-    }
+	public function getDescription(): string {
+		return 'Cron: import client request logs into DB';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Lines Logs]');
-        $this->loadCron();
+		$this->initCron('XC_VM[Lines Logs]');
+		$this->loadCron();
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function loadCron(): void {
-        $db = self::db();
+	private function loadCron(): void {
+		$db = self::db();
 
-        $rLog = LOGS_TMP_PATH . 'client_request.log';
-        if (!file_exists($rLog)) {
-            return;
-        }
+		$rLog = LOGS_TMP_PATH . 'client_request.log';
+		if (!file_exists($rLog)) {
+			return;
+		}
 
-        $rQuery = rtrim($this->parseLog($rLog), ',');
-        if (!empty($rQuery)) {
-            $db->query('INSERT INTO `lines_logs` (`stream_id`,`user_id`,`client_status`,`query_string`,`user_agent`,`ip`,`extra_data`,`date`) VALUES ' . $rQuery . ';');
-        }
-        unlink($rLog);
-    }
+		$rQuery = rtrim($this->parseLog($rLog), ',');
+		if (!empty($rQuery)) {
+			$db->query('INSERT INTO `lines_logs` (`stream_id`,`user_id`,`client_status`,`query_string`,`user_agent`,`ip`,`extra_data`,`date`) VALUES ' . $rQuery . ';');
+		}
+		unlink($rLog);
+	}
 
-    private function parseLog(string $rLog): string {
-        $db = self::db();
-        $rQuery = '';
-        $rFP = fopen($rLog, 'r');
-        while (!feof($rFP)) {
-            $rLine = trim(fgets($rFP));
-            if (!empty($rLine)) {
-                $rLine = json_decode(base64_decode($rLine), true);
-                $rLine = array_map(array($db, 'escape'), $rLine);
-                $rQuery .= '(' . $rLine['stream_id'] . ',' . $rLine['user_id'] . ',' . $rLine['action'] . ',' . $rLine['query_string'] . ',' . $rLine['user_agent'] . ',' . $rLine['user_ip'] . ',' . $rLine['extra_data'] . ',' . $rLine['time'] . '),';
-                break;
-            }
-        }
-        fclose($rFP);
-        return $rQuery;
-    }
+	private function parseLog(string $rLog): string {
+		$db = self::db();
+		$rQuery = '';
+		$rFP = fopen($rLog, 'r');
+		while (!feof($rFP)) {
+			$rLine = trim(fgets($rFP));
+			if (!empty($rLine)) {
+				$rLine = json_decode(base64_decode($rLine), true);
+				$rLine = array_map([$db, 'escape'], $rLine);
+				$rQuery .= '(' . $rLine['stream_id'] . ',' . $rLine['user_id'] . ',' . $rLine['action'] . ',' . $rLine['query_string'] . ',' . $rLine['user_agent'] . ',' . $rLine['user_ip'] . ',' . $rLine['extra_data'] . ',' . $rLine['time'] . '),';
+				break;
+			}
+		}
+		fclose($rFP);
+		return $rQuery;
+	}
 }
diff --git a/src/Cli/CronJobs/ModuleLicensesCronJob.php b/src/Cli/CronJobs/ModuleLicensesCronJob.php
index 5656889d..47a7f197 100644
--- a/src/Cli/CronJobs/ModuleLicensesCronJob.php
+++ b/src/Cli/CronJobs/ModuleLicensesCronJob.php
@@ -25,63 +25,63 @@ use XcVm\Core\Module\ModuleManager;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ModuleLicensesCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:module_licenses';
-    }
+	public function getName(): string {
+		return 'cron:module_licenses';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: renew per-machine ionCube licenses for platform modules';
-    }
+	public function getDescription(): string {
+		return 'Cron: renew per-machine ionCube licenses for platform modules';
+	}
 
-    public function execute(array $rArgs): int {
-        $this->setProcessTitle('xc_vm: module licenses');
+	public function execute(array $rArgs): int {
+		$this->setProcessTitle('xc_vm: module licenses');
 
-        // Licensing only applies when the ionCube loader + extension are present.
-        if (!function_exists('ioncube_server_data') || !class_exists('XC_VM')) {
-            echo "ionCube loader/extension not present — nothing to do.\n";
-            return 0;
-        }
+		// Licensing only applies when the ionCube loader + extension are present.
+		if (!function_exists('ioncube_server_data') || !class_exists('XC_VM')) {
+			echo "ionCube loader/extension not present — nothing to do.\n";
+			return 0;
+		}
 
-        $apiKey = (string) (SettingsManager::get('platform_api_key') ?? '');
-        if ($apiKey === '') {
-            echo "No platform API key configured — skipping.\n";
-            return 0;
-        }
+		$apiKey = (string) (SettingsManager::get('platform_api_key') ?? '');
+		if ($apiKey === '') {
+			echo "No platform API key configured — skipping.\n";
+			return 0;
+		}
 
-        $manager = new ModuleManager(container: ServiceContainer::getInstance());
+		$manager = new ModuleManager(container: ServiceContainer::getInstance());
 
-        $platform = array_filter(
-            $manager->listModules(),
-            static fn ($m) => ($m['source'] ?? '') === 'platform'
-        );
-        if (empty($platform)) {
-            echo "No platform modules installed.\n";
-            return 0;
-        }
+		$platform = array_filter(
+			$manager->listModules(),
+			static fn ($m) => ($m['source'] ?? '') === 'platform'
+		);
+		if (empty($platform)) {
+			echo "No platform modules installed.\n";
+			return 0;
+		}
 
-        $renewed = 0;
-        $skipped = 0;
-        foreach ($platform as $m) {
-            $slug = (string) ($m['name'] ?? '');
-            $dir  = (string) ($m['path'] ?? '');
+		$renewed = 0;
+		$skipped = 0;
+		foreach ($platform as $m) {
+			$slug = (string) ($m['name'] ?? '');
+			$dir  = (string) ($m['path'] ?? '');
 
-            // Only renew modules that are actually licensed (carry a .lic).
-            if ($slug === '' || $dir === '' || empty(glob($dir . '/*.lic'))) {
-                continue;
-            }
+			// Only renew modules that are actually licensed (carry a .lic).
+			if ($slug === '' || $dir === '' || empty(glob($dir . '/*.lic'))) {
+				continue;
+			}
 
-            if ($manager->renewModuleLicense($slug, $apiKey)) {
-                echo "[OK]   {$slug}: license renewed\n";
-                $renewed++;
-            } else {
-                echo "[WARN] {$slug}: not renewed (licensing off / not entitled / error)\n";
-                $skipped++;
-            }
-        }
+			if ($manager->renewModuleLicense($slug, $apiKey)) {
+				echo "[OK]   {$slug}: license renewed\n";
+				$renewed++;
+			} else {
+				echo "[WARN] {$slug}: not renewed (licensing off / not entitled / error)\n";
+				$skipped++;
+			}
+		}
 
-        echo "Done: {$renewed} renewed, {$skipped} skipped.\n";
-        return 0;
-    }
+		echo "Done: {$renewed} renewed, {$skipped} skipped.\n";
+		return 0;
+	}
 }
diff --git a/src/Cli/CronJobs/ModuleUpdatesCronJob.php b/src/Cli/CronJobs/ModuleUpdatesCronJob.php
index 44215a3f..b66077a7 100644
--- a/src/Cli/CronJobs/ModuleUpdatesCronJob.php
+++ b/src/Cli/CronJobs/ModuleUpdatesCronJob.php
@@ -29,49 +29,48 @@ use XcVm\Core\Module\ModuleUpdateChecker;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ModuleUpdatesCronJob implements CommandInterface {
+	public function getName(): string {
+		return 'cron:module_updates';
+	}
 
-    public function getName(): string {
-        return 'cron:module_updates';
-    }
+	public function getDescription(): string {
+		return 'Cron: check module update availability from their declared sources';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: check module update availability from their declared sources';
-    }
+	public function execute(array $rArgs): int {
+		register_shutdown_function(function () {
+			global $db;
+			if (is_object($db)) {
+				$db->close_mysql();
+			}
+		});
 
-    public function execute(array $rArgs): int {
-        register_shutdown_function(function () {
-            global $db;
-            if (is_object($db)) {
-                $db->close_mysql();
-            }
-        });
+		$rManager = new ModuleManager(container: ServiceContainer::getInstance());
+		$rChecker = new ModuleUpdateChecker();
 
-        $rManager = new ModuleManager(container: ServiceContainer::getInstance());
-        $rChecker = new ModuleUpdateChecker();
+		foreach ($rManager->listModules() as $rModule) {
+			// Only installed modules — the check compares against installed_version.
+			if (($rModule['installed_version'] ?? '') === '') {
+				continue;
+			}
 
-        foreach ($rManager->listModules() as $rModule) {
-            // Only installed modules — the check compares against installed_version.
-            if (($rModule['installed_version'] ?? '') === '') {
-                continue;
-            }
+			$rInstalled = (string) $rModule['installed_version'];
+			$rLatest    = $rChecker->latestAvailable($rModule);
 
-            $rInstalled = (string) $rModule['installed_version'];
-            $rLatest    = $rChecker->latestAvailable($rModule);
+			if ($rLatest !== null && version_compare($rLatest, $rInstalled, '>')) {
+				$rManager->recordAvailableVersion($rModule['name'], $rLatest);
+				echo '[UPDATE] ' . $rModule['name'] . ': ' . $rInstalled . ' -> ' . $rLatest . "\n";
+			} elseif ($rChecker->lastError() !== null) {
+				// Source unreachable (rate limit, network) — keep any previously
+				// recorded flag; clearing here would hide a real update until the
+				// next successful check.
+				echo '[SKIP] ' . $rModule['name'] . ': ' . $rChecker->lastError() . "\n";
+			} else {
+				// Nothing newer — clear any stale flag.
+				$rManager->recordAvailableVersion($rModule['name'], null);
+			}
+		}
 
-            if ($rLatest !== null && version_compare($rLatest, $rInstalled, '>')) {
-                $rManager->recordAvailableVersion($rModule['name'], $rLatest);
-                echo '[UPDATE] ' . $rModule['name'] . ': ' . $rInstalled . ' -> ' . $rLatest . "\n";
-            } elseif ($rChecker->lastError() !== null) {
-                // Source unreachable (rate limit, network) — keep any previously
-                // recorded flag; clearing here would hide a real update until the
-                // next successful check.
-                echo '[SKIP] ' . $rModule['name'] . ': ' . $rChecker->lastError() . "\n";
-            } else {
-                // Nothing newer — clear any stale flag.
-                $rManager->recordAvailableVersion($rModule['name'], null);
-            }
-        }
-
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/src/Cli/CronJobs/ProvidersCronJob.php b/src/Cli/CronJobs/ProvidersCronJob.php
index e6a9007b..681970d0 100644
--- a/src/Cli/CronJobs/ProvidersCronJob.php
+++ b/src/Cli/CronJobs/ProvidersCronJob.php
@@ -17,168 +17,182 @@ use XcVm\Domain\Stream\StreamProcess;
  */
 
 class ProvidersCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:providers';
-    }
+	public function getName(): string {
+		return 'cron:providers';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: sync providers (channels, VOD, series)';
-    }
+	public function getDescription(): string {
+		return 'Cron: sync providers (channels, VOD, series)';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Providers]');
+		$this->initCron('XC_VM[Providers]');
 
-        $rTimeout = 300;
-        set_time_limit($rTimeout);
-        ini_set('max_execution_time', $rTimeout);
+		$rTimeout = 300;
+		set_time_limit($rTimeout);
+		ini_set('max_execution_time', $rTimeout);
 
-        $rProviderID = null;
-        if (!empty($rArgs[0])) {
-            $rProviderID = intval($rArgs[0]);
-        }
+		$rProviderID = null;
+		if (!empty($rArgs[0])) {
+			$rProviderID = intval($rArgs[0]);
+		}
 
-        $this->loadCron($rProviderID);
+		$this->loadCron($rProviderID);
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function readURL(string $rURL): ?array {
-        $rContext = stream_context_create(array('http' => array('timeout' => 30)));
-        return json_decode(@file_get_contents($rURL, false, $rContext) ?: 'null', true);
-    }
+	private function readURL(string $rURL): ?array {
+		$rContext = stream_context_create(['http' => ['timeout' => 30]]);
+		return json_decode(@file_get_contents($rURL, false, $rContext) ?: 'null', true);
+	}
 
-    private function loadCron(?int $rProviderID): void {
-        global $db;
+	private function loadCron(?int $rProviderID): void {
+		global $db;
 
-        if ($rProviderID) {
-            $db->query('SELECT `id`, `stream_display_name`, `title_sync` FROM `streams` WHERE `title_sync` LIKE ?;', $rProviderID . '_%');
-        } else {
-            $db->query('SELECT `id`, `stream_display_name`, `title_sync` FROM `streams` WHERE `title_sync` IS NOT NULL;');
-        }
+		if ($rProviderID) {
+			$db->query('SELECT `id`, `stream_display_name`, `title_sync` FROM `streams` WHERE `title_sync` LIKE ?;', $rProviderID . '_%');
+		} else {
+			$db->query('SELECT `id`, `stream_display_name`, `title_sync` FROM `streams` WHERE `title_sync` IS NOT NULL;');
+		}
 
-        $rSyncTitle = array();
-        foreach ($db->get_rows() as $rRow) {
-            list($rSyncID, $rSyncStream) = array_map('intval', explode('_', $rRow['title_sync']));
-            if (!isset($rSyncTitle[$rSyncID])) {
-                $rSyncTitle[$rSyncID] = array();
-            }
-            $rSyncTitle[$rSyncID][$rSyncStream] = array($rRow['id'], $rRow['stream_display_name']);
-        }
+		$rSyncTitle = [];
+		foreach ($db->get_rows() as $rRow) {
+			list($rSyncID, $rSyncStream) = array_map('intval', explode('_', $rRow['title_sync']));
+			if (!isset($rSyncTitle[$rSyncID])) {
+				$rSyncTitle[$rSyncID] = [];
+			}
+			$rSyncTitle[$rSyncID][$rSyncStream] = [$rRow['id'], $rRow['stream_display_name']];
+		}
 
-        if ($rProviderID) {
-            $db->query('SELECT * FROM `providers` WHERE `id` = ?;', $rProviderID);
-        } else {
-            $db->query('SELECT * FROM `providers` WHERE `enabled` = 1;');
-        }
+		if ($rProviderID) {
+			$db->query('SELECT * FROM `providers` WHERE `id` = ?;', $rProviderID);
+		} else {
+			$db->query('SELECT * FROM `providers` WHERE `enabled` = 1;');
+		}
 
-        foreach ($db->get_rows() as $rRow) {
-            $rArray = array();
-            $rURL = (($rRow['ssl'] ? 'https' : 'http')) . '://' . $rRow['ip'] . ':' . $rRow['port'] . '/';
-            if ($rRow['legacy']) {
-                $rURL .= 'player_api.php?username=' . $rRow['username'] . '&password=' . $rRow['password'];
-            } else {
-                $rURL .= 'player_api/' . $rRow['username'] . '/' . $rRow['password'] . '?connections=1';
-            }
+		foreach ($db->get_rows() as $rRow) {
+			$rArray = [];
+			$rURL = (($rRow['ssl'] ? 'https' : 'http')) . '://' . $rRow['ip'] . ':' . $rRow['port'] . '/';
+			if ($rRow['legacy']) {
+				$rURL .= 'player_api.php?username=' . $rRow['username'] . '&password=' . $rRow['password'];
+			} else {
+				$rURL .= 'player_api/' . $rRow['username'] . '/' . $rRow['password'] . '?connections=1';
+			}
 
-            $rInfo = $this->readURL($rURL);
-            if ($rInfo) {
-                $rStatus = 1;
-                $rUserInfo = $rInfo['user_info'] ?? [];
-                $rArray['max_connections'] = $rUserInfo['max_connections'] ?? null;
-                $rArray['active_connections'] = $rUserInfo['active_cons'] ?? 0;
-                $rArray['exp_date'] = $rUserInfo['exp_date'] ?? null;
-            } else {
-                $rStatus = 0;
-                $rArray['exp_date'] = ($rRow['exp_date'] ?: -1);
-            }
+			$rInfo = $this->readURL($rURL);
+			if ($rInfo) {
+				$rStatus = 1;
+				$rUserInfo = $rInfo['user_info'] ?? [];
+				$rArray['max_connections'] = $rUserInfo['max_connections'] ?? null;
+				$rArray['active_connections'] = $rUserInfo['active_cons'] ?? 0;
+				$rArray['exp_date'] = $rUserInfo['exp_date'] ?? null;
+			} else {
+				$rStatus = 0;
+				$rArray['exp_date'] = ($rRow['exp_date'] ?: -1);
+			}
 
-            $rCategories = array();
-            $rCategoriesURL = $rURL . '&action=get_live_categories';
-            $rLiveCategories = $this->readURL($rCategoriesURL);
-            if (!is_array($rLiveCategories)) $rLiveCategories = [];
-            foreach ($rLiveCategories as $rCategory) {
-                if (isset($rCategory['category_id'])) { $rCategories[$rCategory['category_id']] = $rCategory['category_name'] ?? ''; }
-            }
-            $rCategoriesURL = $rURL . '&action=get_vod_categories';
-            $rVodCategories = $this->readURL($rCategoriesURL);
-            if (!is_array($rVodCategories)) $rVodCategories = [];
-            foreach ($rVodCategories as $rCategory) {
-                if (isset($rCategory['category_id'])) { $rCategories[$rCategory['category_id']] = $rCategory['category_name'] ?? ''; }
-            }
+			$rCategories = [];
+			$rCategoriesURL = $rURL . '&action=get_live_categories';
+			$rLiveCategories = $this->readURL($rCategoriesURL);
+			if (!is_array($rLiveCategories)) {
+				$rLiveCategories = [];
+			}
+			foreach ($rLiveCategories as $rCategory) {
+				if (isset($rCategory['category_id'])) {
+					$rCategories[$rCategory['category_id']] = $rCategory['category_name'] ?? '';
+				}
+			}
+			$rCategoriesURL = $rURL . '&action=get_vod_categories';
+			$rVodCategories = $this->readURL($rCategoriesURL);
+			if (!is_array($rVodCategories)) {
+				$rVodCategories = [];
+			}
+			foreach ($rVodCategories as $rCategory) {
+				if (isset($rCategory['category_id'])) {
+					$rCategories[$rCategory['category_id']] = $rCategory['category_name'] ?? '';
+				}
+			}
 
-            $rStreamsURL = $rURL . '&action=get_live_streams';
-            $rStreams = $this->readURL($rStreamsURL);
-            if (!is_array($rStreams)) $rStreams = [];
-            $rArray['streams'] = count($rStreams);
+			$rStreamsURL = $rURL . '&action=get_live_streams';
+			$rStreams = $this->readURL($rStreamsURL);
+			if (!is_array($rStreams)) {
+				$rStreams = [];
+			}
+			$rArray['streams'] = count($rStreams);
 
-            $rVODURL = $rURL . '&action=get_vod_streams';
-            $rVOD = $this->readURL($rVODURL);
-            if (!is_array($rVOD)) $rVOD = [];
-            $rArray['movies'] = count($rVOD);
+			$rVODURL = $rURL . '&action=get_vod_streams';
+			$rVOD = $this->readURL($rVODURL);
+			if (!is_array($rVOD)) {
+				$rVOD = [];
+			}
+			$rArray['movies'] = count($rVOD);
 
-            $rSeriesURL = $rURL . '&action=get_series';
-            $rSeries = $this->readURL($rSeriesURL);
-            if (!is_array($rSeries)) $rSeries = [];
-            $rArray['series'] = count($rSeries);
+			$rSeriesURL = $rURL . '&action=get_series';
+			$rSeries = $this->readURL($rSeriesURL);
+			if (!is_array($rSeries)) {
+				$rSeries = [];
+			}
+			$rArray['series'] = count($rSeries);
 
-            $rLastChanged = time();
-            $db->query('UPDATE `providers` SET `data` = ?, `last_changed` = ?, `status` = ? WHERE `id` = ?;', json_encode($rArray), $rLastChanged, $rStatus, $rRow['id']);
+			$rLastChanged = time();
+			$db->query('UPDATE `providers` SET `data` = ?, `last_changed` = ?, `status` = ? WHERE `id` = ?;', json_encode($rArray), $rLastChanged, $rStatus, $rRow['id']);
 
-            $db->query('SELECT `type`, `stream_id`, `category_id`, `stream_display_name`, `stream_icon`, `channel_id` FROM `providers_streams` WHERE `provider_id` = ?;', $rRow['id']);
-            $rNewIDs = $rExistingIDs = array();
-            foreach ($db->get_rows() as $rStream) {
-                $rExistingIDs[$rStream['stream_id']] = md5($rStream['category_id'] . '_' . (($rStream['stream_display_name'] ?: '')) . '_' . (($rStream['stream_icon'] ?: '')) . '_' . (($rStream['channel_id'] ?: '')));
-            }
+			$db->query('SELECT `type`, `stream_id`, `category_id`, `stream_display_name`, `stream_icon`, `channel_id` FROM `providers_streams` WHERE `provider_id` = ?;', $rRow['id']);
+			$rNewIDs = $rExistingIDs = [];
+			foreach ($db->get_rows() as $rStream) {
+				$rExistingIDs[$rStream['stream_id']] = md5($rStream['category_id'] . '_' . (($rStream['stream_display_name'] ?: '')) . '_' . (($rStream['stream_icon'] ?: '')) . '_' . (($rStream['channel_id'] ?: '')));
+			}
 
-            $rTime = time();
-            foreach (array('live' => $rStreams, 'movie' => $rVOD) as $rType => $rSelection) {
-                foreach ($rSelection as $rStream) {
-                    // External provider payloads may omit any of these keys.
-                    $rStream += array('stream_id' => null, 'category_id' => '', 'name' => '', 'stream_icon' => '', 'epg_channel_id' => '', 'container_extension' => '');
-                    if ($rStream['stream_id'] === null) {
-                        continue;
-                    }
-                    $rNewIDs[] = $rStream['stream_id'];
-                    $rCategoryIDs = (isset($rStream['category_ids']) ? (is_array($rStream['category_ids']) ? $rStream['category_ids'] : array()) : array($rStream['category_id']));
-                    $rCategoryArray = array();
-                    foreach ($rCategoryIDs as $rCategoryID) {
-                        // The provider may reference a category id absent from the
-                        // categories feed; default to '' instead of warning.
-                        $rCategoryArray[] = $rCategories[$rCategoryID] ?? '';
-                    }
-                    $rCategoryIDs = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
-                    if (isset($rExistingIDs[$rStream['stream_id']])) {
-                        $rUUID = $rExistingIDs[$rStream['stream_id']];
-                        if (md5($rCategoryIDs . '_' . (($rStream['name'] ?: '')) . '_' . (($rStream['stream_icon'] ?: '')) . '_' . ((($rType == 'live' ? $rStream['epg_channel_id'] : $rStream['container_extension']) ?: ''))) != $rUUID) {
-                            $db->query('UPDATE `providers_streams` SET `category_id` = ?, `category_array` = ?, `stream_display_name` = ?, `stream_icon` = ?, `channel_id` = ?, `modified` = ? WHERE `provider_id` = ? AND `stream_id` = ?;', $rCategoryIDs, json_encode($rCategoryArray), $rStream['name'], $rStream['stream_icon'], ($rType == 'live' ? $rStream['epg_channel_id'] : $rStream['container_extension']), $rTime, $rRow['id'], $rStream['stream_id']);
-                        }
-                    } else {
-                        $db->query('INSERT INTO `providers_streams`(`provider_id`, `type`, `stream_id`, `category_id`, `category_array`, `stream_display_name`, `stream_icon`, `channel_id`, `added`, `modified`) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?);', $rRow['id'], $rType, $rStream['stream_id'], $rCategoryIDs, json_encode($rCategoryArray), $rStream['name'], $rStream['stream_icon'], ($rType == 'live' ? $rStream['epg_channel_id'] : $rStream['container_extension']), $rTime, $rTime);
-                    }
-                    if ($rType == 'live' && isset($rSyncTitle[$rRow['id']][$rStream['stream_id']])) {
-                        if ($rStream['name'] != $rSyncTitle[$rRow['id']][$rStream['stream_id']][1]) {
-                            $db->query('UPDATE `streams` SET `stream_display_name` = ? WHERE `id` = ?;', $rStream['name'], $rSyncTitle[$rRow['id']][$rStream['stream_id']][0]);
-                            StreamProcess::updateStream($rSyncTitle[$rRow['id']][$rStream['stream_id']][0]);
-                        }
-                    }
-                }
-            }
+			$rTime = time();
+			foreach (['live' => $rStreams, 'movie' => $rVOD] as $rType => $rSelection) {
+				foreach ($rSelection as $rStream) {
+					// External provider payloads may omit any of these keys.
+					$rStream += ['stream_id' => null, 'category_id' => '', 'name' => '', 'stream_icon' => '', 'epg_channel_id' => '', 'container_extension' => ''];
+					if ($rStream['stream_id'] === null) {
+						continue;
+					}
+					$rNewIDs[] = $rStream['stream_id'];
+					$rCategoryIDs = (isset($rStream['category_ids']) ? (is_array($rStream['category_ids']) ? $rStream['category_ids'] : []) : [$rStream['category_id']]);
+					$rCategoryArray = [];
+					foreach ($rCategoryIDs as $rCategoryID) {
+						// The provider may reference a category id absent from the
+						// categories feed; default to '' instead of warning.
+						$rCategoryArray[] = $rCategories[$rCategoryID] ?? '';
+					}
+					$rCategoryIDs = '[' . implode(',', array_map('intval', $rCategoryIDs)) . ']';
+					if (isset($rExistingIDs[$rStream['stream_id']])) {
+						$rUUID = $rExistingIDs[$rStream['stream_id']];
+						if (md5($rCategoryIDs . '_' . (($rStream['name'] ?: '')) . '_' . (($rStream['stream_icon'] ?: '')) . '_' . ((($rType == 'live' ? $rStream['epg_channel_id'] : $rStream['container_extension']) ?: ''))) != $rUUID) {
+							$db->query('UPDATE `providers_streams` SET `category_id` = ?, `category_array` = ?, `stream_display_name` = ?, `stream_icon` = ?, `channel_id` = ?, `modified` = ? WHERE `provider_id` = ? AND `stream_id` = ?;', $rCategoryIDs, json_encode($rCategoryArray), $rStream['name'], $rStream['stream_icon'], ($rType == 'live' ? $rStream['epg_channel_id'] : $rStream['container_extension']), $rTime, $rRow['id'], $rStream['stream_id']);
+						}
+					} else {
+						$db->query('INSERT INTO `providers_streams`(`provider_id`, `type`, `stream_id`, `category_id`, `category_array`, `stream_display_name`, `stream_icon`, `channel_id`, `added`, `modified`) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?);', $rRow['id'], $rType, $rStream['stream_id'], $rCategoryIDs, json_encode($rCategoryArray), $rStream['name'], $rStream['stream_icon'], ($rType == 'live' ? $rStream['epg_channel_id'] : $rStream['container_extension']), $rTime, $rTime);
+					}
+					if ($rType == 'live' && isset($rSyncTitle[$rRow['id']][$rStream['stream_id']])) {
+						if ($rStream['name'] != $rSyncTitle[$rRow['id']][$rStream['stream_id']][1]) {
+							$db->query('UPDATE `streams` SET `stream_display_name` = ? WHERE `id` = ?;', $rStream['name'], $rSyncTitle[$rRow['id']][$rStream['stream_id']][0]);
+							StreamProcess::updateStream($rSyncTitle[$rRow['id']][$rStream['stream_id']][0]);
+						}
+					}
+				}
+			}
 
-            $rDelete = array();
-            foreach (array_keys($rExistingIDs) as $rStreamID) {
-                if (!in_array($rStreamID, $rNewIDs)) {
-                    $rDelete[] = $rStreamID;
-                }
-            }
-            if (count($rDelete) > 0) {
-                $db->query('DELETE FROM `providers_streams` WHERE `provider_id` = ? AND `stream_id` IN (' . implode(',', array_map('intval', $rDelete)) . ');', $rRow['id']);
-            }
-        }
-    }
+			$rDelete = [];
+			foreach (array_keys($rExistingIDs) as $rStreamID) {
+				if (!in_array($rStreamID, $rNewIDs)) {
+					$rDelete[] = $rStreamID;
+				}
+			}
+			if (count($rDelete) > 0) {
+				$db->query('DELETE FROM `providers_streams` WHERE `provider_id` = ? AND `stream_id` IN (' . implode(',', array_map('intval', $rDelete)) . ');', $rRow['id']);
+			}
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/RootMysqlCronJob.php b/src/Cli/CronJobs/RootMysqlCronJob.php
index 119cf4e1..069eefcf 100644
--- a/src/Cli/CronJobs/RootMysqlCronJob.php
+++ b/src/Cli/CronJobs/RootMysqlCronJob.php
@@ -19,161 +19,161 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class RootMysqlCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:root_mysql';
-    }
+	public function getName(): string {
+		return 'cron:root_mysql';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: monitor MariaDB, parse syslog, block bruteforce (root)';
-    }
+	public function getDescription(): string {
+		return 'Cron: monitor MariaDB, parse syslog, block bruteforce (root)';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsRoot()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsRoot()) {
+			return 1;
+		}
 
-        if (!$this->checkMariaDB()) {
-            return 1;
-        }
+		if (!$this->checkMariaDB()) {
+			return 1;
+		}
 
-        global $db;
+		global $db;
 
-        $this->setProcessTitle('XC_VM[MysqlErrors]');
-        $this->acquireCronLock();
+		$this->setProcessTitle('XC_VM[MysqlErrors]');
+		$this->acquireCronLock();
 
-        $rIgnoreErrors = array('innodb: page_cleaner', 'aborted connection', 'got an error reading communication packets', 'got packets out of order', 'got timeout reading communication packets');
+		$rIgnoreErrors = ['innodb: page_cleaner', 'aborted connection', 'got an error reading communication packets', 'got packets out of order', 'got timeout reading communication packets'];
 
-        if (SettingsManager::get('mysql_sleep_kill') > 0) {
-            $db->query("SELECT `id` FROM `INFORMATION_SCHEMA`.`PROCESSLIST` WHERE `COMMAND` = 'Sleep' AND `TIME` > ?;", intval(SettingsManager::get('mysql_sleep_kill')));
-            foreach ($db->get_rows() as $rRow) {
-                $db->query('KILL ?;', $rRow['id']);
-            }
-        }
+		if (SettingsManager::get('mysql_sleep_kill') > 0) {
+			$db->query("SELECT `id` FROM `INFORMATION_SCHEMA`.`PROCESSLIST` WHERE `COMMAND` = 'Sleep' AND `TIME` > ?;", intval(SettingsManager::get('mysql_sleep_kill')));
+			foreach ($db->get_rows() as $rRow) {
+				$db->query('KILL ?;', $rRow['id']);
+			}
+		}
 
-        $db->query('SELECT MAX(`date`) AS `date` FROM `mysql_syslog`;');
-        $rMaxTime = intval($db->get_row()['date']);
+		$db->query('SELECT MAX(`date`) AS `date` FROM `mysql_syslog`;');
+		$rMaxTime = intval($db->get_row()['date']);
 
-        $rMaxAttempts = 10;
-        $rAttempts = array();
+		$rMaxAttempts = 10;
+		$rAttempts = [];
 
-        $db->query("SELECT `mysql_syslog`.`ip`, COUNT(`mysql_syslog`.`id`) AS `count`, `blocked_ips`.`id` AS `block_id` FROM `mysql_syslog` LEFT JOIN `blocked_ips` ON `blocked_ips`.`ip` = `mysql_syslog`.`ip` WHERE `type` = 'AUTH' AND `mysql_syslog`.`date` > UNIX_TIMESTAMP() - 86400 GROUP BY `mysql_syslog`.`ip`;");
-        foreach ($db->get_rows() as $rRow) {
-            $rAttempts[$rRow['ip']] = $rRow['count'];
-            if ($rMaxAttempts < $rRow['count'] && !$rRow['block_id']) {
-                if (!in_array($rRow['ip'], ServerRepository::getAllowedIPs())) {
-                    echo 'Blocking IP ' . $rRow['ip'] . "\n";
-                    BlocklistService::blockIP(array('ip' => $rRow['ip'], 'notes' => 'MYSQL BRUTEFORCE ATTACK'));
-                }
-            }
-        }
-        
-        // Fast-path: skip expensive syslog tail/grep when file size has not changed.
-        $rSyslogMarker = CRONS_TMP_PATH . 'mysql_syslog_size';
-        $rCurrentSize = @filesize('/var/log/syslog') ?: 0;
-        $rLastSize = file_exists($rSyslogMarker) ? intval(@file_get_contents($rSyslogMarker)) : -1;
+		$db->query("SELECT `mysql_syslog`.`ip`, COUNT(`mysql_syslog`.`id`) AS `count`, `blocked_ips`.`id` AS `block_id` FROM `mysql_syslog` LEFT JOIN `blocked_ips` ON `blocked_ips`.`ip` = `mysql_syslog`.`ip` WHERE `type` = 'AUTH' AND `mysql_syslog`.`date` > UNIX_TIMESTAMP() - 86400 GROUP BY `mysql_syslog`.`ip`;");
+		foreach ($db->get_rows() as $rRow) {
+			$rAttempts[$rRow['ip']] = $rRow['count'];
+			if ($rMaxAttempts < $rRow['count'] && !$rRow['block_id']) {
+				if (!in_array($rRow['ip'], ServerRepository::getAllowedIPs())) {
+					echo 'Blocking IP ' . $rRow['ip'] . "\n";
+					BlocklistService::blockIP(['ip' => $rRow['ip'], 'notes' => 'MYSQL BRUTEFORCE ATTACK']);
+				}
+			}
+		}
 
-        if ($rCurrentSize === $rLastSize) {
-            @unlink($this->rIdentifier);
-            return 0;
-        }
+		// Fast-path: skip expensive syslog tail/grep when file size has not changed.
+		$rSyslogMarker = CRONS_TMP_PATH . 'mysql_syslog_size';
+		$rCurrentSize = @filesize('/var/log/syslog') ?: 0;
+		$rLastSize = file_exists($rSyslogMarker) ? intval(@file_get_contents($rSyslogMarker)) : -1;
 
-        @file_put_contents($rSyslogMarker, $rCurrentSize);
-        exec('sudo tail -n 1000 /var/log/syslog | grep mysqld', $rOutput, $rRetVal);
-        foreach ($rOutput as $rError) {
-            $rMySQLDParts = explode('mysqld[', $rError, 2);
-            if (count($rMySQLDParts) < 2) {
-                continue;
-            }
+		if ($rCurrentSize === $rLastSize) {
+			@unlink($this->rIdentifier);
+			return 0;
+		}
 
-            $rErrorParts = explode(']:', $rMySQLDParts[1], 2);
-            if (count($rErrorParts) < 2) {
-                continue;
-            }
+		@file_put_contents($rSyslogMarker, $rCurrentSize);
+		exec('sudo tail -n 1000 /var/log/syslog | grep mysqld', $rOutput, $rRetVal);
+		foreach ($rOutput as $rError) {
+			$rMySQLDParts = explode('mysqld[', $rError, 2);
+			if (count($rMySQLDParts) < 2) {
+				continue;
+			}
 
-            $rStrip = trim($rErrorParts[1]);
-            $rTime = strtotime(substr($rStrip, 0, 19));
+			$rErrorParts = explode(']:', $rMySQLDParts[1], 2);
+			if (count($rErrorParts) < 2) {
+				continue;
+			}
 
-            if ($rMaxTime >= $rTime) {
-                continue;
-            }
+			$rStrip = trim($rErrorParts[1]);
+			$rTime = strtotime(substr($rStrip, 0, 19));
 
-            if (empty($rStrip) || $this->inArray($rIgnoreErrors, $rStrip)) {
-                continue;
-            }
+			if ($rMaxTime >= $rTime) {
+				continue;
+			}
 
-            $rNote = null;
-            $rType = null;
+			if (empty($rStrip) || $this->inArray($rIgnoreErrors, $rStrip)) {
+				continue;
+			}
 
-            if (stripos($rStrip, '[Note]') !== false) {
-                $rNote = trim(explode('[Note]', $rStrip)[1]);
-                $rType = 'NOTICE';
-            } elseif (stripos($rStrip, '[Warning]') !== false) {
-                $rNote = trim(explode('[Warning]', $rStrip)[1]);
-                $rType = 'WARNING';
-            } elseif (stripos($rStrip, '[Error]') !== false) {
-                $rNote = trim(explode('[Error]', $rStrip)[1]);
-                $rType = 'ERROR';
-            }
+			$rNote = null;
+			$rType = null;
 
-            if (!$rNote) {
-                continue;
-            }
+			if (stripos($rStrip, '[Note]') !== false) {
+				$rNote = trim(explode('[Note]', $rStrip)[1]);
+				$rType = 'NOTICE';
+			} elseif (stripos($rStrip, '[Warning]') !== false) {
+				$rNote = trim(explode('[Warning]', $rStrip)[1]);
+				$rType = 'WARNING';
+			} elseif (stripos($rStrip, '[Error]') !== false) {
+				$rNote = trim(explode('[Error]', $rStrip)[1]);
+				$rType = 'ERROR';
+			}
 
-            $rUsername = null;
-            $rHost = null;
-            $rDatabase = null;
+			if (!$rNote) {
+				continue;
+			}
 
-            if (stripos($rNote, 'access denied for user') !== false) {
-                $rUsername = trim(explode("'", explode("user '", $rNote)[1])[0]);
-                $rHost = trim(explode("'", explode("user '", $rNote)[1])[2]);
-                $rType = 'AUTH';
-            }
+			$rUsername = null;
+			$rHost = null;
+			$rDatabase = null;
 
-            if (stripos($rNote, 'user:') !== false) {
-                $rUsername = trim(explode("'", explode("user: '", $rNote)[1])[0]);
-                $rHost = trim(explode("'", explode("host: '", $rNote)[1])[0]);
-                $rDatabase = trim(explode("'", explode("db: '", $rNote)[1])[0]);
-                $rType = 'ABORTED';
-            }
+			if (stripos($rNote, 'access denied for user') !== false) {
+				$rUsername = trim(explode("'", explode("user '", $rNote)[1])[0]);
+				$rHost = trim(explode("'", explode("user '", $rNote)[1])[2]);
+				$rType = 'AUTH';
+			}
 
-            $db->query('INSERT INTO `mysql_syslog`(`type`,`error`,`username`,`ip`,`database`,`date`) VALUES(?,?,?,?,?,?)', $rType, $rNote, $rUsername, $rHost, $rDatabase, $rTime);
-        }
+			if (stripos($rNote, 'user:') !== false) {
+				$rUsername = trim(explode("'", explode("user: '", $rNote)[1])[0]);
+				$rHost = trim(explode("'", explode("host: '", $rNote)[1])[0]);
+				$rDatabase = trim(explode("'", explode("db: '", $rNote)[1])[0]);
+				$rType = 'ABORTED';
+			}
 
-        @unlink($this->rIdentifier);
+			$db->query('INSERT INTO `mysql_syslog`(`type`,`error`,`username`,`ip`,`database`,`date`) VALUES(?,?,?,?,?,?)', $rType, $rNote, $rUsername, $rHost, $rDatabase, $rTime);
+		}
 
-        return 0;
-    }
+		@unlink($this->rIdentifier);
 
-    private function inArray(array $needles, string $haystack): bool {
-        foreach ($needles as $needle) {
-            if (stristr($haystack, $needle)) {
-                return true;
-            }
-        }
-        return false;
-    }
+		return 0;
+	}
 
-    private function checkMariaDB(): bool {
-        exec('systemctl is-active mariadb 2>/dev/null', $out, $code);
-        $isActive = isset($out[0]) && trim($out[0]) === 'active';
+	private function inArray(array $needles, string $haystack): bool {
+		foreach ($needles as $needle) {
+			if (stristr($haystack, $needle)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-        if (!$isActive) {
-            echo "[MYSQL] MariaDB is DOWN, restarting...\n";
-            exec('systemctl restart mariadb 2>&1', $restartOut, $restartCode);
-            sleep(3);
+	private function checkMariaDB(): bool {
+		exec('systemctl is-active mariadb 2>/dev/null', $out, $code);
+		$isActive = isset($out[0]) && trim($out[0]) === 'active';
 
-            exec('systemctl is-active mariadb 2>/dev/null', $checkOut);
-            if (isset($checkOut[0]) && trim($checkOut[0]) === 'active') {
-                echo "[MYSQL] MariaDB successfully restarted\n";
-                return true;
-            } else {
-                echo "[MYSQL] FAILED to restart MariaDB\n";
-                return false;
-            }
-        }
+		if (!$isActive) {
+			echo "[MYSQL] MariaDB is DOWN, restarting...\n";
+			exec('systemctl restart mariadb 2>&1', $restartOut, $restartCode);
+			sleep(3);
 
-        return true;
-    }
+			exec('systemctl is-active mariadb 2>/dev/null', $checkOut);
+			if (isset($checkOut[0]) && trim($checkOut[0]) === 'active') {
+				echo "[MYSQL] MariaDB successfully restarted\n";
+				return true;
+			} else {
+				echo "[MYSQL] FAILED to restart MariaDB\n";
+				return false;
+			}
+		}
+
+		return true;
+	}
 }
diff --git a/src/Cli/CronJobs/RootSignalsCronJob.php b/src/Cli/CronJobs/RootSignalsCronJob.php
index 994432a9..60a6185b 100644
--- a/src/Cli/CronJobs/RootSignalsCronJob.php
+++ b/src/Cli/CronJobs/RootSignalsCronJob.php
@@ -20,713 +20,712 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class RootSignalsCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    private $rSaveIPTables = false;
-    private $AutoUpdateServerIP = true;
+	private $rSaveIPTables = false;
 
-    public function getName(): string {
-        return 'cron:root_signals';
-    }
+	private $AutoUpdateServerIP = true;
 
-    public function getDescription(): string {
-        return 'Cron: process signals, iptables, nginx, service management (root)';
-    }
+	public function getName(): string {
+		return 'cron:root_signals';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsRoot()) {
-            return 1;
-        }
+	public function getDescription(): string {
+		return 'Cron: process signals, iptables, nginx, service management (root)';
+	}
 
-        set_time_limit(0);
-        register_shutdown_function([$this, 'shutdown']);
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsRoot()) {
+			return 1;
+		}
 
-        $this->rIdentifier = CRONS_TMP_PATH . md5(Encryption::generateUniqueCode(SettingsManager::get('live_streaming_pass')) . static::class);
-        ProcessManager::acquireCronLock($this->rIdentifier);
+		set_time_limit(0);
+		register_shutdown_function([$this, 'shutdown']);
 
-        $pids = shell_exec("pgrep -f 'XC_VM\[Signals\]'");
-        if (!empty($pids)) {
-            shell_exec("sudo kill -9 $pids");
-        }
-        cli_set_process_title('XC_VM[Signals]');
-        file_put_contents(CONFIG_PATH . 'signals.last', time());
+		$this->rIdentifier = CRONS_TMP_PATH . md5(Encryption::generateUniqueCode(SettingsManager::get('live_streaming_pass')) . static::class);
+		ProcessManager::acquireCronLock($this->rIdentifier);
 
-        $this->loadCron();
+		$pids = shell_exec("pgrep -f 'XC_VM\[Signals\]'");
+		if (!empty($pids)) {
+			shell_exec("sudo kill -9 $pids");
+		}
+		cli_set_process_title('XC_VM[Signals]');
+		file_put_contents(CONFIG_PATH . 'signals.last', time());
 
-        return 0;
-    }
+		$this->loadCron();
 
-    private function blockip($rIP): bool {
-        $isPrivate = false;
+		return 0;
+	}
 
-        if (filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            $isPrivate = filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
-            $isPrivate = !$isPrivate;
+	private function blockip($rIP): bool {
+		$isPrivate = false;
 
-            if (!$isPrivate) {
-                $isPrivate = (strpos($rIP, '127.') === 0) || ($rIP === '0.0.0.0');
-            }
+		if (filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+			$isPrivate = filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
+			$isPrivate = !$isPrivate;
 
-            if (!$isPrivate) {
-                exec('sudo iptables -I INPUT -s ' . escapeshellcmd($rIP) . ' -j DROP');
-            }
-        } elseif (filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            $isPrivate = (
-                strpos($rIP, 'fc') === 0 ||
-                strpos($rIP, 'fd') === 0 ||
-                strpos($rIP, 'fe80') === 0 ||
-                $rIP === '::1' ||
-                strpos($rIP, '2001:db8') === 0
-            );
+			if (!$isPrivate) {
+				$isPrivate = (strpos($rIP, '127.') === 0) || ($rIP === '0.0.0.0');
+			}
 
-            if (!$isPrivate) {
-                exec('sudo ip6tables -I INPUT -s ' . escapeshellcmd($rIP) . ' -j DROP');
-            }
-        }
+			if (!$isPrivate) {
+				exec('sudo iptables -I INPUT -s ' . escapeshellcmd($rIP) . ' -j DROP');
+			}
+		} elseif (filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+			$isPrivate = (strpos($rIP, 'fc') === 0 ||
+				strpos($rIP, 'fd') === 0 ||
+				strpos($rIP, 'fe80') === 0 ||
+				$rIP === '::1' ||
+				strpos($rIP, '2001:db8') === 0);
 
-        if (!$isPrivate && $rIP) {
-            touch(FLOOD_TMP_PATH . 'block_' . $rIP);
-            return true;
-        } elseif ($isPrivate) {
-            error_log("Block attempt denied for private IP: " . $rIP);
-            return false;
-        }
+			if (!$isPrivate) {
+				exec('sudo ip6tables -I INPUT -s ' . escapeshellcmd($rIP) . ' -j DROP');
+			}
+		}
 
-        return false;
-    }
+		if (!$isPrivate && $rIP) {
+			touch(FLOOD_TMP_PATH . 'block_' . $rIP);
+			return true;
+		} elseif ($isPrivate) {
+			error_log("Block attempt denied for private IP: " . $rIP);
+			return false;
+		}
 
-    private function unblockip($rIP): void {
-        if (filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            exec('sudo iptables -D INPUT -s ' . escapeshellcmd($rIP) . ' -j DROP');
-        } elseif (filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            exec('sudo ip6tables -D INPUT -s ' . escapeshellcmd($rIP) . ' -j DROP');
-        }
-        if (file_exists(FLOOD_TMP_PATH . 'block_' . $rIP)) {
-            unlink(FLOOD_TMP_PATH . 'block_' . $rIP);
-        }
-    }
+		return false;
+	}
 
-    private function flushIPs(): void {
-        exec('sudo iptables -F && sudo ip6tables -F');
-        shell_exec('sudo rm ' . FLOOD_TMP_PATH . 'block_*');
-    }
+	private function unblockip($rIP): void {
+		if (filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+			exec('sudo iptables -D INPUT -s ' . escapeshellcmd($rIP) . ' -j DROP');
+		} elseif (filter_var($rIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+			exec('sudo ip6tables -D INPUT -s ' . escapeshellcmd($rIP) . ' -j DROP');
+		}
+		if (file_exists(FLOOD_TMP_PATH . 'block_' . $rIP)) {
+			unlink(FLOOD_TMP_PATH . 'block_' . $rIP);
+		}
+	}
 
-    private function saveiptables(): void {
-        exec('sudo iptables-save && sudo ip6tables-save');
-    }
+	private function flushIPs(): void {
+		exec('sudo iptables -F && sudo ip6tables -F');
+		shell_exec('sudo rm ' . FLOOD_TMP_PATH . 'block_*');
+	}
 
-    private function getBlockedIPs(): array {
-        $rReturn = [];
-        exec('sudo iptables -nL --line-numbers -t filter', $rLines);
-        foreach ($rLines as $rLine) {
-            $rLine = explode(' ', preg_replace('!\\s+!', ' ', $rLine));
-            if (isset($rLine[1], $rLine[4]) && $rLine[1] == 'DROP') {
-                $rReturn[] = $rLine[4];
-            }
-        }
-        $rLines = '';
-        exec('sudo ip6tables -nL --line-numbers -t filter', $rLines);
-        foreach ($rLines as $rLine) {
-            $rLine = explode(' ', preg_replace('!\\s+!', ' ', $rLine));
-            if (isset($rLine[1], $rLine[3]) && $rLine[1] == 'DROP') {
-                $rReturn[] = $rLine[3];
-            }
-        }
-        return $rReturn;
-    }
+	private function saveiptables(): void {
+		exec('sudo iptables-save && sudo ip6tables-save');
+	}
 
-    private function getServerIP(?string $interface = null): ?string {
-        if ($interface === null) {
-            $route = shell_exec('ip route show default 2>/dev/null');
-            if ($route && preg_match('/dev\s+([^\s]+)/', $route, $m)) {
-                $interface = $m[1];
-            } else {
-                return null;
-            }
-        }
+	private function getBlockedIPs(): array {
+		$rReturn = [];
+		exec('sudo iptables -nL --line-numbers -t filter', $rLines);
+		foreach ($rLines as $rLine) {
+			$rLine = explode(' ', preg_replace('!\\s+!', ' ', $rLine));
+			if (isset($rLine[1], $rLine[4]) && $rLine[1] == 'DROP') {
+				$rReturn[] = $rLine[4];
+			}
+		}
+		$rLines = '';
+		exec('sudo ip6tables -nL --line-numbers -t filter', $rLines);
+		foreach ($rLines as $rLine) {
+			$rLine = explode(' ', preg_replace('!\\s+!', ' ', $rLine));
+			if (isset($rLine[1], $rLine[3]) && $rLine[1] == 'DROP') {
+				$rReturn[] = $rLine[3];
+			}
+		}
+		return $rReturn;
+	}
 
-        $output = shell_exec(
-            'ip -j addr show ' . escapeshellarg($interface) . ' 2>/dev/null'
-        );
+	private function getServerIP(?string $interface = null): ?string {
+		if ($interface === null) {
+			$route = shell_exec('ip route show default 2>/dev/null');
+			if ($route && preg_match('/dev\s+([^\s]+)/', $route, $m)) {
+				$interface = $m[1];
+			} else {
+				return null;
+			}
+		}
 
-        if (!$output) {
-            return null;
-        }
+		$output = shell_exec(
+			'ip -j addr show ' . escapeshellarg($interface) . ' 2>/dev/null'
+		);
 
-        $data = json_decode($output, true);
-        if (empty($data[0]['addr_info'])) {
-            return null;
-        }
+		if (!$output) {
+			return null;
+		}
 
-        foreach ($data[0]['addr_info'] as $addr) {
-            if (($addr['family'] ?? null) === 'inet') {
-                return $addr['local'] ?? null;
-            }
-        }
+		$data = json_decode($output, true);
+		if (empty($data[0]['addr_info'])) {
+			return null;
+		}
 
-        return null;
-    }
+		foreach ($data[0]['addr_info'] as $addr) {
+			if (($addr['family'] ?? null) === 'inet') {
+				return $addr['local'] ?? null;
+			}
+		}
 
-    private function loadCron(): void {
-        global $db;
-        $rServers = ServerRepository::getAll(true);
-        $db->query("SELECT `signal_id` FROM `signals` WHERE `server_id` = ? AND `custom_data` = '{\"action\":\"flush\"}' AND `cache` = 0;", SERVER_ID);
-        if ($db->num_rows() > 0) {
-            echo "Flushing IP's...";
-            $this->flushIPs();
-            $this->saveiptables();
-            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'FLUSH', 'Flushed blocked IP\\'s from iptables.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-            $db->query("DELETE FROM `signals` WHERE `server_id` = ? AND `custom_data` = '{\"action\":\"flush\"}' AND `cache` = 0;", SERVER_ID);
-        } else {
-            // Auto-unban: on MAIN only, drop expired automatic IP bans (flood/
-            // bruteforce) so the sync below removes them from iptables. Manual admin
-            // bans (any other notes) are left permanent.
-            $rUnbanSettings = SettingsManager::getAll();
-            if (!empty($rServers[SERVER_ID]['is_main']) && !empty($rUnbanSettings['auto_unban_ip'])) {
-                $rUnbanMul = array('minutes' => 60, 'hours' => 3600, 'days' => 86400);
-                $rUnbanUnit = (string) ($rUnbanSettings['ban_duration_unit'] ?? 'hours');
-                $rUnbanSecs = max(1, intval($rUnbanSettings['ban_duration_value'] ?? 24)) * ($rUnbanMul[$rUnbanUnit] ?? 3600);
-                $db->query("DELETE FROM `blocked_ips` WHERE `date` < ? AND (UPPER(`notes`) LIKE '%ATTACK%' OR UPPER(`notes`) LIKE '%BRUTEFORCE%' OR UPPER(`notes`) LIKE '%FLOOD%');", time() - $rUnbanSecs);
-            }
+		return null;
+	}
 
-            $rSyncMarker = CRONS_TMP_PATH . 'blocked_ips_sync_marker';
-            $rRunFullSync = true;
-            $db->query('SELECT COUNT(*) AS `count` FROM `blocked_ips`;');
-            $rCurrentIPCount = intval($db->get_row()['count']);
+	private function loadCron(): void {
+		global $db;
+		$rServers = ServerRepository::getAll(true);
+		$db->query("SELECT `signal_id` FROM `signals` WHERE `server_id` = ? AND `custom_data` = '{\"action\":\"flush\"}' AND `cache` = 0;", SERVER_ID);
+		if ($db->num_rows() > 0) {
+			echo "Flushing IP's...";
+			$this->flushIPs();
+			$this->saveiptables();
+			$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'FLUSH', 'Flushed blocked IP\\'s from iptables.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+			$db->query("DELETE FROM `signals` WHERE `server_id` = ? AND `custom_data` = '{\"action\":\"flush\"}' AND `cache` = 0;", SERVER_ID);
+		} else {
+			// Auto-unban: on MAIN only, drop expired automatic IP bans (flood/
+			// bruteforce) so the sync below removes them from iptables. Manual admin
+			// bans (any other notes) are left permanent.
+			$rUnbanSettings = SettingsManager::getAll();
+			if (!empty($rServers[SERVER_ID]['is_main']) && !empty($rUnbanSettings['auto_unban_ip'])) {
+				$rUnbanMul = ['minutes' => 60, 'hours' => 3600, 'days' => 86400];
+				$rUnbanUnit = (string) ($rUnbanSettings['ban_duration_unit'] ?? 'hours');
+				$rUnbanSecs = max(1, intval($rUnbanSettings['ban_duration_value'] ?? 24)) * ($rUnbanMul[$rUnbanUnit] ?? 3600);
+				$db->query("DELETE FROM `blocked_ips` WHERE `date` < ? AND (UPPER(`notes`) LIKE '%ATTACK%' OR UPPER(`notes`) LIKE '%BRUTEFORCE%' OR UPPER(`notes`) LIKE '%FLOOD%');", time() - $rUnbanSecs);
+			}
 
-            if (file_exists($rSyncMarker)) {
-                $rLastSyncData = json_decode(@file_get_contents($rSyncMarker), true);
-                if (is_array($rLastSyncData) && isset($rLastSyncData['count'], $rLastSyncData['time'])) {
-                    if (intval($rLastSyncData['count']) == $rCurrentIPCount && (time() - intval($rLastSyncData['time'])) < 300) {
-                        $rRunFullSync = false;
-                    }
-                }
-            }
+			$rSyncMarker = CRONS_TMP_PATH . 'blocked_ips_sync_marker';
+			$rRunFullSync = true;
+			$db->query('SELECT COUNT(*) AS `count` FROM `blocked_ips`;');
+			$rCurrentIPCount = intval($db->get_row()['count']);
 
-            if ($rRunFullSync) {
-                $rActualBlocked = $this->getBlockedIPs();
-                $rActualBlockedFlip = array_flip($rActualBlocked);
-                $db->query('SELECT `ip` FROM `blocked_ips`;');
-                $rBlocked = array_keys($db->get_rows(true, 'ip'));
-                $rBlockedFlip = array_flip($rBlocked);
-                $rAdd = $rDel = [];
-                foreach (array_count_values($rActualBlocked) as $rIP => $rCount) {
-                    if ($rCount > 1) {
-                        echo $rCount . "\n";
-                        foreach (range(1, $rCount - 1) as $i) {
-                            $rDel[] = $rIP;
-                        }
-                    }
-                }
-                foreach ($rBlocked as $rIP) {
-                    if (!isset($rActualBlockedFlip[$rIP])) {
-                        $rAdd[] = $rIP;
-                    }
-                }
-                foreach ($rActualBlocked as $rIP) {
-                    if (!isset($rBlockedFlip[$rIP])) {
-                        $rDel[] = $rIP;
-                    }
-                }
-                if (count($rDel) > 0) {
-                    $this->rSaveIPTables = true;
-                    foreach ($rDel as $rIP) {
-                        echo 'Unblock IP: ' . $rIP . "\n";
-                        $this->unblockip($rIP);
-                    }
-                }
-                if (count($rAdd) > 0) {
-                    $this->rSaveIPTables = true;
-                    foreach ($rAdd as $rIP) {
-                        echo 'Block IP: ' . $rIP . "\n";
-                        $this->blockip($rIP);
-                    }
-                }
-                if ($this->rSaveIPTables) {
-                    $this->saveiptables();
-                    $this->rSaveIPTables = false;
-                }
-                @file_put_contents($rSyncMarker, json_encode(['count' => $rCurrentIPCount, 'time' => time()]));
-            }
-        }
-        $rReload = false;
-        $rMinistraLegacyConf = 'set $ministra_legacy_redirect ' . (SettingsManager::get('mag_legacy_redirect') ? '1' : '0') . ';';
-        $rCurrentMinistraLegacyConf = (trim(@file_get_contents(BIN_PATH . 'nginx/conf/ministra_legacy.conf')) ?: '');
-        if ($rMinistraLegacyConf != $rCurrentMinistraLegacyConf) {
-            echo 'Updating Ministra legacy /c toggle...' . "\n";
-            file_put_contents(BIN_PATH . 'nginx/conf/ministra_legacy.conf', $rMinistraLegacyConf);
-            $rReload = true;
-        }
-        $rAllowedIPs = ServerRepository::getAllowedIPs();
-        $rXC_VMList = [];
-        foreach ($rAllowedIPs as $rIP) {
-            if (!empty($rIP) && filter_var($rIP, FILTER_VALIDATE_IP)) {
-                $newEntry = 'set_real_ip_from ' . $rIP . ';';
-                if (!in_array($newEntry, $rXC_VMList)) {
-                    $rXC_VMList[] = $newEntry;
-                }
-            }
-        }
-        $rXC_VMList = trim(implode("\n", array_unique($rXC_VMList)));
-        $rCurrentList = (trim(file_get_contents(BIN_PATH . 'nginx/conf/realip_xc_vm.conf')) ?: '');
-        if ($rXC_VMList != $rCurrentList) {
-            echo 'Updating XC_VM IP List...' . "\n";
-            file_put_contents(BIN_PATH . 'nginx/conf/realip_xc_vm.conf', $rXC_VMList);
-            $rReload = true;
-        }
-        $rCurrentList = (trim(file_get_contents(BIN_PATH . 'nginx/conf/realip_cloudflare.conf')) ?: '');
-        if (SettingsManager::get('cloudflare')) {
-            if (empty($rCurrentList)) {
-                echo 'Enabling Cloudflare...' . "\n";
-                file_put_contents(BIN_PATH . 'nginx/conf/realip_cloudflare.conf', 'set_real_ip_from 103.21.244.0/22;' . "\n" . 'set_real_ip_from 103.22.200.0/22;' . "\n" . 'set_real_ip_from 103.31.4.0/22;' . "\n" . 'set_real_ip_from 104.16.0.0/13;' . "\n" . 'set_real_ip_from 104.24.0.0/14;' . "\n" . 'set_real_ip_from 108.162.192.0/18;' . "\n" . 'set_real_ip_from 131.0.72.0/22;' . "\n" . 'set_real_ip_from 141.101.64.0/18;' . "\n" . 'set_real_ip_from 162.158.0.0/15;' . "\n" . 'set_real_ip_from 172.64.0.0/13;' . "\n" . 'set_real_ip_from 173.245.48.0/20;' . "\n" . 'set_real_ip_from 188.114.96.0/20;' . "\n" . 'set_real_ip_from 190.93.240.0/20;' . "\n" . 'set_real_ip_from 197.234.240.0/22;' . "\n" . 'set_real_ip_from 198.41.128.0/17;' . "\n" . 'set_real_ip_from 2400:cb00::/32;' . "\n" . 'set_real_ip_from 2606:4700::/32;' . "\n" . 'set_real_ip_from 2803:f800::/32;' . "\n" . 'set_real_ip_from 2405:b500::/32;' . "\n" . 'set_real_ip_from 2405:8100::/32;' . "\n" . 'set_real_ip_from 2c0f:f248::/32;' . "\n" . 'set_real_ip_from 2a06:98c0::/29;');
-                $rReload = true;
-            }
-        } else {
-            if (!empty($rCurrentList)) {
-                echo 'Disabling Cloudflare...' . "\n";
-                file_put_contents(BIN_PATH . 'nginx/conf/realip_cloudflare.conf', '');
-                $rReload = true;
-            }
-        }
-        if ($rServers[SERVER_ID]['is_main']) {
-            $rCurrentStatus = stripos((trim(file_get_contents(BIN_PATH . 'nginx/conf/gzip.conf')) ?: 'gzip off'), 'gzip on') !== false;
-            if ($rServers[SERVER_ID]['enable_gzip']) {
-                if (!$rCurrentStatus) {
-                    echo 'Enabling GZIP...' . "\n";
-                    file_put_contents(BIN_PATH . 'nginx/conf/gzip.conf', 'gzip on;' . "\n" . 'gzip_min_length 1000;' . "\n" . 'gzip_buffers 4 32k;' . "\n" . 'gzip_proxied any;' . "\n" . 'gzip_types application/json application/xml;' . "\n" . 'gzip_vary on;' . "\n" . 'gzip_disable "MSIE [1-6].(?!.*SV1)";');
-                    $rReload = true;
-                }
-            } else {
-                if ($rCurrentStatus) {
-                    echo 'Disabling GZIP...' . "\n";
-                    file_put_contents(BIN_PATH . 'nginx/conf/gzip.conf', 'gzip off;');
-                    $rReload = true;
-                }
-            }
+			if (file_exists($rSyncMarker)) {
+				$rLastSyncData = json_decode(@file_get_contents($rSyncMarker), true);
+				if (is_array($rLastSyncData) && isset($rLastSyncData['count'], $rLastSyncData['time'])) {
+					if (intval($rLastSyncData['count']) == $rCurrentIPCount && (time() - intval($rLastSyncData['time'])) < 300) {
+						$rRunFullSync = false;
+					}
+				}
+			}
 
-            $rServerIP = $this->getServerIP(($rServers[SERVER_ID]['network_interface'] == 'auto' ? null : $rServers[SERVER_ID]['network_interface']));
-            if ($rServerIP && $rServerIP != $rServers[SERVER_ID]['server_ip'] && $this->AutoUpdateServerIP) {
-                echo 'Updating server IP from ' . $rServers[SERVER_ID]['server_ip'] . ' to ' . $rServerIP . '...' . "\n";
-                $db->query('UPDATE `servers` SET `server_ip` = ? WHERE `id` = ?;', $rServerIP, SERVER_ID);
-                $rServers[SERVER_ID]['server_ip'] = $rServerIP;
-            }
+			if ($rRunFullSync) {
+				$rActualBlocked = $this->getBlockedIPs();
+				$rActualBlockedFlip = array_flip($rActualBlocked);
+				$db->query('SELECT `ip` FROM `blocked_ips`;');
+				$rBlocked = array_keys($db->get_rows(true, 'ip'));
+				$rBlockedFlip = array_flip($rBlocked);
+				$rAdd = $rDel = [];
+				foreach (array_count_values($rActualBlocked) as $rIP => $rCount) {
+					if ($rCount > 1) {
+						echo $rCount . "\n";
+						foreach (range(1, $rCount - 1) as $i) {
+							$rDel[] = $rIP;
+						}
+					}
+				}
+				foreach ($rBlocked as $rIP) {
+					if (!isset($rActualBlockedFlip[$rIP])) {
+						$rAdd[] = $rIP;
+					}
+				}
+				foreach ($rActualBlocked as $rIP) {
+					if (!isset($rBlockedFlip[$rIP])) {
+						$rDel[] = $rIP;
+					}
+				}
+				if (count($rDel) > 0) {
+					$this->rSaveIPTables = true;
+					foreach ($rDel as $rIP) {
+						echo 'Unblock IP: ' . $rIP . "\n";
+						$this->unblockip($rIP);
+					}
+				}
+				if (count($rAdd) > 0) {
+					$this->rSaveIPTables = true;
+					foreach ($rAdd as $rIP) {
+						echo 'Block IP: ' . $rIP . "\n";
+						$this->blockip($rIP);
+					}
+				}
+				if ($this->rSaveIPTables) {
+					$this->saveiptables();
+					$this->rSaveIPTables = false;
+				}
+				@file_put_contents($rSyncMarker, json_encode(['count' => $rCurrentIPCount, 'time' => time()]));
+			}
+		}
+		$rReload = false;
+		$rMinistraLegacyConf = 'set $ministra_legacy_redirect ' . (SettingsManager::get('mag_legacy_redirect') ? '1' : '0') . ';';
+		$rCurrentMinistraLegacyConf = (trim(@file_get_contents(BIN_PATH . 'nginx/conf/ministra_legacy.conf')) ?: '');
+		if ($rMinistraLegacyConf != $rCurrentMinistraLegacyConf) {
+			echo 'Updating Ministra legacy /c toggle...' . "\n";
+			file_put_contents(BIN_PATH . 'nginx/conf/ministra_legacy.conf', $rMinistraLegacyConf);
+			$rReload = true;
+		}
+		$rAllowedIPs = ServerRepository::getAllowedIPs();
+		$rXC_VMList = [];
+		foreach ($rAllowedIPs as $rIP) {
+			if (!empty($rIP) && filter_var($rIP, FILTER_VALIDATE_IP)) {
+				$newEntry = 'set_real_ip_from ' . $rIP . ';';
+				if (!in_array($newEntry, $rXC_VMList)) {
+					$rXC_VMList[] = $newEntry;
+				}
+			}
+		}
+		$rXC_VMList = trim(implode("\n", array_unique($rXC_VMList)));
+		$rCurrentList = (trim(file_get_contents(BIN_PATH . 'nginx/conf/realip_xc_vm.conf')) ?: '');
+		if ($rXC_VMList != $rCurrentList) {
+			echo 'Updating XC_VM IP List...' . "\n";
+			file_put_contents(BIN_PATH . 'nginx/conf/realip_xc_vm.conf', $rXC_VMList);
+			$rReload = true;
+		}
+		$rCurrentList = (trim(file_get_contents(BIN_PATH . 'nginx/conf/realip_cloudflare.conf')) ?: '');
+		if (SettingsManager::get('cloudflare')) {
+			if (empty($rCurrentList)) {
+				echo 'Enabling Cloudflare...' . "\n";
+				file_put_contents(BIN_PATH . 'nginx/conf/realip_cloudflare.conf', 'set_real_ip_from 103.21.244.0/22;' . "\n" . 'set_real_ip_from 103.22.200.0/22;' . "\n" . 'set_real_ip_from 103.31.4.0/22;' . "\n" . 'set_real_ip_from 104.16.0.0/13;' . "\n" . 'set_real_ip_from 104.24.0.0/14;' . "\n" . 'set_real_ip_from 108.162.192.0/18;' . "\n" . 'set_real_ip_from 131.0.72.0/22;' . "\n" . 'set_real_ip_from 141.101.64.0/18;' . "\n" . 'set_real_ip_from 162.158.0.0/15;' . "\n" . 'set_real_ip_from 172.64.0.0/13;' . "\n" . 'set_real_ip_from 173.245.48.0/20;' . "\n" . 'set_real_ip_from 188.114.96.0/20;' . "\n" . 'set_real_ip_from 190.93.240.0/20;' . "\n" . 'set_real_ip_from 197.234.240.0/22;' . "\n" . 'set_real_ip_from 198.41.128.0/17;' . "\n" . 'set_real_ip_from 2400:cb00::/32;' . "\n" . 'set_real_ip_from 2606:4700::/32;' . "\n" . 'set_real_ip_from 2803:f800::/32;' . "\n" . 'set_real_ip_from 2405:b500::/32;' . "\n" . 'set_real_ip_from 2405:8100::/32;' . "\n" . 'set_real_ip_from 2c0f:f248::/32;' . "\n" . 'set_real_ip_from 2a06:98c0::/29;');
+				$rReload = true;
+			}
+		} else {
+			if (!empty($rCurrentList)) {
+				echo 'Disabling Cloudflare...' . "\n";
+				file_put_contents(BIN_PATH . 'nginx/conf/realip_cloudflare.conf', '');
+				$rReload = true;
+			}
+		}
+		if ($rServers[SERVER_ID]['is_main']) {
+			$rCurrentStatus = stripos((trim(file_get_contents(BIN_PATH . 'nginx/conf/gzip.conf')) ?: 'gzip off'), 'gzip on') !== false;
+			if ($rServers[SERVER_ID]['enable_gzip']) {
+				if (!$rCurrentStatus) {
+					echo 'Enabling GZIP...' . "\n";
+					file_put_contents(BIN_PATH . 'nginx/conf/gzip.conf', 'gzip on;' . "\n" . 'gzip_min_length 1000;' . "\n" . 'gzip_buffers 4 32k;' . "\n" . 'gzip_proxied any;' . "\n" . 'gzip_types application/json application/xml;' . "\n" . 'gzip_vary on;' . "\n" . 'gzip_disable "MSIE [1-6].(?!.*SV1)";');
+					$rReload = true;
+				}
+			} else {
+				if ($rCurrentStatus) {
+					echo 'Disabling GZIP...' . "\n";
+					file_put_contents(BIN_PATH . 'nginx/conf/gzip.conf', 'gzip off;');
+					$rReload = true;
+				}
+			}
 
-            if (empty(SettingsManager::get('live_streaming_pass'))) {
-                $db->query('UPDATE `settings` SET `live_streaming_pass` = ?', Encryption::randomString(40));
-            }
-        }
+			$rServerIP = $this->getServerIP(($rServers[SERVER_ID]['network_interface'] == 'auto' ? null : $rServers[SERVER_ID]['network_interface']));
+			if ($rServerIP && $rServerIP != $rServers[SERVER_ID]['server_ip'] && $this->AutoUpdateServerIP) {
+				echo 'Updating server IP from ' . $rServers[SERVER_ID]['server_ip'] . ' to ' . $rServerIP . '...' . "\n";
+				$db->query('UPDATE `servers` SET `server_ip` = ? WHERE `id` = ?;', $rServerIP, SERVER_ID);
+				$rServers[SERVER_ID]['server_ip'] = $rServerIP;
+			}
 
-        // xc_fanout keepalive supervisor — ensure run.sh itself is alive. It is
-        // the daemon's Restart=always loop (respawns the daemon within ~2s of any
-        // exit, SIGKILL included), launched once by `service boot`. If IT dies
-        // (OOM, a stray kill) the daemon is left unsupervised and never comes back
-        // after its next exit — nothing else re-launches the loop (fanout_binary
-        // only pkills the daemon and relies on it; StartupCommand only fixes its
-        // mode). Re-launch it here every minute when absent — a cheap pgrep,
-        // idempotent regardless (run.sh holds an flock single-instance guard, so
-        // any racing duplicate supervisor exits at once), run as xc_vm to
-        // match `service boot`. Closes the "supervisor died → fanout stays down"
-        // gap. Runs on every node (main + LB), like the daemon self-heal below.
-        $rRunSh = MAIN_HOME . 'bin/xc_fanout/run.sh';
-        if (is_file($rRunSh) && trim((string) shell_exec('pgrep -u xc_vm -f ' . escapeshellarg($rRunSh) . ' 2>/dev/null')) === '') {
-            shell_exec('sudo -u xc_vm bash ' . escapeshellarg($rRunSh) . ' >/dev/null 2>&1 &');
-        }
+			if (empty(SettingsManager::get('live_streaming_pass'))) {
+				$db->query('UPDATE `settings` SET `live_streaming_pass` = ?', Encryption::randomString(40));
+			}
+		}
 
-        // xc_fanout daemon binary — keep it installed and current (ADR 0003,
-        // Phase G). Nothing else pulls it: not the installer, not UpdateCommand,
-        // so a fresh node/LB would never get the daemon and an updated panel would
-        // keep an old one. fanout_binary is idempotent (downloads only on a
-        // version mismatch, and only when GitHub is reachable), so it is safe to
-        // poll. Throttle the check to ~hourly via a stamp, but the first pass
-        // (stamp absent) runs immediately so a fresh install/LB gets the daemon
-        // within a minute; the running daemon is respawned by fanout_binary on an
-        // actual upgrade. Root context (this cron) is required — it installs into
-        // bin/ and chowns. Runs on every node (main + LB) since LBs need it too.
-        $rFanoutStamp = CRONS_TMP_PATH . 'fanout_binary_check';
-        if (!file_exists($rFanoutStamp) || time() - intval(@file_get_contents($rFanoutStamp) ?: 0) > 3600) {
-            file_put_contents($rFanoutStamp, time());
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php fanout_binary >/dev/null 2>&1 &');
-        }
+		// xc_fanout keepalive supervisor — ensure run.sh itself is alive. It is
+		// the daemon's Restart=always loop (respawns the daemon within ~2s of any
+		// exit, SIGKILL included), launched once by `service boot`. If IT dies
+		// (OOM, a stray kill) the daemon is left unsupervised and never comes back
+		// after its next exit — nothing else re-launches the loop (fanout_binary
+		// only pkills the daemon and relies on it; StartupCommand only fixes its
+		// mode). Re-launch it here every minute when absent — a cheap pgrep,
+		// idempotent regardless (run.sh holds an flock single-instance guard, so
+		// any racing duplicate supervisor exits at once), run as xc_vm to
+		// match `service boot`. Closes the "supervisor died → fanout stays down"
+		// gap. Runs on every node (main + LB), like the daemon self-heal below.
+		$rRunSh = MAIN_HOME . 'bin/xc_fanout/run.sh';
+		if (is_file($rRunSh) && trim((string) shell_exec('pgrep -u xc_vm -f ' . escapeshellarg($rRunSh) . ' 2>/dev/null')) === '') {
+			shell_exec('sudo -u xc_vm bash ' . escapeshellarg($rRunSh) . ' >/dev/null 2>&1 &');
+		}
 
-        // xcvm_core PHP extension — same self-heal rationale as the daemon above.
-        // The extension is mirrored into the binaries repo tree decoupled from the
-        // heavy runtime bundle, so nothing else keeps it current: a fresh LB (or a
-        // node on an older extension) would never converge on its own. xcvm_core is
-        // idempotent (version-compared, downloads only on a mismatch) and installs
-        // with a load-test + rollback, so it is safe to poll ~hourly; the first
-        // pass runs immediately. This is what delivers config_set_redis to LB nodes,
-        // without which StatusCommand::configureRedisLb cannot point Redis at main.
-        $rCoreStamp = CRONS_TMP_PATH . 'xcvm_core_check';
-        if (!file_exists($rCoreStamp) || time() - intval(@file_get_contents($rCoreStamp) ?: 0) > 3600) {
-            file_put_contents($rCoreStamp, time());
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php xcvm_core >/dev/null 2>&1 &');
-        }
+		// xc_fanout daemon binary — keep it installed and current (ADR 0003,
+		// Phase G). Nothing else pulls it: not the installer, not UpdateCommand,
+		// so a fresh node/LB would never get the daemon and an updated panel would
+		// keep an old one. fanout_binary is idempotent (downloads only on a
+		// version mismatch, and only when GitHub is reachable), so it is safe to
+		// poll. Throttle the check to ~hourly via a stamp, but the first pass
+		// (stamp absent) runs immediately so a fresh install/LB gets the daemon
+		// within a minute; the running daemon is respawned by fanout_binary on an
+		// actual upgrade. Root context (this cron) is required — it installs into
+		// bin/ and chowns. Runs on every node (main + LB) since LBs need it too.
+		$rFanoutStamp = CRONS_TMP_PATH . 'fanout_binary_check';
+		if (!file_exists($rFanoutStamp) || time() - intval(@file_get_contents($rFanoutStamp) ?: 0) > 3600) {
+			file_put_contents($rFanoutStamp, time());
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php fanout_binary >/dev/null 2>&1 &');
+		}
 
-        // yt-dlp — same self-heal rationale. It is a static bundled binary that
-        // resolves media URLs (StreamUtils) and nothing else keeps it current, so
-        // it goes stale between panel releases and breaks extraction. The `ytdlp`
-        // command is idempotent (version-compared against the upstream release,
-        // downloads only on a mismatch, SHA-verified + run-tested before an atomic
-        // swap), so it is safe to poll. Daily is enough (yt-dlp releases ~weekly);
-        // the first pass (stamp absent) runs immediately. Runs on every node that
-        // has the binary (main + LB).
-        $rYtDlpStamp = CRONS_TMP_PATH . 'ytdlp_check';
-        if (!file_exists($rYtDlpStamp) || time() - intval(@file_get_contents($rYtDlpStamp) ?: 0) > 86400) {
-            file_put_contents($rYtDlpStamp, time());
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php ytdlp >/dev/null 2>&1 &');
-        }
+		// xcvm_core PHP extension — same self-heal rationale as the daemon above.
+		// The extension is mirrored into the binaries repo tree decoupled from the
+		// heavy runtime bundle, so nothing else keeps it current: a fresh LB (or a
+		// node on an older extension) would never converge on its own. xcvm_core is
+		// idempotent (version-compared, downloads only on a mismatch) and installs
+		// with a load-test + rollback, so it is safe to poll ~hourly; the first
+		// pass runs immediately. This is what delivers config_set_redis to LB nodes,
+		// without which StatusCommand::configureRedisLb cannot point Redis at main.
+		$rCoreStamp = CRONS_TMP_PATH . 'xcvm_core_check';
+		if (!file_exists($rCoreStamp) || time() - intval(@file_get_contents($rCoreStamp) ?: 0) > 3600) {
+			file_put_contents($rCoreStamp, time());
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php xcvm_core >/dev/null 2>&1 &');
+		}
 
-        if ($rServers[SERVER_ID]['limit_requests'] > 0) {
-            $rLimitConf = 'limit_req_zone global zone=two:10m rate=' . intval($rServers[SERVER_ID]['limit_requests']) . 'r/s;';
-        } else {
-            $rLimitConf = '';
-        }
-        $rCurrentConf = (trim(file_get_contents(BIN_PATH . 'nginx/conf/limit.conf')) ?: '');
-        if ($rLimitConf != $rCurrentConf) {
-            echo 'Updating rate limit...' . "\n";
-            file_put_contents(BIN_PATH . 'nginx/conf/limit.conf', $rLimitConf);
-            $rReload = true;
-        }
-        if ($rServers[SERVER_ID]['limit_requests'] > 0) {
-            $rLimitConf = 'limit_req zone=two burst=' . intval($rServers[SERVER_ID]['limit_burst']) . ';';
-        } else {
-            $rLimitConf = '';
-        }
-        $rCurrentConf = (trim(file_get_contents(BIN_PATH . 'nginx/conf/limit_queue.conf')) ?: '');
-        if ($rLimitConf != $rCurrentConf) {
-            echo 'Updating rate limit queue...' . "\n";
-            file_put_contents(BIN_PATH . 'nginx/conf/limit_queue.conf', $rLimitConf);
-            $rReload = true;
-        }
-        if ($rReload) {
-            shell_exec('sudo ' . BIN_PATH . 'nginx/sbin/nginx -s reload');
-        }
-        if (SettingsManager::get('restart_php_fpm')) {
-            $rPHP = count(glob(BIN_PATH . 'php/sockets/*.pid') ?: []);
-            $rNginx = 0;
-            foreach (glob('/proc/*/cmdline') ?: [] as $rCmdFile) {
-                $rRaw = @file_get_contents($rCmdFile);
-                if ($rRaw && strpos(str_replace("\0", ' ', $rRaw), 'nginx: master') !== false) {
-                    $rNginx++;
-                }
-            }
-            if ($rNginx > 0) {
-                if ($rPHP == 0) {
-                    echo 'PHP-FPM ERROR - Restarting...';
-                    $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'PHP-FPM', 'Restarted PHP-FPM instances due to a suspected crash.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                    shell_exec('sudo systemctl stop xc_vm');
-                    shell_exec('sudo systemctl start xc_vm');
-                    exit();
-                }
-            }
-            $rCurlMarker = CRONS_TMP_PATH . 'fpm_curl_check';
-            if (!file_exists($rCurlMarker) || (time() - filemtime($rCurlMarker)) >= 300) {
-                @touch($rCurlMarker);
-                $rHandle = curl_init('http://127.0.0.1:' . $rServers[SERVER_ID]['http_broadcast_port'] . '/init');
-                curl_setopt($rHandle, CURLOPT_RETURNTRANSFER, true);
-                curl_exec($rHandle);
-                $rCode = curl_getinfo($rHandle, CURLINFO_HTTP_CODE);
-                if (!in_array($rCode, [500, 502])) {
-                    curl_close($rHandle);
-                } else {
-                    echo $rCode . ' ERROR - Restarting...';
-                    $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'PHP-FPM', 'Restarted services due to " . $rCode . " error.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                    shell_exec('sudo systemctl stop xc_vm');
-                    shell_exec('sudo systemctl start xc_vm');
-                    exit();
-                }
-            }
-        }
-        if ($db->query("SELECT `signal_id`, `custom_data` FROM `signals` WHERE `server_id` = ? AND `custom_data` <> '' AND `cache` = 0 ORDER BY signal_id ASC;", SERVER_ID)) {
-            $rRows = $db->get_rows();
-            $rCheck = ['php' => false, 'services' => false, 'ports' => false, 'ramdisk' => false];
-            foreach ($rRows as $rRow) {
-                $rData = json_decode($rRow['custom_data'], true);
-                switch ($rData['action']) {
-                    case 'disable_ramdisk':
-                    case 'enable_ramdisk':
-                        $rCheck['ramdisk'] = true;
-                        break;
-                    case 'set_services':
-                        $rCheck['services'] = true;
-                        break;
-                    case 'set_port':
-                        $rCheck['ports'] = true;
-                        break;
-                }
-            }
-            if ($rCheck['services']) {
-                $rCurServices = 0;
-                $rStartScript = explode("\n", file_get_contents(MAIN_HOME . 'bin/daemons.sh'));
-                foreach ($rStartScript as $rLine) {
-                    if (explode(' ', $rLine)[0] == 'start-stop-daemon') {
-                        $rCurServices++;
-                    }
-                }
-                if ($rServers[SERVER_ID]['total_services'] != $rCurServices) {
-                    array_unshift($rRows, ['custom_data' => json_encode(['action' => 'set_services', 'count' => $rServers[SERVER_ID]['total_services'], 'reload' => true])]);
-                }
-            }
-            if ($rCheck['ports']) {
-                $rListen = $rPorts = ['http' => [], 'https' => []];
-                foreach (array_merge([intval($rServers[SERVER_ID]['http_broadcast_port'])], explode(',', $rServers[SERVER_ID]['http_ports_add'])) as $rPort) {
-                    if (is_numeric($rPort) && $rPort > 0 && $rPort <= 65535) {
-                        $rListen['http'][] = 'listen ' . intval($rPort) . ';';
-                        $rPorts['http'][] = intval($rPort);
-                    }
-                }
-                foreach (array_merge([intval($rServers[SERVER_ID]['https_broadcast_port'])], explode(',', $rServers[SERVER_ID]['https_ports_add'])) as $rPort) {
-                    if (is_numeric($rPort) && $rPort > 0 && $rPort <= 65535) {
-                        $rListen['https'][] = 'listen ' . intval($rPort) . ' ssl;';
-                        $rPorts['https'][] = intval($rPort);
-                    }
-                }
-                if (trim(implode(' ', $rListen['http'])) != trim(file_get_contents(MAIN_HOME . 'bin/nginx/conf/ports/http.conf'))) {
-                    array_unshift($rRows, ['custom_data' => json_encode(['action' => 'set_port', 'type' => 0, 'ports' => $rPorts['http'], 'reload' => true])]);
-                }
-                if (trim(implode(' ', $rListen['https'])) != trim(file_get_contents(MAIN_HOME . 'bin/nginx/conf/ports/https.conf'))) {
-                    array_unshift($rRows, ['custom_data' => json_encode(['action' => 'set_port', 'type' => 1, 'ports' => $rPorts['https'], 'reload' => true])]);
-                }
-                if ('listen ' . intval($rServers[SERVER_ID]['rtmp_port']) . ';' != trim(file_get_contents(MAIN_HOME . 'bin/nginx_rtmp/conf/port.conf'))) {
-                    array_unshift($rRows, ['custom_data' => json_encode(['action' => 'set_port', 'type' => 2, 'ports' => [intval($rServers[SERVER_ID]['rtmp_port'])], 'reload' => true])]);
-                }
-            }
-            if ($rCheck['ramdisk']) {
-                $rMounted = false;
-                exec('df -h', $rLines);
-                array_shift($rLines);
-                foreach ($rLines as $rLine) {
-                    $rSplit = explode(' ', preg_replace('!\\s+!', ' ', trim($rLine)));
-                    if (implode(' ', array_slice($rSplit, 5, count($rSplit) - 5)) == rtrim(STREAMS_PATH, '/')) {
-                        $rMounted = true;
-                        break;
-                    }
-                }
-                if ($rServers[SERVER_ID]['use_disk']) {
-                    if ($rMounted) {
-                        array_unshift($rRows, ['custom_data' => json_encode(['action' => 'disable_ramdisk'])]);
-                    }
-                } else {
-                    if (!$rMounted) {
-                        array_unshift($rRows, ['custom_data' => json_encode(['action' => 'enable_ramdisk'])]);
-                    }
-                }
-            }
-            if (file_exists(TMP_PATH . 'crontab')) {
-                echo 'Checking crontab...' . "\n";
-                exec('crontab -u xc_vm -l', $rCrons);
-                $rCurrentCron = trim(implode("\n", $rCrons));
-                $rJobs = [];
-                $db->query('SELECT * FROM `crontab` WHERE `enabled` = 1;');
-                foreach ($db->get_rows() as $rRow) {
-                    $rJobs[] = $rRow['time'] . ' ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:' . $rRow['filename'] . ' # XC_VM';
-                }
-                $rActualCron = trim(implode("\n", $rJobs));
-                if ($rCurrentCron != $rActualCron) {
-                    echo 'Updating Crons...' . "\n";
-                    unlink(TMP_PATH . 'crontab');
-                } else {
-                    echo "Crons valid.\n";
-                }
-            }
-            if (file_exists(CONFIG_PATH . 'sysctl.on')) {
-                if (strtoupper(substr(explode("\n", file_get_contents('/etc/sysctl.conf'))[0], 0, 7)) != '# XC_VM') {
-                    echo 'Sysctl missing! Writing it.' . "\n";
-                    exec('sudo modprobe ip_conntrack');
-                    file_put_contents('/etc/sysctl.conf', implode(PHP_EOL, ['# XC_VM', '', 'net.core.somaxconn = 655350', 'net.ipv4.route.flush=1', 'net.ipv4.tcp_no_metrics_save=1', 'net.ipv4.tcp_moderate_rcvbuf = 1', 'fs.file-max = 6815744', 'fs.aio-max-nr = 6815744', 'fs.nr_open = 6815744', 'net.ipv4.ip_local_port_range = 1024 65000', 'net.ipv4.tcp_sack = 1', 'net.ipv4.tcp_rmem = 10000000 10000000 10000000', 'net.ipv4.tcp_wmem = 10000000 10000000 10000000', 'net.ipv4.tcp_mem = 10000000 10000000 10000000', 'net.core.rmem_max = 524287', 'net.core.wmem_max = 524287', 'net.core.rmem_default = 524287', 'net.core.wmem_default = 524287', 'net.core.optmem_max = 524287', 'net.core.netdev_max_backlog = 300000', 'net.ipv4.tcp_max_syn_backlog = 300000', 'net.netfilter.nf_conntrack_max=1215196608', 'net.ipv4.tcp_window_scaling = 1', 'vm.max_map_count = 655300', 'net.ipv4.tcp_max_tw_buckets = 50000', 'net.ipv6.conf.all.disable_ipv6 = 1', 'net.ipv6.conf.default.disable_ipv6 = 1', 'net.ipv6.conf.lo.disable_ipv6 = 1', 'kernel.shmmax=134217728', 'kernel.shmall=134217728', 'vm.overcommit_memory = 1', 'net.ipv4.tcp_tw_reuse=1']));
-                    exec('sudo sysctl -p > /dev/null');
-                }
-            }
-            if (count($rRows) > 0) {
-                foreach ($rRows as $rRow) {
-                    $rData = json_decode($rRow['custom_data'], true);
-                    if (!empty($rRow['signal_id'])) {
-                        $db->query('DELETE FROM `signals` WHERE `signal_id` = ?;', $rRow['signal_id']);
-                    }
-                    switch ($rData['action']) {
-                        case 'reboot':
-                            echo 'Rebooting system...' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'REBOOT', 'System rebooted on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            $db->close_mysql();
-                            shell_exec('sudo reboot');
-                            break;
-                        case 'restart_services':
-                            echo 'Restarting services...' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'RESTART', 'XC_VM services restarted on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            shell_exec('sudo systemctl stop xc_vm');
-                            shell_exec('sudo systemctl start xc_vm');
-                            break;
-                        case 'stop_services':
-                            echo 'Stopping services...' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'STOP', 'XC_VM services stopped on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            shell_exec('sudo systemctl stop xc_vm');
-                            break;
-                        case 'reload_nginx':
-                            echo 'Reloading nginx...' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'RELOAD', 'NGINX services reloaded on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            shell_exec('sudo ' . BIN_PATH . 'nginx_rtmp/sbin/nginx_rtmp -s reload');
-                            shell_exec('sudo ' . BIN_PATH . 'nginx/sbin/nginx -s reload');
-                            break;
-                        case 'disable_ramdisk':
-                            echo 'Disabling ramdisk...' . "\n";
-                            $rFstab = file_get_contents('/etc/fstab');
-                            $rOutput = [];
-                            foreach (explode("\n", $rFstab) as $rLine) {
-                                if (substr($rLine, 0, 31) == 'tmpfs /home/xc_vm/content/streams') {
-                                    $rLine = '#' . $rLine;
-                                }
-                                $rOutput[] = $rLine;
-                            }
-                            file_put_contents('/etc/fstab', implode("\n", $rOutput));
-                            shell_exec('sudo umount -l ' . STREAMS_PATH);
-                            shell_exec('sudo chown -R xc_vm:xc_vm ' . STREAMS_PATH);
-                            break;
-                        case 'enable_ramdisk':
-                            echo 'Enabling ramdisk...' . "\n";
-                            $rFstab = file_get_contents('/etc/fstab');
-                            $rOutput = [];
-                            foreach (explode("\n", $rFstab) as $rLine) {
-                                if (substr($rLine, 0, 32) == '#tmpfs /home/xc_vm/content/streams') {
-                                    $rLine = ltrim($rLine, '#');
-                                }
-                                $rOutput[] = $rLine;
-                            }
-                            file_put_contents('/etc/fstab', implode("\n", $rOutput));
-                            shell_exec('sudo mount ' . STREAMS_PATH);
-                            shell_exec('sudo chown -R xc_vm:xc_vm ' . STREAMS_PATH);
-                            break;
-                        case 'certbot_generate':
-                            echo 'Generating certbot certificate.' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'CERTBOT', 'Attempting to generate certbot certificate on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php certbot "' . base64_encode(json_encode($rData)) . '" 2>&1 &');
-                            break;
-                        case 'update_binaries':
-                            echo 'Updating binaries...' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'BINARIES', 'Updating XC_VM binaries from XC_VM server...', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php binaries 2>&1 &');
-                            break;
-                        case 'install_module':
-                            echo 'Installing module distributed from MAIN...' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'MODULE', 'Installing module distributed from MAIN...', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php module:install "' . base64_encode(json_encode($rData)) . '" 2>&1 &');
-                            break;
-                        case 'delete_module':
-                            echo 'Deleting module removed on MAIN...' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'MODULE', 'Deleting module removed on MAIN...', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php module:delete "' . base64_encode(json_encode($rData)) . '" 2>&1 &');
-                            break;
-                        case 'update':
-                            echo 'Updating...' . "\n";
-                            $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'UPDATE', 'Updating XC_VM...', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
-                            shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php update update 2>&1 &');
-                            break;
-                        case 'rollback':
-                            $rRbVersion = isset($rData['version']) ? trim((string) $rData['version']) : '';
-                            if (preg_match('/^\d+\.\d+\.\d+$/', $rRbVersion)) {
-                                echo 'Rolling back to ' . $rRbVersion . '...' . "\n";
-                                $db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'UPDATE', ?, 'root', 'localhost', NULL, ?);", SERVER_ID, 'Rolling back XC_VM to ' . $rRbVersion . '...', time());
-                                shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php update rollback ' . escapeshellarg($rRbVersion) . ' 2>&1 &');
-                            }
-                            break;
-                        case 'set_services':
-                            echo 'Setting PHP Services' . "\n";
-                            $rServices = intval($rData['count']);
-                            if ($rData['reload']) {
-                                shell_exec('sudo systemctl stop xc_vm');
-                            }
-                            shell_exec('sudo rm ' . MAIN_HOME . 'bin/php/etc/*.conf');
-                            $rNewScript = '#! /bin/bash' . "\n";
-                            $rNewBalance = 'upstream php {' . "\n" . '    least_conn;' . "\n";
-                            $rTemplate = file_get_contents(MAIN_HOME . 'bin/php/etc/template');
-                            foreach (range(1, $rServices) as $i) {
-                                $rNewScript .= 'start-stop-daemon --start --quiet --pidfile ' . MAIN_HOME . 'bin/php/sockets/' . $i . '.pid --exec ' . MAIN_HOME . 'bin/php/sbin/php-fpm -- --daemonize --fpm-config ' . MAIN_HOME . 'bin/php/etc/' . $i . '.conf' . "\n";
-                                $rNewBalance .= '    server unix:' . MAIN_HOME . 'bin/php/sockets/' . $i . '.sock;' . "\n";
-                                file_put_contents(MAIN_HOME . 'bin/php/etc/' . $i . '.conf', str_replace('#PATH#', MAIN_HOME, str_replace('#ID#', (string) $i, $rTemplate)));
-                            }
-                            file_put_contents(MAIN_HOME . 'bin/daemons.sh', $rNewScript);
-                            file_put_contents(MAIN_HOME . 'bin/nginx/conf/balance.conf', $rNewBalance . '}');
-                            shell_exec('sudo chown xc_vm:xc_vm ' . MAIN_HOME . 'bin/php/etc/*');
-                            if ($rData['reload']) {
-                                shell_exec('sudo systemctl start xc_vm');
-                            }
-                            break;
-                        case 'set_governor':
-                            $rNewGovernor = $rData['data'];
-                            if (!empty($rNewGovernor) && shell_exec('which cpufreq-info')) {
-                                $rGovernors = array_filter(explode(' ', trim(shell_exec('cpufreq-info -g'))));
-                                $rGovernor = explode(' ', trim(shell_exec('cpufreq-info -p')));
-                                if ($rGovernor[2] != $rNewGovernor && in_array($rNewGovernor, $rGovernors)) {
-                                    shell_exec("sudo bash -c 'for ((i=0;i<\$(nproc);i++)); do cpufreq-set -c \$i -g " . $rNewGovernor . "; done'");
-                                    sleep(2);
-                                    $rGovernor = explode(' ', trim(shell_exec('cpufreq-info -p')));
-                                    $db->query('UPDATE `servers` SET `governor` = ? WHERE `id` = ?;', json_encode($rGovernor), SERVER_ID);
-                                }
-                            }
-                            break;
-                        case 'set_sysctl':
-                            $rNewConfig = $rData['data'];
-                            if (!empty($rNewConfig)) {
-                                $rSysCtl = file_get_contents('/etc/sysctl.conf');
-                                if ($rSysCtl != $rNewConfig) {
-                                    shell_exec('sudo modprobe ip_conntrack > /dev/null');
-                                    file_put_contents('/etc/sysctl.conf', $rNewConfig);
-                                    shell_exec('sudo sysctl -p > /dev/null');
-                                    $db->query('UPDATE `servers` SET `sysctl` = ? WHERE `id` = ?;', $rNewConfig, SERVER_ID);
-                                }
-                            }
-                            break;
-                        case 'set_port':
-                            echo 'Setting NGINX Port' . "\n";
-                            if (intval($rData['type']) == 0) {
-                                $rListen = [];
-                                foreach ($rData['ports'] as $rPort) {
-                                    if (is_numeric($rPort) && $rPort >= 80 && $rPort <= 65535) {
-                                        $rListen[] = 'listen ' . intval($rPort) . ';';
-                                    }
-                                }
-                                file_put_contents(MAIN_HOME . 'bin/nginx/conf/ports/http.conf', implode(' ', $rListen));
-                                file_put_contents(MAIN_HOME . 'bin/nginx_rtmp/conf/live.conf', 'on_play http://127.0.0.1:' . intval($rData['ports'][0]) . '/stream/rtmp; on_publish http://127.0.0.1:' . intval($rData['ports'][0]) . '/stream/rtmp; on_play_done http://127.0.0.1:' . intval($rData['ports'][0]) . '/stream/rtmp;');
-                                if ($rData['reload']) {
-                                    shell_exec('sudo ' . BIN_PATH . 'nginx/sbin/nginx -s reload');
-                                }
-                            } elseif (intval($rData['type']) == 1) {
-                                $rListen = [];
-                                foreach ($rData['ports'] as $rPort) {
-                                    if (is_numeric($rPort) && $rPort >= 80 && $rPort <= 65535) {
-                                        $rListen[] = 'listen ' . intval($rPort) . ' ssl;';
-                                    }
-                                }
-                                file_put_contents(MAIN_HOME . 'bin/nginx/conf/ports/https.conf', implode(' ', $rListen));
-                                if ($rData['reload']) {
-                                    shell_exec('sudo ' . BIN_PATH . 'nginx/sbin/nginx -s reload');
-                                }
-                            } elseif (intval($rData['type']) == 2) {
-                                file_put_contents(MAIN_HOME . 'bin/nginx_rtmp/conf/port.conf', 'listen ' . intval($rData['ports'][0]) . ';');
-                                if ($rData['reload']) {
-                                    shell_exec('sudo ' . BIN_PATH . 'nginx_rtmp/sbin/nginx_rtmp -s reload');
-                                }
-                            }
-                            // no break
-                        default:
-                            break;
-                    }
-                }
-            }
-            $db->query('DELETE FROM `signals` WHERE LENGTH(`custom_data`) > 0 AND UNIX_TIMESTAMP() - `time` >= 86400;');
-            $db->close_mysql();
-        } else {
-            exit();
-        }
-    }
+		// yt-dlp — same self-heal rationale. It is a static bundled binary that
+		// resolves media URLs (StreamUtils) and nothing else keeps it current, so
+		// it goes stale between panel releases and breaks extraction. The `ytdlp`
+		// command is idempotent (version-compared against the upstream release,
+		// downloads only on a mismatch, SHA-verified + run-tested before an atomic
+		// swap), so it is safe to poll. Daily is enough (yt-dlp releases ~weekly);
+		// the first pass (stamp absent) runs immediately. Runs on every node that
+		// has the binary (main + LB).
+		$rYtDlpStamp = CRONS_TMP_PATH . 'ytdlp_check';
+		if (!file_exists($rYtDlpStamp) || time() - intval(@file_get_contents($rYtDlpStamp) ?: 0) > 86400) {
+			file_put_contents($rYtDlpStamp, time());
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php ytdlp >/dev/null 2>&1 &');
+		}
 
-    public function shutdown(): void {
-        global $db;
-        if ($this->rSaveIPTables) {
-            $this->saveiptables();
-        }
-        if (is_object($db)) {
-            $db->close_mysql();
-        }
-        @unlink($this->rIdentifier);
-    }
+		if ($rServers[SERVER_ID]['limit_requests'] > 0) {
+			$rLimitConf = 'limit_req_zone global zone=two:10m rate=' . intval($rServers[SERVER_ID]['limit_requests']) . 'r/s;';
+		} else {
+			$rLimitConf = '';
+		}
+		$rCurrentConf = (trim(file_get_contents(BIN_PATH . 'nginx/conf/limit.conf')) ?: '');
+		if ($rLimitConf != $rCurrentConf) {
+			echo 'Updating rate limit...' . "\n";
+			file_put_contents(BIN_PATH . 'nginx/conf/limit.conf', $rLimitConf);
+			$rReload = true;
+		}
+		if ($rServers[SERVER_ID]['limit_requests'] > 0) {
+			$rLimitConf = 'limit_req zone=two burst=' . intval($rServers[SERVER_ID]['limit_burst']) . ';';
+		} else {
+			$rLimitConf = '';
+		}
+		$rCurrentConf = (trim(file_get_contents(BIN_PATH . 'nginx/conf/limit_queue.conf')) ?: '');
+		if ($rLimitConf != $rCurrentConf) {
+			echo 'Updating rate limit queue...' . "\n";
+			file_put_contents(BIN_PATH . 'nginx/conf/limit_queue.conf', $rLimitConf);
+			$rReload = true;
+		}
+		if ($rReload) {
+			shell_exec('sudo ' . BIN_PATH . 'nginx/sbin/nginx -s reload');
+		}
+		if (SettingsManager::get('restart_php_fpm')) {
+			$rPHP = count(glob(BIN_PATH . 'php/sockets/*.pid') ?: []);
+			$rNginx = 0;
+			foreach (glob('/proc/*/cmdline') ?: [] as $rCmdFile) {
+				$rRaw = @file_get_contents($rCmdFile);
+				if ($rRaw && strpos(str_replace("\0", ' ', $rRaw), 'nginx: master') !== false) {
+					$rNginx++;
+				}
+			}
+			if ($rNginx > 0) {
+				if ($rPHP == 0) {
+					echo 'PHP-FPM ERROR - Restarting...';
+					$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'PHP-FPM', 'Restarted PHP-FPM instances due to a suspected crash.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+					shell_exec('sudo systemctl stop xc_vm');
+					shell_exec('sudo systemctl start xc_vm');
+					exit();
+				}
+			}
+			$rCurlMarker = CRONS_TMP_PATH . 'fpm_curl_check';
+			if (!file_exists($rCurlMarker) || (time() - filemtime($rCurlMarker)) >= 300) {
+				@touch($rCurlMarker);
+				$rHandle = curl_init('http://127.0.0.1:' . $rServers[SERVER_ID]['http_broadcast_port'] . '/init');
+				curl_setopt($rHandle, CURLOPT_RETURNTRANSFER, true);
+				curl_exec($rHandle);
+				$rCode = curl_getinfo($rHandle, CURLINFO_HTTP_CODE);
+				if (!in_array($rCode, [500, 502])) {
+					curl_close($rHandle);
+				} else {
+					echo $rCode . ' ERROR - Restarting...';
+					$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'PHP-FPM', 'Restarted services due to " . $rCode . " error.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+					shell_exec('sudo systemctl stop xc_vm');
+					shell_exec('sudo systemctl start xc_vm');
+					exit();
+				}
+			}
+		}
+		if ($db->query("SELECT `signal_id`, `custom_data` FROM `signals` WHERE `server_id` = ? AND `custom_data` <> '' AND `cache` = 0 ORDER BY signal_id ASC;", SERVER_ID)) {
+			$rRows = $db->get_rows();
+			$rCheck = ['php' => false, 'services' => false, 'ports' => false, 'ramdisk' => false];
+			foreach ($rRows as $rRow) {
+				$rData = json_decode($rRow['custom_data'], true);
+				switch ($rData['action']) {
+					case 'disable_ramdisk':
+					case 'enable_ramdisk':
+						$rCheck['ramdisk'] = true;
+						break;
+					case 'set_services':
+						$rCheck['services'] = true;
+						break;
+					case 'set_port':
+						$rCheck['ports'] = true;
+						break;
+				}
+			}
+			if ($rCheck['services']) {
+				$rCurServices = 0;
+				$rStartScript = explode("\n", file_get_contents(MAIN_HOME . 'bin/daemons.sh'));
+				foreach ($rStartScript as $rLine) {
+					if (explode(' ', $rLine)[0] == 'start-stop-daemon') {
+						$rCurServices++;
+					}
+				}
+				if ($rServers[SERVER_ID]['total_services'] != $rCurServices) {
+					array_unshift($rRows, ['custom_data' => json_encode(['action' => 'set_services', 'count' => $rServers[SERVER_ID]['total_services'], 'reload' => true])]);
+				}
+			}
+			if ($rCheck['ports']) {
+				$rListen = $rPorts = ['http' => [], 'https' => []];
+				foreach (array_merge([intval($rServers[SERVER_ID]['http_broadcast_port'])], explode(',', $rServers[SERVER_ID]['http_ports_add'])) as $rPort) {
+					if (is_numeric($rPort) && $rPort > 0 && $rPort <= 65535) {
+						$rListen['http'][] = 'listen ' . intval($rPort) . ';';
+						$rPorts['http'][] = intval($rPort);
+					}
+				}
+				foreach (array_merge([intval($rServers[SERVER_ID]['https_broadcast_port'])], explode(',', $rServers[SERVER_ID]['https_ports_add'])) as $rPort) {
+					if (is_numeric($rPort) && $rPort > 0 && $rPort <= 65535) {
+						$rListen['https'][] = 'listen ' . intval($rPort) . ' ssl;';
+						$rPorts['https'][] = intval($rPort);
+					}
+				}
+				if (trim(implode(' ', $rListen['http'])) != trim(file_get_contents(MAIN_HOME . 'bin/nginx/conf/ports/http.conf'))) {
+					array_unshift($rRows, ['custom_data' => json_encode(['action' => 'set_port', 'type' => 0, 'ports' => $rPorts['http'], 'reload' => true])]);
+				}
+				if (trim(implode(' ', $rListen['https'])) != trim(file_get_contents(MAIN_HOME . 'bin/nginx/conf/ports/https.conf'))) {
+					array_unshift($rRows, ['custom_data' => json_encode(['action' => 'set_port', 'type' => 1, 'ports' => $rPorts['https'], 'reload' => true])]);
+				}
+				if ('listen ' . intval($rServers[SERVER_ID]['rtmp_port']) . ';' != trim(file_get_contents(MAIN_HOME . 'bin/nginx_rtmp/conf/port.conf'))) {
+					array_unshift($rRows, ['custom_data' => json_encode(['action' => 'set_port', 'type' => 2, 'ports' => [intval($rServers[SERVER_ID]['rtmp_port'])], 'reload' => true])]);
+				}
+			}
+			if ($rCheck['ramdisk']) {
+				$rMounted = false;
+				exec('df -h', $rLines);
+				array_shift($rLines);
+				foreach ($rLines as $rLine) {
+					$rSplit = explode(' ', preg_replace('!\\s+!', ' ', trim($rLine)));
+					if (implode(' ', array_slice($rSplit, 5, count($rSplit) - 5)) == rtrim(STREAMS_PATH, '/')) {
+						$rMounted = true;
+						break;
+					}
+				}
+				if ($rServers[SERVER_ID]['use_disk']) {
+					if ($rMounted) {
+						array_unshift($rRows, ['custom_data' => json_encode(['action' => 'disable_ramdisk'])]);
+					}
+				} else {
+					if (!$rMounted) {
+						array_unshift($rRows, ['custom_data' => json_encode(['action' => 'enable_ramdisk'])]);
+					}
+				}
+			}
+			if (file_exists(TMP_PATH . 'crontab')) {
+				echo 'Checking crontab...' . "\n";
+				exec('crontab -u xc_vm -l', $rCrons);
+				$rCurrentCron = trim(implode("\n", $rCrons));
+				$rJobs = [];
+				$db->query('SELECT * FROM `crontab` WHERE `enabled` = 1;');
+				foreach ($db->get_rows() as $rRow) {
+					$rJobs[] = $rRow['time'] . ' ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:' . $rRow['filename'] . ' # XC_VM';
+				}
+				$rActualCron = trim(implode("\n", $rJobs));
+				if ($rCurrentCron != $rActualCron) {
+					echo 'Updating Crons...' . "\n";
+					unlink(TMP_PATH . 'crontab');
+				} else {
+					echo "Crons valid.\n";
+				}
+			}
+			if (file_exists(CONFIG_PATH . 'sysctl.on')) {
+				if (strtoupper(substr(explode("\n", file_get_contents('/etc/sysctl.conf'))[0], 0, 7)) != '# XC_VM') {
+					echo 'Sysctl missing! Writing it.' . "\n";
+					exec('sudo modprobe ip_conntrack');
+					file_put_contents('/etc/sysctl.conf', implode(PHP_EOL, ['# XC_VM', '', 'net.core.somaxconn = 655350', 'net.ipv4.route.flush=1', 'net.ipv4.tcp_no_metrics_save=1', 'net.ipv4.tcp_moderate_rcvbuf = 1', 'fs.file-max = 6815744', 'fs.aio-max-nr = 6815744', 'fs.nr_open = 6815744', 'net.ipv4.ip_local_port_range = 1024 65000', 'net.ipv4.tcp_sack = 1', 'net.ipv4.tcp_rmem = 10000000 10000000 10000000', 'net.ipv4.tcp_wmem = 10000000 10000000 10000000', 'net.ipv4.tcp_mem = 10000000 10000000 10000000', 'net.core.rmem_max = 524287', 'net.core.wmem_max = 524287', 'net.core.rmem_default = 524287', 'net.core.wmem_default = 524287', 'net.core.optmem_max = 524287', 'net.core.netdev_max_backlog = 300000', 'net.ipv4.tcp_max_syn_backlog = 300000', 'net.netfilter.nf_conntrack_max=1215196608', 'net.ipv4.tcp_window_scaling = 1', 'vm.max_map_count = 655300', 'net.ipv4.tcp_max_tw_buckets = 50000', 'net.ipv6.conf.all.disable_ipv6 = 1', 'net.ipv6.conf.default.disable_ipv6 = 1', 'net.ipv6.conf.lo.disable_ipv6 = 1', 'kernel.shmmax=134217728', 'kernel.shmall=134217728', 'vm.overcommit_memory = 1', 'net.ipv4.tcp_tw_reuse=1']));
+					exec('sudo sysctl -p > /dev/null');
+				}
+			}
+			if (count($rRows) > 0) {
+				foreach ($rRows as $rRow) {
+					$rData = json_decode($rRow['custom_data'], true);
+					if (!empty($rRow['signal_id'])) {
+						$db->query('DELETE FROM `signals` WHERE `signal_id` = ?;', $rRow['signal_id']);
+					}
+					switch ($rData['action']) {
+						case 'reboot':
+							echo 'Rebooting system...' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'REBOOT', 'System rebooted on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							$db->close_mysql();
+							shell_exec('sudo reboot');
+							break;
+						case 'restart_services':
+							echo 'Restarting services...' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'RESTART', 'XC_VM services restarted on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							shell_exec('sudo systemctl stop xc_vm');
+							shell_exec('sudo systemctl start xc_vm');
+							break;
+						case 'stop_services':
+							echo 'Stopping services...' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'STOP', 'XC_VM services stopped on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							shell_exec('sudo systemctl stop xc_vm');
+							break;
+						case 'reload_nginx':
+							echo 'Reloading nginx...' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'RELOAD', 'NGINX services reloaded on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							shell_exec('sudo ' . BIN_PATH . 'nginx_rtmp/sbin/nginx_rtmp -s reload');
+							shell_exec('sudo ' . BIN_PATH . 'nginx/sbin/nginx -s reload');
+							break;
+						case 'disable_ramdisk':
+							echo 'Disabling ramdisk...' . "\n";
+							$rFstab = file_get_contents('/etc/fstab');
+							$rOutput = [];
+							foreach (explode("\n", $rFstab) as $rLine) {
+								if (substr($rLine, 0, 31) == 'tmpfs /home/xc_vm/content/streams') {
+									$rLine = '#' . $rLine;
+								}
+								$rOutput[] = $rLine;
+							}
+							file_put_contents('/etc/fstab', implode("\n", $rOutput));
+							shell_exec('sudo umount -l ' . STREAMS_PATH);
+							shell_exec('sudo chown -R xc_vm:xc_vm ' . STREAMS_PATH);
+							break;
+						case 'enable_ramdisk':
+							echo 'Enabling ramdisk...' . "\n";
+							$rFstab = file_get_contents('/etc/fstab');
+							$rOutput = [];
+							foreach (explode("\n", $rFstab) as $rLine) {
+								if (substr($rLine, 0, 32) == '#tmpfs /home/xc_vm/content/streams') {
+									$rLine = ltrim($rLine, '#');
+								}
+								$rOutput[] = $rLine;
+							}
+							file_put_contents('/etc/fstab', implode("\n", $rOutput));
+							shell_exec('sudo mount ' . STREAMS_PATH);
+							shell_exec('sudo chown -R xc_vm:xc_vm ' . STREAMS_PATH);
+							break;
+						case 'certbot_generate':
+							echo 'Generating certbot certificate.' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'CERTBOT', 'Attempting to generate certbot certificate on request.', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php certbot "' . base64_encode(json_encode($rData)) . '" 2>&1 &');
+							break;
+						case 'update_binaries':
+							echo 'Updating binaries...' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'BINARIES', 'Updating XC_VM binaries from XC_VM server...', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php binaries 2>&1 &');
+							break;
+						case 'install_module':
+							echo 'Installing module distributed from MAIN...' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'MODULE', 'Installing module distributed from MAIN...', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php module:install "' . base64_encode(json_encode($rData)) . '" 2>&1 &');
+							break;
+						case 'delete_module':
+							echo 'Deleting module removed on MAIN...' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'MODULE', 'Deleting module removed on MAIN...', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php module:delete "' . base64_encode(json_encode($rData)) . '" 2>&1 &');
+							break;
+						case 'update':
+							echo 'Updating...' . "\n";
+							$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'UPDATE', 'Updating XC_VM...', 'root', 'localhost', NULL, ?);", SERVER_ID, time());
+							shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php update update 2>&1 &');
+							break;
+						case 'rollback':
+							$rRbVersion = isset($rData['version']) ? trim((string) $rData['version']) : '';
+							if (preg_match('/^\d+\.\d+\.\d+$/', $rRbVersion)) {
+								echo 'Rolling back to ' . $rRbVersion . '...' . "\n";
+								$db->query("INSERT INTO `mysql_syslog`(`server_id`, `type`, `error`, `username`, `ip`, `database`, `date`) VALUES(?, 'UPDATE', ?, 'root', 'localhost', NULL, ?);", SERVER_ID, 'Rolling back XC_VM to ' . $rRbVersion . '...', time());
+								shell_exec('sudo ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php update rollback ' . escapeshellarg($rRbVersion) . ' 2>&1 &');
+							}
+							break;
+						case 'set_services':
+							echo 'Setting PHP Services' . "\n";
+							$rServices = intval($rData['count']);
+							if ($rData['reload']) {
+								shell_exec('sudo systemctl stop xc_vm');
+							}
+							shell_exec('sudo rm ' . MAIN_HOME . 'bin/php/etc/*.conf');
+							$rNewScript = '#! /bin/bash' . "\n";
+							$rNewBalance = 'upstream php {' . "\n" . '    least_conn;' . "\n";
+							$rTemplate = file_get_contents(MAIN_HOME . 'bin/php/etc/template');
+							foreach (range(1, $rServices) as $i) {
+								$rNewScript .= 'start-stop-daemon --start --quiet --pidfile ' . MAIN_HOME . 'bin/php/sockets/' . $i . '.pid --exec ' . MAIN_HOME . 'bin/php/sbin/php-fpm -- --daemonize --fpm-config ' . MAIN_HOME . 'bin/php/etc/' . $i . '.conf' . "\n";
+								$rNewBalance .= '    server unix:' . MAIN_HOME . 'bin/php/sockets/' . $i . '.sock;' . "\n";
+								file_put_contents(MAIN_HOME . 'bin/php/etc/' . $i . '.conf', str_replace('#PATH#', MAIN_HOME, str_replace('#ID#', (string) $i, $rTemplate)));
+							}
+							file_put_contents(MAIN_HOME . 'bin/daemons.sh', $rNewScript);
+							file_put_contents(MAIN_HOME . 'bin/nginx/conf/balance.conf', $rNewBalance . '}');
+							shell_exec('sudo chown xc_vm:xc_vm ' . MAIN_HOME . 'bin/php/etc/*');
+							if ($rData['reload']) {
+								shell_exec('sudo systemctl start xc_vm');
+							}
+							break;
+						case 'set_governor':
+							$rNewGovernor = $rData['data'];
+							if (!empty($rNewGovernor) && shell_exec('which cpufreq-info')) {
+								$rGovernors = array_filter(explode(' ', trim(shell_exec('cpufreq-info -g'))));
+								$rGovernor = explode(' ', trim(shell_exec('cpufreq-info -p')));
+								if ($rGovernor[2] != $rNewGovernor && in_array($rNewGovernor, $rGovernors)) {
+									shell_exec("sudo bash -c 'for ((i=0;i<\$(nproc);i++)); do cpufreq-set -c \$i -g " . $rNewGovernor . "; done'");
+									sleep(2);
+									$rGovernor = explode(' ', trim(shell_exec('cpufreq-info -p')));
+									$db->query('UPDATE `servers` SET `governor` = ? WHERE `id` = ?;', json_encode($rGovernor), SERVER_ID);
+								}
+							}
+							break;
+						case 'set_sysctl':
+							$rNewConfig = $rData['data'];
+							if (!empty($rNewConfig)) {
+								$rSysCtl = file_get_contents('/etc/sysctl.conf');
+								if ($rSysCtl != $rNewConfig) {
+									shell_exec('sudo modprobe ip_conntrack > /dev/null');
+									file_put_contents('/etc/sysctl.conf', $rNewConfig);
+									shell_exec('sudo sysctl -p > /dev/null');
+									$db->query('UPDATE `servers` SET `sysctl` = ? WHERE `id` = ?;', $rNewConfig, SERVER_ID);
+								}
+							}
+							break;
+						case 'set_port':
+							echo 'Setting NGINX Port' . "\n";
+							if (intval($rData['type']) == 0) {
+								$rListen = [];
+								foreach ($rData['ports'] as $rPort) {
+									if (is_numeric($rPort) && $rPort >= 80 && $rPort <= 65535) {
+										$rListen[] = 'listen ' . intval($rPort) . ';';
+									}
+								}
+								file_put_contents(MAIN_HOME . 'bin/nginx/conf/ports/http.conf', implode(' ', $rListen));
+								file_put_contents(MAIN_HOME . 'bin/nginx_rtmp/conf/live.conf', 'on_play http://127.0.0.1:' . intval($rData['ports'][0]) . '/stream/rtmp; on_publish http://127.0.0.1:' . intval($rData['ports'][0]) . '/stream/rtmp; on_play_done http://127.0.0.1:' . intval($rData['ports'][0]) . '/stream/rtmp;');
+								if ($rData['reload']) {
+									shell_exec('sudo ' . BIN_PATH . 'nginx/sbin/nginx -s reload');
+								}
+							} elseif (intval($rData['type']) == 1) {
+								$rListen = [];
+								foreach ($rData['ports'] as $rPort) {
+									if (is_numeric($rPort) && $rPort >= 80 && $rPort <= 65535) {
+										$rListen[] = 'listen ' . intval($rPort) . ' ssl;';
+									}
+								}
+								file_put_contents(MAIN_HOME . 'bin/nginx/conf/ports/https.conf', implode(' ', $rListen));
+								if ($rData['reload']) {
+									shell_exec('sudo ' . BIN_PATH . 'nginx/sbin/nginx -s reload');
+								}
+							} elseif (intval($rData['type']) == 2) {
+								file_put_contents(MAIN_HOME . 'bin/nginx_rtmp/conf/port.conf', 'listen ' . intval($rData['ports'][0]) . ';');
+								if ($rData['reload']) {
+									shell_exec('sudo ' . BIN_PATH . 'nginx_rtmp/sbin/nginx_rtmp -s reload');
+								}
+							}
+							// no break
+						default:
+							break;
+					}
+				}
+			}
+			$db->query('DELETE FROM `signals` WHERE LENGTH(`custom_data`) > 0 AND UNIX_TIMESTAMP() - `time` >= 86400;');
+			$db->close_mysql();
+		} else {
+			exit();
+		}
+	}
+
+	public function shutdown(): void {
+		global $db;
+		if ($this->rSaveIPTables) {
+			$this->saveiptables();
+		}
+		if (is_object($db)) {
+			$db->close_mysql();
+		}
+		@unlink($this->rIdentifier);
+	}
 }
diff --git a/src/Cli/CronJobs/SeriesCronJob.php b/src/Cli/CronJobs/SeriesCronJob.php
index bc31fe3d..744653a6 100644
--- a/src/Cli/CronJobs/SeriesCronJob.php
+++ b/src/Cli/CronJobs/SeriesCronJob.php
@@ -19,60 +19,60 @@ use XcVm\Domain\Vod\SeriesService;
  */
 
 class SeriesCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:series';
-    }
+	public function getName(): string {
+		return 'cron:series';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: update series playlists and scan bouquets';
-    }
+	public function getDescription(): string {
+		return 'Cron: update series playlists and scan bouquets';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->setProcessTitle('XC_VM[Series]');
-        $this->acquireCronLock();
+		$this->setProcessTitle('XC_VM[Series]');
+		$this->acquireCronLock();
 
-        $this->loadCron();
+		$this->loadCron();
 
-        @unlink($this->rIdentifier);
+		@unlink($this->rIdentifier);
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function loadCron(): void {
-        global $db;
+	private function loadCron(): void {
+		global $db;
 
-        if (time() - SettingsManager::get('cc_time') < 3600) {
-            return;
-        }
+		if (time() - SettingsManager::get('cc_time') < 3600) {
+			return;
+		}
 
-        $db->query('UPDATE `settings` SET `cc_time` = ?;', time());
-        $db->query('SELECT `id`, `stream_display_name`, `series_no`, `stream_source` FROM `streams` WHERE `type` = 3 AND `series_no` <> 0;');
+		$db->query('UPDATE `settings` SET `cc_time` = ?;', time());
+		$db->query('SELECT `id`, `stream_display_name`, `series_no`, `stream_source` FROM `streams` WHERE `type` = 3 AND `series_no` <> 0;');
 
-        if ($db->num_rows() > 0) {
-            foreach ($db->get_rows() as $rRow) {
-                $rPlaylist = SeriesService::generatePlaylist(intval($rRow['series_no']));
-                if ($rPlaylist['success']) {
-                    $rSourceArray = json_decode($rRow['stream_source'], true);
-                    $UpdateSeries = false;
-                    foreach ($rPlaylist['sources'] as $rSource) {
-                        if (!in_array($rSource, $rSourceArray)) {
-                            $UpdateSeries = true;
-                        }
-                    }
-                    if ($UpdateSeries) {
-                        $db->query('UPDATE `streams` SET `stream_source` = ? WHERE `id` = ?;', json_encode($rPlaylist['sources'], JSON_UNESCAPED_UNICODE), $rRow['id']);
-                        echo 'Updated: ' . $rRow['stream_display_name'] . "\n";
-                    }
-                }
-            }
-        }
+		if ($db->num_rows() > 0) {
+			foreach ($db->get_rows() as $rRow) {
+				$rPlaylist = SeriesService::generatePlaylist(intval($rRow['series_no']));
+				if ($rPlaylist['success']) {
+					$rSourceArray = json_decode($rRow['stream_source'], true);
+					$UpdateSeries = false;
+					foreach ($rPlaylist['sources'] as $rSource) {
+						if (!in_array($rSource, $rSourceArray)) {
+							$UpdateSeries = true;
+						}
+					}
+					if ($UpdateSeries) {
+						$db->query('UPDATE `streams` SET `stream_source` = ? WHERE `id` = ?;', json_encode($rPlaylist['sources'], JSON_UNESCAPED_UNICODE), $rRow['id']);
+						echo 'Updated: ' . $rRow['stream_display_name'] . "\n";
+					}
+				}
+			}
+		}
 
-        BouquetService::scan();
-    }
+		BouquetService::scan();
+	}
 }
diff --git a/src/Cli/CronJobs/ServersCronJob.php b/src/Cli/CronJobs/ServersCronJob.php
index 316938c1..74d11796 100644
--- a/src/Cli/CronJobs/ServersCronJob.php
+++ b/src/Cli/CronJobs/ServersCronJob.php
@@ -21,204 +21,204 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class ServersCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:servers';
-    }
+	public function getName(): string {
+		return 'cron:servers';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: monitor server, launch daemons, update statistics';
-    }
+	public function getDescription(): string {
+		return 'Cron: monitor server, launch daemons, update statistics';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Servers]');
-        $this->loadCron();
+		$this->initCron('XC_VM[Servers]');
+		$this->loadCron();
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function pingServer(string $rIP, $rPort): int {
-        $rStartTime = microtime(true);
-        $rSocket = @fsockopen($rIP, $rPort, $rErrNo, $rErrStr, 3);
-        $rStopTime = microtime(true);
-        if (!$rSocket) {
-            $rStatus = -1;
-        } else {
-            fclose($rSocket);
-            $rStatus = floor(($rStopTime - $rStartTime) * 1000);
-        }
-        return $rStatus;
-    }
+	private function pingServer(string $rIP, $rPort): int {
+		$rStartTime = microtime(true);
+		$rSocket = @fsockopen($rIP, $rPort, $rErrNo, $rErrStr, 3);
+		$rStopTime = microtime(true);
+		if (!$rSocket) {
+			$rStatus = -1;
+		} else {
+			fclose($rSocket);
+			$rStatus = floor(($rStopTime - $rStartTime) * 1000);
+		}
+		return $rStatus;
+	}
 
-    private function loadCron(): void {
-        global $db;
+	private function loadCron(): void {
+		global $db;
 
-        SettingsManager::set(SettingsRepository::getAll(true));
+		SettingsManager::set(SettingsRepository::getAll(true));
 
-        if (!ProcessManager::isNginxRunning()) {
-            echo 'XC_VM not running...' . "\n";
-            return;
-        }
+		if (!ProcessManager::isNginxRunning()) {
+			echo 'XC_VM not running...' . "\n";
+			return;
+		}
 
-        $rServers = ServerRepository::getAll(true);
+		$rServers = ServerRepository::getAll(true);
 
-        // The current server must be present in the map; if it isn't (row not
-        // yet inserted, or a transient load failure) every $rServers[SERVER_ID]
-        // access below would raise offset-on-null warnings and do nothing useful.
-        if (!isset($rServers[SERVER_ID])) {
-            echo 'Server ' . SERVER_ID . ' not found in servers list...' . "\n";
-            return;
-        }
+		// The current server must be present in the map; if it isn't (row not
+		// yet inserted, or a transient load failure) every $rServers[SERVER_ID]
+		// access below would raise offset-on-null warnings and do nothing useful.
+		if (!isset($rServers[SERVER_ID])) {
+			echo 'Server ' . SERVER_ID . ' not found in servers list...' . "\n";
+			return;
+		}
 
-        if ($rServers[SERVER_ID]['is_main'] && SettingsManager::get('redis_handler')) {
-            exec('pgrep -u xc_vm redis-server', $rRedis);
-            if (count($rRedis) == 0) {
-                echo 'Restarting Redis!' . "\n";
-                shell_exec(MAIN_HOME . 'bin/redis/redis-server ' . MAIN_HOME . '/bin/redis/redis.conf > /dev/null 2>/dev/null &');
-            }
-        }
+		if ($rServers[SERVER_ID]['is_main'] && SettingsManager::get('redis_handler')) {
+			exec('pgrep -u xc_vm redis-server', $rRedis);
+			if (count($rRedis) == 0) {
+				echo 'Restarting Redis!' . "\n";
+				shell_exec(MAIN_HOME . 'bin/redis/redis-server ' . MAIN_HOME . '/bin/redis/redis.conf > /dev/null 2>/dev/null &');
+			}
+		}
 
-        // Daemon liveness checks read /proc via ProcessManager: the old
-        // "ps | grep <word>" pipelines matched unrelated processes — e.g.
-        // ffmpeg's -thread_queue_size satisfied the "queue" check, so the
-        // encode queue daemon was never revived while any stream was up.
-        if (!ProcessManager::isAnyProcessRunning(array('XC_VM[Signals]', 'console.php signals'))) {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php signals > /dev/null 2>/dev/null &');
-        }
+		// Daemon liveness checks read /proc via ProcessManager: the old
+		// "ps | grep <word>" pipelines matched unrelated processes — e.g.
+		// ffmpeg's -thread_queue_size satisfied the "queue" check, so the
+		// encode queue daemon was never revived while any stream was up.
+		if (!ProcessManager::isAnyProcessRunning(['XC_VM[Signals]', 'console.php signals'])) {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php signals > /dev/null 2>/dev/null &');
+		}
 
-        if ($rServers[SERVER_ID]['is_main']) {
-            $rCachePIDs = ProcessManager::findProcessPIDs(array('XC_VM[CacheHandler]', 'console.php cache_handler'));
-            if (SettingsManager::get('enable_cache') && count($rCachePIDs) == 0) {
-                shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cache_handler > /dev/null 2>/dev/null &');
-            } elseif (!SettingsManager::get('enable_cache') && count($rCachePIDs) > 0) {
-                echo 'Killing Cache Handler' . "\n";
-                foreach ($rCachePIDs as $rPID) {
-                    shell_exec('kill -9 ' . intval($rPID));
-                }
-            }
-        }
+		if ($rServers[SERVER_ID]['is_main']) {
+			$rCachePIDs = ProcessManager::findProcessPIDs(['XC_VM[CacheHandler]', 'console.php cache_handler']);
+			if (SettingsManager::get('enable_cache') && count($rCachePIDs) == 0) {
+				shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cache_handler > /dev/null 2>/dev/null &');
+			} elseif (!SettingsManager::get('enable_cache') && count($rCachePIDs) > 0) {
+				echo 'Killing Cache Handler' . "\n";
+				foreach ($rCachePIDs as $rPID) {
+					shell_exec('kill -9 ' . intval($rPID));
+				}
+			}
+		}
 
-        if (!ProcessManager::isAnyProcessRunning(array(BIN_PATH . 'network'))) {
-            shell_exec(BIN_PATH . 'network > /dev/null 2>/dev/null &');
-        }
+		if (!ProcessManager::isAnyProcessRunning([BIN_PATH . 'network'])) {
+			shell_exec(BIN_PATH . 'network > /dev/null 2>/dev/null &');
+		}
 
-        // A watchdog generation lives only a few seconds. If one is still
-        // present but far older it is wedged — typically blocked in poll()
-        // on a half-open MariaDB socket (CLOSE_WAIT) inside its DB ping — and
-        // will never refresh last_check_ago, so the panel marks the node
-        // offline while nginx/php/redis/streams are all fine. Kill the stale
-        // process and start a fresh generation; a plain presence check alone
-        // would keep trusting the wedged one forever.
-        $rWatchdogAlive = false;
-        foreach (ProcessManager::findProcessPIDs(array('XC_VM[Watchdog]', 'console.php watchdog')) as $rWatchdogPID) {
-            if (ProcessManager::getProcessAge($rWatchdogPID) > 90) {
-                ProcessManager::kill($rWatchdogPID);
-                continue;
-            }
-            $rWatchdogAlive = true;
-        }
-        if (!$rWatchdogAlive) {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php watchdog > /dev/null 2>/dev/null &');
-        }
+		// A watchdog generation lives only a few seconds. If one is still
+		// present but far older it is wedged — typically blocked in poll()
+		// on a half-open MariaDB socket (CLOSE_WAIT) inside its DB ping — and
+		// will never refresh last_check_ago, so the panel marks the node
+		// offline while nginx/php/redis/streams are all fine. Kill the stale
+		// process and start a fresh generation; a plain presence check alone
+		// would keep trusting the wedged one forever.
+		$rWatchdogAlive = false;
+		foreach (ProcessManager::findProcessPIDs(['XC_VM[Watchdog]', 'console.php watchdog']) as $rWatchdogPID) {
+			if (ProcessManager::getProcessAge($rWatchdogPID) > 90) {
+				ProcessManager::kill($rWatchdogPID);
+				continue;
+			}
+			$rWatchdogAlive = true;
+		}
+		if (!$rWatchdogAlive) {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php watchdog > /dev/null 2>/dev/null &');
+		}
 
-        if (!ProcessManager::isAnyProcessRunning(array('XC_VM[Queue]', 'console.php queue'))) {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php queue > /dev/null 2>/dev/null &');
-        }
+		if (!ProcessManager::isAnyProcessRunning(['XC_VM[Queue]', 'console.php queue'])) {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php queue > /dev/null 2>/dev/null &');
+		}
 
-        $rOnDemandPIDs = ProcessManager::findProcessPIDs(array('XC_VM[Ondemand]', 'console.php ondemand'));
-        if (SettingsManager::get('on_demand_instant_off') && count($rOnDemandPIDs) == 0) {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php ondemand > /dev/null 2>/dev/null &');
-        } elseif (!SettingsManager::get('on_demand_instant_off') && count($rOnDemandPIDs) > 0) {
-            echo 'Killing On-Demand Instant-Off' . "\n";
-            foreach ($rOnDemandPIDs as $rPID) {
-                shell_exec('kill -9 ' . intval($rPID));
-            }
-        }
+		$rOnDemandPIDs = ProcessManager::findProcessPIDs(['XC_VM[Ondemand]', 'console.php ondemand']);
+		if (SettingsManager::get('on_demand_instant_off') && count($rOnDemandPIDs) == 0) {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php ondemand > /dev/null 2>/dev/null &');
+		} elseif (!SettingsManager::get('on_demand_instant_off') && count($rOnDemandPIDs) > 0) {
+			echo 'Killing On-Demand Instant-Off' . "\n";
+			foreach ($rOnDemandPIDs as $rPID) {
+				shell_exec('kill -9 ' . intval($rPID));
+			}
+		}
 
-        $rScannerPIDs = ProcessManager::findProcessPIDs(array('XC_VM[Scanner]', 'console.php scanner'));
-        if (SettingsManager::get('on_demand_checker') && count($rScannerPIDs) == 0) {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php scanner > /dev/null 2>/dev/null &');
-        } elseif (!SettingsManager::get('on_demand_checker') && count($rScannerPIDs) > 0) {
-            echo 'Killing On-Demand Scanner' . "\n";
-            foreach ($rScannerPIDs as $rPID) {
-                shell_exec('kill -9 ' . intval($rPID));
-            }
-        }
+		$rScannerPIDs = ProcessManager::findProcessPIDs(['XC_VM[Scanner]', 'console.php scanner']);
+		if (SettingsManager::get('on_demand_checker') && count($rScannerPIDs) == 0) {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php scanner > /dev/null 2>/dev/null &');
+		} elseif (!SettingsManager::get('on_demand_checker') && count($rScannerPIDs) > 0) {
+			echo 'Killing On-Demand Scanner' . "\n";
+			foreach ($rScannerPIDs as $rPID) {
+				shell_exec('kill -9 ' . intval($rPID));
+			}
+		}
 
-        $rStats = SystemInfo::getStats();
-        $rWatchdog = json_decode($rServers[SERVER_ID]['watchdog_data'] ?? '', true);
-        $rCPUAverage = ($rWatchdog['cpu_average_array'] ?? []) ?: [];
-        if (count($rCPUAverage) > 0) {
-            $rStats['cpu'] = round(array_sum($rCPUAverage) / count($rCPUAverage), 2);
-        }
+		$rStats = SystemInfo::getStats();
+		$rWatchdog = json_decode($rServers[SERVER_ID]['watchdog_data'] ?? '', true);
+		$rCPUAverage = ($rWatchdog['cpu_average_array'] ?? []) ?: [];
+		if (count($rCPUAverage) > 0) {
+			$rStats['cpu'] = round(array_sum($rCPUAverage) / count($rCPUAverage), 2);
+		}
 
-        $rHardware = array('total_ram' => $rStats['total_mem'], 'total_used' => $rStats['total_mem_used'], 'cores' => $rStats['cpu_cores'], 'threads' => $rStats['cpu_cores'], 'kernel' => $rStats['kernel'], 'total_running_streams' => $rStats['total_running_streams'], 'cpu_name' => $rStats['cpu_name'], 'cpu_usage' => $rStats['cpu'], 'network_speed' => $rStats['network_speed'], 'bytes_sent' => $rStats['bytes_sent'], 'bytes_received' => $rStats['bytes_received']);
+		$rHardware = ['total_ram' => $rStats['total_mem'], 'total_used' => $rStats['total_mem_used'], 'cores' => $rStats['cpu_cores'], 'threads' => $rStats['cpu_cores'], 'kernel' => $rStats['kernel'], 'total_running_streams' => $rStats['total_running_streams'], 'cpu_name' => $rStats['cpu_name'], 'cpu_usage' => $rStats['cpu'], 'network_speed' => $rStats['network_speed'], 'bytes_sent' => $rStats['bytes_sent'], 'bytes_received' => $rStats['bytes_received']];
 
-        if (@fsockopen($rServers[SERVER_ID]['server_ip'], $rServers[SERVER_ID]['http_broadcast_port'], $rErrNo, $rErrStr, 3) || @fsockopen($rServers[SERVER_ID]['server_ip'], $rServers[SERVER_ID]['https_broadcast_port'], $rErrNo, $rErrStr, 3)) {
-            $rRemoteStatus = true;
-        } else {
-            $rRemoteStatus = false;
-        }
+		if (@fsockopen($rServers[SERVER_ID]['server_ip'], $rServers[SERVER_ID]['http_broadcast_port'], $rErrNo, $rErrStr, 3) || @fsockopen($rServers[SERVER_ID]['server_ip'], $rServers[SERVER_ID]['https_broadcast_port'], $rErrNo, $rErrStr, 3)) {
+			$rRemoteStatus = true;
+		} else {
+			$rRemoteStatus = false;
+		}
 
-        if (SettingsManager::get('redis_handler')) {
-            $rConnections = $rServers[SERVER_ID]['connections'];
-            $rUsers = $rServers[SERVER_ID]['users'];
-            $rAllUsers = 0;
-            foreach (array_keys($rServers) as $rServerID) {
-                if ($rServers[$rServerID]['server_online']) {
-                    $rAllUsers += $rServers[$rServerID]['users'];
-                }
-            }
-        } else {
-            $db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0;', SERVER_ID);
-            $rConnections = intval($db->get_row()['count']);
-            $db->query('SELECT `activity_id` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0 GROUP BY `user_id`;', SERVER_ID);
-            $rUsers = intval($db->num_rows());
-            $db->query('SELECT `activity_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
-            $rAllUsers = intval($db->num_rows());
-        }
+		if (SettingsManager::get('redis_handler')) {
+			$rConnections = $rServers[SERVER_ID]['connections'];
+			$rUsers = $rServers[SERVER_ID]['users'];
+			$rAllUsers = 0;
+			foreach (array_keys($rServers) as $rServerID) {
+				if ($rServers[$rServerID]['server_online']) {
+					$rAllUsers += $rServers[$rServerID]['users'];
+				}
+			}
+		} else {
+			$db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0;', SERVER_ID);
+			$rConnections = intval($db->get_row()['count']);
+			$db->query('SELECT `activity_id` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0 GROUP BY `user_id`;', SERVER_ID);
+			$rUsers = intval($db->num_rows());
+			$db->query('SELECT `activity_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
+			$rAllUsers = intval($db->num_rows());
+		}
 
-        $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `pid` > 0 AND `type` = 1;', SERVER_ID);
-        $rStreams = intval($db->get_row()['count']);
+		$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `pid` > 0 AND `type` = 1;', SERVER_ID);
+		$rStreams = intval($db->get_row()['count']);
 
-        $rPing = 0;
-        if (!$rServers[SERVER_ID]['is_main']) {
-            $rMainID = null;
-            foreach ($rServers as $rServerID => $rServerArray) {
-                if ($rServerArray['is_main']) {
-                    $rMainID = $rServerID;
-                    break;
-                }
-            }
-            if ($rMainID) {
-                $rPing = $this->pingServer($rServers[$rMainID]['server_ip'], $rServers[$rMainID]['http_broadcast_port']);
-            }
-        }
+		$rPing = 0;
+		if (!$rServers[SERVER_ID]['is_main']) {
+			$rMainID = null;
+			foreach ($rServers as $rServerID => $rServerArray) {
+				if ($rServerArray['is_main']) {
+					$rMainID = $rServerID;
+					break;
+				}
+			}
+			if ($rMainID) {
+				$rPing = $this->pingServer($rServers[$rMainID]['server_ip'], $rServers[$rMainID]['http_broadcast_port']);
+			}
+		}
 
-        $rSysCtl = file_get_contents('/etc/sysctl.conf');
-        $rGovernors = array();
-        if (shell_exec('which cpufreq-info')) {
-            $rGovernors = array_filter(explode(' ', trim(shell_exec('cpufreq-info -g') ?? '')));
-        }
+		$rSysCtl = file_get_contents('/etc/sysctl.conf');
+		$rGovernors = [];
+		if (shell_exec('which cpufreq-info')) {
+			$rGovernors = array_filter(explode(' ', trim(shell_exec('cpufreq-info -g') ?? '')));
+		}
 
-        $rAddresses = array_values(array_unique(array_map('trim', explode("\n", shell_exec("ip -4 addr | grep -oP '(?<=inet\\s)\\d+(\\.\\d+){3}'")))));
+		$rAddresses = array_values(array_unique(array_map('trim', explode("\n", shell_exec("ip -4 addr | grep -oP '(?<=inet\\s)\\d+(\\.\\d+){3}'")))));
 
-        $db->query('INSERT INTO `servers_stats`(`server_id`, `connections`, `total_users`, `users`, `streams`, `cpu`, `cpu_cores`, `cpu_avg`, `total_mem`, `total_mem_free`, `total_mem_used`, `total_mem_used_percent`, `total_disk_space`, `uptime`, `total_running_streams`, `bytes_sent`, `bytes_received`, `bytes_sent_total`, `bytes_received_total`, `cpu_load_average`, `gpu_info`, `iostat_info`, `time`) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, UNIX_TIMESTAMP());', SERVER_ID, $rConnections, $rAllUsers, $rUsers, $rStreams, $rStats['cpu'], $rStats['cpu_cores'], $rStats['cpu_avg'], $rStats['total_mem'], $rStats['total_mem_free'], $rStats['total_mem_used'], $rStats['total_mem_used_percent'], $rStats['total_disk_space'], $rStats['uptime'], $rStats['total_running_streams'], $rStats['bytes_sent'], $rStats['bytes_received'], $rStats['bytes_sent_total'], $rStats['bytes_received_total'], $rStats['cpu_load_average'], json_encode($rStats['gpu_info'], JSON_UNESCAPED_UNICODE), json_encode($rStats['iostat_info'], JSON_UNESCAPED_UNICODE));
+		$db->query('INSERT INTO `servers_stats`(`server_id`, `connections`, `total_users`, `users`, `streams`, `cpu`, `cpu_cores`, `cpu_avg`, `total_mem`, `total_mem_free`, `total_mem_used`, `total_mem_used_percent`, `total_disk_space`, `uptime`, `total_running_streams`, `bytes_sent`, `bytes_received`, `bytes_sent_total`, `bytes_received_total`, `cpu_load_average`, `gpu_info`, `iostat_info`, `time`) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, UNIX_TIMESTAMP());', SERVER_ID, $rConnections, $rAllUsers, $rUsers, $rStreams, $rStats['cpu'], $rStats['cpu_cores'], $rStats['cpu_avg'], $rStats['total_mem'], $rStats['total_mem_free'], $rStats['total_mem_used'], $rStats['total_mem_used_percent'], $rStats['total_disk_space'], $rStats['uptime'], $rStats['total_running_streams'], $rStats['bytes_sent'], $rStats['bytes_received'], $rStats['bytes_sent_total'], $rStats['bytes_received_total'], $rStats['cpu_load_average'], json_encode($rStats['gpu_info'], JSON_UNESCAPED_UNICODE), json_encode($rStats['iostat_info'], JSON_UNESCAPED_UNICODE));
 
-        $db->query('UPDATE `servers` SET `remote_status` = ?, `xc_vm_version` = ?, `server_hardware` = ?,`whitelist_ips` = ?, `governors` = ?, `sysctl` = ?, `video_devices` = ?, `audio_devices` = ?, `gpu_info` = ?, `interfaces` = ?, `time_offset` = ' . intval(time()) . ' - UNIX_TIMESTAMP(), `ping` = ? WHERE `id` = ?', $rRemoteStatus, XC_VM_VERSION, json_encode($rHardware, JSON_UNESCAPED_UNICODE), json_encode($rAddresses, JSON_UNESCAPED_UNICODE), json_encode($rGovernors, JSON_UNESCAPED_UNICODE), $rSysCtl, json_encode($rStats['video_devices'], JSON_UNESCAPED_UNICODE), json_encode($rStats['audio_devices'], JSON_UNESCAPED_UNICODE), json_encode($rStats['gpu_info'], JSON_UNESCAPED_UNICODE), json_encode($rStats['interfaces'], JSON_UNESCAPED_UNICODE), $rPing, SERVER_ID);
+		$db->query('UPDATE `servers` SET `remote_status` = ?, `xc_vm_version` = ?, `server_hardware` = ?,`whitelist_ips` = ?, `governors` = ?, `sysctl` = ?, `video_devices` = ?, `audio_devices` = ?, `gpu_info` = ?, `interfaces` = ?, `time_offset` = ' . intval(time()) . ' - UNIX_TIMESTAMP(), `ping` = ? WHERE `id` = ?', $rRemoteStatus, XC_VM_VERSION, json_encode($rHardware, JSON_UNESCAPED_UNICODE), json_encode($rAddresses, JSON_UNESCAPED_UNICODE), json_encode($rGovernors, JSON_UNESCAPED_UNICODE), $rSysCtl, json_encode($rStats['video_devices'], JSON_UNESCAPED_UNICODE), json_encode($rStats['audio_devices'], JSON_UNESCAPED_UNICODE), json_encode($rStats['gpu_info'], JSON_UNESCAPED_UNICODE), json_encode($rStats['interfaces'], JSON_UNESCAPED_UNICODE), $rPing, SERVER_ID);
 
-        if ($rServers[SERVER_ID]['is_main']) {
-            foreach ($rServers as $rServerID => $rServerArray) {
-                if ($rServerArray['server_online'] != $rServerArray['last_status']) {
-                    $db->query('UPDATE `servers` SET `last_status` = ? WHERE `id` = ?;', $rServerArray['server_online'], $rServerID);
-                }
-            }
-            $db->query('DELETE FROM `signals` WHERE `time` <= ?;', time() - 86400);
-        }
-    }
+		if ($rServers[SERVER_ID]['is_main']) {
+			foreach ($rServers as $rServerID => $rServerArray) {
+				if ($rServerArray['server_online'] != $rServerArray['last_status']) {
+					$db->query('UPDATE `servers` SET `last_status` = ? WHERE `id` = ?;', $rServerArray['server_online'], $rServerID);
+				}
+			}
+			$db->query('DELETE FROM `signals` WHERE `time` <= ?;', time() - 86400);
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/StatsCronJob.php b/src/Cli/CronJobs/StatsCronJob.php
index 45c9a4c8..7c7efb7e 100644
--- a/src/Cli/CronJobs/StatsCronJob.php
+++ b/src/Cli/CronJobs/StatsCronJob.php
@@ -17,73 +17,73 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class StatsCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:stats';
-    }
+	public function getName(): string {
+		return 'cron:stats';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: recalculate stream statistics (rating, uptime, connections)';
-    }
+	public function getDescription(): string {
+		return 'Cron: recalculate stream statistics (rating, uptime, connections)';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Stats]');
+		$this->initCron('XC_VM[Stats]');
 
-        $rTimeout = 60;
-        set_time_limit($rTimeout);
-        ini_set('max_execution_time', $rTimeout);
+		$rTimeout = 60;
+		set_time_limit($rTimeout);
+		ini_set('max_execution_time', $rTimeout);
 
-        $this->loadCron();
+		$this->loadCron();
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function loadCron(): void {
-        global $db;
+	private function loadCron(): void {
+		global $db;
 
-        if (!ServerRepository::getAll()[SERVER_ID]['is_main']) {
-            return;
-        }
+		if (!ServerRepository::getAll()[SERVER_ID]['is_main']) {
+			return;
+		}
 
-        $rTime = time();
-        $rDates = array(
-            'today' => array($rTime - 86400, $rTime),
-            'week'  => array($rTime - 604800, $rTime),
-            'month' => array($rTime - 2592000, $rTime),
-            'all'   => array(0, $rTime),
-        );
+		$rTime = time();
+		$rDates = [
+			'today' => [$rTime - 86400, $rTime],
+			'week'  => [$rTime - 604800, $rTime],
+			'month' => [$rTime - 2592000, $rTime],
+			'all'   => [0, $rTime],
+		];
 
-        $db->query('TRUNCATE `streams_stats`;');
+		$db->query('TRUNCATE `streams_stats`;');
 
-        foreach ($rDates as $rType => $rDate) {
-            $rStats = array();
+		foreach ($rDates as $rType => $rDate) {
+			$rStats = [];
 
-            $db->query('SELECT `stream_id`, COUNT(*) AS `connections`, SUM(`date_end` - `date_start`) AS `time`, COUNT(DISTINCT(`user_id`)) AS `users` FROM `lines_activity` LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id` WHERE `date_start` > ? AND `date_end` <= ? GROUP BY `stream_id`;', $rDate[0], $rDate[1]);
-            if ($db->num_rows() > 0) {
-                foreach ($db->get_rows() as $rRow) {
-                    $rStats[$rRow['stream_id']] = array('rank' => 0, 'time' => intval($rRow['time']), 'connections' => $rRow['connections'], 'users' => $rRow['users']);
-                }
-            }
+			$db->query('SELECT `stream_id`, COUNT(*) AS `connections`, SUM(`date_end` - `date_start`) AS `time`, COUNT(DISTINCT(`user_id`)) AS `users` FROM `lines_activity` LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id` WHERE `date_start` > ? AND `date_end` <= ? GROUP BY `stream_id`;', $rDate[0], $rDate[1]);
+			if ($db->num_rows() > 0) {
+				foreach ($db->get_rows() as $rRow) {
+					$rStats[$rRow['stream_id']] = ['rank' => 0, 'time' => intval($rRow['time']), 'connections' => $rRow['connections'], 'users' => $rRow['users']];
+				}
+			}
 
-            $db->query('SELECT `stream_id`, SUM(`date_end` - `date_start`) AS `time` FROM `lines_activity` LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id` WHERE `date_start` > ? AND `date_end` <= ? GROUP BY `stream_id` ORDER BY `time` DESC, `stream_id` DESC;', $rDate[0], $rDate[1]);
-            if ($db->num_rows() > 0) {
-                $rRank = 1;
-                foreach ($db->get_rows() as $rRow) {
-                    if (isset($rStats[$rRow['stream_id']])) {
-                        $rStats[$rRow['stream_id']]['rank'] = $rRank;
-                        $rRank++;
-                    }
-                }
-            }
+			$db->query('SELECT `stream_id`, SUM(`date_end` - `date_start`) AS `time` FROM `lines_activity` LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id` WHERE `date_start` > ? AND `date_end` <= ? GROUP BY `stream_id` ORDER BY `time` DESC, `stream_id` DESC;', $rDate[0], $rDate[1]);
+			if ($db->num_rows() > 0) {
+				$rRank = 1;
+				foreach ($db->get_rows() as $rRow) {
+					if (isset($rStats[$rRow['stream_id']])) {
+						$rStats[$rRow['stream_id']]['rank'] = $rRank;
+						$rRank++;
+					}
+				}
+			}
 
-            foreach ($rStats as $rStreamID => $rArray) {
-                $db->query('INSERT INTO `streams_stats`(`stream_id`, `rank`, `time`, `connections`, `users`, `type`) VALUES(?, ?, ?, ?, ?, ?);', $rStreamID, $rArray['rank'], $rArray['time'], $rArray['connections'], $rArray['users'], $rType);
-            }
-        }
-    }
+			foreach ($rStats as $rStreamID => $rArray) {
+				$db->query('INSERT INTO `streams_stats`(`stream_id`, `rank`, `time`, `connections`, `users`, `type`) VALUES(?, ?, ?, ?, ?, ?);', $rStreamID, $rArray['rank'], $rArray['time'], $rArray['connections'], $rArray['users'], $rType);
+			}
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/StreamsCronJob.php b/src/Cli/CronJobs/StreamsCronJob.php
index 147c9ba5..3f2d0265 100644
--- a/src/Cli/CronJobs/StreamsCronJob.php
+++ b/src/Cli/CronJobs/StreamsCronJob.php
@@ -26,429 +26,429 @@ use XcVm\Streaming\Fanout\FanoutClient;
  */
 
 class StreamsCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:streams';
-    }
+	public function getName(): string {
+		return 'cron:streams';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: check live streams, monitors, on-demand, rogue PIDs';
-    }
+	public function getDescription(): string {
+		return 'Cron: check live streams, monitors, on-demand, rogue PIDs';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Live Checker]');
-        $this->loadCron();
+		$this->initCron('XC_VM[Live Checker]');
+		$this->loadCron();
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * Whether handing a stream (whose watchdog is gone) to the fanout supervisor
-     * must restart its producer rather than adopt it.
-     *
-     * An ffmpeg producer's feed into the daemon is a tee slave that, once broken
-     * by a daemon restart, stays broken for the life of the process — adopting it
-     * would leave the daemon's viewers on dead air until a stall restart. The
-     * native remuxer redials the ingest socket by itself, so it is adopted and
-     * the channel does not blink.
-     */
-    private static function handOverNeedsRestart(array $rStream): int {
-        $rPID = file_exists(STREAMS_PATH . $rStream['stream_id'] . '_.pid') ? intval(@file_get_contents(STREAMS_PATH . $rStream['stream_id'] . '_.pid')) : intval($rStream['pid']);
-        if (!ProcessManager::isStreamRunning($rPID, $rStream['stream_id'])) {
-            return 0; // nothing running: a plain start
-        }
-        $rExe = basename((string) @readlink('/proc/' . $rPID . '/exe'));
-        return (strpos($rExe, 'ffmpeg') === 0 && FanoutClient::daemonStreamMissing(intval($rStream['stream_id']))) ? 1 : 0;
-    }
+	/**
+	 * Whether handing a stream (whose watchdog is gone) to the fanout supervisor
+	 * must restart its producer rather than adopt it.
+	 *
+	 * An ffmpeg producer's feed into the daemon is a tee slave that, once broken
+	 * by a daemon restart, stays broken for the life of the process — adopting it
+	 * would leave the daemon's viewers on dead air until a stall restart. The
+	 * native remuxer redials the ingest socket by itself, so it is adopted and
+	 * the channel does not blink.
+	 */
+	private static function handOverNeedsRestart(array $rStream): int {
+		$rPID = file_exists(STREAMS_PATH . $rStream['stream_id'] . '_.pid') ? intval(@file_get_contents(STREAMS_PATH . $rStream['stream_id'] . '_.pid')) : intval($rStream['pid']);
+		if (!ProcessManager::isStreamRunning($rPID, $rStream['stream_id'])) {
+			return 0; // nothing running: a plain start
+		}
+		$rExe = basename((string) @readlink('/proc/' . $rPID . '/exe'));
+		return (strpos($rExe, 'ffmpeg') === 0 && FanoutClient::daemonStreamMissing(intval($rStream['stream_id']))) ? 1 : 0;
+	}
 
-    /**
-     * Fold the producer's CPU, memory and kind into the stream's progress JSON —
-     * what the admin streams list shows per stream.
-     *
-     * Only this node can read its own /proc, so the reading is taken here and
-     * travels to the panel in the row the cron already writes. CPU is the
-     * difference against this pass's predecessor, so it is the average over the
-     * last minute rather than ffmpeg's lifetime average — and where there is no
-     * usable predecessor (the producer's first pass, or a new pid after a
-     * restart) the lifetime average stands in, so the column never waits a pass
-     * to show a figure.
-     *
-     * The previous reading is kept beside the stream's files (`<id>_.usage`, on
-     * the streams tmpfs, removed with the rest of `<id>_*` when it stops) rather
-     * than in the database row: it is this node's bookkeeping, and a value that
-     * has to survive a round trip through a row other code also rewrites is one
-     * that sometimes does not.
-     *
-     * @param string $rProgressJson This pass's progress report.
-     * @param int    $rStreamID     The stream.
-     * @param int    $rPID          The producer's pid.
-     * @return string The JSON to store.
-     */
-    private static function withResourceUsage(string $rProgressJson, int $rStreamID, int $rPID): string {
-        $rProgress = json_decode($rProgressJson, true);
-        if (!is_array($rProgress)) {
-            $rProgress = array();
-        }
-        // Keys an earlier version kept in the row for the CPU difference.
-        unset($rProgress['cpu_t'], $rProgress['cpu_at']);
+	/**
+	 * Fold the producer's CPU, memory and kind into the stream's progress JSON —
+	 * what the admin streams list shows per stream.
+	 *
+	 * Only this node can read its own /proc, so the reading is taken here and
+	 * travels to the panel in the row the cron already writes. CPU is the
+	 * difference against this pass's predecessor, so it is the average over the
+	 * last minute rather than ffmpeg's lifetime average — and where there is no
+	 * usable predecessor (the producer's first pass, or a new pid after a
+	 * restart) the lifetime average stands in, so the column never waits a pass
+	 * to show a figure.
+	 *
+	 * The previous reading is kept beside the stream's files (`<id>_.usage`, on
+	 * the streams tmpfs, removed with the rest of `<id>_*` when it stops) rather
+	 * than in the database row: it is this node's bookkeeping, and a value that
+	 * has to survive a round trip through a row other code also rewrites is one
+	 * that sometimes does not.
+	 *
+	 * @param string $rProgressJson This pass's progress report.
+	 * @param int    $rStreamID     The stream.
+	 * @param int    $rPID          The producer's pid.
+	 * @return string The JSON to store.
+	 */
+	private static function withResourceUsage(string $rProgressJson, int $rStreamID, int $rPID): string {
+		$rProgress = json_decode($rProgressJson, true);
+		if (!is_array($rProgress)) {
+			$rProgress = [];
+		}
+		// Keys an earlier version kept in the row for the CPU difference.
+		unset($rProgress['cpu_t'], $rProgress['cpu_at']);
 
-        $rSamplePath = STREAMS_PATH . $rStreamID . '_.usage';
-        $rSample = ProcessManager::resourceSample($rPID);
-        if ($rSample === null) {
-            @unlink($rSamplePath);
-            unset($rProgress['cpu'], $rProgress['mem'], $rProgress['producer']);
-            return json_encode($rProgress);
-        }
+		$rSamplePath = STREAMS_PATH . $rStreamID . '_.usage';
+		$rSample = ProcessManager::resourceSample($rPID);
+		if ($rSample === null) {
+			@unlink($rSamplePath);
+			unset($rProgress['cpu'], $rProgress['mem'], $rProgress['producer']);
+			return json_encode($rProgress);
+		}
 
-        $rCPU = null;
-        $rPrevious = json_decode((string) @file_get_contents($rSamplePath), true);
-        if (is_array($rPrevious) && intval($rPrevious['pid'] ?? 0) === $rPID) {
-            $rCPU = ProcessManager::cpuPercent($rSample, $rPrevious);
-        }
-        if ($rCPU === null) {
-            $rCPU = ProcessManager::cpuPercentSinceStart($rSample);
-        }
-        @file_put_contents($rSamplePath, json_encode(array('pid' => $rPID, 'ticks' => $rSample['ticks'], 'at' => $rSample['at'])));
+		$rCPU = null;
+		$rPrevious = json_decode((string) @file_get_contents($rSamplePath), true);
+		if (is_array($rPrevious) && intval($rPrevious['pid'] ?? 0) === $rPID) {
+			$rCPU = ProcessManager::cpuPercent($rSample, $rPrevious);
+		}
+		if ($rCPU === null) {
+			$rCPU = ProcessManager::cpuPercentSinceStart($rSample);
+		}
+		@file_put_contents($rSamplePath, json_encode(['pid' => $rPID, 'ticks' => $rSample['ticks'], 'at' => $rSample['at']]));
 
-        $rProgress['cpu'] = $rCPU;
-        $rProgress['mem'] = $rSample['rss'];
-        $rProgress['producer'] = ProcessManager::producerKind($rPID);
+		$rProgress['cpu'] = $rCPU;
+		$rProgress['mem'] = $rSample['rss'];
+		$rProgress['producer'] = ProcessManager::producerKind($rPID);
 
-        return json_encode($rProgress);
-    }
+		return json_encode($rProgress);
+	}
 
-    private function loadCron(): void {
-        $rRedis = SettingsManager::getBool('redis_handler');
-        global $db;
+	private function loadCron(): void {
+		$rRedis = SettingsManager::getBool('redis_handler');
+		global $db;
 
-        if (!ProcessManager::isNginxRunning()) {
-            echo 'XC_VM not running...' . "\n";
-        }
+		if (!ProcessManager::isNginxRunning()) {
+			echo 'XC_VM not running...' . "\n";
+		}
 
-        if ($rRedis) {
-            RedisManager::ensureConnected();
-        }
+		if ($rRedis) {
+			RedisManager::ensureConnected();
+		}
 
-        $rActivePIDs = array();
-        $rStreamIDs = array();
+		$rActivePIDs = [];
+		$rStreamIDs = [];
 
-        // Bring streams_servers in step with the fanout supervisor first, so the
-        // pass below reads what is actually running. $rSupervised is the set it
-        // is supervising, or null when it cannot be asked — unknown, which the
-        // checks below treat as "not supervised" exactly as before this existed.
-        $rStates = FanoutClient::monitorStates();
-        $rSupervised = StreamProcess::reconcileSupervised($rStates);
-        $rSupervisedSet = array_flip($rSupervised ?? array());
-        // While the daemon takes hand-overs, streams still under a PHP monitor
-        // (started before supervision was on, or while the daemon was down) are
-        // moved to it — adopting their running encoder, so they do not restart.
-        $rMigrate = $rStates !== null && !empty($rStates['accepting']) && StreamProcess::supervisionEnabled();
+		// Bring streams_servers in step with the fanout supervisor first, so the
+		// pass below reads what is actually running. $rSupervised is the set it
+		// is supervising, or null when it cannot be asked — unknown, which the
+		// checks below treat as "not supervised" exactly as before this existed.
+		$rStates = FanoutClient::monitorStates();
+		$rSupervised = StreamProcess::reconcileSupervised($rStates);
+		$rSupervisedSet = array_flip($rSupervised ?? []);
+		// While the daemon takes hand-overs, streams still under a PHP monitor
+		// (started before supervision was on, or while the daemon was down) are
+		// moved to it — adopting their running encoder, so they do not restart.
+		$rMigrate = $rStates !== null && !empty($rStates['accepting']) && StreamProcess::supervisionEnabled();
 
-        if ($rRedis) {
-            $db->query('SELECT t2.stream_display_name, t2.delay_minutes, t1.stream_started, t1.stream_info, t2.fps_restart, t1.stream_status, t1.progress_info, t1.stream_id, t1.monitor_pid, t1.on_demand, t1.server_stream_id, t1.pid, servers_attached.attached, t2.vframes_server_id, t2.vframes_pid, t2.tv_archive_server_id, t2.tv_archive_pid FROM `streams_servers` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id AND t2.direct_source = 0 INNER JOIN `streams_types` t3 ON t3.type_id = t2.type LEFT JOIN (SELECT `stream_id`, COUNT(*) AS `attached` FROM `streams_servers` WHERE `parent_id` = ? AND `pid` IS NOT NULL AND `pid` > 0 AND `monitor_pid` IS NOT NULL AND `monitor_pid` > 0 GROUP BY `stream_id`) AS `servers_attached` ON `servers_attached`.`stream_id` = t1.`stream_id` WHERE (t1.pid IS NOT NULL OR t1.stream_status <> 0 OR t1.to_analyze = 1) AND t1.server_id = ? AND t3.live = 1', SERVER_ID, SERVER_ID);
-        } else {
-            $db->query("SELECT t2.stream_display_name, t2.delay_minutes, t1.stream_started, t1.stream_info, t2.fps_restart, t1.stream_status, t1.progress_info, t1.stream_id, t1.monitor_pid, t1.on_demand, t1.server_stream_id, t1.pid, clients.online_clients, clients_hls.online_clients_hls, servers_attached.attached, t2.vframes_server_id, t2.vframes_pid, t2.tv_archive_server_id, t2.tv_archive_pid FROM `streams_servers` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id AND t2.direct_source = 0 INNER JOIN `streams_types` t3 ON t3.type_id = t2.type LEFT JOIN (SELECT stream_id, COUNT(*) as online_clients FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0 GROUP BY stream_id) AS clients ON clients.stream_id = t1.stream_id LEFT JOIN (SELECT `stream_id`, COUNT(*) AS `attached` FROM `streams_servers` WHERE `parent_id` = ? AND `pid` IS NOT NULL AND `pid` > 0 AND `monitor_pid` IS NOT NULL AND `monitor_pid` > 0 GROUP BY `stream_id`) AS `servers_attached` ON `servers_attached`.`stream_id` = t1.`stream_id` LEFT JOIN (SELECT stream_id, COUNT(*) as online_clients_hls FROM `lines_live` WHERE `server_id` = ? AND `container` = 'hls' AND `hls_end` = 0 GROUP BY stream_id) AS clients_hls ON clients_hls.stream_id = t1.stream_id WHERE (t1.pid IS NOT NULL OR t1.stream_status <> 0 OR t1.to_analyze = 1) AND t1.server_id = ? AND t3.live = 1", SERVER_ID, SERVER_ID, SERVER_ID, SERVER_ID);
-        }
+		if ($rRedis) {
+			$db->query('SELECT t2.stream_display_name, t2.delay_minutes, t1.stream_started, t1.stream_info, t2.fps_restart, t1.stream_status, t1.progress_info, t1.stream_id, t1.monitor_pid, t1.on_demand, t1.server_stream_id, t1.pid, servers_attached.attached, t2.vframes_server_id, t2.vframes_pid, t2.tv_archive_server_id, t2.tv_archive_pid FROM `streams_servers` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id AND t2.direct_source = 0 INNER JOIN `streams_types` t3 ON t3.type_id = t2.type LEFT JOIN (SELECT `stream_id`, COUNT(*) AS `attached` FROM `streams_servers` WHERE `parent_id` = ? AND `pid` IS NOT NULL AND `pid` > 0 AND `monitor_pid` IS NOT NULL AND `monitor_pid` > 0 GROUP BY `stream_id`) AS `servers_attached` ON `servers_attached`.`stream_id` = t1.`stream_id` WHERE (t1.pid IS NOT NULL OR t1.stream_status <> 0 OR t1.to_analyze = 1) AND t1.server_id = ? AND t3.live = 1', SERVER_ID, SERVER_ID);
+		} else {
+			$db->query("SELECT t2.stream_display_name, t2.delay_minutes, t1.stream_started, t1.stream_info, t2.fps_restart, t1.stream_status, t1.progress_info, t1.stream_id, t1.monitor_pid, t1.on_demand, t1.server_stream_id, t1.pid, clients.online_clients, clients_hls.online_clients_hls, servers_attached.attached, t2.vframes_server_id, t2.vframes_pid, t2.tv_archive_server_id, t2.tv_archive_pid FROM `streams_servers` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id AND t2.direct_source = 0 INNER JOIN `streams_types` t3 ON t3.type_id = t2.type LEFT JOIN (SELECT stream_id, COUNT(*) as online_clients FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0 GROUP BY stream_id) AS clients ON clients.stream_id = t1.stream_id LEFT JOIN (SELECT `stream_id`, COUNT(*) AS `attached` FROM `streams_servers` WHERE `parent_id` = ? AND `pid` IS NOT NULL AND `pid` > 0 AND `monitor_pid` IS NOT NULL AND `monitor_pid` > 0 GROUP BY `stream_id`) AS `servers_attached` ON `servers_attached`.`stream_id` = t1.`stream_id` LEFT JOIN (SELECT stream_id, COUNT(*) as online_clients_hls FROM `lines_live` WHERE `server_id` = ? AND `container` = 'hls' AND `hls_end` = 0 GROUP BY stream_id) AS clients_hls ON clients_hls.stream_id = t1.stream_id WHERE (t1.pid IS NOT NULL OR t1.stream_status <> 0 OR t1.to_analyze = 1) AND t1.server_id = ? AND t3.live = 1", SERVER_ID, SERVER_ID, SERVER_ID, SERVER_ID);
+		}
 
-        if ($db->num_rows() > 0) {
-            foreach ($db->get_rows() as $rStream) {
-                echo 'Stream ID: ' . $rStream['stream_id'] . "\n";
-                $rStreamIDs[] = $rStream['stream_id'];
+		if ($db->num_rows() > 0) {
+			foreach ($db->get_rows() as $rStream) {
+				echo 'Stream ID: ' . $rStream['stream_id'] . "\n";
+				$rStreamIDs[] = $rStream['stream_id'];
 
-                $rIsSupervised = isset($rSupervisedSet[intval($rStream['stream_id'])]);
-                // superviseStream, not startMonitor: a stream the daemon will not
-                // take (delay, created channels) must keep the PHP monitor it has,
-                // not have a second one spawned beside it every pass.
-                if ($rMigrate && !$rIsSupervised && ProcessManager::isMonitorAlive($rStream['monitor_pid'], $rStream['stream_id'])) {
-                    if (StreamProcess::superviseStream(intval($rStream['stream_id']), false)) {
-                        echo 'Handed over to the fanout supervisor.' . "\n\n";
-                        continue;
-                    }
-                }
-                if ($rIsSupervised || ProcessManager::isMonitorAlive($rStream['monitor_pid'], $rStream['stream_id']) || $rStream['on_demand']) {
-                    if ($rStream['on_demand'] == 1 && $rStream['attached'] == 0) {
-                        if ($rRedis) {
-                            $rCount = 0;
-                            $rRedis = RedisManager::instance();
-                            if ($rRedis) {
-                                $rKeys = $rRedis->zRangeByScore('STREAM#' . $rStream['stream_id'], '-inf', '+inf');
-                                if (count($rKeys) > 0) {
-                                    $rConnections = array_map('igbinary_unserialize', $rRedis->mGet($rKeys));
-                                    foreach ($rConnections as $rConnection) {
-                                        if ($rConnection && $rConnection['server_id'] == SERVER_ID) {
-                                            $rCount++;
-                                        }
-                                    }
-                                }
-                            }
-                            $rStream['online_clients'] = $rCount;
-                        }
+				$rIsSupervised = isset($rSupervisedSet[intval($rStream['stream_id'])]);
+				// superviseStream, not startMonitor: a stream the daemon will not
+				// take (delay, created channels) must keep the PHP monitor it has,
+				// not have a second one spawned beside it every pass.
+				if ($rMigrate && !$rIsSupervised && ProcessManager::isMonitorAlive($rStream['monitor_pid'], $rStream['stream_id'])) {
+					if (StreamProcess::superviseStream(intval($rStream['stream_id']), false)) {
+						echo 'Handed over to the fanout supervisor.' . "\n\n";
+						continue;
+					}
+				}
+				if ($rIsSupervised || ProcessManager::isMonitorAlive($rStream['monitor_pid'], $rStream['stream_id']) || $rStream['on_demand']) {
+					if ($rStream['on_demand'] == 1 && $rStream['attached'] == 0) {
+						if ($rRedis) {
+							$rCount = 0;
+							$rRedis = RedisManager::instance();
+							if ($rRedis) {
+								$rKeys = $rRedis->zRangeByScore('STREAM#' . $rStream['stream_id'], '-inf', '+inf');
+								if (count($rKeys) > 0) {
+									$rConnections = array_map('igbinary_unserialize', $rRedis->mGet($rKeys));
+									foreach ($rConnections as $rConnection) {
+										if ($rConnection && $rConnection['server_id'] == SERVER_ID) {
+											$rCount++;
+										}
+									}
+								}
+							}
+							$rStream['online_clients'] = $rCount;
+						}
 
-                        $rAdminQueue = $rQueue = 0;
-                        if (SettingsManager::getBool('on_demand_instant_off') && file_exists(SIGNALS_TMP_PATH . 'queue_' . intval($rStream['stream_id']))) {
-                            foreach ((igbinary_unserialize(file_get_contents(SIGNALS_TMP_PATH . 'queue_' . intval($rStream['stream_id']))) ?: array()) as $rPID) {
-                                if (ProcessManager::isRunning($rPID, 'php-fpm')) {
-                                    $rQueue++;
-                                }
-                            }
-                        }
-                        if (file_exists(SIGNALS_TMP_PATH . 'admin_' . intval($rStream['stream_id']))) {
-                            if (time() - filemtime(SIGNALS_TMP_PATH . 'admin_' . intval($rStream['stream_id'])) <= 30) {
-                                $rAdminQueue = 1;
-                            } else {
-                                unlink(SIGNALS_TMP_PATH . 'admin_' . intval($rStream['stream_id']));
-                            }
-                        }
-                        if ($rQueue == 0 && $rAdminQueue == 0 && $rStream['online_clients'] == 0 && (file_exists(STREAMS_PATH . $rStream['stream_id'] . '_.m3u8') || SettingsManager::getInt('on_demand_wait_time') < time() - intval($rStream['stream_started']) || $rStream['stream_status'] == 1)) {
-                            echo 'Stop on-demand stream...' . "\n\n";
-                            StreamProcess::stopStream($rStream['stream_id'], true);
-                            // Stopped: nothing below applies (it would start a thumbnail
-                            // and a TV archive worker for the stream just stopped).
-                            continue;
-                        }
-                    }
+						$rAdminQueue = $rQueue = 0;
+						if (SettingsManager::getBool('on_demand_instant_off') && file_exists(SIGNALS_TMP_PATH . 'queue_' . intval($rStream['stream_id']))) {
+							foreach ((igbinary_unserialize(file_get_contents(SIGNALS_TMP_PATH . 'queue_' . intval($rStream['stream_id']))) ?: []) as $rPID) {
+								if (ProcessManager::isRunning($rPID, 'php-fpm')) {
+									$rQueue++;
+								}
+							}
+						}
+						if (file_exists(SIGNALS_TMP_PATH . 'admin_' . intval($rStream['stream_id']))) {
+							if (time() - filemtime(SIGNALS_TMP_PATH . 'admin_' . intval($rStream['stream_id'])) <= 30) {
+								$rAdminQueue = 1;
+							} else {
+								unlink(SIGNALS_TMP_PATH . 'admin_' . intval($rStream['stream_id']));
+							}
+						}
+						if ($rQueue == 0 && $rAdminQueue == 0 && $rStream['online_clients'] == 0 && (file_exists(STREAMS_PATH . $rStream['stream_id'] . '_.m3u8') || SettingsManager::getInt('on_demand_wait_time') < time() - intval($rStream['stream_started']) || $rStream['stream_status'] == 1)) {
+							echo 'Stop on-demand stream...' . "\n\n";
+							StreamProcess::stopStream($rStream['stream_id'], true);
+							// Stopped: nothing below applies (it would start a thumbnail
+							// and a TV archive worker for the stream just stopped).
+							continue;
+						}
+					}
 
-                    if ($rStream['vframes_server_id'] == SERVER_ID && !ProcessManager::isNamedProcessRunning($rStream['vframes_pid'], 'Thumbnail', $rStream['stream_id'])) {
-                        echo 'Start Thumbnail...' . "\n";
-                        StreamProcess::startThumbnail($rStream['stream_id']);
-                    }
-                    if ($rStream['tv_archive_server_id'] == SERVER_ID && !ProcessManager::isNamedProcessRunning($rStream['tv_archive_pid'], 'TVArchive', $rStream['stream_id'])) {
-                        echo 'Start TV Archive...' . "\n";
-                        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php archive ' . intval($rStream['stream_id']) . ' >/dev/null 2>/dev/null & echo $!');
-                    }
+					if ($rStream['vframes_server_id'] == SERVER_ID && !ProcessManager::isNamedProcessRunning($rStream['vframes_pid'], 'Thumbnail', $rStream['stream_id'])) {
+						echo 'Start Thumbnail...' . "\n";
+						StreamProcess::startThumbnail($rStream['stream_id']);
+					}
+					if ($rStream['tv_archive_server_id'] == SERVER_ID && !ProcessManager::isNamedProcessRunning($rStream['tv_archive_pid'], 'TVArchive', $rStream['stream_id'])) {
+						echo 'Start TV Archive...' . "\n";
+						shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php archive ' . intval($rStream['stream_id']) . ' >/dev/null 2>/dev/null & echo $!');
+					}
 
-                    foreach (glob(STREAMS_PATH . $rStream['stream_id'] . '_*.ts.enc') as $rFile) {
-                        if (!file_exists(rtrim($rFile, '.enc'))) {
-                            unlink($rFile);
-                        }
-                    }
+					foreach (glob(STREAMS_PATH . $rStream['stream_id'] . '_*.ts.enc') as $rFile) {
+						if (!file_exists(rtrim($rFile, '.enc'))) {
+							unlink($rFile);
+						}
+					}
 
-                    if (file_exists(STREAMS_PATH . $rStream['stream_id'] . '_.pid')) {
-                        $rPID = intval(file_get_contents(STREAMS_PATH . $rStream['stream_id'] . '_.pid'));
-                    } else {
-                        $rPID = intval(shell_exec("ps aux | grep -v grep | grep '/" . intval($rStream['stream_id']) . "_.m3u8' | awk '{print \$2}'"));
-                    }
-                    $rActivePIDs[] = intval($rPID);
+					if (file_exists(STREAMS_PATH . $rStream['stream_id'] . '_.pid')) {
+						$rPID = intval(file_get_contents(STREAMS_PATH . $rStream['stream_id'] . '_.pid'));
+					} else {
+						$rPID = intval(shell_exec("ps aux | grep -v grep | grep '/" . intval($rStream['stream_id']) . "_.m3u8' | awk '{print \$2}'"));
+					}
+					$rActivePIDs[] = intval($rPID);
 
-                    $rPlaylist = STREAMS_PATH . $rStream['stream_id'] . '_.m3u8';
-                    if (ProcessManager::isStreamRunning($rPID, $rStream['stream_id']) && file_exists($rPlaylist)) {
-                        // Re-feed after a daemon restart (ADR 0003, C-ops). This
-                        // stream's ffmpeg is running and teeing into the daemon,
-                        // but if the daemon restarted it wiped its in-memory
-                        // registry and `onfail=ignore` silently dropped the tee
-                        // slave — the daemon no longer knows the stream
-                        // (control /streams/<id> → 404) and delivery has quietly
-                        // fallen back to legacy. Restart it so buildLive
-                        // re-registers the ingest and the daemon serves it again.
-                        // Guard: only a reachable-daemon 404 (daemonStreamMissing),
-                        // so a stopped daemon leaves legacy alone; throttled by a
-                        // stamp so a stream whose ingest keeps failing is not
-                        // restart-looped every cron tick. Proxy streams have no
-                        // local ffmpeg, so they never reach this running branch.
-                        // Only an ffmpeg producer needs the restart: a broken tee slave
-                        // stays broken. The PHP relays (LLOD, loopback) and a delayed
-                        // stream's DelayCommand re-register and redial the daemon by
-                        // themselves (IngestFeeder), and restarting a delayed stream
-                        // would throw its buffer away.
-                        $rSelfFeeding = intval($rStream['delay_minutes'] ?? 0) > 0 || ProcessManager::producerKind($rPID) === 'php';
-                        if (!$rSelfFeeding && FanoutClient::daemonStreamMissing($rStream['stream_id'])) {
-                            // The stamp lives outside STREAMS_PATH: the restart below
-                            // runs `rm -f <id>_*` there, which deleted a `<id>_.refeed`
-                            // stamp — and with it the 120 s throttle it was meant to be.
-                            $rRefeedStamp = SIGNALS_TMP_PATH . 'refeed_' . intval($rStream['stream_id']);
-                            if (!file_exists($rRefeedStamp) || time() - filemtime($rRefeedStamp) > 120) {
-                                echo 'Daemon lost stream ' . $rStream['stream_id'] . ' (restarted) — re-feeding...' . "\n\n";
-                                touch($rRefeedStamp);
-                                StreamProcess::startMonitor($rStream['stream_id'], 1);
-                                continue;
-                            }
-                        }
+					$rPlaylist = STREAMS_PATH . $rStream['stream_id'] . '_.m3u8';
+					if (ProcessManager::isStreamRunning($rPID, $rStream['stream_id']) && file_exists($rPlaylist)) {
+						// Re-feed after a daemon restart (ADR 0003, C-ops). This
+						// stream's ffmpeg is running and teeing into the daemon,
+						// but if the daemon restarted it wiped its in-memory
+						// registry and `onfail=ignore` silently dropped the tee
+						// slave — the daemon no longer knows the stream
+						// (control /streams/<id> → 404) and delivery has quietly
+						// fallen back to legacy. Restart it so buildLive
+						// re-registers the ingest and the daemon serves it again.
+						// Guard: only a reachable-daemon 404 (daemonStreamMissing),
+						// so a stopped daemon leaves legacy alone; throttled by a
+						// stamp so a stream whose ingest keeps failing is not
+						// restart-looped every cron tick. Proxy streams have no
+						// local ffmpeg, so they never reach this running branch.
+						// Only an ffmpeg producer needs the restart: a broken tee slave
+						// stays broken. The PHP relays (LLOD, loopback) and a delayed
+						// stream's DelayCommand re-register and redial the daemon by
+						// themselves (IngestFeeder), and restarting a delayed stream
+						// would throw its buffer away.
+						$rSelfFeeding = intval($rStream['delay_minutes'] ?? 0) > 0 || ProcessManager::producerKind($rPID) === 'php';
+						if (!$rSelfFeeding && FanoutClient::daemonStreamMissing($rStream['stream_id'])) {
+							// The stamp lives outside STREAMS_PATH: the restart below
+							// runs `rm -f <id>_*` there, which deleted a `<id>_.refeed`
+							// stamp — and with it the 120 s throttle it was meant to be.
+							$rRefeedStamp = SIGNALS_TMP_PATH . 'refeed_' . intval($rStream['stream_id']);
+							if (!file_exists($rRefeedStamp) || time() - filemtime($rRefeedStamp) > 120) {
+								echo 'Daemon lost stream ' . $rStream['stream_id'] . ' (restarted) — re-feeding...' . "\n\n";
+								touch($rRefeedStamp);
+								StreamProcess::startMonitor($rStream['stream_id'], 1);
+								continue;
+							}
+						}
 
-                        echo 'Update Stream Information...' . "\n";
-                        $rBitrate = StreamUtils::getStreamBitrate('live', STREAMS_PATH . $rStream['stream_id'] . '_.m3u8');
-                        $rProgressPath = STREAMS_PATH . $rStream['stream_id'] . '_.progress';
-                        if (file_exists($rProgressPath)) {
-                            // ffmpeg appends key=value progress reports to this file
-                            // for the stream's whole life. Read only the tail, keep
-                            // the last COMPLETE report block (terminated by a
-                            // "progress=" line) and re-encode it as the JSON the rest
-                            // of the panel expects. Then truncate so the file stays
-                            // tiny on disk (ffmpeg keeps its write offset, so the
-                            // hole left behind is sparse).
-                            $rTail = '';
-                            $rFp = fopen($rProgressPath, 'rb');
-                            if ($rFp !== false) {
-                                fseek($rFp, 0, SEEK_END);
-                                if (ftell($rFp) > 16384) {
-                                    fseek($rFp, -16384, SEEK_END);
-                                } else {
-                                    rewind($rFp);
-                                }
-                                $rTail = stream_get_contents($rFp);
-                                fclose($rFp);
-                            }
-                            $rReport = array();
-                            $rCurrentReport = array();
-                            foreach (explode("\n", (string) $rTail) as $rLine) {
-                                $rLine = trim($rLine);
-                                if ($rLine === '') {
-                                    continue;
-                                }
-                                $rKV = explode('=', $rLine, 2);
-                                if (count($rKV) !== 2) {
-                                    continue;
-                                }
-                                $rReportKey = trim($rKV[0]);
-                                $rCurrentReport[$rReportKey] = trim($rKV[1]);
-                                if ($rReportKey === 'progress') {
-                                    $rReport = $rCurrentReport;
-                                    $rCurrentReport = array();
-                                }
-                            }
-                            $rProgress = $rReport ? json_encode($rReport) : ($rStream['progress_info'] ?: json_encode(array()));
-                            file_put_contents($rProgressPath, '');
-                            if ($rStream['fps_restart']) {
-                                file_put_contents(STREAMS_PATH . $rStream['stream_id'] . '_.progress_check', $rProgress);
-                            }
-                        } else {
-                            $rProgress = $rStream['progress_info'];
-                        }
-                        $rProgress = self::withResourceUsage((string) $rProgress, intval($rStream['stream_id']), $rPID);
-                        // A supervised stream's codecs, resolution and bitrate come
-                        // from the daemon, measured off the bytes (reconcileSupervised
-                        // wrote them above); recomputing them here from a stream_info
-                        // that nothing probes any more would blank them. Only the
-                        // producer's progress report is this pass's to record.
-                        if ($rIsSupervised) {
-                            if ($rProgress !== $rStream['progress_info']) {
-                                $db->query('UPDATE `streams_servers` SET `progress_info` = ? WHERE `server_stream_id` = ?', $rProgress, $rStream['server_stream_id']);
-                            }
-                            echo "\n";
-                            continue;
-                        }
-                        if (file_exists(STREAMS_PATH . $rStream['stream_id'] . '_.stream_info')) {
-                            $rStreamInfo = file_get_contents(STREAMS_PATH . $rStream['stream_id'] . '_.stream_info');
-                            unlink(STREAMS_PATH . $rStream['stream_id'] . '_.stream_info');
-                        } else {
-                            $rStreamInfo = $rStream['stream_info'];
-                        }
-                        $rCompatible = 0;
-                        $rAudioCodec = $rVideoCodec = $rResolution = null;
-                        if ($rStreamInfo) {
-                            $rStreamJSON = json_decode($rStreamInfo, true);
-                            $rCompatible = intval(DiagnosticsService::checkCompatibility($rStreamJSON, SettingsManager::getBool('player_allow_hevc')));
-                            if (is_array($rStreamJSON) && isset($rStreamJSON['codecs']) && is_array($rStreamJSON['codecs'])) {
-                                $rAudioCodec = isset($rStreamJSON['codecs']['audio']['codec_name']) ? $rStreamJSON['codecs']['audio']['codec_name'] : null;
-                                $rVideoCodec = isset($rStreamJSON['codecs']['video']['codec_name']) ? $rStreamJSON['codecs']['video']['codec_name'] : null;
-                                $rResolution = isset($rStreamJSON['codecs']['video']['height']) ? $rStreamJSON['codecs']['video']['height'] : null;
-                            }
-                            if ($rResolution) {
-                                $rResolution = StreamSorter::getNearest(array(240, 360, 480, 576, 720, 1080, 1440, 2160), $rResolution);
-                            }
-                        }
-                        if ($rStream['pid'] != $rPID) {
-                            $db->query('UPDATE `streams_servers` SET `pid` = ?, `progress_info` = ?, `stream_info` = ?, `compatible` = ?, `bitrate` = ?, `audio_codec` = ?, `video_codec` = ?, `resolution` = ? WHERE `server_stream_id` = ?', $rPID, $rProgress, $rStreamInfo, $rCompatible, $rBitrate, $rAudioCodec, $rVideoCodec, $rResolution, $rStream['server_stream_id']);
-                        } else {
-                            $db->query('UPDATE `streams_servers` SET `progress_info` = ?, `stream_info` = ?, `compatible` = ?, `bitrate` = ?, `audio_codec` = ?, `video_codec` = ?, `resolution` = ? WHERE `server_stream_id` = ?', $rProgress, $rStreamInfo, $rCompatible, $rBitrate, $rAudioCodec, $rVideoCodec, $rResolution, $rStream['server_stream_id']);
-                        }
-                    }
-                    echo "\n";
-                } else {
-                    echo 'Start monitor...' . "\n\n";
-                    if (StreamProcess::startMonitor($rStream['stream_id'], self::handOverNeedsRestart($rStream)) === StreamProcess::MONITOR_PHP) {
-                        usleep(50000); // stagger PHP monitor spawns
-                    }
-                }
-            }
-        }
+						echo 'Update Stream Information...' . "\n";
+						$rBitrate = StreamUtils::getStreamBitrate('live', STREAMS_PATH . $rStream['stream_id'] . '_.m3u8');
+						$rProgressPath = STREAMS_PATH . $rStream['stream_id'] . '_.progress';
+						if (file_exists($rProgressPath)) {
+							// ffmpeg appends key=value progress reports to this file
+							// for the stream's whole life. Read only the tail, keep
+							// the last COMPLETE report block (terminated by a
+							// "progress=" line) and re-encode it as the JSON the rest
+							// of the panel expects. Then truncate so the file stays
+							// tiny on disk (ffmpeg keeps its write offset, so the
+							// hole left behind is sparse).
+							$rTail = '';
+							$rFp = fopen($rProgressPath, 'rb');
+							if ($rFp !== false) {
+								fseek($rFp, 0, SEEK_END);
+								if (ftell($rFp) > 16384) {
+									fseek($rFp, -16384, SEEK_END);
+								} else {
+									rewind($rFp);
+								}
+								$rTail = stream_get_contents($rFp);
+								fclose($rFp);
+							}
+							$rReport = [];
+							$rCurrentReport = [];
+							foreach (explode("\n", (string) $rTail) as $rLine) {
+								$rLine = trim($rLine);
+								if ($rLine === '') {
+									continue;
+								}
+								$rKV = explode('=', $rLine, 2);
+								if (count($rKV) !== 2) {
+									continue;
+								}
+								$rReportKey = trim($rKV[0]);
+								$rCurrentReport[$rReportKey] = trim($rKV[1]);
+								if ($rReportKey === 'progress') {
+									$rReport = $rCurrentReport;
+									$rCurrentReport = [];
+								}
+							}
+							$rProgress = $rReport ? json_encode($rReport) : ($rStream['progress_info'] ?: json_encode([]));
+							file_put_contents($rProgressPath, '');
+							if ($rStream['fps_restart']) {
+								file_put_contents(STREAMS_PATH . $rStream['stream_id'] . '_.progress_check', $rProgress);
+							}
+						} else {
+							$rProgress = $rStream['progress_info'];
+						}
+						$rProgress = self::withResourceUsage((string) $rProgress, intval($rStream['stream_id']), $rPID);
+						// A supervised stream's codecs, resolution and bitrate come
+						// from the daemon, measured off the bytes (reconcileSupervised
+						// wrote them above); recomputing them here from a stream_info
+						// that nothing probes any more would blank them. Only the
+						// producer's progress report is this pass's to record.
+						if ($rIsSupervised) {
+							if ($rProgress !== $rStream['progress_info']) {
+								$db->query('UPDATE `streams_servers` SET `progress_info` = ? WHERE `server_stream_id` = ?', $rProgress, $rStream['server_stream_id']);
+							}
+							echo "\n";
+							continue;
+						}
+						if (file_exists(STREAMS_PATH . $rStream['stream_id'] . '_.stream_info')) {
+							$rStreamInfo = file_get_contents(STREAMS_PATH . $rStream['stream_id'] . '_.stream_info');
+							unlink(STREAMS_PATH . $rStream['stream_id'] . '_.stream_info');
+						} else {
+							$rStreamInfo = $rStream['stream_info'];
+						}
+						$rCompatible = 0;
+						$rAudioCodec = $rVideoCodec = $rResolution = null;
+						if ($rStreamInfo) {
+							$rStreamJSON = json_decode($rStreamInfo, true);
+							$rCompatible = intval(DiagnosticsService::checkCompatibility($rStreamJSON, SettingsManager::getBool('player_allow_hevc')));
+							if (is_array($rStreamJSON) && isset($rStreamJSON['codecs']) && is_array($rStreamJSON['codecs'])) {
+								$rAudioCodec = isset($rStreamJSON['codecs']['audio']['codec_name']) ? $rStreamJSON['codecs']['audio']['codec_name'] : null;
+								$rVideoCodec = isset($rStreamJSON['codecs']['video']['codec_name']) ? $rStreamJSON['codecs']['video']['codec_name'] : null;
+								$rResolution = isset($rStreamJSON['codecs']['video']['height']) ? $rStreamJSON['codecs']['video']['height'] : null;
+							}
+							if ($rResolution) {
+								$rResolution = StreamSorter::getNearest([240, 360, 480, 576, 720, 1080, 1440, 2160], $rResolution);
+							}
+						}
+						if ($rStream['pid'] != $rPID) {
+							$db->query('UPDATE `streams_servers` SET `pid` = ?, `progress_info` = ?, `stream_info` = ?, `compatible` = ?, `bitrate` = ?, `audio_codec` = ?, `video_codec` = ?, `resolution` = ? WHERE `server_stream_id` = ?', $rPID, $rProgress, $rStreamInfo, $rCompatible, $rBitrate, $rAudioCodec, $rVideoCodec, $rResolution, $rStream['server_stream_id']);
+						} else {
+							$db->query('UPDATE `streams_servers` SET `progress_info` = ?, `stream_info` = ?, `compatible` = ?, `bitrate` = ?, `audio_codec` = ?, `video_codec` = ?, `resolution` = ? WHERE `server_stream_id` = ?', $rProgress, $rStreamInfo, $rCompatible, $rBitrate, $rAudioCodec, $rVideoCodec, $rResolution, $rStream['server_stream_id']);
+						}
+					}
+					echo "\n";
+				} else {
+					echo 'Start monitor...' . "\n\n";
+					if (StreamProcess::startMonitor($rStream['stream_id'], self::handOverNeedsRestart($rStream)) === StreamProcess::MONITOR_PHP) {
+						usleep(50000); // stagger PHP monitor spawns
+					}
+				}
+			}
+		}
 
-        $db->query('SELECT `streams`.`id` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`direct_source` = 1 AND `streams`.`direct_proxy` = 1 AND `streams_servers`.`server_id` = ? AND `streams_servers`.`pid` > 0;', SERVER_ID);
-        if ($db->num_rows() > 0) {
-            foreach ($db->get_rows() as $rStream) {
-                if (file_exists(STREAMS_PATH . $rStream['id'] . '.analyse')) {
-                    $rFFProbeOutput = FFprobeRunner::probeStream(STREAMS_PATH . $rStream['id'] . '.analyse');
-                    // Defaults: the UPDATE below runs even when probing fails or
-                    // the output has no codec info, so these must always be set.
-                    $rBitrate = $rCompatible = $rAudioCodec = $rVideoCodec = $rResolution = null;
-                    if ($rFFProbeOutput) {
-                        $rBitrate = $rFFProbeOutput['bitrate'] / 1024;
-                        $rCompatible = intval(DiagnosticsService::checkCompatibility($rFFProbeOutput, SettingsManager::getBool('player_allow_hevc')));
-                        if (is_array($rFFProbeOutput) && isset($rFFProbeOutput['codecs']) && is_array($rFFProbeOutput['codecs'])) {
-                            $rAudioCodec = isset($rFFProbeOutput['codecs']['audio']['codec_name']) ? $rFFProbeOutput['codecs']['audio']['codec_name'] : null;
-                            $rVideoCodec = isset($rFFProbeOutput['codecs']['video']['codec_name']) ? $rFFProbeOutput['codecs']['video']['codec_name'] : null;
-                            $rResolution = isset($rFFProbeOutput['codecs']['video']['height']) ? $rFFProbeOutput['codecs']['video']['height'] : null;
-                        }
-                        if ($rResolution) {
-                            $rResolution = StreamSorter::getNearest(array(240, 360, 480, 576, 720, 1080, 1440, 2160), $rResolution);
-                        }
-                    }
-                    echo 'Stream ID: ' . $rStream['id'] . "\n";
-                    echo 'Update Stream Information...' . "\n";
-                    $db->query('UPDATE `streams_servers` SET `bitrate` = ?, `stream_info` = ?, `audio_codec` = ?, `video_codec` = ?, `resolution` = ?, `compatible` = ? WHERE `stream_id` = ? AND `server_id` = ?', $rBitrate, json_encode($rFFProbeOutput), $rAudioCodec, $rVideoCodec, $rResolution, $rCompatible, $rStream['id'], SERVER_ID);
-                }
+		$db->query('SELECT `streams`.`id` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`direct_source` = 1 AND `streams`.`direct_proxy` = 1 AND `streams_servers`.`server_id` = ? AND `streams_servers`.`pid` > 0;', SERVER_ID);
+		if ($db->num_rows() > 0) {
+			foreach ($db->get_rows() as $rStream) {
+				if (file_exists(STREAMS_PATH . $rStream['id'] . '.analyse')) {
+					$rFFProbeOutput = FFprobeRunner::probeStream(STREAMS_PATH . $rStream['id'] . '.analyse');
+					// Defaults: the UPDATE below runs even when probing fails or
+					// the output has no codec info, so these must always be set.
+					$rBitrate = $rCompatible = $rAudioCodec = $rVideoCodec = $rResolution = null;
+					if ($rFFProbeOutput) {
+						$rBitrate = $rFFProbeOutput['bitrate'] / 1024;
+						$rCompatible = intval(DiagnosticsService::checkCompatibility($rFFProbeOutput, SettingsManager::getBool('player_allow_hevc')));
+						if (is_array($rFFProbeOutput) && isset($rFFProbeOutput['codecs']) && is_array($rFFProbeOutput['codecs'])) {
+							$rAudioCodec = isset($rFFProbeOutput['codecs']['audio']['codec_name']) ? $rFFProbeOutput['codecs']['audio']['codec_name'] : null;
+							$rVideoCodec = isset($rFFProbeOutput['codecs']['video']['codec_name']) ? $rFFProbeOutput['codecs']['video']['codec_name'] : null;
+							$rResolution = isset($rFFProbeOutput['codecs']['video']['height']) ? $rFFProbeOutput['codecs']['video']['height'] : null;
+						}
+						if ($rResolution) {
+							$rResolution = StreamSorter::getNearest([240, 360, 480, 576, 720, 1080, 1440, 2160], $rResolution);
+						}
+					}
+					echo 'Stream ID: ' . $rStream['id'] . "\n";
+					echo 'Update Stream Information...' . "\n";
+					$db->query('UPDATE `streams_servers` SET `bitrate` = ?, `stream_info` = ?, `audio_codec` = ?, `video_codec` = ?, `resolution` = ?, `compatible` = ? WHERE `stream_id` = ? AND `server_id` = ?', $rBitrate, json_encode($rFFProbeOutput), $rAudioCodec, $rVideoCodec, $rResolution, $rCompatible, $rStream['id'], SERVER_ID);
+				}
 
-                $rUUIDs = array();
-                $rConnections = ConnectionTracker::getConnections(SERVER_ID, null, $rStream['id']);
-                foreach ($rConnections as $rItems) {
-                    foreach ($rItems as $rItem) {
-                        $rUUIDs[] = $rItem['uuid'];
-                    }
-                }
+				$rUUIDs = [];
+				$rConnections = ConnectionTracker::getConnections(SERVER_ID, null, $rStream['id']);
+				foreach ($rConnections as $rItems) {
+					foreach ($rItems as $rItem) {
+						$rUUIDs[] = $rItem['uuid'];
+					}
+				}
 
-                $rConDir = CONS_TMP_PATH . $rStream['id'] . '/';
-                // The per-stream connection dir only exists once a client connects,
-                // so its absence is normal — guard with is_dir() to avoid a bogus
-                // opendir() warning being logged every cron tick on idle streams.
-                if (is_dir($rConDir) && ($rHandle = opendir($rConDir))) {
-                    while (false !== ($rFilename = readdir($rHandle))) {
-                        if ($rFilename != '.' && $rFilename != '..') {
-                            if (!in_array($rFilename, $rUUIDs)) {
-                                unlink(CONS_TMP_PATH . $rStream['id'] . '/' . $rFilename);
-                            }
-                        }
-                    }
-                    closedir($rHandle);
-                }
-            }
-        }
+				$rConDir = CONS_TMP_PATH . $rStream['id'] . '/';
+				// The per-stream connection dir only exists once a client connects,
+				// so its absence is normal — guard with is_dir() to avoid a bogus
+				// opendir() warning being logged every cron tick on idle streams.
+				if (is_dir($rConDir) && ($rHandle = opendir($rConDir))) {
+					while (false !== ($rFilename = readdir($rHandle))) {
+						if ($rFilename != '.' && $rFilename != '..') {
+							if (!in_array($rFilename, $rUUIDs)) {
+								unlink(CONS_TMP_PATH . $rStream['id'] . '/' . $rFilename);
+							}
+						}
+					}
+					closedir($rHandle);
+				}
+			}
+		}
 
-        $db->query('SELECT `stream_id` FROM `streams_servers` WHERE `on_demand` = 1 AND `server_id` = ?;', SERVER_ID);
-        $rOnDemandIDs = array_keys($db->get_rows(true, 'stream_id'));
-        $rProcesses = shell_exec('ps aux | grep XC_VM');
-        if (preg_match_all('/XC_VM\\[(.*)\\]/', $rProcesses, $rMatches)) {
-            $rRemove = array_diff($rMatches[1], $rStreamIDs);
-            $rRemove = array_diff($rRemove, $rOnDemandIDs);
-            foreach ($rRemove as $rStreamID) {
-                if (is_numeric($rStreamID)) {
-                    echo 'Kill Stream ID: ' . $rStreamID . "\n";
-                    shell_exec("kill -9 `ps -ef | grep '/" . intval($rStreamID) . '_.m3u8\\|XC_VM\\[' . intval($rStreamID) . "\\]' | grep -v grep | awk '{print \$2}'`;");
-                    shell_exec('rm -f ' . STREAMS_PATH . intval($rStreamID) . '_*');
-                }
-            }
-        }
+		$db->query('SELECT `stream_id` FROM `streams_servers` WHERE `on_demand` = 1 AND `server_id` = ?;', SERVER_ID);
+		$rOnDemandIDs = array_keys($db->get_rows(true, 'stream_id'));
+		$rProcesses = shell_exec('ps aux | grep XC_VM');
+		if (preg_match_all('/XC_VM\\[(.*)\\]/', $rProcesses, $rMatches)) {
+			$rRemove = array_diff($rMatches[1], $rStreamIDs);
+			$rRemove = array_diff($rRemove, $rOnDemandIDs);
+			foreach ($rRemove as $rStreamID) {
+				if (is_numeric($rStreamID)) {
+					echo 'Kill Stream ID: ' . $rStreamID . "\n";
+					shell_exec("kill -9 `ps -ef | grep '/" . intval($rStreamID) . '_.m3u8\\|XC_VM\\[' . intval($rStreamID) . "\\]' | grep -v grep | awk '{print \$2}'`;");
+					shell_exec('rm -f ' . STREAMS_PATH . intval($rStreamID) . '_*');
+				}
+			}
+		}
 
-        if (SettingsManager::getBool('kill_rogue_ffmpeg')) {
-            // The supervisor restarts producers on its own schedule: a pid read from
-            // _.pid at the top of this pass may already have been replaced, and the
-            // replacement is not rogue. Ask the daemon for what it runs NOW.
-            $rStates = FanoutClient::monitorStates();
-            foreach (($rStates['streams'] ?? array()) as $rState) {
-                if (intval($rState['pid'] ?? 0) > 0) {
-                    $rActivePIDs[] = intval($rState['pid']);
-                }
-            }
-            exec("ps aux | grep -v grep | grep '/*_.m3u8' | awk '{print \$2}'", $rRoguePIDs);
-            foreach ($rRoguePIDs as $rPID) {
-                if (is_numeric($rPID) && intval($rPID) > 0 && !in_array($rPID, $rActivePIDs)) {
-                    echo 'Kill Roque PID: ' . $rPID . "\n";
-                    shell_exec('kill -9 ' . $rPID . ';');
-                }
-            }
-        }
-    }
+		if (SettingsManager::getBool('kill_rogue_ffmpeg')) {
+			// The supervisor restarts producers on its own schedule: a pid read from
+			// _.pid at the top of this pass may already have been replaced, and the
+			// replacement is not rogue. Ask the daemon for what it runs NOW.
+			$rStates = FanoutClient::monitorStates();
+			foreach (($rStates['streams'] ?? []) as $rState) {
+				if (intval($rState['pid'] ?? 0) > 0) {
+					$rActivePIDs[] = intval($rState['pid']);
+				}
+			}
+			exec("ps aux | grep -v grep | grep '/*_.m3u8' | awk '{print \$2}'", $rRoguePIDs);
+			foreach ($rRoguePIDs as $rPID) {
+				if (is_numeric($rPID) && intval($rPID) > 0 && !in_array($rPID, $rActivePIDs)) {
+					echo 'Kill Roque PID: ' . $rPID . "\n";
+					shell_exec('kill -9 ' . $rPID . ';');
+				}
+			}
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/StreamsLogsCronJob.php b/src/Cli/CronJobs/StreamsLogsCronJob.php
index 69a56e3d..60d8746f 100644
--- a/src/Cli/CronJobs/StreamsLogsCronJob.php
+++ b/src/Cli/CronJobs/StreamsLogsCronJob.php
@@ -16,58 +16,58 @@ use XcVm\Cli\CronTrait;
  */
 
 class StreamsLogsCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:streams_logs';
-    }
+	public function getName(): string {
+		return 'cron:streams_logs';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: import stream logs into DB';
-    }
+	public function getDescription(): string {
+		return 'Cron: import stream logs into DB';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Stream Logs]');
+		$this->initCron('XC_VM[Stream Logs]');
 
-        global $db;
+		global $db;
 
-        $rLog = LOGS_TMP_PATH . 'stream_log.log';
-        if (!file_exists($rLog)) {
-            return 0;
-        }
+		$rLog = LOGS_TMP_PATH . 'stream_log.log';
+		if (!file_exists($rLog)) {
+			return 0;
+		}
 
-        $rQuery = rtrim($this->parseLog($rLog), ',');
-        if (!empty($rQuery)) {
-            $db->query('INSERT INTO `streams_logs` (`stream_id`,`server_id`,`action`,`source`,`date`) VALUES ' . $rQuery . ';');
-        }
-        unlink($rLog);
+		$rQuery = rtrim($this->parseLog($rLog), ',');
+		if (!empty($rQuery)) {
+			$db->query('INSERT INTO `streams_logs` (`stream_id`,`server_id`,`action`,`source`,`date`) VALUES ' . $rQuery . ';');
+		}
+		unlink($rLog);
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function parseLog(string $rLog): string {
-        $rQuery = '';
-        if (!file_exists($rLog)) {
-            return $rQuery;
-        }
+	private function parseLog(string $rLog): string {
+		$rQuery = '';
+		if (!file_exists($rLog)) {
+			return $rQuery;
+		}
 
-        $rFP = fopen($rLog, 'r');
-        while (!feof($rFP)) {
-            $rLine = trim(fgets($rFP));
-            if (!empty($rLine)) {
-                $rLine = json_decode(base64_decode($rLine), true);
-                if (!$rLine['stream_id']) {
-                    continue;
-                }
-                $rQuery .= '(' . intval($rLine['stream_id']) . ',' . SERVER_ID . ",'" . addslashes($rLine['action']) . "','" . addslashes($rLine['source']) . "','" . addslashes($rLine['time']) . "'),";
-            }
-        }
-        fclose($rFP);
+		$rFP = fopen($rLog, 'r');
+		while (!feof($rFP)) {
+			$rLine = trim(fgets($rFP));
+			if (!empty($rLine)) {
+				$rLine = json_decode(base64_decode($rLine), true);
+				if (!$rLine['stream_id']) {
+					continue;
+				}
+				$rQuery .= '(' . intval($rLine['stream_id']) . ',' . SERVER_ID . ",'" . addslashes($rLine['action']) . "','" . addslashes($rLine['source']) . "','" . addslashes($rLine['time']) . "'),";
+			}
+		}
+		fclose($rFP);
 
-        return $rQuery;
-    }
+		return $rQuery;
+	}
 }
diff --git a/src/Cli/CronJobs/TmdbCronJob.php b/src/Cli/CronJobs/TmdbCronJob.php
index bea77a98..a7580486 100644
--- a/src/Cli/CronJobs/TmdbCronJob.php
+++ b/src/Cli/CronJobs/TmdbCronJob.php
@@ -18,31 +18,31 @@ use XcVm\Infrastructure\Tmdb\TmdbApiService;
  */
 
 class TmdbCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:tmdb';
-    }
+	public function getName(): string {
+		return 'cron:tmdb';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: update TMDB data (series, movies)';
-    }
+	public function getDescription(): string {
+		return 'Cron: update TMDB data (series, movies)';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        TmdbApiService::requireLibrary();
+		TmdbApiService::requireLibrary();
 
-        $this->initCron('XC_VM[TMDB]');
+		$this->initCron('XC_VM[TMDB]');
 
-        $rTimeout = 3600;
-        set_time_limit($rTimeout);
-        ini_set('max_execution_time', $rTimeout);
+		$rTimeout = 3600;
+		set_time_limit($rTimeout);
+		ini_set('max_execution_time', $rTimeout);
 
-        TmdbCron::run();
+		TmdbCron::run();
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/src/Cli/CronJobs/TmdbPopularCronJob.php b/src/Cli/CronJobs/TmdbPopularCronJob.php
index d80c0abe..5369ee00 100644
--- a/src/Cli/CronJobs/TmdbPopularCronJob.php
+++ b/src/Cli/CronJobs/TmdbPopularCronJob.php
@@ -18,27 +18,27 @@ use XcVm\Infrastructure\Tmdb\TmdbApiService;
  */
 
 class TmdbPopularCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:tmdb_popular';
-    }
+	public function getName(): string {
+		return 'cron:tmdb_popular';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: update popular TMDB movies';
-    }
+	public function getDescription(): string {
+		return 'Cron: update popular TMDB movies';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[Popular]');
+		$this->initCron('XC_VM[Popular]');
 
-        TmdbApiService::requireLibrary();
+		TmdbApiService::requireLibrary();
 
-        TmdbPopularCron::run();
+		TmdbPopularCron::run();
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/src/Cli/CronJobs/TmpCronJob.php b/src/Cli/CronJobs/TmpCronJob.php
index 69f6ad38..13e31891 100644
--- a/src/Cli/CronJobs/TmpCronJob.php
+++ b/src/Cli/CronJobs/TmpCronJob.php
@@ -17,63 +17,63 @@ use XcVm\Core\Config\SettingsManager;
  */
 
 class TmpCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:tmp';
-    }
+	public function getName(): string {
+		return 'cron:tmp';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: cleanup temporary files and stale playlists';
-    }
+	public function getDescription(): string {
+		return 'Cron: cleanup temporary files and stale playlists';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        global $db;
-        $db->close_mysql();
+		global $db;
+		$db->close_mysql();
 
-        $this->setProcessTitle('XC_VM[TMP]');
-        $this->acquireCronLock();
+		$this->setProcessTitle('XC_VM[TMP]');
+		$this->acquireCronLock();
 
-        $rTmpPaths = array(
-            TMP_PATH, CRONS_TMP_PATH, DIVERGENCE_TMP_PATH,
-            FLOOD_TMP_PATH, MINISTRA_TMP_PATH, SIGNALS_TMP_PATH, LOGS_TMP_PATH
-        );
+		$rTmpPaths = [
+			TMP_PATH, CRONS_TMP_PATH, DIVERGENCE_TMP_PATH,
+			FLOOD_TMP_PATH, MINISTRA_TMP_PATH, SIGNALS_TMP_PATH, LOGS_TMP_PATH
+		];
 
-        foreach ($rTmpPaths as $rTmpPath) {
-            if (!is_dir($rTmpPath)) {
-                @mkdir($rTmpPath, 0775, true);
-                continue;
-            }
-            foreach (scandir($rTmpPath) as $rFile) {
-                $fullPath = $rTmpPath . '/' . $rFile;
-                if ($rFile === '.' || $rFile === '..') {
-                    continue;
-                }
-                if (is_file($fullPath) && time() - filemtime($fullPath) >= 600 && stripos($rFile, 'ministra_') === false) {
-                    unlink($fullPath);
-                }
-            }
-        }
+		foreach ($rTmpPaths as $rTmpPath) {
+			if (!is_dir($rTmpPath)) {
+				@mkdir($rTmpPath, 0775, true);
+				continue;
+			}
+			foreach (scandir($rTmpPath) as $rFile) {
+				$fullPath = $rTmpPath . '/' . $rFile;
+				if ($rFile === '.' || $rFile === '..') {
+					continue;
+				}
+				if (is_file($fullPath) && time() - filemtime($fullPath) >= 600 && stripos($rFile, 'ministra_') === false) {
+					unlink($fullPath);
+				}
+			}
+		}
 
-        foreach (scandir(PLAYLIST_PATH) as $rFile) {
-            $fullPath = rtrim(PLAYLIST_PATH, '/') . '/' . $rFile;
-            if ($rFile === '.' || $rFile === '..') {
-                continue;
-            }
-            if (is_file($fullPath)) {
-                if (SettingsManager::get('cache_playlists') <= time() - filemtime($fullPath)) {
-                    unlink($fullPath);
-                }
-            }
-        }
+		foreach (scandir(PLAYLIST_PATH) as $rFile) {
+			$fullPath = rtrim(PLAYLIST_PATH, '/') . '/' . $rFile;
+			if ($rFile === '.' || $rFile === '..') {
+				continue;
+			}
+			if (is_file($fullPath)) {
+				if (SettingsManager::get('cache_playlists') <= time() - filemtime($fullPath)) {
+					unlink($fullPath);
+				}
+			}
+		}
 
-        clearstatcache();
-        @unlink($this->rIdentifier);
+		clearstatcache();
+		@unlink($this->rIdentifier);
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/src/Cli/CronJobs/UpdateCronJob.php b/src/Cli/CronJobs/UpdateCronJob.php
index e4f7e9ae..8e843bdc 100644
--- a/src/Cli/CronJobs/UpdateCronJob.php
+++ b/src/Cli/CronJobs/UpdateCronJob.php
@@ -19,68 +19,68 @@ use XcVm\Core\Updates\UpdateChannels;
  */
 
 class UpdateCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:update';
-    }
+	public function getName(): string {
+		return 'cron:update';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: check for XC_VM updates';
-    }
+	public function getDescription(): string {
+		return 'Cron: check for XC_VM updates';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        if (!$this->isRunning()) {
-            return 1;
-        }
+		if (!$this->isRunning()) {
+			return 1;
+		}
 
-        global $db, $gitRelease;
+		global $db, $gitRelease;
 
-        if (!$gitRelease) {
-            if (defined('GIT_OWNER') && defined('GIT_REPO_MAIN')) {
-                $gitRelease = new GitHubReleases(GIT_OWNER, GIT_REPO_MAIN, UpdateChannels::main());
-            }
-        }
+		if (!$gitRelease) {
+			if (defined('GIT_OWNER') && defined('GIT_REPO_MAIN')) {
+				$gitRelease = new GitHubReleases(GIT_OWNER, GIT_REPO_MAIN, UpdateChannels::main());
+			}
+		}
 
-        if (!$gitRelease) {
-            FileLogger::log('cron', 'GitRelease service not initialized', 'cron:update');
-            return 1;
-        }
+		if (!$gitRelease) {
+			FileLogger::log('cron', 'GitRelease service not initialized', 'cron:update');
+			return 1;
+		}
 
-        $rUpdate = $gitRelease->getUpdate(XC_VM_VERSION);
+		$rUpdate = $gitRelease->getUpdate(XC_VM_VERSION);
 
-        if (is_array($rUpdate) && $rUpdate['version'] && (0 < version_compare($rUpdate['version'], XC_VM_VERSION) || version_compare($rUpdate['version'], XC_VM_VERSION) == 0)) {
-            echo 'Update is available!' . "\n";
-            $updatedChanges = array();
-            foreach (array_reverse($rUpdate['changelog']) as $rItem) {
-                if (!($rItem['version'] == XC_VM_VERSION)) {
-                    $updatedChanges[] = $rItem;
-                } else {
-                    break;
-                }
-            }
-            $rUpdate['changelog'] = $updatedChanges;
-            $db->query('UPDATE `settings` SET `update_data` = ?;', json_encode($rUpdate));
-        } else {
-            $db->query('UPDATE `settings` SET `update_data` = NULL;');
-        }
+		if (is_array($rUpdate) && $rUpdate['version'] && (0 < version_compare($rUpdate['version'], XC_VM_VERSION) || version_compare($rUpdate['version'], XC_VM_VERSION) == 0)) {
+			echo 'Update is available!' . "\n";
+			$updatedChanges = [];
+			foreach (array_reverse($rUpdate['changelog']) as $rItem) {
+				if (!($rItem['version'] == XC_VM_VERSION)) {
+					$updatedChanges[] = $rItem;
+				} else {
+					break;
+				}
+			}
+			$rUpdate['changelog'] = $updatedChanges;
+			$db->query('UPDATE `settings` SET `update_data` = ?;', json_encode($rUpdate));
+		} else {
+			$db->query('UPDATE `settings` SET `update_data` = NULL;');
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function isRunning(): bool {
-        $rNginx = 0;
-        exec('ps -fp $(pgrep -u xc_vm)', $rOutput, $rReturnVar);
-        foreach ($rOutput as $rProcess) {
-            $rSplit = explode(' ', preg_replace('!\\s+!', ' ', trim($rProcess)));
-            if ($rSplit[8] == 'nginx:' && $rSplit[9] == 'master') {
-                $rNginx++;
-            }
-        }
-        return 0 < $rNginx;
-    }
+	private function isRunning(): bool {
+		$rNginx = 0;
+		exec('ps -fp $(pgrep -u xc_vm)', $rOutput, $rReturnVar);
+		foreach ($rOutput as $rProcess) {
+			$rSplit = explode(' ', preg_replace('!\\s+!', ' ', trim($rProcess)));
+			if ($rSplit[8] == 'nginx:' && $rSplit[9] == 'master') {
+				$rNginx++;
+			}
+		}
+		return 0 < $rNginx;
+	}
 }
diff --git a/src/Cli/CronJobs/UsersCronJob.php b/src/Cli/CronJobs/UsersCronJob.php
index 3b7e5ef3..01cf7517 100644
--- a/src/Cli/CronJobs/UsersCronJob.php
+++ b/src/Cli/CronJobs/UsersCronJob.php
@@ -22,620 +22,621 @@ use XcVm\Infrastructure\Redis\RedisManager;
  */
 
 class UsersCronJob implements CommandInterface {
-    use CronTrait;
-
-    private $rPHPPIDs = array();
-    private $rServers = array();
-
-    public function getName(): string {
-        return 'cron:users';
-    }
-
-    public function getDescription(): string {
-        return 'Cron: manage user connections, Redis sync, divergence';
-    }
-
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
-
-        set_time_limit(0);
-        ini_set('memory_limit', -1);
-
-        $this->setProcessTitle('XC_VM[Users]');
-        $this->acquireCronLock();
-
-        global $db;
-
-        $rSync = null;
-        $this->rServers = ServerRepository::getAll();
-
-        if (!empty($rArgs[0]) && $this->rServers[SERVER_ID]['is_main']) {
-            RedisManager::ensureConnected();
-
-            if (RedisManager::isConnected()) {
-                $rSync = intval($rArgs[0]);
-
-                if ($rSync == 1) {
-                    $rDeSync = $rRedisUsers = $rRedisUpdate = $rRedisSet = array();
-                    $db->query('SELECT * FROM `lines_live` WHERE `hls_end` = 0;');
-                    $rRows = $db->get_rows();
-
-                    if (count($rRows) > 0) {
-                        $rStreamIDs = array();
-
-                        foreach ($rRows as $rRow) {
-                            $streamId = (int)$rRow['stream_id'];
-                            if ($streamId > 0 && !in_array($streamId, $rStreamIDs)) {
-                                $rStreamIDs[] = $streamId;
-                            }
-                        }
-
-                        $rOnDemand = array();
-                        if (count($rStreamIDs) > 0) {
-                            $db->query('SELECT `stream_id`, `server_id`, `on_demand` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ');');
-                            foreach ($db->get_rows() as $rRow) {
-                                $rOnDemand[$rRow['stream_id']][$rRow['server_id']] = intval($rRow['on_demand']);
-                            }
-                        }
-
-                        $rRedis = RedisManager::instance()->multi();
-
-                        foreach ($rRows as $rRow) {
-                            echo 'Resynchronising UUID: ' . $rRow['uuid'] . "\n";
-
-                            if (empty($rRow['hmac_id'])) {
-                                $rRow['identity'] = $rRow['user_id'];
-                            } else {
-                                $rRow['identity'] = $rRow['hmac_id'] . '_' . $rRow['hmac_identifier'];
-                            }
-
-                            $rRow['on_demand'] = ($rOnDemand[$rRow['stream_id']][$rRow['server_id']] ?: 0);
-                            $rRedis->zAdd('LINE#' . $rRow['identity'], $rRow['date_start'], $rRow['uuid']);
-                            $rRedis->zAdd('LINE_ALL#' . $rRow['identity'], $rRow['date_start'], $rRow['uuid']);
-                            $rRedis->zAdd('STREAM#' . $rRow['stream_id'], $rRow['date_start'], $rRow['uuid']);
-                            $rRedis->zAdd('SERVER#' . $rRow['server_id'], $rRow['date_start'], $rRow['uuid']);
-
-                            if ($rRow['user_id']) {
-                                $rRedis->zAdd('SERVER_LINES#' . $rRow['server_id'], $rRow['user_id'], $rRow['uuid']);
-                            }
-
-                            if ($rRow['proxy_id']) {
-                                $rRedis->zAdd('PROXY#' . $rRow['proxy_id'], $rRow['date_start'], $rRow['uuid']);
-                            }
-
-                            $rRedis->zAdd('CONNECTIONS', $rRow['date_start'], $rRow['uuid']);
-                            $rRedis->zAdd('LIVE', $rRow['date_start'], $rRow['uuid']);
-                            $rRedis->set($rRow['uuid'], igbinary_serialize($rRow));
-                            $rDeSync[] = $rRow['uuid'];
-                        }
-                        $rRedis->exec();
-
-                        if (count($rDeSync) > 0) {
-                            $db->query("DELETE FROM `lines_live` WHERE `uuid` IN ('" . implode("','", $rDeSync) . "');");
-                        }
-                    }
-                }
-            } else {
-                echo "Couldn't connect to Redis.\n";
-                return 1;
-            }
-        }
-
-        if (SettingsManager::getBool('redis_handler') && $this->rServers[SERVER_ID]['is_main']) {
-            $this->rServers = ServerRepository::getAll(true);
-
-            foreach ($this->rServers as $rServer) {
-                $rDecodedPids = json_decode($rServer['php_pids'] ?? '', true);
-                $this->rPHPPIDs[$rServer['id']] = is_array($rDecodedPids) ? array_map('intval', $rDecodedPids) : [];
-            }
-        }
-
-        $this->loadCron();
-
-        return 0;
-    }
-
-    private function processDeletions($rDelete, $rDelStream = array()) {
-        $rRedis = SettingsManager::getBool('redis_handler');
-        global $db;
-        $rTime = time();
-
-        if ($rRedis) {
-            // Redis can die mid-run — postpone cleanup instead of crashing the
-            // cron; the entries stay in LIVE/ENDED and are re-detected next run.
-            if ($rDelete['count'] > 0 && ($rRedisInstance = RedisManager::instance())) {
-                $rRedis = $rRedisInstance->multi();
-
-                foreach ($rDelete['line'] as $rUserID => $rUUIDs) {
-                    $rRedis->zRem('LINE#' . $rUserID, ...$rUUIDs);
-                    $rRedis->zRem('LINE_ALL#' . $rUserID, ...$rUUIDs);
-                }
-
-                foreach ($rDelete['stream'] as $rStreamID => $rUUIDs) {
-                    $rRedis->zRem('STREAM#' . $rStreamID, ...$rUUIDs);
-                }
-
-                foreach ($rDelete['server'] as $rServerID => $rUUIDs) {
-                    $rRedis->zRem('SERVER#' . $rServerID, ...$rUUIDs);
-                    $rRedis->zRem('SERVER_LINES#' . $rServerID, ...$rUUIDs);
-                }
-
-                foreach ($rDelete['proxy'] as $rProxyID => $rUUIDs) {
-                    $rRedis->zRem('PROXY#' . $rProxyID, ...$rUUIDs);
-                }
-
-                if (count($rDelete['uuid']) > 0) {
-                    $rRedis->zRem('CONNECTIONS', ...$rDelete['uuid']);
-                    $rRedis->zRem('LIVE', ...$rDelete['uuid']);
-                    $rRedis->sRem('ENDED', ...$rDelete['uuid']);
-                    $rRedis->del(...$rDelete['uuid']);
-                }
-
-                $rRedis->exec();
-            } elseif ($rDelete['count'] > 0) {
-                echo "Redis unavailable, connection cleanup postponed until next run\n";
-            }
-        } else {
-            foreach ($rDelete as $rServerID => $rConnections) {
-                if (count($rConnections) > 0) {
-                    $db->query("DELETE FROM `lines_live` WHERE `uuid` IN ('" . implode("','", $rConnections) . "')");
-                }
-            }
-        }
-
-        foreach (($rRedis ? $rDelete['server'] : $rDelete) as $rServerID => $rConnections) {
-            if ($rServerID != SERVER_ID) {
-                $rQuery = '';
-
-                foreach ($rConnections as $rConnection) {
-                    $rQuery .= '(' . $rServerID . ',1,' . $rTime . ',' . $db->escape(json_encode(array('type' => 'delete_con', 'uuid' => $rConnection))) . '),';
-                }
-                $rQuery = rtrim($rQuery, ',');
-
-                if (!empty($rQuery)) {
-                    $db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES ' . $rQuery . ';');
-                }
-            }
-        }
-
-        foreach ($rDelStream as $rStreamID => $rConnections) {
-            foreach ($rConnections as $rConnection) {
-                @unlink(CONS_TMP_PATH . $rStreamID . '/' . $rConnection);
-            }
-        }
-
-        if ($rRedis) {
-            return array('line' => array(), 'server' => array(), 'server_lines' => array(), 'proxy' => array(), 'stream' => array(), 'uuid' => array(), 'count' => 0);
-        }
-
-        return array();
-    }
-
-    /**
-     * Blob 'identity' may be absent (written by an external component or a
-     * pre-identity build) — derive it the same way the sync path does.
-     *
-     * @param array $rConnection Deserialized connection blob.
-     * @return int|string
-     */
-    private function connectionIdentity(array $rConnection) {
-        if (isset($rConnection['identity'])) {
-            return $rConnection['identity'];
-        }
-
-        if (empty($rConnection['hmac_id'])) {
-            return intval($rConnection['user_id'] ?? 0);
-        }
-
-        return $rConnection['hmac_id'] . '_' . ($rConnection['hmac_identifier'] ?? '');
-    }
-
-    private function loadCron(): void {
-        $rRedis = SettingsManager::getBool('redis_handler');
-        global $db;
-
-        $rServers = $this->rServers;
-        $rPHPPIDs = $this->rPHPPIDs;
-
-        if ($rRedis) {
-            RedisManager::ensureConnected();
-        }
-
-        $rStartTime = time();
-        $rLiveKeys = array();
-
-        if (!$rRedis || $rServers[SERVER_ID]['is_main']) {
-            $rAutoKick = SettingsManager::getInt('user_auto_kick_hours') * 3600;
-            $rLiveKeys = $rDelete = $rDeleteStream = array();
-            $rRedisDelete = array('line' => array(), 'server' => array(), 'server_lines' => array(), 'proxy' => array(), 'stream' => array(), 'uuid' => array(), 'count' => 0);
-
-            if ($rRedis) {
-                $rUsers = array();
-                $rResult = ConnectionTracker::getConnections();
-                $rKeys = $rResult[0] ?? [];
-                $rConnections = $rResult[1] ?? [];
-                $i = 0;
-
-                for ($rSize = count($rConnections); $i < $rSize; $i++) {
-                    $rConnection = $rConnections[$i];
-
-                    if (is_array($rConnection)) {
-                        $rConnection['identity'] = $this->connectionIdentity($rConnection);
-                        $rUsers[$rConnection['identity']][] = $rConnection;
-                        $rLiveKeys[] = $rConnection['uuid'];
-                    } else {
-                        $rRedisDelete['count']++;
-                        $rRedisDelete['uuid'][] = $rKeys[$i];
-                    }
-                }
-                unset($rConnections);
-            } else {
-                $rUsers = ConnectionTracker::getConnections(($rServers[SERVER_ID]['is_main'] ? null : SERVER_ID));
-            }
-
-            $rRestreamerArray = $rMaxConnectionsArray = array();
-            $rUserIDs = InputValidator::confirmIDs(array_keys($rUsers));
-
-            if (count($rUserIDs) > 0) {
-                $db->query('SELECT `id`, `max_connections`, `is_restreamer` FROM `lines` WHERE `id` IN (' . implode(',', $rUserIDs) . ');');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rMaxConnectionsArray[$rRow['id']] = $rRow['max_connections'];
-                    $rRestreamerArray[$rRow['id']] = $rRow['is_restreamer'];
-                }
-            }
-
-            if ($rRedis && $rServers[SERVER_ID]['is_main']) {
-                foreach (ConnectionTracker::getEnded() as $rConnection) {
-                    if (is_array($rConnection)) {
-                        $rConnection['identity'] = $this->connectionIdentity($rConnection);
-                        if (!in_array($rConnection['container'], array('ts', 'hls', 'rtmp')) && time() - $rConnection['hls_last_read'] < 300) {
-                            $rClose = false;
-                        } else {
-                            $rClose = true;
-                        }
-
-                        if ($rClose) {
-                            echo 'Close connection: ' . $rConnection['uuid'] . "\n";
-                            ConnectionTracker::closeConnection($rConnection, false, false);
-                            $rRedisDelete['count']++;
-                            $rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
-                            $rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
-                            $rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
-                            $rRedisDelete['uuid'][] = $rConnection['uuid'];
-
-                            if ($rConnection['proxy_id']) {
-                                $rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
-                            }
-                        }
-                    }
-                }
-
-                if ($rRedisDelete['count'] >= 1000) {
-                    $rRedisDelete = $this->processDeletions($rRedisDelete, $rRedisDelete['stream']);
-                }
-            }
-
-            foreach ($rUsers as $rUserID => $rConnections) {
-                $rActiveCount = 0;
-                // HMAC identities and deleted lines have no row in `lines` —
-                // 0 disables the max-connections kick below.
-                $rMaxConnections = $rMaxConnectionsArray[$rUserID] ?? 0;
-                $rIsRestreamer = !empty($rRestreamerArray[$rUserID]);
-
-                foreach ($rConnections as $rConnection) {
-                    if ($rConnection['server_id'] == SERVER_ID || $rRedis) {
-                        if (!isset($rConnection['exp_date']) || is_null($rConnection['exp_date']) || $rConnection['exp_date'] >= $rStartTime) {
-                            $rTotalTime = $rStartTime - $rConnection['date_start'];
-
-                            if (!($rAutoKick != 0 && $rAutoKick <= $rTotalTime) || $rIsRestreamer) {
-                                if ($rConnection['container'] == 'hls') {
-                                    if (30 <= $rStartTime - $rConnection['hls_last_read'] || $rConnection['hls_end'] == 1) {
-                                        echo 'Close connection: ' . $rConnection['uuid'] . "\n";
-                                        ConnectionTracker::closeConnection($rConnection, false, false);
-
-                                        if ($rRedis) {
-                                            $rRedisDelete['count']++;
-                                            $rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
-                                            $rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
-                                            $rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                            $rRedisDelete['uuid'][] = $rConnection['uuid'];
-
-                                            if ($rConnection['user_id']) {
-                                                $rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                            }
-
-                                            if ($rConnection['proxy_id']) {
-                                                $rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
-                                            }
-                                        } else {
-                                            $rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
-                                            $rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
-                                        }
-                                    }
-                                } else {
-                                    // Daemon-served TS (pid=0, ADR 0003 Phase C) has no PHP
-                                    // worker to probe — the fanout_sync daemon closes it by
-                                    // reconciling against the daemon's live-connection set.
-                                    // Skip it here so this reaper neither leaks it (a live
-                                    // reused worker pid reads as "running") nor closes it
-                                    // early (when that worker recycles).
-                                    if ($rConnection['container'] != 'rtmp' && intval($rConnection['pid']) !== 0) {
-                                        if ($rConnection['server_id'] == SERVER_ID) {
-                                            $rIsRunning = ProcessManager::isRunning($rConnection['pid'], 'php-fpm');
-                                        } else {
-                                            if ($rConnection['date_start'] <= $rServers[$rConnection['server_id']]['last_check_ago'] - 1 && 0 < count($rPHPPIDs[$rConnection['server_id']])) {
-                                                $rIsRunning = in_array(intval($rConnection['pid']), $rPHPPIDs[$rConnection['server_id']]);
-                                            } else {
-                                                $rIsRunning = true;
-                                            }
-                                        }
-
-                                        if (($rConnection['hls_end'] == 1 && ($rStartTime - $rConnection['hls_last_read']) >= 300) || !$rIsRunning) {
-                                            echo 'Close connection: ' . $rConnection['uuid'] . "\n";
-                                            ConnectionTracker::closeConnection($rConnection, false, false);
-
-                                            if ($rRedis) {
-                                                $rRedisDelete['count']++;
-                                                $rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
-                                                $rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
-                                                $rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                                $rRedisDelete['uuid'][] = $rConnection['uuid'];
-
-                                                if ($rConnection['user_id']) {
-                                                    $rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                                }
-
-                                                if ($rConnection['proxy_id']) {
-                                                    $rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
-                                                }
-                                            } else {
-                                                $rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
-                                                $rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
-                                            }
-                                        }
-                                    }
-                                }
-                            } else {
-                                echo 'Close connection: ' . $rConnection['uuid'] . "\n";
-                                ConnectionTracker::closeConnection($rConnection, false, false);
-
-                                if ($rRedis) {
-                                    $rRedisDelete['count']++;
-                                    $rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
-                                    $rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
-                                    $rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                    $rRedisDelete['uuid'][] = $rConnection['uuid'];
-
-                                    if ($rConnection['user_id']) {
-                                        $rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                    }
-
-                                    if ($rConnection['proxy_id']) {
-                                        $rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
-                                    }
-                                } else {
-                                    $rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
-                                    $rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
-                                }
-                            }
-                        } else {
-                            echo 'Close connection: ' . $rConnection['uuid'] . "\n";
-                            ConnectionTracker::closeConnection($rConnection, false, false);
-
-                            if ($rRedis) {
-                                $rRedisDelete['count']++;
-                                $rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
-                                $rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
-                                $rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                $rRedisDelete['uuid'][] = $rConnection['uuid'];
-
-                                if ($rConnection['user_id']) {
-                                    $rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                }
-
-                                if ($rConnection['proxy_id']) {
-                                    $rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
-                                }
-                            } else {
-                                $rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
-                                $rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
-                            }
-                        }
-                    }
-
-                    if (!$rConnection['hls_end']) {
-                        $rActiveCount++;
-                    }
-                }
-
-                if ($rServers[SERVER_ID]['is_main'] && 0 < $rMaxConnections && $rMaxConnections < $rActiveCount) {
-                    foreach ($rConnections as $rConnection) {
-                        if (!$rConnection['hls_end']) {
-                            echo 'Close connection: ' . $rConnection['uuid'] . "\n";
-                            ConnectionTracker::closeConnection($rConnection, false, false);
-
-                            if ($rRedis) {
-                                $rRedisDelete['count']++;
-                                $rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
-                                $rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
-                                $rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                $rRedisDelete['uuid'][] = $rConnection['uuid'];
-
-                                if ($rConnection['user_id']) {
-                                    $rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
-                                }
-
-                                if ($rConnection['proxy_id']) {
-                                    $rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
-                                }
-                            } else {
-                                $rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
-                                $rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
-                            }
-
-                            $rActiveCount--;
-                        }
-
-                        if ($rActiveCount >= $rMaxConnections) {
-                            break;
-                        }
-                    }
-                }
-
-                if ($rRedis && 1000 <= $rRedisDelete['count']) {
-                    $rRedisDelete = $this->processDeletions($rRedisDelete, $rRedisDelete['stream']);
-                } else {
-                    if (!$rRedis && count($rDelete) >= 1000) {
-                        $rDelete = $this->processDeletions($rDelete, $rDeleteStream);
-                    }
-                }
-            }
-
-            if ($rRedis && 0 < $rRedisDelete['count']) {
-                $this->processDeletions($rRedisDelete, $rRedisDelete['stream']);
-            } else {
-                if (!$rRedis && count($rDelete) > 0) {
-                    $this->processDeletions($rDelete, $rDeleteStream);
-                }
-            }
-        }
-
-        $rConnectionSpeeds = glob(DIVERGENCE_TMP_PATH . '*');
-
-        if (count($rConnectionSpeeds) > 0) {
-            $rBitrates = [];
-
-            if ($rRedis) {
-                $rStreamMap = [];
-
-                $db->query('SELECT `stream_id`, `bitrate` FROM `streams_servers` WHERE `server_id` = ? AND `bitrate` IS NOT NULL;', SERVER_ID);
-                foreach ($db->get_rows() as $rRow) {
-                    $bitrate = intval($rRow['bitrate']);
-                    if ($bitrate > 0) {
-                        $rStreamMap[intval($rRow['stream_id'])] = intval($bitrate / 8 * 0.92);
-                    }
-                }
-
-                $rUUIDs = [];
-                foreach ($rConnectionSpeeds as $rConnectionSpeed) {
-                    if (!empty($rConnectionSpeed)) {
-                        $rUUIDs[] = basename($rConnectionSpeed);
-                    }
-                }
-
-                if (count($rUUIDs) > 0) {
-                    $rRedis = RedisManager::instance();
-                    if (!$rRedis) {
-                        $rConnections = array();
-                    } else {
-                        $rConnections = array_map(
-                            static fn($v) => ($v !== false) ? igbinary_unserialize($v) : null,
-                            $rRedis->mGet($rUUIDs)
-                        );
-                    }
-
-                    foreach ($rConnections as $rConnection) {
-                        if (!is_array($rConnection)) {
-                            continue;
-                        }
-
-                        $uuid = $rConnection['uuid'];
-                        $streamId = intval($rConnection['stream_id']);
-
-                        if (!isset($rStreamMap[$streamId])) {
-                            continue;
-                        }
-
-                        $rBitrates[$uuid] = $rStreamMap[$streamId];
-                    }
-                }
-
-                unset($rStreamMap);
-            } else {
-                $db->query('SELECT `lines_live`.`uuid`, `streams_servers`.`bitrate` FROM `lines_live` LEFT JOIN `streams_servers` ON `lines_live`.`stream_id` = `streams_servers`.`stream_id` AND `lines_live`.`server_id` = `streams_servers`.`server_id` WHERE `lines_live`.`server_id` = ?;', SERVER_ID);
-
-                foreach ($db->get_rows() as $rRow) {
-                    $bitrate = intval($rRow['bitrate']);
-                    if ($bitrate > 0) {
-                        $rBitrates[$rRow['uuid']] = intval($bitrate / 8 * 0.92);
-                    }
-                }
-            }
-
-            if (!$rRedis) {
-                $rUUIDMap = array();
-                $db->query('SELECT `uuid`, `activity_id` FROM `lines_live`;');
-                foreach ($db->get_rows() as $rRow) {
-                    $rUUIDMap[$rRow['uuid']] = $rRow['activity_id'];
-                }
-            }
-
-            $rLiveQuery = $rDivergenceUpdate = [];
-
-            foreach ($rConnectionSpeeds as $rConnectionSpeed) {
-                if (empty($rConnectionSpeed)) {
-                    continue;
-                }
-
-                $rUUID = basename($rConnectionSpeed);
-                $rAverageSpeed = intval(file_get_contents($rConnectionSpeed));
-
-                if (!isset($rBitrates[$rUUID]) || $rBitrates[$rUUID] <= 0) {
-                    $rDivergenceUpdate[] = "('" . $rUUID . "', 0)";
-
-                    if (!$rRedis && isset($rUUIDMap[$rUUID])) {
-                        $rLiveQuery[] = '(' . $rUUIDMap[$rUUID] . ', 0)';
-                    }
-
-                    continue;
-                }
-
-                $realBitrate = $rBitrates[$rUUID];
-                $rDivergence = intval(($rAverageSpeed - $realBitrate) / $realBitrate * 100);
-
-                if ($rDivergence > 0) {
-                    $rDivergence = 0;
-                }
-
-                $rDivergenceUpdate[] = "('" . $rUUID . "', " . abs($rDivergence) . ')';
-
-                if (!$rRedis && isset($rUUIDMap[$rUUID])) {
-                    $rLiveQuery[] = '(' . $rUUIDMap[$rUUID] . ', ' . abs($rDivergence) . ')';
-                }
-            }
-
-            if (count($rDivergenceUpdate) > 0) {
-                $rUpdateQuery = implode(',', $rDivergenceUpdate);
-                $db->query('INSERT INTO `lines_divergence`(`uuid`,`divergence`) VALUES ' . $rUpdateQuery . ' ON DUPLICATE KEY UPDATE `divergence`=VALUES(`divergence`);');
-            }
-
-            if (!$rRedis && count($rLiveQuery) > 0) {
-                $rLiveQueryStr = implode(',', $rLiveQuery);
-                $db->query('INSERT INTO `lines_live`(`activity_id`,`divergence`) VALUES ' . $rLiveQueryStr . ' ON DUPLICATE KEY UPDATE `divergence`=VALUES(`divergence`);');
-            }
-
-            shell_exec('rm -f ' . DIVERGENCE_TMP_PATH . '*');
-        }
-
-        if ($rServers[SERVER_ID]['is_main']) {
-            if ($rRedis) {
-                $rDeleteQuery = "DELETE FROM `lines_divergence` WHERE `uuid` NOT IN ('" . implode("','", $rLiveKeys) . "');";
-                for ($rRetry = 0; $rRetry < 3; $rRetry++) {
-                    if ($db->query($rDeleteQuery)) {
-                        break;
-                    }
-                    usleep(200000);
-                }
-            } else {
-                $db->query('DELETE FROM `lines_divergence` WHERE `uuid` NOT IN (SELECT `uuid` FROM `lines_live`);');
-            }
-        }
-
-        if ($rServers[SERVER_ID]['is_main']) {
-            $db->query('DELETE FROM `lines_live` WHERE `uuid` IS NULL;');
-        }
-    }
+	use CronTrait;
+
+	private $rPHPPIDs = [];
+
+	private $rServers = [];
+
+	public function getName(): string {
+		return 'cron:users';
+	}
+
+	public function getDescription(): string {
+		return 'Cron: manage user connections, Redis sync, divergence';
+	}
+
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
+
+		set_time_limit(0);
+		ini_set('memory_limit', -1);
+
+		$this->setProcessTitle('XC_VM[Users]');
+		$this->acquireCronLock();
+
+		global $db;
+
+		$rSync = null;
+		$this->rServers = ServerRepository::getAll();
+
+		if (!empty($rArgs[0]) && $this->rServers[SERVER_ID]['is_main']) {
+			RedisManager::ensureConnected();
+
+			if (RedisManager::isConnected()) {
+				$rSync = intval($rArgs[0]);
+
+				if ($rSync == 1) {
+					$rDeSync = $rRedisUsers = $rRedisUpdate = $rRedisSet = [];
+					$db->query('SELECT * FROM `lines_live` WHERE `hls_end` = 0;');
+					$rRows = $db->get_rows();
+
+					if (count($rRows) > 0) {
+						$rStreamIDs = [];
+
+						foreach ($rRows as $rRow) {
+							$streamId = (int) $rRow['stream_id'];
+							if ($streamId > 0 && !in_array($streamId, $rStreamIDs)) {
+								$rStreamIDs[] = $streamId;
+							}
+						}
+
+						$rOnDemand = [];
+						if (count($rStreamIDs) > 0) {
+							$db->query('SELECT `stream_id`, `server_id`, `on_demand` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ');');
+							foreach ($db->get_rows() as $rRow) {
+								$rOnDemand[$rRow['stream_id']][$rRow['server_id']] = intval($rRow['on_demand']);
+							}
+						}
+
+						$rRedis = RedisManager::instance()->multi();
+
+						foreach ($rRows as $rRow) {
+							echo 'Resynchronising UUID: ' . $rRow['uuid'] . "\n";
+
+							if (empty($rRow['hmac_id'])) {
+								$rRow['identity'] = $rRow['user_id'];
+							} else {
+								$rRow['identity'] = $rRow['hmac_id'] . '_' . $rRow['hmac_identifier'];
+							}
+
+							$rRow['on_demand'] = ($rOnDemand[$rRow['stream_id']][$rRow['server_id']] ?: 0);
+							$rRedis->zAdd('LINE#' . $rRow['identity'], $rRow['date_start'], $rRow['uuid']);
+							$rRedis->zAdd('LINE_ALL#' . $rRow['identity'], $rRow['date_start'], $rRow['uuid']);
+							$rRedis->zAdd('STREAM#' . $rRow['stream_id'], $rRow['date_start'], $rRow['uuid']);
+							$rRedis->zAdd('SERVER#' . $rRow['server_id'], $rRow['date_start'], $rRow['uuid']);
+
+							if ($rRow['user_id']) {
+								$rRedis->zAdd('SERVER_LINES#' . $rRow['server_id'], $rRow['user_id'], $rRow['uuid']);
+							}
+
+							if ($rRow['proxy_id']) {
+								$rRedis->zAdd('PROXY#' . $rRow['proxy_id'], $rRow['date_start'], $rRow['uuid']);
+							}
+
+							$rRedis->zAdd('CONNECTIONS', $rRow['date_start'], $rRow['uuid']);
+							$rRedis->zAdd('LIVE', $rRow['date_start'], $rRow['uuid']);
+							$rRedis->set($rRow['uuid'], igbinary_serialize($rRow));
+							$rDeSync[] = $rRow['uuid'];
+						}
+						$rRedis->exec();
+
+						if (count($rDeSync) > 0) {
+							$db->query("DELETE FROM `lines_live` WHERE `uuid` IN ('" . implode("','", $rDeSync) . "');");
+						}
+					}
+				}
+			} else {
+				echo "Couldn't connect to Redis.\n";
+				return 1;
+			}
+		}
+
+		if (SettingsManager::getBool('redis_handler') && $this->rServers[SERVER_ID]['is_main']) {
+			$this->rServers = ServerRepository::getAll(true);
+
+			foreach ($this->rServers as $rServer) {
+				$rDecodedPids = json_decode($rServer['php_pids'] ?? '', true);
+				$this->rPHPPIDs[$rServer['id']] = is_array($rDecodedPids) ? array_map('intval', $rDecodedPids) : [];
+			}
+		}
+
+		$this->loadCron();
+
+		return 0;
+	}
+
+	private function processDeletions($rDelete, $rDelStream = []) {
+		$rRedis = SettingsManager::getBool('redis_handler');
+		global $db;
+		$rTime = time();
+
+		if ($rRedis) {
+			// Redis can die mid-run — postpone cleanup instead of crashing the
+			// cron; the entries stay in LIVE/ENDED and are re-detected next run.
+			if ($rDelete['count'] > 0 && ($rRedisInstance = RedisManager::instance())) {
+				$rRedis = $rRedisInstance->multi();
+
+				foreach ($rDelete['line'] as $rUserID => $rUUIDs) {
+					$rRedis->zRem('LINE#' . $rUserID, ...$rUUIDs);
+					$rRedis->zRem('LINE_ALL#' . $rUserID, ...$rUUIDs);
+				}
+
+				foreach ($rDelete['stream'] as $rStreamID => $rUUIDs) {
+					$rRedis->zRem('STREAM#' . $rStreamID, ...$rUUIDs);
+				}
+
+				foreach ($rDelete['server'] as $rServerID => $rUUIDs) {
+					$rRedis->zRem('SERVER#' . $rServerID, ...$rUUIDs);
+					$rRedis->zRem('SERVER_LINES#' . $rServerID, ...$rUUIDs);
+				}
+
+				foreach ($rDelete['proxy'] as $rProxyID => $rUUIDs) {
+					$rRedis->zRem('PROXY#' . $rProxyID, ...$rUUIDs);
+				}
+
+				if (count($rDelete['uuid']) > 0) {
+					$rRedis->zRem('CONNECTIONS', ...$rDelete['uuid']);
+					$rRedis->zRem('LIVE', ...$rDelete['uuid']);
+					$rRedis->sRem('ENDED', ...$rDelete['uuid']);
+					$rRedis->del(...$rDelete['uuid']);
+				}
+
+				$rRedis->exec();
+			} elseif ($rDelete['count'] > 0) {
+				echo "Redis unavailable, connection cleanup postponed until next run\n";
+			}
+		} else {
+			foreach ($rDelete as $rServerID => $rConnections) {
+				if (count($rConnections) > 0) {
+					$db->query("DELETE FROM `lines_live` WHERE `uuid` IN ('" . implode("','", $rConnections) . "')");
+				}
+			}
+		}
+
+		foreach (($rRedis ? $rDelete['server'] : $rDelete) as $rServerID => $rConnections) {
+			if ($rServerID != SERVER_ID) {
+				$rQuery = '';
+
+				foreach ($rConnections as $rConnection) {
+					$rQuery .= '(' . $rServerID . ',1,' . $rTime . ',' . $db->escape(json_encode(['type' => 'delete_con', 'uuid' => $rConnection])) . '),';
+				}
+				$rQuery = rtrim($rQuery, ',');
+
+				if (!empty($rQuery)) {
+					$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES ' . $rQuery . ';');
+				}
+			}
+		}
+
+		foreach ($rDelStream as $rStreamID => $rConnections) {
+			foreach ($rConnections as $rConnection) {
+				@unlink(CONS_TMP_PATH . $rStreamID . '/' . $rConnection);
+			}
+		}
+
+		if ($rRedis) {
+			return ['line' => [], 'server' => [], 'server_lines' => [], 'proxy' => [], 'stream' => [], 'uuid' => [], 'count' => 0];
+		}
+
+		return [];
+	}
+
+	/**
+	 * Blob 'identity' may be absent (written by an external component or a
+	 * pre-identity build) — derive it the same way the sync path does.
+	 *
+	 * @param array $rConnection Deserialized connection blob.
+	 * @return int|string
+	 */
+	private function connectionIdentity(array $rConnection) {
+		if (isset($rConnection['identity'])) {
+			return $rConnection['identity'];
+		}
+
+		if (empty($rConnection['hmac_id'])) {
+			return intval($rConnection['user_id'] ?? 0);
+		}
+
+		return $rConnection['hmac_id'] . '_' . ($rConnection['hmac_identifier'] ?? '');
+	}
+
+	private function loadCron(): void {
+		$rRedis = SettingsManager::getBool('redis_handler');
+		global $db;
+
+		$rServers = $this->rServers;
+		$rPHPPIDs = $this->rPHPPIDs;
+
+		if ($rRedis) {
+			RedisManager::ensureConnected();
+		}
+
+		$rStartTime = time();
+		$rLiveKeys = [];
+
+		if (!$rRedis || $rServers[SERVER_ID]['is_main']) {
+			$rAutoKick = SettingsManager::getInt('user_auto_kick_hours') * 3600;
+			$rLiveKeys = $rDelete = $rDeleteStream = [];
+			$rRedisDelete = ['line' => [], 'server' => [], 'server_lines' => [], 'proxy' => [], 'stream' => [], 'uuid' => [], 'count' => 0];
+
+			if ($rRedis) {
+				$rUsers = [];
+				$rResult = ConnectionTracker::getConnections();
+				$rKeys = $rResult[0] ?? [];
+				$rConnections = $rResult[1] ?? [];
+				$i = 0;
+
+				for ($rSize = count($rConnections); $i < $rSize; $i++) {
+					$rConnection = $rConnections[$i];
+
+					if (is_array($rConnection)) {
+						$rConnection['identity'] = $this->connectionIdentity($rConnection);
+						$rUsers[$rConnection['identity']][] = $rConnection;
+						$rLiveKeys[] = $rConnection['uuid'];
+					} else {
+						$rRedisDelete['count']++;
+						$rRedisDelete['uuid'][] = $rKeys[$i];
+					}
+				}
+				unset($rConnections);
+			} else {
+				$rUsers = ConnectionTracker::getConnections(($rServers[SERVER_ID]['is_main'] ? null : SERVER_ID));
+			}
+
+			$rRestreamerArray = $rMaxConnectionsArray = [];
+			$rUserIDs = InputValidator::confirmIDs(array_keys($rUsers));
+
+			if (count($rUserIDs) > 0) {
+				$db->query('SELECT `id`, `max_connections`, `is_restreamer` FROM `lines` WHERE `id` IN (' . implode(',', $rUserIDs) . ');');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rMaxConnectionsArray[$rRow['id']] = $rRow['max_connections'];
+					$rRestreamerArray[$rRow['id']] = $rRow['is_restreamer'];
+				}
+			}
+
+			if ($rRedis && $rServers[SERVER_ID]['is_main']) {
+				foreach (ConnectionTracker::getEnded() as $rConnection) {
+					if (is_array($rConnection)) {
+						$rConnection['identity'] = $this->connectionIdentity($rConnection);
+						if (!in_array($rConnection['container'], ['ts', 'hls', 'rtmp']) && time() - $rConnection['hls_last_read'] < 300) {
+							$rClose = false;
+						} else {
+							$rClose = true;
+						}
+
+						if ($rClose) {
+							echo 'Close connection: ' . $rConnection['uuid'] . "\n";
+							ConnectionTracker::closeConnection($rConnection, false, false);
+							$rRedisDelete['count']++;
+							$rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
+							$rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
+							$rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
+							$rRedisDelete['uuid'][] = $rConnection['uuid'];
+
+							if ($rConnection['proxy_id']) {
+								$rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
+							}
+						}
+					}
+				}
+
+				if ($rRedisDelete['count'] >= 1000) {
+					$rRedisDelete = $this->processDeletions($rRedisDelete, $rRedisDelete['stream']);
+				}
+			}
+
+			foreach ($rUsers as $rUserID => $rConnections) {
+				$rActiveCount = 0;
+				// HMAC identities and deleted lines have no row in `lines` —
+				// 0 disables the max-connections kick below.
+				$rMaxConnections = $rMaxConnectionsArray[$rUserID] ?? 0;
+				$rIsRestreamer = !empty($rRestreamerArray[$rUserID]);
+
+				foreach ($rConnections as $rConnection) {
+					if ($rConnection['server_id'] == SERVER_ID || $rRedis) {
+						if (!isset($rConnection['exp_date']) || is_null($rConnection['exp_date']) || $rConnection['exp_date'] >= $rStartTime) {
+							$rTotalTime = $rStartTime - $rConnection['date_start'];
+
+							if (!($rAutoKick != 0 && $rAutoKick <= $rTotalTime) || $rIsRestreamer) {
+								if ($rConnection['container'] == 'hls') {
+									if (30 <= $rStartTime - $rConnection['hls_last_read'] || $rConnection['hls_end'] == 1) {
+										echo 'Close connection: ' . $rConnection['uuid'] . "\n";
+										ConnectionTracker::closeConnection($rConnection, false, false);
+
+										if ($rRedis) {
+											$rRedisDelete['count']++;
+											$rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
+											$rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
+											$rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
+											$rRedisDelete['uuid'][] = $rConnection['uuid'];
+
+											if ($rConnection['user_id']) {
+												$rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
+											}
+
+											if ($rConnection['proxy_id']) {
+												$rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
+											}
+										} else {
+											$rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
+											$rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
+										}
+									}
+								} else {
+									// Daemon-served TS (pid=0, ADR 0003 Phase C) has no PHP
+									// worker to probe — the fanout_sync daemon closes it by
+									// reconciling against the daemon's live-connection set.
+									// Skip it here so this reaper neither leaks it (a live
+									// reused worker pid reads as "running") nor closes it
+									// early (when that worker recycles).
+									if ($rConnection['container'] != 'rtmp' && intval($rConnection['pid']) !== 0) {
+										if ($rConnection['server_id'] == SERVER_ID) {
+											$rIsRunning = ProcessManager::isRunning($rConnection['pid'], 'php-fpm');
+										} else {
+											if ($rConnection['date_start'] <= $rServers[$rConnection['server_id']]['last_check_ago'] - 1 && 0 < count($rPHPPIDs[$rConnection['server_id']])) {
+												$rIsRunning = in_array(intval($rConnection['pid']), $rPHPPIDs[$rConnection['server_id']]);
+											} else {
+												$rIsRunning = true;
+											}
+										}
+
+										if (($rConnection['hls_end'] == 1 && ($rStartTime - $rConnection['hls_last_read']) >= 300) || !$rIsRunning) {
+											echo 'Close connection: ' . $rConnection['uuid'] . "\n";
+											ConnectionTracker::closeConnection($rConnection, false, false);
+
+											if ($rRedis) {
+												$rRedisDelete['count']++;
+												$rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
+												$rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
+												$rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
+												$rRedisDelete['uuid'][] = $rConnection['uuid'];
+
+												if ($rConnection['user_id']) {
+													$rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
+												}
+
+												if ($rConnection['proxy_id']) {
+													$rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
+												}
+											} else {
+												$rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
+												$rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
+											}
+										}
+									}
+								}
+							} else {
+								echo 'Close connection: ' . $rConnection['uuid'] . "\n";
+								ConnectionTracker::closeConnection($rConnection, false, false);
+
+								if ($rRedis) {
+									$rRedisDelete['count']++;
+									$rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
+									$rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
+									$rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
+									$rRedisDelete['uuid'][] = $rConnection['uuid'];
+
+									if ($rConnection['user_id']) {
+										$rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
+									}
+
+									if ($rConnection['proxy_id']) {
+										$rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
+									}
+								} else {
+									$rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
+									$rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
+								}
+							}
+						} else {
+							echo 'Close connection: ' . $rConnection['uuid'] . "\n";
+							ConnectionTracker::closeConnection($rConnection, false, false);
+
+							if ($rRedis) {
+								$rRedisDelete['count']++;
+								$rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
+								$rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
+								$rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
+								$rRedisDelete['uuid'][] = $rConnection['uuid'];
+
+								if ($rConnection['user_id']) {
+									$rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
+								}
+
+								if ($rConnection['proxy_id']) {
+									$rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
+								}
+							} else {
+								$rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
+								$rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
+							}
+						}
+					}
+
+					if (!$rConnection['hls_end']) {
+						$rActiveCount++;
+					}
+				}
+
+				if ($rServers[SERVER_ID]['is_main'] && 0 < $rMaxConnections && $rMaxConnections < $rActiveCount) {
+					foreach ($rConnections as $rConnection) {
+						if (!$rConnection['hls_end']) {
+							echo 'Close connection: ' . $rConnection['uuid'] . "\n";
+							ConnectionTracker::closeConnection($rConnection, false, false);
+
+							if ($rRedis) {
+								$rRedisDelete['count']++;
+								$rRedisDelete['line'][$rConnection['identity']][] = $rConnection['uuid'];
+								$rRedisDelete['stream'][$rConnection['stream_id']][] = $rConnection['uuid'];
+								$rRedisDelete['server'][$rConnection['server_id']][] = $rConnection['uuid'];
+								$rRedisDelete['uuid'][] = $rConnection['uuid'];
+
+								if ($rConnection['user_id']) {
+									$rRedisDelete['server_lines'][$rConnection['server_id']][] = $rConnection['uuid'];
+								}
+
+								if ($rConnection['proxy_id']) {
+									$rRedisDelete['proxy'][$rConnection['proxy_id']][] = $rConnection['uuid'];
+								}
+							} else {
+								$rDelete[$rConnection['server_id']][] = $rConnection['uuid'];
+								$rDeleteStream[$rConnection['stream_id']] = $rDelete[$rConnection['server_id']];
+							}
+
+							$rActiveCount--;
+						}
+
+						if ($rActiveCount >= $rMaxConnections) {
+							break;
+						}
+					}
+				}
+
+				if ($rRedis && 1000 <= $rRedisDelete['count']) {
+					$rRedisDelete = $this->processDeletions($rRedisDelete, $rRedisDelete['stream']);
+				} else {
+					if (!$rRedis && count($rDelete) >= 1000) {
+						$rDelete = $this->processDeletions($rDelete, $rDeleteStream);
+					}
+				}
+			}
+
+			if ($rRedis && 0 < $rRedisDelete['count']) {
+				$this->processDeletions($rRedisDelete, $rRedisDelete['stream']);
+			} else {
+				if (!$rRedis && count($rDelete) > 0) {
+					$this->processDeletions($rDelete, $rDeleteStream);
+				}
+			}
+		}
+
+		$rConnectionSpeeds = glob(DIVERGENCE_TMP_PATH . '*');
+
+		if (count($rConnectionSpeeds) > 0) {
+			$rBitrates = [];
+
+			if ($rRedis) {
+				$rStreamMap = [];
+
+				$db->query('SELECT `stream_id`, `bitrate` FROM `streams_servers` WHERE `server_id` = ? AND `bitrate` IS NOT NULL;', SERVER_ID);
+				foreach ($db->get_rows() as $rRow) {
+					$bitrate = intval($rRow['bitrate']);
+					if ($bitrate > 0) {
+						$rStreamMap[intval($rRow['stream_id'])] = intval($bitrate / 8 * 0.92);
+					}
+				}
+
+				$rUUIDs = [];
+				foreach ($rConnectionSpeeds as $rConnectionSpeed) {
+					if (!empty($rConnectionSpeed)) {
+						$rUUIDs[] = basename($rConnectionSpeed);
+					}
+				}
+
+				if (count($rUUIDs) > 0) {
+					$rRedis = RedisManager::instance();
+					if (!$rRedis) {
+						$rConnections = [];
+					} else {
+						$rConnections = array_map(
+							static fn($v) => ($v !== false) ? igbinary_unserialize($v) : null,
+							$rRedis->mGet($rUUIDs)
+						);
+					}
+
+					foreach ($rConnections as $rConnection) {
+						if (!is_array($rConnection)) {
+							continue;
+						}
+
+						$uuid = $rConnection['uuid'];
+						$streamId = intval($rConnection['stream_id']);
+
+						if (!isset($rStreamMap[$streamId])) {
+							continue;
+						}
+
+						$rBitrates[$uuid] = $rStreamMap[$streamId];
+					}
+				}
+
+				unset($rStreamMap);
+			} else {
+				$db->query('SELECT `lines_live`.`uuid`, `streams_servers`.`bitrate` FROM `lines_live` LEFT JOIN `streams_servers` ON `lines_live`.`stream_id` = `streams_servers`.`stream_id` AND `lines_live`.`server_id` = `streams_servers`.`server_id` WHERE `lines_live`.`server_id` = ?;', SERVER_ID);
+
+				foreach ($db->get_rows() as $rRow) {
+					$bitrate = intval($rRow['bitrate']);
+					if ($bitrate > 0) {
+						$rBitrates[$rRow['uuid']] = intval($bitrate / 8 * 0.92);
+					}
+				}
+			}
+
+			if (!$rRedis) {
+				$rUUIDMap = [];
+				$db->query('SELECT `uuid`, `activity_id` FROM `lines_live`;');
+				foreach ($db->get_rows() as $rRow) {
+					$rUUIDMap[$rRow['uuid']] = $rRow['activity_id'];
+				}
+			}
+
+			$rLiveQuery = $rDivergenceUpdate = [];
+
+			foreach ($rConnectionSpeeds as $rConnectionSpeed) {
+				if (empty($rConnectionSpeed)) {
+					continue;
+				}
+
+				$rUUID = basename($rConnectionSpeed);
+				$rAverageSpeed = intval(file_get_contents($rConnectionSpeed));
+
+				if (!isset($rBitrates[$rUUID]) || $rBitrates[$rUUID] <= 0) {
+					$rDivergenceUpdate[] = "('" . $rUUID . "', 0)";
+
+					if (!$rRedis && isset($rUUIDMap[$rUUID])) {
+						$rLiveQuery[] = '(' . $rUUIDMap[$rUUID] . ', 0)';
+					}
+
+					continue;
+				}
+
+				$realBitrate = $rBitrates[$rUUID];
+				$rDivergence = intval(($rAverageSpeed - $realBitrate) / $realBitrate * 100);
+
+				if ($rDivergence > 0) {
+					$rDivergence = 0;
+				}
+
+				$rDivergenceUpdate[] = "('" . $rUUID . "', " . abs($rDivergence) . ')';
+
+				if (!$rRedis && isset($rUUIDMap[$rUUID])) {
+					$rLiveQuery[] = '(' . $rUUIDMap[$rUUID] . ', ' . abs($rDivergence) . ')';
+				}
+			}
+
+			if (count($rDivergenceUpdate) > 0) {
+				$rUpdateQuery = implode(',', $rDivergenceUpdate);
+				$db->query('INSERT INTO `lines_divergence`(`uuid`,`divergence`) VALUES ' . $rUpdateQuery . ' ON DUPLICATE KEY UPDATE `divergence`=VALUES(`divergence`);');
+			}
+
+			if (!$rRedis && count($rLiveQuery) > 0) {
+				$rLiveQueryStr = implode(',', $rLiveQuery);
+				$db->query('INSERT INTO `lines_live`(`activity_id`,`divergence`) VALUES ' . $rLiveQueryStr . ' ON DUPLICATE KEY UPDATE `divergence`=VALUES(`divergence`);');
+			}
+
+			shell_exec('rm -f ' . DIVERGENCE_TMP_PATH . '*');
+		}
+
+		if ($rServers[SERVER_ID]['is_main']) {
+			if ($rRedis) {
+				$rDeleteQuery = "DELETE FROM `lines_divergence` WHERE `uuid` NOT IN ('" . implode("','", $rLiveKeys) . "');";
+				for ($rRetry = 0; $rRetry < 3; $rRetry++) {
+					if ($db->query($rDeleteQuery)) {
+						break;
+					}
+					usleep(200000);
+				}
+			} else {
+				$db->query('DELETE FROM `lines_divergence` WHERE `uuid` NOT IN (SELECT `uuid` FROM `lines_live`);');
+			}
+		}
+
+		if ($rServers[SERVER_ID]['is_main']) {
+			$db->query('DELETE FROM `lines_live` WHERE `uuid` IS NULL;');
+		}
+	}
 }
diff --git a/src/Cli/CronJobs/VodCronJob.php b/src/Cli/CronJobs/VodCronJob.php
index e295da81..28689783 100644
--- a/src/Cli/CronJobs/VodCronJob.php
+++ b/src/Cli/CronJobs/VodCronJob.php
@@ -23,178 +23,178 @@ use XcVm\Streaming\Health\ProcessChecker;
  */
 
 class VodCronJob implements CommandInterface {
-    use CronTrait;
+	use CronTrait;
 
-    public function getName(): string {
-        return 'cron:vod';
-    }
+	public function getName(): string {
+		return 'cron:vod';
+	}
 
-    public function getDescription(): string {
-        return 'Cron: check VOD/channels, start recordings, analyze media';
-    }
+	public function getDescription(): string {
+		return 'Cron: check VOD/channels, start recordings, analyze media';
+	}
 
-    public function execute(array $rArgs): int {
-        if (!$this->assertRunAsXcVm()) {
-            return 1;
-        }
+	public function execute(array $rArgs): int {
+		if (!$this->assertRunAsXcVm()) {
+			return 1;
+		}
 
-        $this->initCron('XC_VM[VOD]');
-        $this->loadCron();
+		$this->initCron('XC_VM[VOD]');
+		$this->loadCron();
 
-        return 0;
-    }
+		return 0;
+	}
 
-    private function loadCron(): void {
-        global $db;
+	private function loadCron(): void {
+		global $db;
 
-        $db->query('SELECT * FROM `streams` t1 INNER JOIN `streams_servers` t3 ON t3.stream_id = t1.id LEFT JOIN `profiles` t2 ON t2.profile_id = t1.transcode_profile_id WHERE t1.type = 3 AND t3.server_id = ? AND t3.parent_id IS NULL;', SERVER_ID);
-        if ($db->num_rows() > 0) {
-            $rStreams = $db->get_rows();
-            foreach ($rStreams as $rStream) {
-                echo "\n\n" . '[*] Checking Stream ' . $rStream['stream_display_name'] . "\n";
-                $rCreateFile = CREATED_PATH . $rStream['id'] . '_.create';
-                $rPID = is_file($rCreateFile) ? intval(file_get_contents($rCreateFile)) : 0;
-                if ($rPID && ProcessChecker::checkPID($rPID, 'XC_VMCreate[' . intval($rStream['id']) . ']')) {
-                    echo "\t" . 'Build Is Still Going!' . "\n";
-                } else {
-                    $rSourcesLeft = array_diff(json_decode($rStream['stream_source'], true), json_decode($rStream['cchannel_rsources'], true));
-                    if (count($rSourcesLeft) > 0) {
-                        echo "\t" . 'Needs Updating!' . "\n";
-                        StreamProcess::queueChannel($rStream['id']);
-                    } else {
-                        if (file_exists(CREATED_PATH . $rStream['id'] . '_.info')) {
-                            $rCCInfo = file_get_contents(CREATED_PATH . $rStream['id'] . '_.info');
-                            $db->query('UPDATE `streams_servers` SET `cc_info` = ? WHERE `server_id` = ? AND `stream_id` = ?;', $rCCInfo, SERVER_ID, $rStream['id']);
-                            unlink(CREATED_PATH . $rStream['id'] . '_.info');
-                        }
-                        echo "\t" . 'Build Finished' . "\n";
-                    }
-                }
-            }
-        }
+		$db->query('SELECT * FROM `streams` t1 INNER JOIN `streams_servers` t3 ON t3.stream_id = t1.id LEFT JOIN `profiles` t2 ON t2.profile_id = t1.transcode_profile_id WHERE t1.type = 3 AND t3.server_id = ? AND t3.parent_id IS NULL;', SERVER_ID);
+		if ($db->num_rows() > 0) {
+			$rStreams = $db->get_rows();
+			foreach ($rStreams as $rStream) {
+				echo "\n\n" . '[*] Checking Stream ' . $rStream['stream_display_name'] . "\n";
+				$rCreateFile = CREATED_PATH . $rStream['id'] . '_.create';
+				$rPID = is_file($rCreateFile) ? intval(file_get_contents($rCreateFile)) : 0;
+				if ($rPID && ProcessChecker::checkPID($rPID, 'XC_VMCreate[' . intval($rStream['id']) . ']')) {
+					echo "\t" . 'Build Is Still Going!' . "\n";
+				} else {
+					$rSourcesLeft = array_diff(json_decode($rStream['stream_source'], true), json_decode($rStream['cchannel_rsources'], true));
+					if (count($rSourcesLeft) > 0) {
+						echo "\t" . 'Needs Updating!' . "\n";
+						StreamProcess::queueChannel($rStream['id']);
+					} else {
+						if (file_exists(CREATED_PATH . $rStream['id'] . '_.info')) {
+							$rCCInfo = file_get_contents(CREATED_PATH . $rStream['id'] . '_.info');
+							$db->query('UPDATE `streams_servers` SET `cc_info` = ? WHERE `server_id` = ? AND `stream_id` = ?;', $rCCInfo, SERVER_ID, $rStream['id']);
+							unlink(CREATED_PATH . $rStream['id'] . '_.info');
+						}
+						echo "\t" . 'Build Finished' . "\n";
+					}
+				}
+			}
+		}
 
-        $db->query('SELECT `id` FROM `recordings` WHERE `status` NOT IN (1,2) AND `source_id` = ? AND ((`start` <= UNIX_TIMESTAMP() AND `end` > UNIX_TIMESTAMP()) OR (`archive` = 1));', SERVER_ID);
-        if ($db->num_rows() > 0) {
-            foreach ($db->get_rows() as $rRow) {
-                echo 'Start recording ID: ' . intval($rRow['id']) . "\n";
-                shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php record ' . intval($rRow['id']) . ' > /dev/null 2>/dev/null &');
-            }
-        }
+		$db->query('SELECT `id` FROM `recordings` WHERE `status` NOT IN (1,2) AND `source_id` = ? AND ((`start` <= UNIX_TIMESTAMP() AND `end` > UNIX_TIMESTAMP()) OR (`archive` = 1));', SERVER_ID);
+		if ($db->num_rows() > 0) {
+			foreach ($db->get_rows() as $rRow) {
+				echo 'Start recording ID: ' . intval($rRow['id']) . "\n";
+				shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php record ' . intval($rRow['id']) . ' > /dev/null 2>/dev/null &');
+			}
+		}
 
-        exec("ps ax | grep 'ffmpeg' | awk '{print \$1}'", $rPIDs);
+		exec("ps ax | grep 'ffmpeg' | awk '{print \$1}'", $rPIDs);
 
-        $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` WHERE `to_analyze` = 1 AND `server_id` = ?', SERVER_ID);
-        $rCount = $db->get_row()['count'];
+		$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` WHERE `to_analyze` = 1 AND `server_id` = ?', SERVER_ID);
+		$rCount = $db->get_row()['count'];
 
-        if ($rCount > 0) {
-            if ($rCount <= 1000) {
-                $rSteps = [0, $rCount];
-            } else {
-                $rSteps = range(0, $rCount, 1000);
-            }
-            if (!$rSteps) {
-                $rSteps = array(0);
-            }
+		if ($rCount > 0) {
+			if ($rCount <= 1000) {
+				$rSteps = [0, $rCount];
+			} else {
+				$rSteps = range(0, $rCount, 1000);
+			}
+			if (!$rSteps) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                $db->query('SELECT t1.*,t2.* FROM `streams_servers` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id AND t2.direct_source = 0 INNER JOIN `streams_types` t3 ON t3.type_id = t2.type AND t3.live = 0 WHERE t1.to_analyze = 1 AND t1.server_id = ? LIMIT ' . $rStep . ', 1000', SERVER_ID);
-                if ($db->num_rows() <= 0) {
-                    continue;
-                }
+			foreach ($rSteps as $rStep) {
+				$db->query('SELECT t1.*,t2.* FROM `streams_servers` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id AND t2.direct_source = 0 INNER JOIN `streams_types` t3 ON t3.type_id = t2.type AND t3.live = 0 WHERE t1.to_analyze = 1 AND t1.server_id = ? LIMIT ' . $rStep . ', 1000', SERVER_ID);
+				if ($db->num_rows() <= 0) {
+					continue;
+				}
 
-                $rRows = $db->get_rows();
-                foreach ($rRows as $rRow) {
-                    echo '[*] Checking Movie ' . $rRow['stream_display_name'] . ' ' . "\t\t" . '---> ';
-                    if (in_array($rRow['pid'], $rPIDs)) {
-                        echo 'ENCODING...' . "\n";
-                    } else {
-                        $rMoviePath = VOD_PATH . intval($rRow['stream_id']) . '.' . escapeshellcmd($rRow['target_container']);
-                        if ($rFFProbee = FFprobeRunner::probeStream($rMoviePath)) {
-                            if (!isset($rFFProbee['codecs']['video']) || !is_array($rFFProbee['codecs']['video'])) {
-                                // ffprobe opened the file but found no usable video stream
-                                // (e.g. a truncated/placeholder upload): parseFFProbe returns
-                                // '' for the missing codec, and the VALID branch below treats
-                                // it as an array ($rFFProbee['codecs']['video']['codec_name']),
-                                // which is a TypeError on PHP 8 that aborts the whole analyzer
-                                // run and leaves every remaining movie stuck in `to_analyze = 1`
-                                // (yellow) forever. Treat such a file as broken instead.
-                                $db->query('UPDATE `streams_servers` SET `to_analyze` = 0,`stream_status` = 1 WHERE `server_stream_id` = ?', $rRow['server_stream_id']);
-                                echo 'BROKEN (no video stream)' . "\n";
-                                StreamProcess::updateStream($rRow['stream_id']);
-                                continue;
-                            }
-                            // ffprobe (especially over network/rclone mounts) can still
-                            // return a partial result for an odd file — e.g. a video stream
-                            // but no audio, where parseFFProbe stores '' (a string) instead
-                            // of an array. The VALID branch dereferences these as arrays
-                            // ($rFFProbee['codecs']['audio']['codec_name']), a TypeError on
-                            // PHP 8 that aborts the whole run. Normalise to arrays.
-                            foreach (array('video', 'audio') as $rCodecKind) {
-                                if (!is_array($rFFProbee['codecs'][$rCodecKind] ?? null)) {
-                                    $rFFProbee['codecs'][$rCodecKind] = array();
-                                }
-                            }
-                            $rDuration = (isset($rFFProbee['duration']) ? $rFFProbee['duration'] : 0);
-                            sscanf($rDuration, '%d:%d:%d', $rHours, $rMinutes, $rSeconds);
-                            $rSeconds = (isset($rSeconds) ? $rHours * 3600 + $rMinutes * 60 + $rSeconds : $rHours * 60 + $rMinutes);
-                            $rSize = filesize($rMoviePath);
-                            // Guard against a zero/unknown duration (ffprobe reports
-                            // 'N/A' for truncated or duration-less files): dividing by
-                            // it throws DivisionByZeroError on PHP 8, which aborts the
-                            // whole analyzer run and leaves every remaining movie stuck
-                            // in `to_analyze = 1` (yellow) forever.
-                            $rBitrate = ($rSeconds > 0 ? round(($rSize * 0.008) / $rSeconds) : 0);
-                            $rMovieProperties = json_decode($rRow['movie_properties'], true);
-                            if (!is_array($rMovieProperties)) {
-                                $rMovieProperties = array();
-                            }
-                            if (!(isset($rMovieProperties['duration_secs']) && $rSeconds == $rMovieProperties['duration_secs'])) {
-                                $rMovieProperties['duration_secs'] = $rSeconds;
-                                $rMovieProperties['duration'] = $rDuration;
-                            }
-                            if (!(isset($rMovieProperties['video']) && $rFFProbee['codecs']['video']['codec_name'] == $rMovieProperties['video'])) {
-                                $rMovieProperties['video'] = $rFFProbee['codecs']['video'];
-                            }
-                            if (!(isset($rMovieProperties['audio']) && $rFFProbee['codecs']['audio']['codec_name'] == $rMovieProperties['audio'])) {
-                                $rMovieProperties['audio'] = $rFFProbee['codecs']['audio'];
-                            }
-                            if (SettingsManager::get('extract_subtitles')) {
-                                if (!(isset($rMovieProperties['subtitle']) && $rFFProbee['codecs']['subtitle']['codec_name'] == $rMovieProperties['subtitle'])) {
-                                    $rMovieProperties['subtitle'] = $rFFProbee['codecs']['subtitle'];
-                                }
-                            }
-                            if (!(isset($rMovieProperties['bitrate']) && $rBitrate == $rMovieProperties['bitrate'])) {
-                                if (0 < $rBitrate) {
-                                    $rMovieProperties['bitrate'] = $rBitrate;
-                                } else {
-                                    $rBitrate = $rMovieProperties['bitrate'];
-                                }
-                            }
-                            if (isset($rFFProbee['codecs']['subtitle']) && SettingsManager::get('extract_subtitles')) {
-                                $i = 0;
-                                foreach ($rFFProbee['codecs']['subtitle'] as $rSubtitle) {
-                                    FFmpegCommand::extractSubtitle($rRow['stream_id'], $rMoviePath, $i);
-                                    $i++;
-                                }
-                            }
-                            $rCompatible = intval(DiagnosticsService::checkCompatibility($rFFProbee, SettingsManager::get('player_allow_hevc')));
-                            $rAudioCodec = ($rFFProbee['codecs']['audio']['codec_name'] ?: null);
-                            $rVideoCodec = ($rFFProbee['codecs']['video']['codec_name'] ?: null);
-                            $rResolution = ($rFFProbee['codecs']['video']['height'] ?: null);
-                            if ($rResolution) {
-                                $rResolution = StreamSorter::getNearest(array(240, 360, 480, 576, 720, 1080, 1440, 2160), $rResolution);
-                            }
-                            $db->query('UPDATE `streams` SET `movie_properties` = ? WHERE `id` = ?', json_encode($rMovieProperties, JSON_UNESCAPED_UNICODE), $rRow['stream_id']);
-                            $db->query('UPDATE `streams_servers` SET `bitrate` = ?,`to_analyze` = 0,`stream_status` = 0,`stream_info` = ?,`audio_codec` = ?,`video_codec` = ?,`resolution` = ?,`compatible` = ? WHERE `server_stream_id` = ?', $rBitrate, json_encode($rFFProbee, JSON_UNESCAPED_UNICODE), $rAudioCodec, $rVideoCodec, $rResolution, $rCompatible, $rRow['server_stream_id']);
-                            echo 'VALID' . "\n";
-                        } else {
-                            $db->query('UPDATE `streams_servers` SET `to_analyze` = 0,`stream_status` = 1 WHERE `server_stream_id` = ?', $rRow['server_stream_id']);
-                            echo 'BROKEN' . "\n";
-                        }
-                        StreamProcess::updateStream($rRow['stream_id']);
-                    }
-                }
-            }
-        }
-    }
+				$rRows = $db->get_rows();
+				foreach ($rRows as $rRow) {
+					echo '[*] Checking Movie ' . $rRow['stream_display_name'] . ' ' . "\t\t" . '---> ';
+					if (in_array($rRow['pid'], $rPIDs)) {
+						echo 'ENCODING...' . "\n";
+					} else {
+						$rMoviePath = VOD_PATH . intval($rRow['stream_id']) . '.' . escapeshellcmd($rRow['target_container']);
+						if ($rFFProbee = FFprobeRunner::probeStream($rMoviePath)) {
+							if (!isset($rFFProbee['codecs']['video']) || !is_array($rFFProbee['codecs']['video'])) {
+								// ffprobe opened the file but found no usable video stream
+								// (e.g. a truncated/placeholder upload): parseFFProbe returns
+								// '' for the missing codec, and the VALID branch below treats
+								// it as an array ($rFFProbee['codecs']['video']['codec_name']),
+								// which is a TypeError on PHP 8 that aborts the whole analyzer
+								// run and leaves every remaining movie stuck in `to_analyze = 1`
+								// (yellow) forever. Treat such a file as broken instead.
+								$db->query('UPDATE `streams_servers` SET `to_analyze` = 0,`stream_status` = 1 WHERE `server_stream_id` = ?', $rRow['server_stream_id']);
+								echo 'BROKEN (no video stream)' . "\n";
+								StreamProcess::updateStream($rRow['stream_id']);
+								continue;
+							}
+							// ffprobe (especially over network/rclone mounts) can still
+							// return a partial result for an odd file — e.g. a video stream
+							// but no audio, where parseFFProbe stores '' (a string) instead
+							// of an array. The VALID branch dereferences these as arrays
+							// ($rFFProbee['codecs']['audio']['codec_name']), a TypeError on
+							// PHP 8 that aborts the whole run. Normalise to arrays.
+							foreach (['video', 'audio'] as $rCodecKind) {
+								if (!is_array($rFFProbee['codecs'][$rCodecKind] ?? null)) {
+									$rFFProbee['codecs'][$rCodecKind] = [];
+								}
+							}
+							$rDuration = (isset($rFFProbee['duration']) ? $rFFProbee['duration'] : 0);
+							sscanf($rDuration, '%d:%d:%d', $rHours, $rMinutes, $rSeconds);
+							$rSeconds = (isset($rSeconds) ? $rHours * 3600 + $rMinutes * 60 + $rSeconds : $rHours * 60 + $rMinutes);
+							$rSize = filesize($rMoviePath);
+							// Guard against a zero/unknown duration (ffprobe reports
+							// 'N/A' for truncated or duration-less files): dividing by
+							// it throws DivisionByZeroError on PHP 8, which aborts the
+							// whole analyzer run and leaves every remaining movie stuck
+							// in `to_analyze = 1` (yellow) forever.
+							$rBitrate = ($rSeconds > 0 ? round(($rSize * 0.008) / $rSeconds) : 0);
+							$rMovieProperties = json_decode($rRow['movie_properties'], true);
+							if (!is_array($rMovieProperties)) {
+								$rMovieProperties = [];
+							}
+							if (!(isset($rMovieProperties['duration_secs']) && $rSeconds == $rMovieProperties['duration_secs'])) {
+								$rMovieProperties['duration_secs'] = $rSeconds;
+								$rMovieProperties['duration'] = $rDuration;
+							}
+							if (!(isset($rMovieProperties['video']) && $rFFProbee['codecs']['video']['codec_name'] == $rMovieProperties['video'])) {
+								$rMovieProperties['video'] = $rFFProbee['codecs']['video'];
+							}
+							if (!(isset($rMovieProperties['audio']) && $rFFProbee['codecs']['audio']['codec_name'] == $rMovieProperties['audio'])) {
+								$rMovieProperties['audio'] = $rFFProbee['codecs']['audio'];
+							}
+							if (SettingsManager::get('extract_subtitles')) {
+								if (!(isset($rMovieProperties['subtitle']) && $rFFProbee['codecs']['subtitle']['codec_name'] == $rMovieProperties['subtitle'])) {
+									$rMovieProperties['subtitle'] = $rFFProbee['codecs']['subtitle'];
+								}
+							}
+							if (!(isset($rMovieProperties['bitrate']) && $rBitrate == $rMovieProperties['bitrate'])) {
+								if (0 < $rBitrate) {
+									$rMovieProperties['bitrate'] = $rBitrate;
+								} else {
+									$rBitrate = $rMovieProperties['bitrate'];
+								}
+							}
+							if (isset($rFFProbee['codecs']['subtitle']) && SettingsManager::get('extract_subtitles')) {
+								$i = 0;
+								foreach ($rFFProbee['codecs']['subtitle'] as $rSubtitle) {
+									FFmpegCommand::extractSubtitle($rRow['stream_id'], $rMoviePath, $i);
+									$i++;
+								}
+							}
+							$rCompatible = intval(DiagnosticsService::checkCompatibility($rFFProbee, SettingsManager::get('player_allow_hevc')));
+							$rAudioCodec = ($rFFProbee['codecs']['audio']['codec_name'] ?: null);
+							$rVideoCodec = ($rFFProbee['codecs']['video']['codec_name'] ?: null);
+							$rResolution = ($rFFProbee['codecs']['video']['height'] ?: null);
+							if ($rResolution) {
+								$rResolution = StreamSorter::getNearest([240, 360, 480, 576, 720, 1080, 1440, 2160], $rResolution);
+							}
+							$db->query('UPDATE `streams` SET `movie_properties` = ? WHERE `id` = ?', json_encode($rMovieProperties, JSON_UNESCAPED_UNICODE), $rRow['stream_id']);
+							$db->query('UPDATE `streams_servers` SET `bitrate` = ?,`to_analyze` = 0,`stream_status` = 0,`stream_info` = ?,`audio_codec` = ?,`video_codec` = ?,`resolution` = ?,`compatible` = ? WHERE `server_stream_id` = ?', $rBitrate, json_encode($rFFProbee, JSON_UNESCAPED_UNICODE), $rAudioCodec, $rVideoCodec, $rResolution, $rCompatible, $rRow['server_stream_id']);
+							echo 'VALID' . "\n";
+						} else {
+							$db->query('UPDATE `streams_servers` SET `to_analyze` = 0,`stream_status` = 1 WHERE `server_stream_id` = ?', $rRow['server_stream_id']);
+							echo 'BROKEN' . "\n";
+						}
+						StreamProcess::updateStream($rRow['stream_id']);
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/src/Cli/CronTrait.php b/src/Cli/CronTrait.php
index 8000990c..5f563b22 100644
--- a/src/Cli/CronTrait.php
+++ b/src/Cli/CronTrait.php
@@ -20,75 +20,74 @@ use XcVm\Core\Util\Encryption;
  */
 
 trait CronTrait {
+	/** @var string|null Путь к lock-файлу */
+	protected $rIdentifier;
 
-    /** @var string|null Путь к lock-файлу */
-    protected $rIdentifier;
+	/**
+	 * Проверить что процесс запущен от пользователя xc_vm.
+	 */
+	protected function assertRunAsXcVm(): bool {
+		if ((posix_getpwuid(posix_geteuid())['name'] ?? null) !== 'xc_vm') {
+			echo "Please run as XC_VM!\n";
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * Проверить что процесс запущен от пользователя xc_vm.
-     */
-    protected function assertRunAsXcVm(): bool {
-        if ((posix_getpwuid(posix_geteuid())['name'] ?? null) !== 'xc_vm') {
-            echo "Please run as XC_VM!\n";
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Проверить что процесс запущен от root.
+	 */
+	protected function assertRunAsRoot(): bool {
+		if ((posix_getpwuid(posix_geteuid())['name'] ?? null) !== 'root') {
+			echo "Please run as root!\n";
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * Проверить что процесс запущен от root.
-     */
-    protected function assertRunAsRoot(): bool {
-        if ((posix_getpwuid(posix_geteuid())['name'] ?? null) !== 'root') {
-            echo "Please run as root!\n";
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Установить заголовок процесса + time limit.
+	 */
+	protected function setProcessTitle(string $rTitle): void {
+		set_time_limit(0);
+		cli_set_process_title($rTitle);
+	}
 
-    /**
-     * Установить заголовок процесса + time limit.
-     */
-    protected function setProcessTitle(string $rTitle): void {
-        set_time_limit(0);
-        cli_set_process_title($rTitle);
-    }
+	/**
+	 * Получить cron lock (уникальный файл в CRONS_TMP_PATH).
+	 * Если lock уже занят — выходит с кодом 0.
+	 */
+	protected function acquireCronLock(): void {
+		$this->rIdentifier = CRONS_TMP_PATH . md5(
+			Encryption::generateUniqueCode(SettingsManager::get('live_streaming_pass')) . static::class
+		);
+		ProcessManager::acquireCronLock($this->rIdentifier);
+	}
 
-    /**
-     * Получить cron lock (уникальный файл в CRONS_TMP_PATH).
-     * Если lock уже занят — выходит с кодом 0.
-     */
-    protected function acquireCronLock(): void {
-        $this->rIdentifier = CRONS_TMP_PATH . md5(
-            Encryption::generateUniqueCode(SettingsManager::get('live_streaming_pass')) . static::class
-        );
-        ProcessManager::acquireCronLock($this->rIdentifier);
-    }
+	/**
+	 * Зарегистрировать shutdown handler: закрытие БД + удаление lock.
+	 */
+	protected function registerShutdown(): void {
+		$rIdentifier = &$this->rIdentifier;
+		register_shutdown_function(static function () use (&$rIdentifier) {
+			global $db;
+			if (isset($db) && is_object($db)) {
+				$db->close_mysql();
+			}
+			if (!empty($rIdentifier) && file_exists($rIdentifier)) {
+				@unlink($rIdentifier);
+			}
+		});
+	}
 
-    /**
-     * Зарегистрировать shutdown handler: закрытие БД + удаление lock.
-     */
-    protected function registerShutdown(): void {
-        $rIdentifier = &$this->rIdentifier;
-        register_shutdown_function(static function () use (&$rIdentifier) {
-            global $db;
-            if (isset($db) && is_object($db)) {
-                $db->close_mysql();
-            }
-            if (!empty($rIdentifier) && file_exists($rIdentifier)) {
-                @unlink($rIdentifier);
-            }
-        });
-    }
-
-    /**
-     * Стандартная инициализация cron-задачи.
-     *
-     * @param string $rTitle Заголовок процесса (например 'XC_VM[Activity]')
-     */
-    protected function initCron(string $rTitle): void {
-        $this->registerShutdown();
-        $this->setProcessTitle($rTitle);
-        $this->acquireCronLock();
-    }
+	/**
+	 * Стандартная инициализация cron-задачи.
+	 *
+	 * @param string $rTitle Заголовок процесса (например 'XC_VM[Activity]')
+	 */
+	protected function initCron(string $rTitle): void {
+		$this->registerShutdown();
+		$this->setProcessTitle($rTitle);
+		$this->acquireCronLock();
+	}
 }
diff --git a/src/Cli/DaemonTrait.php b/src/Cli/DaemonTrait.php
index a9a4aa3c..b6141348 100644
--- a/src/Cli/DaemonTrait.php
+++ b/src/Cli/DaemonTrait.php
@@ -21,7 +21,6 @@ use XcVm\Infrastructure\Redis\RedisManager;
  */
 
 trait DaemonTrait {
-
 	/** @var string MD5 файла команды при запуске */
 	protected $rDaemonMD5;
 
diff --git a/src/Cli/migration_logic.php b/src/Cli/migration_logic.php
index 57e90d53..055dfd18 100644
--- a/src/Cli/migration_logic.php
+++ b/src/Cli/migration_logic.php
@@ -19,1575 +19,1575 @@ use XcVm\Core\Database\QueryHelper;
 set_time_limit(0);
 ini_set('memory_limit', -1);
 global $db;
-$rXUITableList = array('access_codes', 'users', 'blocked_ips', 'blocked_uas', 'blocked_isps', 'bouquets', 'enigma2_devices', 'mag_devices', 'epg', 'users_groups', 'users_packages', 'rtmp_ips', 'streams_series', 'streams_episodes', 'servers', 'streams', 'streams_options', 'streams_servers', 'streams_categories', 'tickets', 'tickets_replies', 'profiles', 'lines', 'watch_folders');
-$rTableList = array('reg_users', 'users', 'enigma2_devices', 'mag_devices', 'user_output', 'streaming_servers', 'series', 'series_episodes', 'streams', 'streams_sys', 'streams_options', 'stream_categories', 'bouquets', 'member_groups', 'packages', 'rtmp_ips', 'epg', 'blocked_ips', 'blocked_user_agents', 'isp_addon', 'tickets', 'tickets_replies', 'transcoding_profiles', 'watch_folders', 'categories', 'epg_sources', 'members', 'blocked_isps', 'groups', 'servers', 'stream_servers');
-$rMigrateOptions = (json_decode(file_get_contents(TMP_PATH . '.migration.options'), true) ?: array());
+$rXUITableList = ['access_codes', 'users', 'blocked_ips', 'blocked_uas', 'blocked_isps', 'bouquets', 'enigma2_devices', 'mag_devices', 'epg', 'users_groups', 'users_packages', 'rtmp_ips', 'streams_series', 'streams_episodes', 'servers', 'streams', 'streams_options', 'streams_servers', 'streams_categories', 'tickets', 'tickets_replies', 'profiles', 'lines', 'watch_folders'];
+$rTableList = ['reg_users', 'users', 'enigma2_devices', 'mag_devices', 'user_output', 'streaming_servers', 'series', 'series_episodes', 'streams', 'streams_sys', 'streams_options', 'stream_categories', 'bouquets', 'member_groups', 'packages', 'rtmp_ips', 'epg', 'blocked_ips', 'blocked_user_agents', 'isp_addon', 'tickets', 'tickets_replies', 'transcoding_profiles', 'watch_folders', 'categories', 'epg_sources', 'members', 'blocked_isps', 'groups', 'servers', 'stream_servers'];
+$rMigrateOptions = (json_decode(file_get_contents(TMP_PATH . '.migration.options'), true) ?: []);
 
 file_put_contents(TMP_PATH . '.migration.pid', getmypid());
 file_put_contents(TMP_PATH . '.migration.status', 1);
 $odb = new DatabaseHandler(migrate: true);
 if (!$odb->connected) {
-    echo 'Failed to connect to migration database, or database is empty!' . "\n";
-    file_put_contents(TMP_PATH . '.migration.status', 3);
-    exit();
+	echo 'Failed to connect to migration database, or database is empty!' . "\n";
+	file_put_contents(TMP_PATH . '.migration.status', 3);
+	exit();
 }
 echo 'Connected to migration database.' . "\n";
 $AdminAccesCode = '';
 $odb->query("SHOW TABLES LIKE 'access_codes';");
 if ($odb->num_rows() > 0) {
-    if (count($rMigrateOptions) == 0) {
-        $rMigrateOptions = $rXUITableList;
-    }
-    $rItemCount = 0;
-    foreach ($rXUITableList as $rTable) {
-        $odb->query('SHOW TABLES LIKE ?;', $rTable);
-        if ($odb->num_rows() > 0) {
-            $odb->query('SELECT COUNT(*) AS `count` FROM `' . $rTable . '`;');
-            $rItemCount += (intval($odb->get_row()['count']) ?: 0);
-        }
-    }
-    if ($rItemCount == 0) {
-        echo "\n" . "Couldn't find anything to migrate in the `xc_vm_migrate` database. Please ensure you restore your backup to that database specifically." . "\n\n";
-        exit();
-    }
-    echo "\n" . 'Migrating database to XC_VM...' . "\n\n";
+	if (count($rMigrateOptions) == 0) {
+		$rMigrateOptions = $rXUITableList;
+	}
+	$rItemCount = 0;
+	foreach ($rXUITableList as $rTable) {
+		$odb->query('SHOW TABLES LIKE ?;', $rTable);
+		if ($odb->num_rows() > 0) {
+			$odb->query('SELECT COUNT(*) AS `count` FROM `' . $rTable . '`;');
+			$rItemCount += (intval($odb->get_row()['count']) ?: 0);
+		}
+	}
+	if ($rItemCount == 0) {
+		echo "\n" . "Couldn't find anything to migrate in the `xc_vm_migrate` database. Please ensure you restore your backup to that database specifically." . "\n\n";
+		exit();
+	}
+	echo "\n" . 'Migrating database to XC_VM...' . "\n\n";
 
-    if (in_array('access_codes', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `access_codes`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `access_codes`;');
-            echo 'Add ' . number_format(count($rResults), 0) . ' access codes.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    if ($rResult['type'] == 0) {
-                        $AdminAccesCode = $rResult['code'];
-                    }
-                    $rResult = QueryHelper::verifyPostTable('access_codes', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `access_codes`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                    AuthRepository::updateCodes();
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('users', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `users`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `users`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' users.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `users` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('users', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `users`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('blocked_ips', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `blocked_ips`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `blocked_ips`;');
-            echo 'Blocking ' . number_format(count($rResults), 0) . ' IP addresses.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('blocked_ips', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `blocked_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('blocked_uas', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `blocked_uas`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `blocked_uas`;');
-            echo 'Blocking ' . number_format(count($rResults), 0) . ' user-agents.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('blocked_uas', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `blocked_uas`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('blocked_isps', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `blocked_isps`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `blocked_isps`;');
-            echo 'Blocking ' . number_format(count($rResults), 0) . " ISP's." . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('blocked_isps', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `blocked_isps`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('bouquets', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `bouquets`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `bouquets`;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' bouquets.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('bouquets', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('enigma2_devices', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `enigma2_devices`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `enigma2_devices`;');
-            echo 'Authorising ' . number_format($rCount, 0) . ' enigma devices.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `enigma2_devices` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('enigma2_devices', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `enigma2_devices`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('mag_devices', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `mag_devices`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `mag_devices`;');
-            echo 'Authorising ' . number_format($rCount, 0) . ' MAG devices.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `mag_devices` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('mag_devices', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `mag_devices`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('epg', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `epg`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `epg`;');
-            echo 'Processing ' . number_format(count($rResults), 0) . ' EPG URLs.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('epg', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `epg`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('users_groups', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `users_groups`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `users_groups`;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' user groups.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('users_groups', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `users_groups`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('users_packages', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `users_packages`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `users_packages`;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' user packages.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('users_packages', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `users_packages`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('rtmp_ips', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `rtmp_ips`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `rtmp_ips`;');
-            echo 'Authorising ' . number_format(count($rResults), 0) . ' RTMP IPs.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('rtmp_ips', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `rtmp_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streams_series', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `streams_series`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_series`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' TV series.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `streams_series` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('streams_series', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streams_episodes', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `streams_episodes`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_episodes`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' episodes.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `streams_episodes` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('streams_episodes', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `streams_episodes`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('servers', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `servers` ORDER BY `id` ASC;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $rMain = false;
-            $db->query('TRUNCATE `servers`;');
-            echo 'Moving ' . number_format(count($rResults), 0) . ' servers.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('servers', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streams', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `streams`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' streams.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `streams` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('streams', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streams_options', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `streams_options`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_options`;');
-            echo 'Attributing ' . number_format($rCount, 0) . ' options to streams.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `streams_options` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('streams_options', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `streams_options`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streams_servers', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `streams_servers`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_servers`;');
-            echo 'Allocating ' . number_format($rCount, 0) . ' streams to servers.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `streams_servers` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult['stream_status'] = 0;
-                        $rResult['stream_started'] = null;
-                        $rResult['monitor_pid'] = null;
-                        if ($rResult['pid'] < 0) {
-                            $rResult['pid'] = null;
-                        }
-                        $rResult = QueryHelper::verifyPostTable('streams_servers', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `streams_servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streams_categories', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `streams_categories`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `streams_categories`;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' categories.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('streams_categories', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('tickets', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `tickets`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `tickets`;');
-            echo 'Posting ' . number_format(count($rResults), 0) . ' tickets.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('tickets', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `tickets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('tickets_replies', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `tickets_replies`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `tickets_replies`;');
-            echo 'Posting ' . number_format(count($rResults), 0) . ' replies.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('tickets_replies', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `tickets_replies`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('profiles', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `profiles`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `profiles`;');
-            echo 'Generating ' . number_format(count($rResults), 0) . ' transcoding profiles.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('profiles', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `profiles`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('providers', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `providers`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `providers`;');
-            echo 'Generating ' . number_format(count($rResults), 0) . ' providers.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('providers', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `providers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('lines', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `lines`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `lines`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' lines.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `lines` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult['stream_status'] = 0;
-                        $rResult['stream_started'] = null;
-                        $rResult['monitor_pid'] = null;
-                        if ($rResult['pid'] < 0) {
-                            $rResult['pid'] = null;
-                        }
-                        $rResult = QueryHelper::verifyPostTable('lines', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `lines`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('watch_folders', $rMigrateOptions)) {
-        $odb->query("SHOW TABLES LIKE 'watch_folders';");
-        if ($odb->num_rows() > 0) {
-            $odb->query('SELECT COUNT(*) AS `count` FROM `watch_folders`;');
-            $rCount = $odb->get_row()['count'];
-            if ($rCount > 0) {
-                $db->query('TRUNCATE `watch_folders`;');
-                echo 'Adding ' . number_format($rCount, 0) . ' folders to watch.' . "\n";
-                $odb->query('SELECT * FROM `watch_folders`;');
-                $rResults = $odb->get_rows();
-                foreach ($rResults as $rResult) {
-                    $rResult = QueryHelper::verifyPostTable('watch_folders', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `watch_folders`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                }
-            }
-        }
-    }
+	if (in_array('access_codes', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `access_codes`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `access_codes`;');
+			echo 'Add ' . number_format(count($rResults), 0) . ' access codes.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					if ($rResult['type'] == 0) {
+						$AdminAccesCode = $rResult['code'];
+					}
+					$rResult = QueryHelper::verifyPostTable('access_codes', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `access_codes`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+					AuthRepository::updateCodes();
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('users', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `users`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `users`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' users.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `users` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('users', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `users`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('blocked_ips', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `blocked_ips`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `blocked_ips`;');
+			echo 'Blocking ' . number_format(count($rResults), 0) . ' IP addresses.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('blocked_ips', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `blocked_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('blocked_uas', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `blocked_uas`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `blocked_uas`;');
+			echo 'Blocking ' . number_format(count($rResults), 0) . ' user-agents.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('blocked_uas', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `blocked_uas`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('blocked_isps', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `blocked_isps`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `blocked_isps`;');
+			echo 'Blocking ' . number_format(count($rResults), 0) . " ISP's." . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('blocked_isps', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `blocked_isps`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('bouquets', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `bouquets`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `bouquets`;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' bouquets.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('bouquets', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('enigma2_devices', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `enigma2_devices`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `enigma2_devices`;');
+			echo 'Authorising ' . number_format($rCount, 0) . ' enigma devices.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `enigma2_devices` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('enigma2_devices', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `enigma2_devices`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('mag_devices', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `mag_devices`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `mag_devices`;');
+			echo 'Authorising ' . number_format($rCount, 0) . ' MAG devices.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `mag_devices` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('mag_devices', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `mag_devices`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('epg', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `epg`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `epg`;');
+			echo 'Processing ' . number_format(count($rResults), 0) . ' EPG URLs.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('epg', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `epg`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('users_groups', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `users_groups`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `users_groups`;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' user groups.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('users_groups', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `users_groups`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('users_packages', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `users_packages`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `users_packages`;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' user packages.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('users_packages', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `users_packages`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('rtmp_ips', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `rtmp_ips`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `rtmp_ips`;');
+			echo 'Authorising ' . number_format(count($rResults), 0) . ' RTMP IPs.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('rtmp_ips', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `rtmp_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streams_series', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `streams_series`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_series`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' TV series.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `streams_series` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('streams_series', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streams_episodes', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `streams_episodes`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_episodes`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' episodes.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `streams_episodes` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('streams_episodes', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `streams_episodes`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('servers', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `servers` ORDER BY `id` ASC;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$rMain = false;
+			$db->query('TRUNCATE `servers`;');
+			echo 'Moving ' . number_format(count($rResults), 0) . ' servers.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('servers', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streams', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `streams`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' streams.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `streams` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('streams', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streams_options', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `streams_options`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_options`;');
+			echo 'Attributing ' . number_format($rCount, 0) . ' options to streams.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `streams_options` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('streams_options', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `streams_options`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streams_servers', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `streams_servers`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_servers`;');
+			echo 'Allocating ' . number_format($rCount, 0) . ' streams to servers.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `streams_servers` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult['stream_status'] = 0;
+						$rResult['stream_started'] = null;
+						$rResult['monitor_pid'] = null;
+						if ($rResult['pid'] < 0) {
+							$rResult['pid'] = null;
+						}
+						$rResult = QueryHelper::verifyPostTable('streams_servers', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `streams_servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streams_categories', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `streams_categories`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `streams_categories`;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' categories.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('streams_categories', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('tickets', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `tickets`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `tickets`;');
+			echo 'Posting ' . number_format(count($rResults), 0) . ' tickets.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('tickets', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `tickets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('tickets_replies', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `tickets_replies`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `tickets_replies`;');
+			echo 'Posting ' . number_format(count($rResults), 0) . ' replies.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('tickets_replies', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `tickets_replies`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('profiles', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `profiles`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `profiles`;');
+			echo 'Generating ' . number_format(count($rResults), 0) . ' transcoding profiles.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('profiles', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `profiles`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('providers', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `providers`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `providers`;');
+			echo 'Generating ' . number_format(count($rResults), 0) . ' providers.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('providers', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `providers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('lines', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `lines`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `lines`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' lines.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `lines` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult['stream_status'] = 0;
+						$rResult['stream_started'] = null;
+						$rResult['monitor_pid'] = null;
+						if ($rResult['pid'] < 0) {
+							$rResult['pid'] = null;
+						}
+						$rResult = QueryHelper::verifyPostTable('lines', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `lines`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('watch_folders', $rMigrateOptions)) {
+		$odb->query("SHOW TABLES LIKE 'watch_folders';");
+		if ($odb->num_rows() > 0) {
+			$odb->query('SELECT COUNT(*) AS `count` FROM `watch_folders`;');
+			$rCount = $odb->get_row()['count'];
+			if ($rCount > 0) {
+				$db->query('TRUNCATE `watch_folders`;');
+				echo 'Adding ' . number_format($rCount, 0) . ' folders to watch.' . "\n";
+				$odb->query('SELECT * FROM `watch_folders`;');
+				$rResults = $odb->get_rows();
+				foreach ($rResults as $rResult) {
+					$rResult = QueryHelper::verifyPostTable('watch_folders', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `watch_folders`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				}
+			}
+		}
+	}
 } else {
-    if (count($rMigrateOptions) == 0) {
-        $rMigrateOptions = $rTableList;
-    }
-    $rItemCount = 0;
-    foreach ($rTableList as $rTable) {
-        $odb->query('SHOW TABLES LIKE ?;', $rTable);
-        if ($odb->num_rows() > 0) {
-            $odb->query('SELECT COUNT(*) AS `count` FROM `' . $rTable . '`;');
-            $rItemCount += (intval($odb->get_row()['count']) ?: 0);
-        }
-    }
-    if ($rItemCount == 0) {
-        echo "\n" . "Couldn't find anything to migrate in the `xc_vm_migrate` database. Please ensure you restore your backup to that database specifically." . "\n\n";
-        exit();
-    }
-    echo "\n" . 'Migrating database to XC_VM...' . "\n\n";
+	if (count($rMigrateOptions) == 0) {
+		$rMigrateOptions = $rTableList;
+	}
+	$rItemCount = 0;
+	foreach ($rTableList as $rTable) {
+		$odb->query('SHOW TABLES LIKE ?;', $rTable);
+		if ($odb->num_rows() > 0) {
+			$odb->query('SELECT COUNT(*) AS `count` FROM `' . $rTable . '`;');
+			$rItemCount += (intval($odb->get_row()['count']) ?: 0);
+		}
+	}
+	if ($rItemCount == 0) {
+		echo "\n" . "Couldn't find anything to migrate in the `xc_vm_migrate` database. Please ensure you restore your backup to that database specifically." . "\n\n";
+		exit();
+	}
+	echo "\n" . 'Migrating database to XC_VM...' . "\n\n";
 
-    echo 'Remapping bouquets.' . "\n";
-    $rSeriesMap = $rBouquetMap = array();
-    $odb->query('SELECT `id`, `type` FROM `streams`;');
-    $rStreams = $odb->get_rows();
-    foreach ($rStreams as $rStream) {
-        $rBouquetMap[intval($rStream['id'])] = intval($rStream['type']);
-    }
-    $odb->query('SELECT `id` FROM `series`;');
-    $rSeries = $odb->get_rows();
-    foreach ($rSeries as $rSeriesArr) {
-        $rSeriesMap[] = intval($rSeriesArr['id']);
-    }
-    if (in_array('reg_users', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `reg_users`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `users`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' users.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `reg_users` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('users', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `users`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('members', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `members`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `users`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' users.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+	echo 'Remapping bouquets.' . "\n";
+	$rSeriesMap = $rBouquetMap = [];
+	$odb->query('SELECT `id`, `type` FROM `streams`;');
+	$rStreams = $odb->get_rows();
+	foreach ($rStreams as $rStream) {
+		$rBouquetMap[intval($rStream['id'])] = intval($rStream['type']);
+	}
+	$odb->query('SELECT `id` FROM `series`;');
+	$rSeries = $odb->get_rows();
+	foreach ($rSeries as $rSeriesArr) {
+		$rSeriesMap[] = intval($rSeriesArr['id']);
+	}
+	if (in_array('reg_users', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `reg_users`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `users`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' users.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `reg_users` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('users', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `users`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('members', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `members`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `users`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' users.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `members` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('users', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `users`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('blocked_ips', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `blocked_ips`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `blocked_ips`;');
-            echo 'Blocking ' . number_format(count($rResults), 0) . ' IP addresses.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('blocked_ips', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `blocked_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('blocked_user_agents', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `blocked_user_agents`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `blocked_uas`;');
-            echo 'Blocking ' . number_format(count($rResults), 0) . ' user-agents.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('blocked_uas', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `blocked_uas`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('isp_addon', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `isp_addon`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `blocked_isps`;');
-            echo 'Blocking ' . number_format(count($rResults), 0) . " ISP's." . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('blocked_isps', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `blocked_isps`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('blocked_isps', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `blocked_isps`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `blocked_isps`;');
-            echo 'Blocking ' . number_format(count($rResults), 0) . " ISP's." . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('blocked_isps', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `blocked_isps`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('bouquets', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `bouquets`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `bouquets`;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' bouquets.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rChannels = json_decode($rResult['bouquet_channels'], true);
-                    $rResult['bouquet_radios'] = array();
-                    $rResult['bouquet_movies'] = $rResult['bouquet_radios'];
-                    $rResult['bouquet_channels'] = $rResult['bouquet_movies'];
-                    foreach ($rChannels as $rStreamID) {
-                        if (isset($rBouquetMap[intval($rStreamID)])) {
-                            $rType = (array(1 => 'channels', 2 => 'movies', 3 => 'channels', 4 => 'radio')[$rBouquetMap[intval($rStreamID)]] ?? null);
-                            if ($rType) {
-                                $rResult['bouquet_' . $rType][] = intval($rStreamID);
-                            }
-                        }
-                    }
-                    $rSeries = json_decode($rResult['bouquet_series'], true);
-                    $rResult['bouquet_series'] = array();
-                    foreach ($rSeries as $rSeriesID) {
-                        if (!in_array(intval($rSeriesID), $rSeriesMap)) {
-                        } else {
-                            $rResult['bouquet_series'][] = intval($rSeriesID);
-                        }
-                    }
-                    foreach (array('channels', 'movies', 'radios', 'series') as $rType) {
-                        if ($rResult['bouquet_' . $rType]) {
-                        } else {
-                            $rResult['bouquet_' . $rType] = '[]';
-                        }
-                    }
-                    $rResult = QueryHelper::verifyPostTable('bouquets', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('enigma2_devices', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `enigma2_devices`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `enigma2_devices`;');
-            echo 'Authorising ' . number_format($rCount, 0) . ' enigma devices.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `members` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('users', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `users`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('blocked_ips', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `blocked_ips`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `blocked_ips`;');
+			echo 'Blocking ' . number_format(count($rResults), 0) . ' IP addresses.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('blocked_ips', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `blocked_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('blocked_user_agents', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `blocked_user_agents`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `blocked_uas`;');
+			echo 'Blocking ' . number_format(count($rResults), 0) . ' user-agents.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('blocked_uas', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `blocked_uas`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('isp_addon', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `isp_addon`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `blocked_isps`;');
+			echo 'Blocking ' . number_format(count($rResults), 0) . " ISP's." . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('blocked_isps', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `blocked_isps`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('blocked_isps', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `blocked_isps`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `blocked_isps`;');
+			echo 'Blocking ' . number_format(count($rResults), 0) . " ISP's." . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('blocked_isps', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `blocked_isps`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('bouquets', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `bouquets`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `bouquets`;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' bouquets.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rChannels = json_decode($rResult['bouquet_channels'], true);
+					$rResult['bouquet_radios'] = [];
+					$rResult['bouquet_movies'] = $rResult['bouquet_radios'];
+					$rResult['bouquet_channels'] = $rResult['bouquet_movies'];
+					foreach ($rChannels as $rStreamID) {
+						if (isset($rBouquetMap[intval($rStreamID)])) {
+							$rType = ([1 => 'channels', 2 => 'movies', 3 => 'channels', 4 => 'radio'][$rBouquetMap[intval($rStreamID)]] ?? null);
+							if ($rType) {
+								$rResult['bouquet_' . $rType][] = intval($rStreamID);
+							}
+						}
+					}
+					$rSeries = json_decode($rResult['bouquet_series'], true);
+					$rResult['bouquet_series'] = [];
+					foreach ($rSeries as $rSeriesID) {
+						if (!in_array(intval($rSeriesID), $rSeriesMap)) {
+						} else {
+							$rResult['bouquet_series'][] = intval($rSeriesID);
+						}
+					}
+					foreach (['channels', 'movies', 'radios', 'series'] as $rType) {
+						if ($rResult['bouquet_' . $rType]) {
+						} else {
+							$rResult['bouquet_' . $rType] = '[]';
+						}
+					}
+					$rResult = QueryHelper::verifyPostTable('bouquets', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('enigma2_devices', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `enigma2_devices`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `enigma2_devices`;');
+			echo 'Authorising ' . number_format($rCount, 0) . ' enigma devices.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `enigma2_devices` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult['lock_device'] = 1;
-                        $rResult = QueryHelper::verifyPostTable('enigma2_devices', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `enigma2_devices`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('mag_devices', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `mag_devices`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `mag_devices`;');
-            echo 'Authorising ' . number_format($rCount, 0) . ' MAG devices.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `enigma2_devices` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult['lock_device'] = 1;
+						$rResult = QueryHelper::verifyPostTable('enigma2_devices', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `enigma2_devices`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('mag_devices', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `mag_devices`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `mag_devices`;');
+			echo 'Authorising ' . number_format($rCount, 0) . ' MAG devices.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `mag_devices` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult['mac'] = base64_decode($rResult['mac']);
-                        $rResult['lock_device'] = 1;
-                        if (0 >= $rResult['user_id']) {
-                        } else {
-                            $rResult = QueryHelper::verifyPostTable('mag_devices', $rResult);
-                            $rPrepare = QueryHelper::prepareArray($rResult);
-                            $rQuery = 'INSERT INTO `mag_devices`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                            $db->query($rQuery, ...$rPrepare['data']);
-                        }
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('epg', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `epg`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `epg`;');
-            echo 'Processing ' . number_format(count($rResults), 0) . ' EPG URLs.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('epg', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `epg`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('epg_sources', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `epg_sources`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `epg`;');
-            echo 'Processing ' . number_format(count($rResults), 0) . ' EPG URLs.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('epg', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `epg`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('member_groups', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `member_groups` WHERE `can_delete` = 1;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('DELETE FROM `users_groups` WHERE `can_delete` = 1;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' user groups.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult['can_view_vod'] = $rResult['reset_stb_data'];
-                    $rResult['allow_restrictions'] = 1;
-                    $rResult['allow_change_username'] = 1;
-                    $rResult['allow_change_password'] = 1;
-                    $rResult['minimum_username_length'] = 8;
-                    $rResult['minimum_password_length'] = 8;
-                    $rResult = QueryHelper::verifyPostTable('users_groups', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `users_groups`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('groups', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `groups` WHERE `can_delete` = 1;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('DELETE FROM `users_groups` WHERE `can_delete` = 1;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' user groups.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult['can_view_vod'] = $rResult['reset_stb_data'];
-                    $rResult['allow_restrictions'] = 1;
-                    $rResult['allow_change_username'] = 1;
-                    $rResult['allow_change_password'] = 1;
-                    $rResult['minimum_username_length'] = 8;
-                    $rResult['minimum_password_length'] = 8;
-                    $rResult = QueryHelper::verifyPostTable('users_groups', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `users_groups`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('groups', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `groups` WHERE `can_delete` = 1;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('DELETE FROM `users_groups` WHERE `can_delete` = 1;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' user groups.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult['can_view_vod'] = $rResult['reset_stb_data'];
-                    $rResult['allow_restrictions'] = 1;
-                    $rResult['allow_change_username'] = 1;
-                    $rResult['allow_change_password'] = 1;
-                    $rResult['minimum_username_length'] = 8;
-                    $rResult['minimum_password_length'] = 8;
-                    $rResult = QueryHelper::verifyPostTable('users_groups', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `users_groups`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('packages', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `packages`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `users_packages`;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' user packages.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    if ($rResult['can_gen_mag']) {
-                        $rResult['is_mag'] = 1;
-                    } else {
-                        $rResult['is_mag'] = 0;
-                    }
-                    if ($rResult['can_gen_e2']) {
-                        $rResult['is_e2'] = 1;
-                    } else {
-                        $rResult['is_e2'] = 0;
-                    }
-                    if ($rResult['only_mag'] || $rResult['only_e2']) {
-                        $rResult['is_line'] = 0;
-                    } else {
-                        $rResult['is_line'] = 1;
-                    }
-                    $rResult['lock_device'] = 1;
-                    $rResult['check_compatible'] = 1;
-                    if (count(json_decode($rResult['output_formats'], true)) != 0) {
-                    } else {
-                        $rResult['output_formats'] = '[1,2,3]';
-                    }
-                    $rResult = QueryHelper::verifyPostTable('users_packages', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `users_packages`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('rtmp_ips', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `rtmp_ips`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `rtmp_ips`;');
-            echo 'Authorising ' . number_format(count($rResults), 0) . ' RTMP IPs.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('rtmp_ips', $rResult);
-                    $rResult['push'] = 1;
-                    $rResult['pull'] = 1;
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `rtmp_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('series', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `series`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_series`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' TV series.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `mag_devices` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult['mac'] = base64_decode($rResult['mac']);
+						$rResult['lock_device'] = 1;
+						if (0 >= $rResult['user_id']) {
+						} else {
+							$rResult = QueryHelper::verifyPostTable('mag_devices', $rResult);
+							$rPrepare = QueryHelper::prepareArray($rResult);
+							$rQuery = 'INSERT INTO `mag_devices`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+							$db->query($rQuery, ...$rPrepare['data']);
+						}
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('epg', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `epg`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `epg`;');
+			echo 'Processing ' . number_format(count($rResults), 0) . ' EPG URLs.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('epg', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `epg`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('epg_sources', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `epg_sources`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `epg`;');
+			echo 'Processing ' . number_format(count($rResults), 0) . ' EPG URLs.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('epg', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `epg`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('member_groups', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `member_groups` WHERE `can_delete` = 1;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('DELETE FROM `users_groups` WHERE `can_delete` = 1;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' user groups.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult['can_view_vod'] = $rResult['reset_stb_data'];
+					$rResult['allow_restrictions'] = 1;
+					$rResult['allow_change_username'] = 1;
+					$rResult['allow_change_password'] = 1;
+					$rResult['minimum_username_length'] = 8;
+					$rResult['minimum_password_length'] = 8;
+					$rResult = QueryHelper::verifyPostTable('users_groups', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `users_groups`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('groups', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `groups` WHERE `can_delete` = 1;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('DELETE FROM `users_groups` WHERE `can_delete` = 1;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' user groups.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult['can_view_vod'] = $rResult['reset_stb_data'];
+					$rResult['allow_restrictions'] = 1;
+					$rResult['allow_change_username'] = 1;
+					$rResult['allow_change_password'] = 1;
+					$rResult['minimum_username_length'] = 8;
+					$rResult['minimum_password_length'] = 8;
+					$rResult = QueryHelper::verifyPostTable('users_groups', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `users_groups`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('groups', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `groups` WHERE `can_delete` = 1;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('DELETE FROM `users_groups` WHERE `can_delete` = 1;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' user groups.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult['can_view_vod'] = $rResult['reset_stb_data'];
+					$rResult['allow_restrictions'] = 1;
+					$rResult['allow_change_username'] = 1;
+					$rResult['allow_change_password'] = 1;
+					$rResult['minimum_username_length'] = 8;
+					$rResult['minimum_password_length'] = 8;
+					$rResult = QueryHelper::verifyPostTable('users_groups', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `users_groups`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('packages', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `packages`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `users_packages`;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' user packages.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					if ($rResult['can_gen_mag']) {
+						$rResult['is_mag'] = 1;
+					} else {
+						$rResult['is_mag'] = 0;
+					}
+					if ($rResult['can_gen_e2']) {
+						$rResult['is_e2'] = 1;
+					} else {
+						$rResult['is_e2'] = 0;
+					}
+					if ($rResult['only_mag'] || $rResult['only_e2']) {
+						$rResult['is_line'] = 0;
+					} else {
+						$rResult['is_line'] = 1;
+					}
+					$rResult['lock_device'] = 1;
+					$rResult['check_compatible'] = 1;
+					if (count(json_decode($rResult['output_formats'], true)) != 0) {
+					} else {
+						$rResult['output_formats'] = '[1,2,3]';
+					}
+					$rResult = QueryHelper::verifyPostTable('users_packages', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `users_packages`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('rtmp_ips', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `rtmp_ips`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `rtmp_ips`;');
+			echo 'Authorising ' . number_format(count($rResults), 0) . ' RTMP IPs.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('rtmp_ips', $rResult);
+					$rResult['push'] = 1;
+					$rResult['pull'] = 1;
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `rtmp_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('series', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `series`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_series`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' TV series.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `series` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult['category_id'] = '[' . intval($rResult['category_id']) . ']';
-                        $rResult['release_date'] = $rResult['releaseDate'];
-                        if ($rResult['tmdb_id'] != 0) {
-                        } else {
-                            $rResult['tmdb_id'] = null;
-                        }
-                        $rResult = QueryHelper::verifyPostTable('streams_series', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT IGNORE INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('series_episodes', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `series_episodes`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_episodes`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' episodes.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `series` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult['category_id'] = '[' . intval($rResult['category_id']) . ']';
+						$rResult['release_date'] = $rResult['releaseDate'];
+						if ($rResult['tmdb_id'] != 0) {
+						} else {
+							$rResult['tmdb_id'] = null;
+						}
+						$rResult = QueryHelper::verifyPostTable('streams_series', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT IGNORE INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('series_episodes', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `series_episodes`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_episodes`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' episodes.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `series_episodes` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult['episode_num'] = $rResult['sort'];
-                        $rResult = QueryHelper::verifyPostTable('streams_episodes', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `streams_episodes`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streaming_servers', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `streaming_servers`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $rMain = false;
-            $db->query('TRUNCATE `servers`;');
-            echo 'Moving ' . number_format(count($rResults), 0) . ' servers.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult['server_type'] = 0;
-                    $rResult['parent_id'] = null;
-                    $rResult['http_broadcast_port'] = 80;
-                    $rResult['https_broadcast_port'] = 443;
-                    $rResult['rtmp_port'] = 8880;
-                    $rResult['total_services'] = 4;
-                    $rResult['http_ports_add'] = null;
-                    $rResult['https_ports_add'] = null;
-                    if ($rResult['can_delete'] == 0 && !$rMain) {
-                        $rResult['is_main'] = 1;
-                        $rMain = true;
-                    } else {
-                        $rResult['is_main'] = 0;
-                    }
-                    $rResult = QueryHelper::verifyPostTable('servers', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('servers', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `servers` ORDER BY `id` ASC;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $rMain = false;
-            $db->query('TRUNCATE `servers`;');
-            echo 'Moving ' . number_format(count($rResults), 0) . ' servers.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult['server_type'] = 0;
-                    $rResult['parent_id'] = null;
-                    $rResult['http_broadcast_port'] = 80;
-                    $rResult['https_broadcast_port'] = 443;
-                    $rResult['rtmp_port'] = 8880;
-                    $rResult['total_services'] = 4;
-                    $rResult['http_ports_add'] = null;
-                    $rResult['https_ports_add'] = null;
-                    if (!$rMain) {
-                        $rResult['is_main'] = 1;
-                        $rMain = true;
-                    } else {
-                        $rResult['is_main'] = 0;
-                    }
-                    $rResult = QueryHelper::verifyPostTable('servers', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    $rCreatedOptions = array();
-    if (in_array('streams', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `streams`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' streams.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `series_episodes` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult['episode_num'] = $rResult['sort'];
+						$rResult = QueryHelper::verifyPostTable('streams_episodes', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `streams_episodes`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streaming_servers', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `streaming_servers`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$rMain = false;
+			$db->query('TRUNCATE `servers`;');
+			echo 'Moving ' . number_format(count($rResults), 0) . ' servers.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult['server_type'] = 0;
+					$rResult['parent_id'] = null;
+					$rResult['http_broadcast_port'] = 80;
+					$rResult['https_broadcast_port'] = 443;
+					$rResult['rtmp_port'] = 8880;
+					$rResult['total_services'] = 4;
+					$rResult['http_ports_add'] = null;
+					$rResult['https_ports_add'] = null;
+					if ($rResult['can_delete'] == 0 && !$rMain) {
+						$rResult['is_main'] = 1;
+						$rMain = true;
+					} else {
+						$rResult['is_main'] = 0;
+					}
+					$rResult = QueryHelper::verifyPostTable('servers', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('servers', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `servers` ORDER BY `id` ASC;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$rMain = false;
+			$db->query('TRUNCATE `servers`;');
+			echo 'Moving ' . number_format(count($rResults), 0) . ' servers.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult['server_type'] = 0;
+					$rResult['parent_id'] = null;
+					$rResult['http_broadcast_port'] = 80;
+					$rResult['https_broadcast_port'] = 443;
+					$rResult['rtmp_port'] = 8880;
+					$rResult['total_services'] = 4;
+					$rResult['http_ports_add'] = null;
+					$rResult['https_ports_add'] = null;
+					if (!$rMain) {
+						$rResult['is_main'] = 1;
+						$rMain = true;
+					} else {
+						$rResult['is_main'] = 0;
+					}
+					$rResult = QueryHelper::verifyPostTable('servers', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	$rCreatedOptions = [];
+	if (in_array('streams', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `streams`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' streams.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `streams` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        try {
-                            $rExternal = json_decode($rResult['external_push'], true);
-                            if ($rExternal) {
-                            } else {
-                                $rResult['external_push'] = '{}';
-                            }
-                            $rResult['category_id'] = '[' . intval($rResult['category_id']) . ']';
-                            $rResult['movie_properties'] = $rResult['movie_propeties'];
-                            if (!$rResult['target_container']) {
-                            } else {
-                                list($rResult['target_container']) = json_decode($rResult['target_container'], true);
-                            }
-                            $rCreatedOptions[$rResult['id']] = $rResult['cchannel_rsources'];
-                            $rResult = QueryHelper::verifyPostTable('streams', $rResult);
-                            $rPrepare = QueryHelper::prepareArray($rResult);
-                            $rQuery = 'INSERT INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                            $db->query($rQuery, ...$rPrepare['data']);
-                        } catch (\Exception $e) {
-                            echo 'Error: ' . $e . "\n";
-                        }
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streams_options', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `streams_options`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_options`;');
-            echo 'Attributing ' . number_format($rCount, 0) . ' options to streams.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `streams` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						try {
+							$rExternal = json_decode($rResult['external_push'], true);
+							if ($rExternal) {
+							} else {
+								$rResult['external_push'] = '{}';
+							}
+							$rResult['category_id'] = '[' . intval($rResult['category_id']) . ']';
+							$rResult['movie_properties'] = $rResult['movie_propeties'];
+							if (!$rResult['target_container']) {
+							} else {
+								list($rResult['target_container']) = json_decode($rResult['target_container'], true);
+							}
+							$rCreatedOptions[$rResult['id']] = $rResult['cchannel_rsources'];
+							$rResult = QueryHelper::verifyPostTable('streams', $rResult);
+							$rPrepare = QueryHelper::prepareArray($rResult);
+							$rQuery = 'INSERT INTO `streams`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+							$db->query($rQuery, ...$rPrepare['data']);
+						} catch (\Exception $e) {
+							echo 'Error: ' . $e . "\n";
+						}
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streams_options', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `streams_options`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_options`;');
+			echo 'Attributing ' . number_format($rCount, 0) . ' options to streams.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `streams_options` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rResult = QueryHelper::verifyPostTable('streams_options', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `streams_options`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('streams_sys', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `streams_sys`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_servers`;');
-            echo 'Allocating ' . number_format($rCount, 0) . ' streams to servers.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `streams_options` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rResult = QueryHelper::verifyPostTable('streams_options', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `streams_options`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('streams_sys', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `streams_sys`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_servers`;');
+			echo 'Allocating ' . number_format($rCount, 0) . ' streams to servers.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `streams_sys` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    if (0 >= count($rResults)) {
-                    } else {
-                        foreach ($rResults as $rResult) {
-                            if ($rResult['parent_id'] && $rResult['parent_id'] != 0) {
-                            } else {
-                                $rResult['parent_id'] = null;
-                            }
-                            if (!isset($rCreatedOptions[$rResult['stream_id']])) {
-                            } else {
-                                $rResult['cchannel_rsources'] = $rCreatedOptions[$rResult['stream_id']];
-                            }
-                            $rResult['custom_ffmpeg'] = '';
-                            $rResult['stream_status'] = 0;
-                            $rResult['stream_started'] = null;
-                            $rResult['monitor_pid'] = null;
-                            if ($rResult['pid'] < 0) {
-                                $rResult['pid'] = null;
-                            }
-                            $rResult = QueryHelper::verifyPostTable('streams_servers', $rResult);
-                            $rPrepare = QueryHelper::prepareArray($rResult);
-                            $rQuery = 'INSERT INTO `streams_servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                            $db->query($rQuery, ...$rPrepare['data']);
-                        }
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('stream_servers', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `stream_servers`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `streams_servers`;');
-            echo 'Allocating ' . number_format($rCount, 0) . ' streams to servers.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `streams_sys` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					if (0 >= count($rResults)) {
+					} else {
+						foreach ($rResults as $rResult) {
+							if ($rResult['parent_id'] && $rResult['parent_id'] != 0) {
+							} else {
+								$rResult['parent_id'] = null;
+							}
+							if (!isset($rCreatedOptions[$rResult['stream_id']])) {
+							} else {
+								$rResult['cchannel_rsources'] = $rCreatedOptions[$rResult['stream_id']];
+							}
+							$rResult['custom_ffmpeg'] = '';
+							$rResult['stream_status'] = 0;
+							$rResult['stream_started'] = null;
+							$rResult['monitor_pid'] = null;
+							if ($rResult['pid'] < 0) {
+								$rResult['pid'] = null;
+							}
+							$rResult = QueryHelper::verifyPostTable('streams_servers', $rResult);
+							$rPrepare = QueryHelper::prepareArray($rResult);
+							$rQuery = 'INSERT INTO `streams_servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+							$db->query($rQuery, ...$rPrepare['data']);
+						}
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('stream_servers', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `stream_servers`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `streams_servers`;');
+			echo 'Allocating ' . number_format($rCount, 0) . ' streams to servers.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `stream_servers` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    if (0 >= count($rResults)) {
-                    } else {
-                        foreach ($rResults as $rResult) {
-                            if ($rResult['parent_id'] && $rResult['parent_id'] != 0) {
-                            } else {
-                                $rResult['parent_id'] = null;
-                            }
-                            $rResult['stream_status'] = 0;
-                            $rResult['stream_started'] = null;
-                            $rResult['monitor_pid'] = null;
-                            if ($rResult['pid'] > 0) {
-                            } else {
-                                $rResult['pid'] = null;
-                            }
-                            $rResult = QueryHelper::verifyPostTable('streams_servers', $rResult);
-                            $rPrepare = QueryHelper::prepareArray($rResult);
-                            $rQuery = 'INSERT INTO `streams_servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                            $db->query($rQuery, ...$rPrepare['data']);
-                        }
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('stream_categories', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `stream_categories`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `streams_categories`;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' categories.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('streams_categories', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('categories', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `categories`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `streams_categories`;');
-            echo 'Creating ' . number_format(count($rResults), 0) . ' categories.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('streams_categories', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('tickets', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `tickets`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `tickets`;');
-            echo 'Posting ' . number_format(count($rResults), 0) . ' tickets.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('tickets', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `tickets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('tickets_replies', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `tickets_replies`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `tickets_replies`;');
-            echo 'Posting ' . number_format(count($rResults), 0) . ' replies.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('tickets_replies', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `tickets_replies`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('transcoding_profiles', $rMigrateOptions)) {
-        $odb->query('SELECT * FROM `transcoding_profiles`;');
-        $rResults = $odb->get_rows();
-        if (count($rResults) > 0) {
-            $db->query('TRUNCATE `profiles`;');
-            echo 'Generating ' . number_format(count($rResults), 0) . ' transcoding profiles.' . "\n";
-            foreach ($rResults as $rResult) {
-                try {
-                    $rResult = QueryHelper::verifyPostTable('profiles', $rResult);
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `profiles`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    $rOutput = array();
-    if (in_array('user_output', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `user_output`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            echo 'Attributing ' . number_format($rCount, 0) . ' output options to lines.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `stream_servers` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					if (0 >= count($rResults)) {
+					} else {
+						foreach ($rResults as $rResult) {
+							if ($rResult['parent_id'] && $rResult['parent_id'] != 0) {
+							} else {
+								$rResult['parent_id'] = null;
+							}
+							$rResult['stream_status'] = 0;
+							$rResult['stream_started'] = null;
+							$rResult['monitor_pid'] = null;
+							if ($rResult['pid'] > 0) {
+							} else {
+								$rResult['pid'] = null;
+							}
+							$rResult = QueryHelper::verifyPostTable('streams_servers', $rResult);
+							$rPrepare = QueryHelper::prepareArray($rResult);
+							$rQuery = 'INSERT INTO `streams_servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+							$db->query($rQuery, ...$rPrepare['data']);
+						}
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('stream_categories', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `stream_categories`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `streams_categories`;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' categories.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('streams_categories', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('categories', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `categories`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `streams_categories`;');
+			echo 'Creating ' . number_format(count($rResults), 0) . ' categories.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('streams_categories', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('tickets', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `tickets`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `tickets`;');
+			echo 'Posting ' . number_format(count($rResults), 0) . ' tickets.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('tickets', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `tickets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('tickets_replies', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `tickets_replies`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `tickets_replies`;');
+			echo 'Posting ' . number_format(count($rResults), 0) . ' replies.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('tickets_replies', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `tickets_replies`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('transcoding_profiles', $rMigrateOptions)) {
+		$odb->query('SELECT * FROM `transcoding_profiles`;');
+		$rResults = $odb->get_rows();
+		if (count($rResults) > 0) {
+			$db->query('TRUNCATE `profiles`;');
+			echo 'Generating ' . number_format(count($rResults), 0) . ' transcoding profiles.' . "\n";
+			foreach ($rResults as $rResult) {
+				try {
+					$rResult = QueryHelper::verifyPostTable('profiles', $rResult);
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `profiles`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	$rOutput = [];
+	if (in_array('user_output', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `user_output`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			echo 'Attributing ' . number_format($rCount, 0) . ' output options to lines.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `user_output` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        $rOutput[$rResult['user_id']][] = $rResult['access_output_id'];
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('users', $rMigrateOptions)) {
-        $odb->query('SELECT COUNT(*) AS `count` FROM `users`;');
-        $rCount = $odb->get_row()['count'];
-        if ($rCount > 0) {
-            $db->query('TRUNCATE `lines`;');
-            echo 'Adding ' . number_format($rCount, 0) . ' lines.' . "\n";
-            $rSteps = [];
-            $stepSize = 1000;
-            for ($i = 0; $i < $rCount; $i += $stepSize) {
-                $rSteps[] = $i;
-            }
-            if (empty($rSteps)) {
-                $rSteps = [0];
-            }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `user_output` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						$rOutput[$rResult['user_id']][] = $rResult['access_output_id'];
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('users', $rMigrateOptions)) {
+		$odb->query('SELECT COUNT(*) AS `count` FROM `users`;');
+		$rCount = $odb->get_row()['count'];
+		if ($rCount > 0) {
+			$db->query('TRUNCATE `lines`;');
+			echo 'Adding ' . number_format($rCount, 0) . ' lines.' . "\n";
+			$rSteps = [];
+			$stepSize = 1000;
+			for ($i = 0; $i < $rCount; $i += $stepSize) {
+				$rSteps[] = $i;
+			}
+			if (empty($rSteps)) {
+				$rSteps = [0];
+			}
 
-            foreach ($rSteps as $rStep) {
-                try {
-                    $odb->query('SELECT * FROM `users` LIMIT ' . $rStep . ', 1000;');
-                    $rResults = $odb->get_rows();
-                    foreach ($rResults as $rResult) {
-                        if (!empty($rResult['isp_desc'])) {
-                        } else {
-                            $rResult['isp_desc'] = null;
-                        }
-                        if (!isset($rOutput[$rResult['id']])) {
-                        } else {
-                            $rResult['allowed_outputs'] = '[' . implode(',', $rOutput[$rResult['id']]) . ']';
-                        }
-                        if (!isset($rResult['output'])) {
-                        } else {
-                            $rResult['allowed_outputs'] = $rResult['output'];
-                        }
-                        $rResult['bouquet'] = '[' . implode(',', array_map('intval', json_decode($rResult['bouquet'], true))) . ']';
-                        $rResult = QueryHelper::verifyPostTable('lines', $rResult);
-                        $rPrepare = QueryHelper::prepareArray($rResult);
-                        $rQuery = 'INSERT INTO `lines`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                        $db->query($rQuery, ...$rPrepare['data']);
-                    }
-                } catch (\Exception $e) {
-                    echo 'Error: ' . $e . "\n";
-                }
-            }
-        }
-    }
-    if (in_array('watch_folders', $rMigrateOptions)) {
-        $odb->query("SHOW TABLES LIKE 'watch_folders';");
-        if (0 >= $odb->num_rows()) {
-        } else {
-            $odb->query('SELECT COUNT(*) AS `count` FROM `watch_folders`;');
-            $rCount = $odb->get_row()['count'];
-            if ($rCount > 0) {
-                $db->query('TRUNCATE `watch_folders`;');
-                echo 'Adding ' . number_format($rCount, 0) . ' folders to watch.' . "\n";
-                $odb->query('SELECT * FROM `watch_folders`;');
-                $rResults = $odb->get_rows();
-                foreach ($rResults as $rResult) {
-                    $rResult = QueryHelper::verifyPostTable('watch_folders', $rResult);
-                    $rResult['bouquets'] = '[' . implode(',', array_map('intval', json_decode($rResult['bouquets'], true))) . ']';
-                    $rResult['fb_bouquets'] = '[' . implode(',', array_map('intval', json_decode($rResult['fb_bouquets'], true))) . ']';
-                    $rPrepare = QueryHelper::prepareArray($rResult);
-                    $rQuery = 'INSERT INTO `watch_folders`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-                    $db->query($rQuery, ...$rPrepare['data']);
-                }
-            }
-        }
-    }
+			foreach ($rSteps as $rStep) {
+				try {
+					$odb->query('SELECT * FROM `users` LIMIT ' . $rStep . ', 1000;');
+					$rResults = $odb->get_rows();
+					foreach ($rResults as $rResult) {
+						if (!empty($rResult['isp_desc'])) {
+						} else {
+							$rResult['isp_desc'] = null;
+						}
+						if (!isset($rOutput[$rResult['id']])) {
+						} else {
+							$rResult['allowed_outputs'] = '[' . implode(',', $rOutput[$rResult['id']]) . ']';
+						}
+						if (!isset($rResult['output'])) {
+						} else {
+							$rResult['allowed_outputs'] = $rResult['output'];
+						}
+						$rResult['bouquet'] = '[' . implode(',', array_map('intval', json_decode($rResult['bouquet'], true))) . ']';
+						$rResult = QueryHelper::verifyPostTable('lines', $rResult);
+						$rPrepare = QueryHelper::prepareArray($rResult);
+						$rQuery = 'INSERT INTO `lines`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+						$db->query($rQuery, ...$rPrepare['data']);
+					}
+				} catch (\Exception $e) {
+					echo 'Error: ' . $e . "\n";
+				}
+			}
+		}
+	}
+	if (in_array('watch_folders', $rMigrateOptions)) {
+		$odb->query("SHOW TABLES LIKE 'watch_folders';");
+		if (0 >= $odb->num_rows()) {
+		} else {
+			$odb->query('SELECT COUNT(*) AS `count` FROM `watch_folders`;');
+			$rCount = $odb->get_row()['count'];
+			if ($rCount > 0) {
+				$db->query('TRUNCATE `watch_folders`;');
+				echo 'Adding ' . number_format($rCount, 0) . ' folders to watch.' . "\n";
+				$odb->query('SELECT * FROM `watch_folders`;');
+				$rResults = $odb->get_rows();
+				foreach ($rResults as $rResult) {
+					$rResult = QueryHelper::verifyPostTable('watch_folders', $rResult);
+					$rResult['bouquets'] = '[' . implode(',', array_map('intval', json_decode($rResult['bouquets'], true))) . ']';
+					$rResult['fb_bouquets'] = '[' . implode(',', array_map('intval', json_decode($rResult['fb_bouquets'], true))) . ']';
+					$rPrepare = QueryHelper::prepareArray($rResult);
+					$rQuery = 'INSERT INTO `watch_folders`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+					$db->query($rQuery, ...$rPrepare['data']);
+				}
+			}
+		}
+	}
 }
 try {
-    $odb->query('SELECT * FROM `settings` LIMIT 1;');
-    $rSettings = $odb->get_row();
-    $db->query('UPDATE `settings` SET `server_name` = ?, `default_timezone` = ?;', $rSettings['server_name'], $rSettings['default_timezone']);
+	$odb->query('SELECT * FROM `settings` LIMIT 1;');
+	$rSettings = $odb->get_row();
+	$db->query('UPDATE `settings` SET `server_name` = ?, `default_timezone` = ?;', $rSettings['server_name'], $rSettings['default_timezone']);
 } catch (\Exception $e) {
-    echo 'Error: ' . $e . "\n";
+	echo 'Error: ' . $e . "\n";
 }
 try {
-    $odb->query("SHOW TABLES LIKE 'admin_settings';");
-    if ($odb->num_rows() > 0) {
-        $rAdminSettings = array();
-        $odb->query('SELECT * FROM `admin_settings`;');
-        foreach ($odb->get_rows() as $rRow) {
-            $rAdminSettings[$rRow['type']] = $rRow['value'];
-        }
-        if (!(0 < strlen($rAdminSettings['recaptcha_v2_secret_key']) && 0 < strlen($rAdminSettings['recaptcha_v2_site_key']))) {
-        } else {
-            $db->query('UPDATE `settings` SET `recaptcha_v2_secret_key` = ?, `recaptcha_v2_site_key` = ?;', $rAdminSettings['recaptcha_v2_secret_key'], $rAdminSettings['recaptcha_v2_site_key']);
-        }
-    }
+	$odb->query("SHOW TABLES LIKE 'admin_settings';");
+	if ($odb->num_rows() > 0) {
+		$rAdminSettings = [];
+		$odb->query('SELECT * FROM `admin_settings`;');
+		foreach ($odb->get_rows() as $rRow) {
+			$rAdminSettings[$rRow['type']] = $rRow['value'];
+		}
+		if (!(0 < strlen($rAdminSettings['recaptcha_v2_secret_key']) && 0 < strlen($rAdminSettings['recaptcha_v2_site_key']))) {
+		} else {
+			$db->query('UPDATE `settings` SET `recaptcha_v2_secret_key` = ?, `recaptcha_v2_site_key` = ?;', $rAdminSettings['recaptcha_v2_secret_key'], $rAdminSettings['recaptcha_v2_site_key']);
+		}
+	}
 } catch (\Exception $e) {
-    echo 'Error: ' . $e . "\n";
+	echo 'Error: ' . $e . "\n";
 }
 if (in_array('access_codes', $rMigrateOptions)) {
-    echo "\n" . 'Admin acces code: ' . $AdminAccesCode;
+	echo "\n" . 'Admin acces code: ' . $AdminAccesCode;
 }
 echo "\n" . 'Migration has been completed!' . "\n\n" . 'Your settings have been reset to the XC_VM default, please take some time to review the settings page and make the desired changes.' . "\n";
 
diff --git a/src/Core/Auth/AuthRepository.php b/src/Core/Auth/AuthRepository.php
index 134b6cc0..f6817117 100644
--- a/src/Core/Auth/AuthRepository.php
+++ b/src/Core/Auth/AuthRepository.php
@@ -23,9 +23,9 @@ class AuthRepository {
 	 * @param int|null $rType Access-code type to filter by, or null for all.
 	 * @return array Rows keyed by access-code id.
 	 */
-	public static function getAllCodes($rType = null) {
+	public static function getAllCodes(?int $rType = null) {
 		global $db;
-		$rReturn = array();
+		$rReturn = [];
 
 		if (!is_null($rType)) {
 			$db->query('SELECT * FROM `access_codes` WHERE `type` = ? ORDER BY `id` ASC;', $rType);
@@ -48,8 +48,8 @@ class AuthRepository {
 	 * @param string $rMainHome Panel home path (trailing slash).
 	 * @return string[] Access-code names (config filenames without extension, excluding 'default').
 	 */
-	public static function getActiveCodes($rMainHome) {
-		$rCodes = array();
+	public static function getActiveCodes(string $rMainHome) {
+		$rCodes = [];
 		$rFiles = scandir($rMainHome . 'bin/nginx/conf/codes/');
 
 		foreach ($rFiles as $rFile) {
@@ -72,7 +72,7 @@ class AuthRepository {
 	public static function getWebPlayerCode(): ?string {
 		foreach (self::getAllCodes(6) as $code) {
 			if (!empty($code['enabled'])) {
-				return (string)$code['code'];
+				return (string) $code['code'];
 			}
 		}
 		return null;
@@ -86,7 +86,7 @@ class AuthRepository {
 	public static function getActiveCodePortalCode(): ?string {
 		foreach (self::getAllCodes(7) as $code) {
 			if (!empty($code['enabled'])) {
-				return (string)$code['code'];
+				return (string) $code['code'];
 			}
 		}
 		return null;
@@ -109,7 +109,7 @@ class AuthRepository {
 
 		foreach (self::getAllCodes() as $rCode) {
 			if ($rCode['enabled']) {
-				$rWhitelist = array();
+				$rWhitelist = [];
 
 				foreach ((array) json_decode($rCode['whitelist'], true) as $rIP) {
 					if (filter_var($rIP, FILTER_VALIDATE_IP)) {
@@ -128,22 +128,22 @@ class AuthRepository {
 				$rAliasMap = [0 => 'Public/Views/admin', 1 => 'reseller', 2 => 'Ministra', 3 => 'includes/api/admin', 4 => 'includes/api/reseller', 5 => 'Ministra/new', 6 => 'Public/assets/player', 7 => 'Public/Views/portal'];
 				$rBurstMap = [0 => 500, 1 => 50, 2 => 50, 3 => 1000, 4 => 1000, 5 => 50, 6 => 500, 7 => 500];
 
-				$rType = $rTypeMap[(int)$rCode['type']] ?? 'admin';
-				$rAlias = $rAliasMap[(int)$rCode['type']] ?? 'Public/Views/admin';
-				$rBurst = $rBurstMap[(int)$rCode['type']] ?? 500;
-				$rCurrentTemplate = in_array($rType, array('ministra', 'ministra/new')) ? $rMinistraTemplate : $rTemplate;
+				$rType = $rTypeMap[(int) $rCode['type']] ?? 'admin';
+				$rAlias = $rAliasMap[(int) $rCode['type']] ?? 'Public/Views/admin';
+				$rBurst = $rBurstMap[(int) $rCode['type']] ?? 500;
+				$rCurrentTemplate = in_array($rType, ['ministra', 'ministra/new']) ? $rMinistraTemplate : $rTemplate;
 
-				if (in_array($rType, array('ministra', 'ministra/new')) || strlen($rCode['code']) >= 4) {
-					file_put_contents($rMainHome . 'bin/nginx/conf/codes/' . $rCode['code'] . '.conf', str_replace(array('#WHITELIST#', '#CODE#', '#TYPE#', '#BURST#', '#ALIAS#'), array(implode(' ', $rWhitelist), (string) $rCode['code'], $rType, (string) $rBurst, $rAlias), $rCurrentTemplate));
+				if (in_array($rType, ['ministra', 'ministra/new']) || strlen($rCode['code']) >= 4) {
+					file_put_contents($rMainHome . 'bin/nginx/conf/codes/' . $rCode['code'] . '.conf', str_replace(['#WHITELIST#', '#CODE#', '#TYPE#', '#BURST#', '#ALIAS#'], [implode(' ', $rWhitelist), (string) $rCode['code'], $rType, (string) $rBurst, $rAlias], $rCurrentTemplate));
 				} else {
-					file_put_contents($rMainHome . 'bin/nginx/conf/codes/' . $rCode['code'] . '.conf', str_replace(array('#WHITELIST#', '#CODE#', '#TYPE#', '#BURST#', '#ALIAS#'), array(implode(' ', $rWhitelist), $rCode['code'] . '/', $rType . '/', (string) $rBurst, $rAlias . '/'), $rCurrentTemplate));
+					file_put_contents($rMainHome . 'bin/nginx/conf/codes/' . $rCode['code'] . '.conf', str_replace(['#WHITELIST#', '#CODE#', '#TYPE#', '#BURST#', '#ALIAS#'], [implode(' ', $rWhitelist), $rCode['code'] . '/', $rType . '/', (string) $rBurst, $rAlias . '/'], $rCurrentTemplate));
 				}
 			}
 		}
 
 		if (count(self::getActiveCodes($rMainHome)) == 0) {
 			if (!file_exists($rMainHome . 'bin/nginx/conf/codes/default.conf')) {
-				file_put_contents($rMainHome . 'bin/nginx/conf/codes/default.conf', str_replace(array('alias ', '#WHITELIST#', '#CODE#', '#TYPE#', '#ALIAS#'), array('root ', '', '', 'admin', 'Public/Views/admin'), $rTemplate));
+				file_put_contents($rMainHome . 'bin/nginx/conf/codes/default.conf', str_replace(['alias ', '#WHITELIST#', '#CODE#', '#TYPE#', '#ALIAS#'], ['root ', '', '', 'admin', 'Public/Views/admin'], $rTemplate));
 			}
 		} else {
 			if (file_exists($rMainHome . 'bin/nginx/conf/codes/default.conf')) {
@@ -151,7 +151,7 @@ class AuthRepository {
 			}
 		}
 
-		ApiClient::systemRequest($rServerId, array('action' => 'reload_nginx'));
+		ApiClient::systemRequest($rServerId, ['action' => 'reload_nginx']);
 	}
 
 	/**
@@ -163,7 +163,7 @@ class AuthRepository {
 	 * @param bool $rInfo When true, return the full access-code DB row instead of the code string.
 	 * @return string|array|null Code string, or the DB row when $rInfo is true (null if not found).
 	 */
-	public static function getCurrentCode($rInfo = false) {
+	public static function getCurrentCode(bool $rInfo = false) {
 		global $db;
 		// Front Controller передаёт XC_CODE через fastcgi_param.
 		// Без FC — определяем из PHP_SELF (legacy поведение).
@@ -189,7 +189,7 @@ class AuthRepository {
 	 */
 	public static function getAllHMAC() {
 		global $db;
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `hmac_keys` ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -207,7 +207,7 @@ class AuthRepository {
 	 * @param int $rID HMAC key id.
 	 * @return array|null The key row, or null if not found.
 	 */
-	public static function getHMACById($rID) {
+	public static function getHMACById(int $rID) {
 		global $db;
 		$db->query('SELECT * FROM `hmac_keys` WHERE `id` = ?;', $rID);
 		if ($db->num_rows() == 1) {
@@ -228,7 +228,7 @@ class AuthRepository {
 	 * @param int $rID User group id.
 	 * @return array The group permissions row, or [] if not found.
 	 */
-	public static function getPermissions($rID) {
+	public static function getPermissions(int $rID) {
 		global $db;
 		$db->query('SELECT * FROM `users_groups` WHERE `group_id` = ?;', $rID);
 
@@ -257,9 +257,9 @@ class AuthRepository {
 	 * @param bool $rUsers   When true, include sub-users and report maps.
 	 * @return array Effective permissions (create flags, stream/series/category ids, users, reports).
 	 */
-	public static function getGroupPermissions($rUserID, $rStreams = true, $rUsers = true) {
+	public static function getGroupPermissions(int $rUserID, bool $rStreams = true, bool $rUsers = true) {
 		global $db;
-		$rReturn = array('create_line' => false, 'create_mag' => false, 'create_enigma' => false, 'stream_ids' => array(), 'series_ids' => array(), 'category_ids' => array(), 'users' => array(), 'direct_reports' => array(), 'all_reports' => array(), 'report_map' => array());
+		$rReturn = ['create_line' => false, 'create_mag' => false, 'create_enigma' => false, 'stream_ids' => [], 'series_ids' => [], 'category_ids' => [], 'users' => [], 'direct_reports' => [], 'all_reports' => [], 'report_map' => []];
 		$rUser = UserRepository::getRegisteredUserById($rUserID);
 
 		if (!$rUser) {
@@ -315,7 +315,7 @@ class AuthRepository {
 	 * @param int $rID Access-code id.
 	 * @return array|null The access-code row, or null if not found.
 	 */
-	public static function getCodeById($rID) {
+	public static function getCodeById(int $rID) {
 		global $db;
 		$db->query('SELECT * FROM `access_codes` WHERE `id` = ?;', $rID);
 
@@ -332,7 +332,7 @@ class AuthRepository {
 	 * @param int $rID Access-code id.
 	 * @return bool True on deletion, false if the code does not exist.
 	 */
-	public static function deleteCode($rID) {
+	public static function deleteCode(int $rID) {
 		global $db;
 		$db->query('SELECT `id` FROM `access_codes` WHERE `id` = ?;', $rID);
 
@@ -352,7 +352,7 @@ class AuthRepository {
 	 * @param int $rID HMAC key id.
 	 * @return bool True on deletion, false if the key does not exist.
 	 */
-	public static function deleteHMAC($rID) {
+	public static function deleteHMAC(int $rID) {
 		global $db;
 		$db->query('SELECT `id` FROM `hmac_keys` WHERE `id` = ?;', $rID);
 
diff --git a/src/Core/Auth/AuthService.php b/src/Core/Auth/AuthService.php
index f9a72a68..10884254 100644
--- a/src/Core/Auth/AuthService.php
+++ b/src/Core/Auth/AuthService.php
@@ -31,7 +31,7 @@ class AuthService {
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => payload].
 	 */
-	public static function processCode($rData) {
+	public static function processCode(array $rData) {
 		global $db;
 		if (isset($rData['edit'])) {
 			$rArray = AdminHelpers::overwriteData(AuthRepository::getCodeById($rData['edit']), $rData);
@@ -49,7 +49,7 @@ class AuthService {
 		}
 
 		if (isset($rData['groups'])) {
-			$rArray['groups'] = array();
+			$rArray['groups'] = [];
 			foreach ($rData['groups'] as $rGroupID) {
 				$rArray['groups'][] = intval($rGroupID);
 			}
@@ -57,7 +57,7 @@ class AuthService {
 			$rArray['groups'] = is_string($rArray['groups'] ?? null) ? (json_decode($rArray['groups'], true) ?: []) : [];
 		}
 
-		if (in_array($rData['type'], array(0, 1, 3, 4))) {
+		if (in_array($rData['type'], [0, 1, 3, 4])) {
 			$rArray['groups'] = '[' . implode(',', array_map('intval', $rArray['groups'])) . ']';
 		} else {
 			$rArray['groups'] = '[]';
@@ -67,20 +67,20 @@ class AuthService {
 			$rArray['whitelist'] = '[]';
 		}
 
-		if (in_array((int)$rData['type'], [6, 7], true)) {
+		if (in_array((int) $rData['type'], [6, 7], true)) {
 			if (strlen($rData['code']) < 3) {
-				return array('status' => STATUS_CODE_LENGTH, 'data' => $rData);
+				return ['status' => STATUS_CODE_LENGTH, 'data' => $rData];
 			}
 		} elseif ($rData['type'] != 2 && strlen($rData['code']) < 8) {
-			return array('status' => STATUS_CODE_LENGTH, 'data' => $rData);
+			return ['status' => STATUS_CODE_LENGTH, 'data' => $rData];
 		}
 
 		if ($rData['type'] == 2 && empty($rData['code'])) {
-			return array('status' => STATUS_INVALID_CODE, 'data' => $rData);
+			return ['status' => STATUS_INVALID_CODE, 'data' => $rData];
 		}
 
-		if (in_array($rData['code'], array('admin', 'stream', 'images', 'player_api', 'player', 'playlist', 'epg', 'live', 'movie', 'series', 'status', 'nginx_status', 'get', 'panel_api', 'xmltv', 'probe', 'thumb', 'timeshift', 'auth', 'vauth', 'tsauth', 'hls', 'play', 'key', 'api', 'c'))) {
-			return array('status' => STATUS_RESERVED_CODE, 'data' => $rData);
+		if (in_array($rData['code'], ['admin', 'stream', 'images', 'player_api', 'player', 'playlist', 'epg', 'live', 'movie', 'series', 'status', 'nginx_status', 'get', 'panel_api', 'xmltv', 'probe', 'thumb', 'timeshift', 'auth', 'vauth', 'tsauth', 'hls', 'play', 'key', 'api', 'c'])) {
+			return ['status' => STATUS_RESERVED_CODE, 'data' => $rData];
 		}
 
 		if (isset($rData['edit'])) {
@@ -90,7 +90,7 @@ class AuthService {
 		}
 
 		if (0 < $db->num_rows()) {
-			return array('status' => STATUS_EXISTS_CODE, 'data' => $rData);
+			return ['status' => STATUS_EXISTS_CODE, 'data' => $rData];
 		}
 
 		$rPrepare = QueryHelper::prepareArray($rArray);
@@ -99,10 +99,10 @@ class AuthService {
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
 			AuthRepository::updateCodes();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID, 'orig_code' => $rOrigCode, 'new_code' => $rData['code']));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID, 'orig_code' => $rOrigCode, 'new_code' => $rData['code']]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	// ──────────────────────────────────────────────
@@ -118,7 +118,7 @@ class AuthService {
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => payload or insert_id].
 	 */
-	public static function processHMAC($rData) {
+	public static function processHMAC(array $rData) {
 		global $db, $rSettings;
 		if (isset($rData['edit'])) {
 			$rArray = AdminHelpers::overwriteData(AuthRepository::getHMACById($rData['edit']), $rData);
@@ -134,24 +134,24 @@ class AuthService {
 		}
 
 		if ($rData['keygen'] != 'HMAC KEY HIDDEN' && strlen($rData['keygen']) != 32) {
-			return array('status' => STATUS_NO_KEY, 'data' => $rData);
+			return ['status' => STATUS_NO_KEY, 'data' => $rData];
 		}
 
 		if (strlen($rData['notes']) == 0) {
-			return array('status' => STATUS_NO_DESCRIPTION, 'data' => $rData);
+			return ['status' => STATUS_NO_DESCRIPTION, 'data' => $rData];
 		}
 
 		if (isset($rData['edit'])) {
 			if ($rData['keygen'] != 'HMAC KEY HIDDEN') {
 				$db->query('SELECT `id` FROM `hmac_keys` WHERE `key` = ? AND `id` <> ?;', Encryption::encrypt($rData['keygen'], $rSettings['live_streaming_pass'], OPENSSL_EXTRA), $rData['edit']);
 				if (0 < $db->num_rows()) {
-					return array('status' => STATUS_EXISTS_HMAC, 'data' => $rData);
+					return ['status' => STATUS_EXISTS_HMAC, 'data' => $rData];
 				}
 			}
 		} else {
 			$db->query('SELECT `id` FROM `hmac_keys` WHERE `key` = ?;', Encryption::encrypt($rData['keygen'], $rSettings['live_streaming_pass'], OPENSSL_EXTRA));
 			if (0 < $db->num_rows()) {
-				return array('status' => STATUS_EXISTS_HMAC, 'data' => $rData);
+				return ['status' => STATUS_EXISTS_HMAC, 'data' => $rData];
 			}
 		}
 
@@ -164,10 +164,10 @@ class AuthService {
 
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -184,7 +184,7 @@ class AuthService {
 	 *                      query string can make: null, an array).
 	 * @return bool
 	 */
-	public static function secretMatches($rKnown, $rGiven): bool {
+	public static function secretMatches(mixed $rKnown, mixed $rGiven): bool {
 		if (!is_scalar($rKnown) || !is_string($rGiven)) {
 			return false;
 		}
@@ -212,7 +212,7 @@ class AuthService {
 	 * @param int        $rMaxConnections Max-connections component.
 	 * @return int|null Matching HMAC key id, or null if no key matches.
 	 */
-	public static function validateHMAC($rHMAC, $rExpiry, $rStreamID, $rExtension, $rIP = '', $rMACIP = '', $rIdentifier = '', $rMaxConnections = 0) {
+	public static function validateHMAC(string $rHMAC, int|string $rExpiry, int|string $rStreamID, string $rExtension, string $rIP = '', string $rMACIP = '', string $rIdentifier = '', int $rMaxConnections = 0) {
 		global $db, $rSettings;
 		$rCached = $rSettings['enable_cache'];
 		if (0 < strlen($rIP) && 0 < strlen($rMACIP) && $rIP != $rMACIP) {
@@ -223,7 +223,7 @@ class AuthService {
 		if ($rCached) {
 			$rKeys = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'hmac_keys'));
 		} else {
-			$rKeys = array();
+			$rKeys = [];
 			$db->query('SELECT `id`, `key` FROM `hmac_keys` WHERE `enabled` = 1;');
 			foreach ($db->get_rows() as $rKey) {
 				$rKeys[] = $rKey;
diff --git a/src/Core/Auth/Authenticator.php b/src/Core/Auth/Authenticator.php
index 9370d4f9..24b67833 100644
--- a/src/Core/Auth/Authenticator.php
+++ b/src/Core/Auth/Authenticator.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Auth;
 
@@ -37,7 +36,7 @@ class Authenticator {
 			return false;
 		}
 
-		$rPost = http_build_query(array('secret' => $rSecret, 'response' => $rToken));
+		$rPost = http_build_query(['secret' => $rSecret, 'response' => $rToken]);
 		$rUrl  = 'https://www.google.com/recaptcha/api/siteverify';
 		$rRaw  = false;
 		$rErr  = '';
@@ -93,7 +92,7 @@ class Authenticator {
 		global $db, $rSettings;
 		if (!empty($rSettings['recaptcha_enable']) && !$rBypassRecaptcha) {
 			if (!self::verifyRecaptcha($rData['g-recaptcha-response'] ?? '')) {
-				return array('status' => STATUS_INVALID_CAPTCHA);
+				return ['status' => STATUS_INVALID_CAPTCHA];
 			}
 		}
 
@@ -105,7 +104,7 @@ class Authenticator {
 			// Always recorded, whatever save_login_logs says: these rows are what
 			// the login flood limit counts (loginFloodExceeded).
 			$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('ADMIN', ?, 0, ?, ?, ?);", $rAccessCode['id'] ?? null, 'INVALID_LOGIN', $rIP, time());
-			return array('status' => STATUS_FAILURE);
+			return ['status' => STATUS_FAILURE];
 		}
 
 		$db->query('SELECT COUNT(*) AS `count` FROM `access_codes`;');
@@ -119,7 +118,7 @@ class Authenticator {
 			if (!empty($rSettings['save_login_logs'])) {
 				$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('ADMIN', ?, ?, ?, ?, ?);", $rAccessCode['id'], $rUserInfo['id'], 'INVALID_CODE', $rIP, time());
 			}
-			return array('status' => STATUS_INVALID_CODE);
+			return ['status' => STATUS_INVALID_CODE];
 		}
 
 		$rPermissions = AuthRepository::getPermissions($rUserInfo['member_group_id']);
@@ -127,7 +126,7 @@ class Authenticator {
 			if (!empty($rSettings['save_login_logs'])) {
 				$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('ADMIN', ?, ?, ?, ?, ?);", $rAccessCode['id'], $rUserInfo['id'], 'NOT_ADMIN', $rIP, time());
 			}
-			return array('status' => STATUS_NOT_ADMIN);
+			return ['status' => STATUS_NOT_ADMIN];
 		}
 
 		if ($rUserInfo['status'] == 1) {
@@ -143,17 +142,17 @@ class Authenticator {
 			if (!empty($rSettings['save_login_logs'])) {
 				$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('ADMIN', ?, ?, ?, ?, ?);", $rAccessCode['id'], $rUserInfo['id'], 'SUCCESS', $rIP, time());
 			}
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		}
 
 		if (!$rUserInfo['status']) {
 			if (!empty($rSettings['save_login_logs'])) {
 				$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('ADMIN', ?, ?, ?, ?, ?);", $rAccessCode['id'], $rUserInfo['id'], 'DISABLED', $rIP, time());
 			}
-			return array('status' => STATUS_DISABLED);
+			return ['status' => STATUS_DISABLED];
 		}
 
-		return array('status' => STATUS_FAILURE);
+		return ['status' => STATUS_FAILURE];
 	}
 
 	/**
@@ -166,7 +165,7 @@ class Authenticator {
 		global $db, $rSettings;
 		if (!empty($rSettings['recaptcha_enable'])) {
 			if (!self::verifyRecaptcha($rData['g-recaptcha-response'] ?? '')) {
-				return array('status' => STATUS_INVALID_CAPTCHA);
+				return ['status' => STATUS_INVALID_CAPTCHA];
 			}
 		}
 
@@ -177,14 +176,14 @@ class Authenticator {
 		if (!isset($rUserInfo)) {
 			// Always recorded: the login flood limit counts these (see login()).
 			$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('RESELLER', ?, 0, ?, ?, ?);", $rAccessCode['id'] ?? null, 'INVALID_LOGIN', $rIP, time());
-			return array('status' => STATUS_FAILURE);
+			return ['status' => STATUS_FAILURE];
 		}
 
 		if (!(in_array($rUserInfo['member_group_id'], ($rAccessCode && isset($rAccessCode['groups'])) ? (json_decode($rAccessCode['groups'], true) ?: []) : []) || count(AuthRepository::getActiveCodes(MAIN_HOME)) == 0)) {
 			if (!empty($rSettings['save_login_logs'])) {
 				$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('RESELLER', ?, ?, ?, ?, ?);", $rAccessCode['id'], $rUserInfo['id'], 'INVALID_CODE', $rIP, time());
 			}
-			return array('status' => STATUS_INVALID_CODE);
+			return ['status' => STATUS_INVALID_CODE];
 		}
 
 		$rPermissions = AuthRepository::getPermissions($rUserInfo['member_group_id']);
@@ -192,7 +191,7 @@ class Authenticator {
 			if (!empty($rSettings['save_login_logs'])) {
 				$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('RESELLER', ?, ?, ?, ?, ?);", $rAccessCode['id'], $rUserInfo['id'], 'NOT_ADMIN', $rIP, time());
 			}
-			return array('status' => STATUS_NOT_RESELLER);
+			return ['status' => STATUS_NOT_RESELLER];
 		}
 
 		if ($rUserInfo['status'] == 1) {
@@ -208,17 +207,17 @@ class Authenticator {
 			if (!empty($rSettings['save_login_logs'])) {
 				$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('RESELLER', ?, ?, ?, ?, ?);", $rAccessCode['id'], $rUserInfo['id'], 'SUCCESS', $rIP, time());
 			}
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		}
 
 		if (!$rUserInfo['status']) {
 			if (!empty($rSettings['save_login_logs'])) {
 				$db->query("INSERT INTO `login_logs`(`type`, `access_code`, `user_id`, `status`, `login_ip`, `date`) VALUES('RESELLER', ?, ?, ?, ?, ?);", $rAccessCode['id'], $rUserInfo['id'], 'DISABLED', $rIP, time());
 			}
-			return array('status' => STATUS_DISABLED);
+			return ['status' => STATUS_DISABLED];
 		}
 
-		return array('status' => STATUS_FAILURE);
+		return ['status' => STATUS_FAILURE];
 	}
 
 	/**
diff --git a/src/Core/Auth/Authorization.php b/src/Core/Auth/Authorization.php
index 40902551..88f71acd 100644
--- a/src/Core/Auth/Authorization.php
+++ b/src/Core/Auth/Authorization.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Auth;
 
@@ -48,7 +47,7 @@ class Authorization {
 		}
 
 		if ($rType == 'user') {
-			$rReports = array_map('intval', array_merge(array($rUserInfo['id']), $rPermissions['all_reports']));
+			$rReports = array_map('intval', array_merge([$rUserInfo['id']], $rPermissions['all_reports']));
 
 			if (0 < count($rReports)) {
 				$db->query('SELECT `id` FROM `users` WHERE `id` = ? AND (`owner_id` IN (' . implode(',', $rReports) . ') OR `id` = ?);', $rID, $rUserInfo['id']);
@@ -59,7 +58,7 @@ class Authorization {
 		}
 
 		if ($rType == 'line') {
-			$rReports = array_map('intval', array_merge(array($rUserInfo['id']), $rPermissions['all_reports']));
+			$rReports = array_map('intval', array_merge([$rUserInfo['id']], $rPermissions['all_reports']));
 			if (0 < count($rReports)) {
 				$db->query('SELECT `id` FROM `lines` WHERE `id` = ? AND `member_id` IN (' . implode(',', $rReports) . ');', $rID);
 				return 0 < $db->num_rows();
@@ -72,7 +71,7 @@ class Authorization {
 		}
 
 		if (0 < count($rPermissions['advanced']) && $rUserInfo['member_group_id'] != 1) {
-			return in_array($rID, ($rPermissions['advanced'] ?: array()));
+			return in_array($rID, ($rPermissions['advanced'] ?: []));
 		}
 
 		return true;
diff --git a/src/Core/Auth/BruteforceGuard.php b/src/Core/Auth/BruteforceGuard.php
index 9069bd50..344dfa2b 100644
--- a/src/Core/Auth/BruteforceGuard.php
+++ b/src/Core/Auth/BruteforceGuard.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Auth;
 
@@ -25,306 +24,304 @@ use XcVm\Infrastructure\Signal\SignalQueue;
  */
 
 class BruteforceGuard {
-    /**
-     * Resolve panel settings, preferring SettingsManager over the legacy global.
-     *
-     * @return array Settings array, or [] when none are available.
-     */
-    private static function getSettings(): array {
-        if (!empty(SettingsManager::getAll())) {
-            return SettingsManager::getAll();
-        }
-        if (!empty($GLOBALS['rSettings'])) {
-            return $GLOBALS['rSettings'];
-        }
-        return array();
-    }
+	/**
+	 * Resolve panel settings, preferring SettingsManager over the legacy global.
+	 *
+	 * @return array Settings array, or [] when none are available.
+	 */
+	private static function getSettings(): array {
+		if (!empty(SettingsManager::getAll())) {
+			return SettingsManager::getAll();
+		}
+		if (!empty($GLOBALS['rSettings'])) {
+			return $GLOBALS['rSettings'];
+		}
+		return [];
+	}
 
-    /**
-     * Resolve the user's IP address.
-     *
-     * @return string
-     */
-    private static function getUserIP(): string {
-        if (class_exists(NetworkUtils::class, false)) {
-            return NetworkUtils::getUserIP();
-        }
-        return $_SERVER['REMOTE_ADDR'] ?? '';
-    }
+	/**
+	 * Resolve the user's IP address.
+	 *
+	 * @return string
+	 */
+	private static function getUserIP(): string {
+		if (class_exists(NetworkUtils::class, false)) {
+			return NetworkUtils::getUserIP();
+		}
+		return $_SERVER['REMOTE_ADDR'] ?? '';
+	}
 
-    /**
-     * Get the allowed IPs list.
-     *
-     * @return array
-     */
-    private static function getAllowedIPs(): array {
-        if (class_exists(ServerRepository::class, false)) {
-            return ServerRepository::getAllowedIPs();
-        }
-        if (isset($GLOBALS['rAllowedIPs'])) {
-            return $GLOBALS['rAllowedIPs'];
-        }
-        return array();
-    }
+	/**
+	 * Get the allowed IPs list.
+	 *
+	 * @return array
+	 */
+	private static function getAllowedIPs(): array {
+		if (class_exists(ServerRepository::class, false)) {
+			return ServerRepository::getAllowedIPs();
+		}
+		if (isset($GLOBALS['rAllowedIPs'])) {
+			return $GLOBALS['rAllowedIPs'];
+		}
+		return [];
+	}
 
-    /**
-     * Get the blocked IPs list.
-     *
-     * @return array
-     */
-    private static function getBlockedIPs(): array {
-        if (class_exists(BlocklistService::class, false)) {
-            return BlocklistService::getBlockedIPs();
-        }
-        if (isset($GLOBALS['rBlockedIPs'])) {
-            return $GLOBALS['rBlockedIPs'];
-        }
-        return array();
-    }
+	/**
+	 * Get the blocked IPs list.
+	 *
+	 * @return array
+	 */
+	private static function getBlockedIPs(): array {
+		if (class_exists(BlocklistService::class, false)) {
+			return BlocklistService::getBlockedIPs();
+		}
+		if (isset($GLOBALS['rBlockedIPs'])) {
+			return $GLOBALS['rBlockedIPs'];
+		}
+		return [];
+	}
 
-    /**
-     * Get database instance.
-     *
-     * @return object|null
-     */
-    private static function getDB(): ?object {
-        if (class_exists(DatabaseFactory::class, false) && DatabaseFactory::get() !== null) {
-            return DatabaseFactory::get();
-        }
-        global $db;
-        if (is_object($db)) {
-            return $db;
-        }
-        return null;
-    }
+	/**
+	 * Get database instance.
+	 *
+	 * @return object|null
+	 */
+	private static function getDB(): ?object {
+		if (class_exists(DatabaseFactory::class, false) && DatabaseFactory::get() !== null) {
+			return DatabaseFactory::get();
+		}
+		global $db;
+		if (is_object($db)) {
+			return $db;
+		}
+		return null;
+	}
 
-    /**
-     * Block an IP: insert into DB (or signal if in cached/streaming mode).
-     *
-     * @param string $ip
-     * @param string $reason
-     * @param bool   $useCachedMode  Use signal-based blocking
-     */
-    private static function blockIP(string $ip, string $reason, bool $useCachedMode = false): void {
-        if ($useCachedMode && !empty($GLOBALS['rCached'])) {
-            $signalKey = (stripos($reason, 'BRUTEFORCE') !== false ? 'bruteforce_attack' : 'flood_attack');
-            SignalQueue::push($signalKey . '/' . $ip, 1);
-        } else {
-            $db = self::getDB();
-            if ($db) {
-                $db->query('INSERT INTO `blocked_ips` (`ip`,`notes`,`date`) VALUES(?,?,?)', $ip, $reason, time());
-            }
-            // Force-refresh blocked IPs cache
-            if (class_exists(BlocklistService::class, false)) {
-                BlocklistService::getBlockedIPs(true);
-            }
-        }
-        touch(FLOOD_TMP_PATH . 'block_' . $ip);
-    }
+	/**
+	 * Block an IP: insert into DB (or signal if in cached/streaming mode).
+	 *
+	 * @param bool   $useCachedMode  Use signal-based blocking
+	 */
+	private static function blockIP(string $ip, string $reason, bool $useCachedMode = false): void {
+		if ($useCachedMode && !empty($GLOBALS['rCached'])) {
+			$signalKey = (stripos($reason, 'BRUTEFORCE') !== false ? 'bruteforce_attack' : 'flood_attack');
+			SignalQueue::push($signalKey . '/' . $ip, 1);
+		} else {
+			$db = self::getDB();
+			if ($db) {
+				$db->query('INSERT INTO `blocked_ips` (`ip`,`notes`,`date`) VALUES(?,?,?)', $ip, $reason, time());
+			}
+			// Force-refresh blocked IPs cache
+			if (class_exists(BlocklistService::class, false)) {
+				BlocklistService::getBlockedIPs(true);
+			}
+		}
+		touch(FLOOD_TMP_PATH . 'block_' . $ip);
+	}
 
-    /**
-     * Check for flood attacks (too many requests per time window).
-     *
-     * @param string|null $ip            IP address (auto-detected if null)
-     * @param bool        $useCachedMode Use signal-based blocking for streaming context
-     */
-    public static function checkFlood(?string $ip = null, bool $useCachedMode = false): void {
-        $settings = self::getSettings();
-        if (empty($settings['flood_limit']) || $settings['flood_limit'] == 0) {
-            return;
-        }
+	/**
+	 * Check for flood attacks (too many requests per time window).
+	 *
+	 * @param string|null $ip            IP address (auto-detected if null)
+	 * @param bool        $useCachedMode Use signal-based blocking for streaming context
+	 */
+	public static function checkFlood(?string $ip = null, bool $useCachedMode = false): void {
+		$settings = self::getSettings();
+		if (empty($settings['flood_limit']) || $settings['flood_limit'] == 0) {
+			return;
+		}
 
-        if (!$ip) {
-            $ip = self::getUserIP();
-        }
+		if (!$ip) {
+			$ip = self::getUserIP();
+		}
 
-        $allowedIPs = self::getAllowedIPs();
-        if (empty($ip) || in_array($ip, $allowedIPs)) {
-            return;
-        }
+		$allowedIPs = self::getAllowedIPs();
+		if (empty($ip) || in_array($ip, $allowedIPs)) {
+			return;
+		}
 
-        $floodExclude = array_filter(array_unique(explode(',', $settings['flood_ips_exclude'] ?? '')));
-        if (in_array($ip, $floodExclude)) {
-            return;
-        }
+		$floodExclude = array_filter(array_unique(explode(',', $settings['flood_ips_exclude'] ?? '')));
+		if (in_array($ip, $floodExclude)) {
+			return;
+		}
 
-        $ipFile = FLOOD_TMP_PATH . $ip;
-        if (file_exists($ipFile)) {
-            $floodRow = json_decode(file_get_contents($ipFile), true);
-            $floodSeconds = $settings['flood_seconds'];
-            $floodLimit = $settings['flood_limit'];
+		$ipFile = FLOOD_TMP_PATH . $ip;
+		if (file_exists($ipFile)) {
+			$floodRow = json_decode(file_get_contents($ipFile), true);
+			$floodSeconds = $settings['flood_seconds'];
+			$floodLimit = $settings['flood_limit'];
 
-            if (time() - $floodRow['last_request'] <= $floodSeconds) {
-                $floodRow['requests']++;
-                if ($floodLimit > $floodRow['requests']) {
-                    $floodRow['last_request'] = time();
-                    file_put_contents($ipFile, json_encode($floodRow), LOCK_EX);
-                } else {
-                    $blockedIPs = self::getBlockedIPs();
-                    if (!in_array($ip, $blockedIPs)) {
-                        self::blockIP($ip, 'FLOOD ATTACK', $useCachedMode);
-                    } else {
-                        touch(FLOOD_TMP_PATH . 'block_' . $ip);
-                    }
-                    unlink($ipFile);
-                    return;
-                }
-            } else {
-                $floodRow['requests'] = 0;
-                $floodRow['last_request'] = time();
-                file_put_contents($ipFile, json_encode($floodRow), LOCK_EX);
-            }
-        } else {
-            file_put_contents($ipFile, json_encode(array('requests' => 0, 'last_request' => time())), LOCK_EX);
-        }
-    }
+			if (time() - $floodRow['last_request'] <= $floodSeconds) {
+				$floodRow['requests']++;
+				if ($floodLimit > $floodRow['requests']) {
+					$floodRow['last_request'] = time();
+					file_put_contents($ipFile, json_encode($floodRow), LOCK_EX);
+				} else {
+					$blockedIPs = self::getBlockedIPs();
+					if (!in_array($ip, $blockedIPs)) {
+						self::blockIP($ip, 'FLOOD ATTACK', $useCachedMode);
+					} else {
+						touch(FLOOD_TMP_PATH . 'block_' . $ip);
+					}
+					unlink($ipFile);
+					return;
+				}
+			} else {
+				$floodRow['requests'] = 0;
+				$floodRow['last_request'] = time();
+				file_put_contents($ipFile, json_encode($floodRow), LOCK_EX);
+			}
+		} else {
+			file_put_contents($ipFile, json_encode(['requests' => 0, 'last_request' => time()]), LOCK_EX);
+		}
+	}
 
-    /**
-     * Check for brute-force attacks (too many unique MACs/usernames).
-     *
-     * @param string|null $ip            IP address (auto-detected if null)
-     * @param string|null $mac           MAC address
-     * @param string|null $username      Username
-     * @param bool        $useCachedMode Use signal-based blocking for streaming context
-     */
-    public static function checkBruteforce(?string $ip = null, ?string $mac = null, ?string $username = null, bool $useCachedMode = false): void {
-        if (!$mac && !$username) {
-            return;
-        }
+	/**
+	 * Check for brute-force attacks (too many unique MACs/usernames).
+	 *
+	 * @param string|null $ip            IP address (auto-detected if null)
+	 * @param string|null $mac           MAC address
+	 * @param string|null $username      Username
+	 * @param bool        $useCachedMode Use signal-based blocking for streaming context
+	 */
+	public static function checkBruteforce(?string $ip = null, ?string $mac = null, ?string $username = null, bool $useCachedMode = false): void {
+		if (!$mac && !$username) {
+			return;
+		}
 
-        $settings = self::getSettings();
+		$settings = self::getSettings();
 
-        if ($mac && $settings['bruteforce_mac_attempts'] == 0) {
-            return;
-        }
-        if ($username && $settings['bruteforce_username_attempts'] == 0) {
-            return;
-        }
+		if ($mac && $settings['bruteforce_mac_attempts'] == 0) {
+			return;
+		}
+		if ($username && $settings['bruteforce_username_attempts'] == 0) {
+			return;
+		}
 
-        if (!$ip) {
-            $ip = self::getUserIP();
-        }
+		if (!$ip) {
+			$ip = self::getUserIP();
+		}
 
-        $allowedIPs = self::getAllowedIPs();
-        if (empty($ip) || in_array($ip, $allowedIPs)) {
-            return;
-        }
+		$allowedIPs = self::getAllowedIPs();
+		if (empty($ip) || in_array($ip, $allowedIPs)) {
+			return;
+		}
 
-        $floodExclude = array_filter(array_unique(explode(',', $settings['flood_ips_exclude'] ?? '')));
-        if (in_array($ip, $floodExclude)) {
-            return;
-        }
+		$floodExclude = array_filter(array_unique(explode(',', $settings['flood_ips_exclude'] ?? '')));
+		if (in_array($ip, $floodExclude)) {
+			return;
+		}
 
-        $floodType = (!is_null($mac) ? 'mac' : 'user');
-        $term = (!is_null($mac) ? $mac : $username);
-        $ipFile = FLOOD_TMP_PATH . $ip . '_' . $floodType;
+		$floodType = (!is_null($mac) ? 'mac' : 'user');
+		$term = (!is_null($mac) ? $mac : $username);
+		$ipFile = FLOOD_TMP_PATH . $ip . '_' . $floodType;
 
-        if (file_exists($ipFile)) {
-            $floodRow = json_decode(file_get_contents($ipFile), true);
-            $floodSeconds = intval($settings['bruteforce_frequency']);
-            $floodLimit = intval($settings[array('mac' => 'bruteforce_mac_attempts', 'user' => 'bruteforce_username_attempts')[$floodType]]);
-            $floodRow['attempts'] = self::truncateAttempts($floodRow['attempts'], $floodSeconds);
+		if (file_exists($ipFile)) {
+			$floodRow = json_decode(file_get_contents($ipFile), true);
+			$floodSeconds = intval($settings['bruteforce_frequency']);
+			$floodLimit = intval($settings[['mac' => 'bruteforce_mac_attempts', 'user' => 'bruteforce_username_attempts'][$floodType]]);
+			$floodRow['attempts'] = self::truncateAttempts($floodRow['attempts'], $floodSeconds);
 
-            if (!in_array($term, array_keys($floodRow['attempts']))) {
-                $floodRow['attempts'][$term] = time();
-                if ($floodLimit > count($floodRow['attempts'])) {
-                    file_put_contents($ipFile, json_encode($floodRow), LOCK_EX);
-                } else {
-                    $blockedIPs = self::getBlockedIPs();
-                    if (!in_array($ip, $blockedIPs)) {
-                        self::blockIP($ip, 'BRUTEFORCE ' . strtoupper($floodType) . ' ATTACK', $useCachedMode);
-                    } else {
-                        touch(FLOOD_TMP_PATH . 'block_' . $ip);
-                    }
-                    unlink($ipFile);
-                    return;
-                }
-            }
-        } else {
-            $floodRow = array('attempts' => array($term => time()));
-            file_put_contents($ipFile, json_encode($floodRow), LOCK_EX);
-        }
-    }
+			if (!in_array($term, array_keys($floodRow['attempts']))) {
+				$floodRow['attempts'][$term] = time();
+				if ($floodLimit > count($floodRow['attempts'])) {
+					file_put_contents($ipFile, json_encode($floodRow), LOCK_EX);
+				} else {
+					$blockedIPs = self::getBlockedIPs();
+					if (!in_array($ip, $blockedIPs)) {
+						self::blockIP($ip, 'BRUTEFORCE ' . strtoupper($floodType) . ' ATTACK', $useCachedMode);
+					} else {
+						touch(FLOOD_TMP_PATH . 'block_' . $ip);
+					}
+					unlink($ipFile);
+					return;
+				}
+			}
+		} else {
+			$floodRow = ['attempts' => [$term => time()]];
+			file_put_contents($ipFile, json_encode($floodRow), LOCK_EX);
+		}
+	}
 
-    /**
-     * Check for auth flood (too many auth requests from same user+IP).
-     *
-     * @param array       $user          User info array (must have 'id' and 'is_restreamer')
-     * @param string|null $ip            IP address (auto-detected if null)
-     */
-    public static function checkAuthFlood(array $user, ?string $ip = null): void {
-        $settings = self::getSettings();
-        if (empty($settings['auth_flood_limit']) || $settings['auth_flood_limit'] == 0) {
-            return;
-        }
+	/**
+	 * Check for auth flood (too many auth requests from same user+IP).
+	 *
+	 * @param array       $user          User info array (must have 'id' and 'is_restreamer')
+	 * @param string|null $ip            IP address (auto-detected if null)
+	 */
+	public static function checkAuthFlood(array $user, ?string $ip = null): void {
+		$settings = self::getSettings();
+		if (empty($settings['auth_flood_limit']) || $settings['auth_flood_limit'] == 0) {
+			return;
+		}
 
-        if (!empty($user['is_restreamer'])) {
-            return;
-        }
+		if (!empty($user['is_restreamer'])) {
+			return;
+		}
 
-        if (!$ip) {
-            $ip = self::getUserIP();
-        }
+		if (!$ip) {
+			$ip = self::getUserIP();
+		}
 
-        $allowedIPs = self::getAllowedIPs();
-        if (empty($ip) || in_array($ip, $allowedIPs)) {
-            return;
-        }
+		$allowedIPs = self::getAllowedIPs();
+		if (empty($ip) || in_array($ip, $allowedIPs)) {
+			return;
+		}
 
-        $floodExclude = array_filter(array_unique(explode(',', $settings['flood_ips_exclude'] ?? '')));
-        if (in_array($ip, $floodExclude)) {
-            return;
-        }
+		$floodExclude = array_filter(array_unique(explode(',', $settings['flood_ips_exclude'] ?? '')));
+		if (in_array($ip, $floodExclude)) {
+			return;
+		}
 
-        $userFile = FLOOD_TMP_PATH . intval($user['id']) . '_' . $ip;
-        if (file_exists($userFile)) {
-            $floodRow = json_decode(file_get_contents($userFile), true);
+		$userFile = FLOOD_TMP_PATH . intval($user['id']) . '_' . $ip;
+		if (file_exists($userFile)) {
+			$floodRow = json_decode(file_get_contents($userFile), true);
 
-            if (isset($floodRow['block_until']) && time() < $floodRow['block_until']) {
-                sleep(intval($settings['auth_flood_sleep']));
-            }
+			if (isset($floodRow['block_until']) && time() < $floodRow['block_until']) {
+				sleep(intval($settings['auth_flood_sleep']));
+			}
 
-            $floodSeconds = intval($settings['auth_flood_seconds']);
-            $floodLimit = intval($settings['auth_flood_limit']);
-            $floodRow['attempts'] = self::truncateAttempts($floodRow['attempts'], $floodSeconds, true);
+			$floodSeconds = intval($settings['auth_flood_seconds']);
+			$floodLimit = intval($settings['auth_flood_limit']);
+			$floodRow['attempts'] = self::truncateAttempts($floodRow['attempts'], $floodSeconds, true);
 
-            if (!($floodLimit > count($floodRow['attempts']))) {
-                $floodRow['block_until'] = time() + intval($settings['auth_flood_seconds']);
-            }
+			if (!($floodLimit > count($floodRow['attempts']))) {
+				$floodRow['block_until'] = time() + intval($settings['auth_flood_seconds']);
+			}
 
-            $floodRow['attempts'][] = time();
-            file_put_contents($userFile, json_encode($floodRow), LOCK_EX);
-        } else {
-            file_put_contents($userFile, json_encode(array('attempts' => array(time()))), LOCK_EX);
-        }
-    }
+			$floodRow['attempts'][] = time();
+			file_put_contents($userFile, json_encode($floodRow), LOCK_EX);
+		} else {
+			file_put_contents($userFile, json_encode(['attempts' => [time()]]), LOCK_EX);
+		}
+	}
 
-    /**
-     * Filter out expired attempts from the list.
-     *
-     * @param array $attempts   Array of attempts (keyed or indexed by time)
-     * @param int   $frequency  Time window in seconds
-     * @param bool  $list       If true, treat as indexed array; otherwise as associative
-     * @return array Filtered attempts
-     */
-    public static function truncateAttempts(array $attempts, int $frequency, bool $list = false): array {
-        $allowed = array();
-        $now = time();
+	/**
+	 * Filter out expired attempts from the list.
+	 *
+	 * @param array $attempts   Array of attempts (keyed or indexed by time)
+	 * @param int   $frequency  Time window in seconds
+	 * @param bool  $list       If true, treat as indexed array; otherwise as associative
+	 * @return array Filtered attempts
+	 */
+	public static function truncateAttempts(array $attempts, int $frequency, bool $list = false): array {
+		$allowed = [];
+		$now = time();
 
-        if ($list) {
-            foreach ($attempts as $attemptTime) {
-                if ($now - $attemptTime <= $frequency) {
-                    $allowed[] = $attemptTime;
-                }
-            }
-        } else {
-            foreach ($attempts as $attempt => $attemptTime) {
-                if ($now - $attemptTime <= $frequency) {
-                    $allowed[$attempt] = $attemptTime;
-                }
-            }
-        }
+		if ($list) {
+			foreach ($attempts as $attemptTime) {
+				if ($now - $attemptTime <= $frequency) {
+					$allowed[] = $attemptTime;
+				}
+			}
+		} else {
+			foreach ($attempts as $attempt => $attemptTime) {
+				if ($now - $attemptTime <= $frequency) {
+					$allowed[$attempt] = $attemptTime;
+				}
+			}
+		}
 
-        return $allowed;
-    }
+		return $allowed;
+	}
 }
diff --git a/src/Core/Auth/PageAuthorization.php b/src/Core/Auth/PageAuthorization.php
index a84a6bef..d0613504 100644
--- a/src/Core/Auth/PageAuthorization.php
+++ b/src/Core/Auth/PageAuthorization.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Auth;
 
diff --git a/src/Core/Auth/SessionManager.php b/src/Core/Auth/SessionManager.php
index 0ad87895..067e806c 100644
--- a/src/Core/Auth/SessionManager.php
+++ b/src/Core/Auth/SessionManager.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Auth;
 
@@ -49,256 +48,257 @@ namespace XcVm\Core\Auth;
  */
 
 class SessionManager {
+	public const DEFAULT_TIMEOUT = 60;
 
-    public const DEFAULT_TIMEOUT = 60;
+	protected static ?string $context = null;
 
-    protected static ?string $context = null;
-    protected static int $timeout = self::DEFAULT_TIMEOUT;
-    protected static bool $started = false;
+	protected static int $timeout = self::DEFAULT_TIMEOUT;
 
-    /** @var array<string, array<string, string>> */
-    protected static array $keyMap = [
-        'admin' => [
-            'auth'     => 'hash',
-            'activity' => 'last_activity',
-            'ip'       => 'ip',
-            'code'     => 'code',
-            'verify'   => 'verify',
-        ],
-        'reseller' => [
-            'auth'     => 'reseller',
-            'activity' => 'rlast_activity',
-            'ip'       => 'rip',
-            'code'     => 'rcode',
-            'verify'   => 'rverify',
-        ],
-        'player' => [
-            'auth'     => 'phash',
-            'verify'   => 'pverify',
-        ],
-    ];
+	protected static bool $started = false;
 
-    /**
-     * Start a session for the given context
-     *
-     * @param string $context 'admin' or 'reseller'
-     * @param int $timeout Timeout in minutes (default: 60)
-     */
-    public static function start(string $context, int $timeout = self::DEFAULT_TIMEOUT): void {
-        self::$context = $context;
-        self::$timeout = $timeout;
+	/** @var array<string, array<string, string>> */
+	protected static array $keyMap = [
+		'admin' => [
+			'auth'     => 'hash',
+			'activity' => 'last_activity',
+			'ip'       => 'ip',
+			'code'     => 'code',
+			'verify'   => 'verify',
+		],
+		'reseller' => [
+			'auth'     => 'reseller',
+			'activity' => 'rlast_activity',
+			'ip'       => 'rip',
+			'code'     => 'rcode',
+			'verify'   => 'rverify',
+		],
+		'player' => [
+			'auth'     => 'phash',
+			'verify'   => 'pverify',
+		],
+	];
 
-        if (session_status() === PHP_SESSION_NONE) {
-            session_start();
-        }
+	/**
+	 * Start a session for the given context
+	 *
+	 * @param string $context 'admin' or 'reseller'
+	 * @param int $timeout Timeout in minutes (default: 60)
+	 */
+	public static function start(string $context, int $timeout = self::DEFAULT_TIMEOUT): void {
+		self::$context = $context;
+		self::$timeout = $timeout;
 
-        self::$started = true;
-        self::checkTimeout();
-    }
+		if (session_status() === PHP_SESSION_NONE) {
+			session_start();
+		}
 
-    /**
-     * Require authentication — redirect to login if not authenticated
-     *
-     * If called as an AJAX endpoint (script_filename == session.php),
-     * returns JSON result instead of redirecting.
-     *
-     * @param string|null $loginUrl Override login redirect URL
-     */
-    public static function requireAuth(?string $loginUrl = null): void {
-        $authKey = self::getKey('auth');
+		self::$started = true;
+		self::checkTimeout();
+	}
 
-        // Direct access to session.php endpoint — return JSON status
-        if (basename($_SERVER['SCRIPT_FILENAME']) === 'session.php') {
-            $isAuth = isset($_SESSION[$authKey]);
-            echo json_encode(['result' => $isAuth]);
-            exit;
-        }
+	/**
+	 * Require authentication — redirect to login if not authenticated
+	 *
+	 * If called as an AJAX endpoint (script_filename == session.php),
+	 * returns JSON result instead of redirecting.
+	 *
+	 * @param string|null $loginUrl Override login redirect URL
+	 */
+	public static function requireAuth(?string $loginUrl = null): void {
+		$authKey = self::getKey('auth');
 
-        // Not authenticated — redirect to login
-        if (!isset($_SESSION[$authKey])) {
-            if ($loginUrl === null) {
-                $prefix = (self::$context === 'reseller') ? '' : './';
-                $loginUrl = $prefix . 'login?referrer=' . urlencode(basename($_SERVER['REQUEST_URI'], '.php'));
-            }
+		// Direct access to session.php endpoint — return JSON status
+		if (basename($_SERVER['SCRIPT_FILENAME']) === 'session.php') {
+			$isAuth = isset($_SESSION[$authKey]);
+			echo json_encode(['result' => $isAuth]);
+			exit;
+		}
 
-            header('Location: ' . $loginUrl);
-            exit;
-        }
+		// Not authenticated — redirect to login
+		if (!isset($_SESSION[$authKey])) {
+			if ($loginUrl === null) {
+				$prefix = (self::$context === 'reseller') ? '' : './';
+				$loginUrl = $prefix . 'login?referrer=' . urlencode(basename($_SERVER['REQUEST_URI'], '.php'));
+			}
 
-        // Authenticated — update activity timestamp and close session
-        self::touch();
-    }
+			header('Location: ' . $loginUrl);
+			exit;
+		}
 
-    /**
-     * Check if user is authenticated (non-blocking, no redirect)
-     *
-     * @return bool
-     */
-    public static function isAuthenticated(): bool {
-        if (!self::$started) {
-            return false;
-        }
+		// Authenticated — update activity timestamp and close session
+		self::touch();
+	}
 
-        $authKey = self::getKey('auth');
-        return isset($_SESSION[$authKey]);
-    }
+	/**
+	 * Check if user is authenticated (non-blocking, no redirect)
+	 *
+	 * @return bool
+	 */
+	public static function isAuthenticated(): bool {
+		if (!self::$started) {
+			return false;
+		}
 
-    /**
-     * Get the auth token/hash for current session
-     *
-     * @return mixed
-     */
-    public static function getUser(): mixed {
-        $authKey = self::getKey('auth');
-        return isset($_SESSION[$authKey]) ? $_SESSION[$authKey] : null;
-    }
+		$authKey = self::getKey('auth');
+		return isset($_SESSION[$authKey]);
+	}
 
-    /**
-     * Get a session value by logical name
-     *
-     * @param string $name Logical name: 'auth', 'activity', 'ip', 'code', 'verify'
-     * @return mixed
-     */
-    public static function getValue(string $name): mixed {
-        $key = self::getKey($name);
-        return isset($_SESSION[$key]) ? $_SESSION[$key] : null;
-    }
+	/**
+	 * Get the auth token/hash for current session
+	 *
+	 * @return mixed
+	 */
+	public static function getUser(): mixed {
+		$authKey = self::getKey('auth');
+		return isset($_SESSION[$authKey]) ? $_SESSION[$authKey] : null;
+	}
 
-    /**
-     * Set a session value by logical name
-     *
-     * @param string $name Logical name
-     * @param mixed $value Value to store
-     */
-    public static function setValue(string $name, mixed $value): void {
-        $key = self::getKey($name);
-        $_SESSION[$key] = $value;
-    }
+	/**
+	 * Get a session value by logical name
+	 *
+	 * @param string $name Logical name: 'auth', 'activity', 'ip', 'code', 'verify'
+	 * @return mixed
+	 */
+	public static function getValue(string $name): mixed {
+		$key = self::getKey($name);
+		return isset($_SESSION[$key]) ? $_SESSION[$key] : null;
+	}
 
-    /**
-     * Create an authenticated session
-     *
-     * @param mixed $hash Authentication hash/token
-     * @param string|null $ip Client IP address
-     */
-    public static function login(mixed $hash, ?string $ip = null): void {
-        if (session_status() === PHP_SESSION_NONE) {
-            session_start();
-        }
+	/**
+	 * Set a session value by logical name
+	 *
+	 * @param string $name Logical name
+	 * @param mixed $value Value to store
+	 */
+	public static function setValue(string $name, mixed $value): void {
+		$key = self::getKey($name);
+		$_SESSION[$key] = $value;
+	}
 
-        self::setValue('auth', $hash);
-        self::setValue('activity', time());
+	/**
+	 * Create an authenticated session
+	 *
+	 * @param mixed $hash Authentication hash/token
+	 * @param string|null $ip Client IP address
+	 */
+	public static function login(mixed $hash, ?string $ip = null): void {
+		if (session_status() === PHP_SESSION_NONE) {
+			session_start();
+		}
 
-        if ($ip !== null) {
-            self::setValue('ip', $ip);
-        }
-    }
+		self::setValue('auth', $hash);
+		self::setValue('activity', time());
 
-    /**
-     * Destroy the current session (logout)
-     */
-    public static function destroy(): void {
-        if (!self::$started && session_status() === PHP_SESSION_NONE) {
-            session_start();
-        }
+		if ($ip !== null) {
+			self::setValue('ip', $ip);
+		}
+	}
 
-        // Clear context-specific keys
-        foreach (self::$keyMap[self::$context] as $key) {
-            if (isset($_SESSION[$key])) {
-                unset($_SESSION[$key]);
-            }
-        }
+	/**
+	 * Destroy the current session (logout)
+	 */
+	public static function destroy(): void {
+		if (!self::$started && session_status() === PHP_SESSION_NONE) {
+			session_start();
+		}
 
-        // If no other context is active, destroy the whole session
-        $otherContext = (self::$context === 'admin') ? 'reseller' : 'admin';
-        $otherAuthKey = self::$keyMap[$otherContext]['auth'];
+		// Clear context-specific keys
+		foreach (self::$keyMap[self::$context] as $key) {
+			if (isset($_SESSION[$key])) {
+				unset($_SESSION[$key]);
+			}
+		}
 
-        if (!isset($_SESSION[$otherAuthKey])) {
-            session_destroy();
-        }
+		// If no other context is active, destroy the whole session
+		$otherContext = (self::$context === 'admin') ? 'reseller' : 'admin';
+		$otherAuthKey = self::$keyMap[$otherContext]['auth'];
 
-        self::$started = false;
-    }
+		if (!isset($_SESSION[$otherAuthKey])) {
+			session_destroy();
+		}
 
-    /**
-     * Clear session keys for a specific context without destroying the session.
-     * Drop-in replacement for legacy destroySession($type).
-     *
-     * @param string $context 'admin', 'reseller', or 'player'
-     */
-    public static function clearContext(string $context): void {
-        if (!isset(self::$keyMap[$context])) {
-            return;
-        }
-        foreach (self::$keyMap[$context] as $key) {
-            unset($_SESSION[$key]);
-        }
-    }
+		self::$started = false;
+	}
 
-    /**
-     * Update the last activity timestamp and close session for writing
-     */
-    public static function touch(): void {
-        $activityKey = self::getKey('activity');
-        $_SESSION[$activityKey] = time();
-        session_write_close();
-    }
+	/**
+	 * Clear session keys for a specific context without destroying the session.
+	 * Drop-in replacement for legacy destroySession($type).
+	 *
+	 * @param string $context 'admin', 'reseller', or 'player'
+	 */
+	public static function clearContext(string $context): void {
+		if (!isset(self::$keyMap[$context])) {
+			return;
+		}
+		foreach (self::$keyMap[$context] as $key) {
+			unset($_SESSION[$key]);
+		}
+	}
 
-    /**
-     * Get current context
-     *
-     * @return string|null
-     */
-    public static function getContext(): ?string {
-        return self::$context;
-    }
+	/**
+	 * Update the last activity timestamp and close session for writing
+	 */
+	public static function touch(): void {
+		$activityKey = self::getKey('activity');
+		$_SESSION[$activityKey] = time();
+		session_write_close();
+	}
 
-    // ───────────────────────────────────────────────────────────
-    //  Internal Methods
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Get current context
+	 *
+	 * @return string|null
+	 */
+	public static function getContext(): ?string {
+		return self::$context;
+	}
 
-    /**
-     * Check for session timeout and expire if needed
-     */
-    protected static function checkTimeout(): void {
-        $authKey = self::getKey('auth');
-        $activityKey = self::getKey('activity');
+	// ───────────────────────────────────────────────────────────
+	//  Internal Methods
+	// ───────────────────────────────────────────────────────────
 
-        if (isset($_SESSION[$authKey]) && isset($_SESSION[$activityKey])) {
-            $elapsed = time() - $_SESSION[$activityKey];
+	/**
+	 * Check for session timeout and expire if needed
+	 */
+	protected static function checkTimeout(): void {
+		$authKey = self::getKey('auth');
+		$activityKey = self::getKey('activity');
 
-            if ($elapsed > (self::$timeout * 60)) {
-                // Session expired — clear all context-specific keys
-                foreach (self::$keyMap[self::$context] as $key) {
-                    if (isset($_SESSION[$key])) {
-                        unset($_SESSION[$key]);
-                    }
-                }
+		if (isset($_SESSION[$authKey]) && isset($_SESSION[$activityKey])) {
+			$elapsed = time() - $_SESSION[$activityKey];
 
-                // Restart session if it was destroyed
-                if (session_status() === PHP_SESSION_NONE) {
-                    session_start();
-                }
-            }
-        }
-    }
+			if ($elapsed > (self::$timeout * 60)) {
+				// Session expired — clear all context-specific keys
+				foreach (self::$keyMap[self::$context] as $key) {
+					if (isset($_SESSION[$key])) {
+						unset($_SESSION[$key]);
+					}
+				}
 
-    /**
-     * Get the actual $_SESSION key for a logical name in current context
-     *
-     * @param string $name Logical name: 'auth', 'activity', 'ip', 'code', 'verify'
-     * @return string
-     */
-    protected static function getKey(string $name): string {
-        if (self::$context === null) {
-            self::$context = 'admin'; // default fallback
-        }
+				// Restart session if it was destroyed
+				if (session_status() === PHP_SESSION_NONE) {
+					session_start();
+				}
+			}
+		}
+	}
 
-        if (isset(self::$keyMap[self::$context][$name])) {
-            return self::$keyMap[self::$context][$name];
-        }
+	/**
+	 * Get the actual $_SESSION key for a logical name in current context
+	 *
+	 * @param string $name Logical name: 'auth', 'activity', 'ip', 'code', 'verify'
+	 * @return string
+	 */
+	protected static function getKey(string $name): string {
+		if (self::$context === null) {
+			self::$context = 'admin'; // default fallback
+		}
 
-        // Unknown key — return as-is (allows extending)
-        return $name;
-    }
+		if (isset(self::$keyMap[self::$context][$name])) {
+			return self::$keyMap[self::$context][$name];
+		}
+
+		// Unknown key — return as-is (allows extending)
+		return $name;
+	}
 }
diff --git a/src/Core/Backup/BackupService.php b/src/Core/Backup/BackupService.php
index ab8989b5..c4a58227 100644
--- a/src/Core/Backup/BackupService.php
+++ b/src/Core/Backup/BackupService.php
@@ -19,7 +19,6 @@ use XcVm\Core\Storage\DropboxClient;
  */
 
 class BackupService {
-
 	private static array $ignoreTables = [
 		'detect_restream_logs',
 		'epg_data',
@@ -49,7 +48,7 @@ class BackupService {
 	 *
 	 * @param string $filename Output SQL file path
 	 */
-	public static function create($filename) {
+	public static function create(string $filename) {
 		\XC_VM::db_dump($filename, self::$ignoreTables);
 	}
 
@@ -60,7 +59,7 @@ class BackupService {
 	 * @param string $filename SQL file path to restore
 	 * @return bool Whether the import succeeded
 	 */
-	public static function restore($filename) {
+	public static function restore(string $filename) {
 		if (!\XC_VM::db_restore($filename)) {
 			return false;
 		}
@@ -73,7 +72,7 @@ class BackupService {
 	 *
 	 * @param string $host Remote host IP
 	 */
-	public static function grantPrivileges($host) {
+	public static function grantPrivileges(string $host) {
 		\XC_VM::db_grant($host);
 	}
 
@@ -82,7 +81,7 @@ class BackupService {
 	 *
 	 * @param string $host Remote host IP
 	 */
-	public static function revokePrivileges($host) {
+	public static function revokePrivileges(string $host) {
 		\XC_VM::db_revoke($host);
 	}
 
@@ -92,14 +91,14 @@ class BackupService {
 	 * @return array[] Each entry: filename, timestamp, date, filesize.
 	 */
 	public static function getLocal() {
-		$rBackups = array();
+		$rBackups = [];
 
 		foreach (scandir(MAIN_HOME . 'backups/') as $rBackup) {
 			$rInfo = pathinfo(MAIN_HOME . 'backups/' . $rBackup);
 
 			if ($rInfo['extension'] != 'sql') {
 			} else {
-				$rBackups[] = array('filename' => $rBackup, 'timestamp' => filemtime(MAIN_HOME . 'backups/' . $rBackup), 'date' => date('Y-m-d H:i:s', filemtime(MAIN_HOME . 'backups/' . $rBackup)), 'filesize' => filesize(MAIN_HOME . 'backups/' . $rBackup));
+				$rBackups[] = ['filename' => $rBackup, 'timestamp' => filemtime(MAIN_HOME . 'backups/' . $rBackup), 'date' => date('Y-m-d H:i:s', filemtime(MAIN_HOME . 'backups/' . $rBackup)), 'filesize' => filesize(MAIN_HOME . 'backups/' . $rBackup)];
 			}
 		}
 		usort(
@@ -121,7 +120,7 @@ class BackupService {
 
 		try {
 			$rClient = new DropboxClient();
-			$rClient->SetBearerToken(array('t' => SettingsManager::get('dropbox_token')));
+			$rClient->SetBearerToken(['t' => SettingsManager::get('dropbox_token')]);
 			$rClient->GetFiles();
 
 			return true;
@@ -139,12 +138,12 @@ class BackupService {
 
 		try {
 			$rClient = new DropboxClient();
-			$rClient->SetBearerToken(array('t' => SettingsManager::get('dropbox_token')));
+			$rClient->SetBearerToken(['t' => SettingsManager::get('dropbox_token')]);
 			$rFiles = $rClient->GetFiles();
 		} catch (\exception $e) {
-			$rFiles = array();
+			$rFiles = [];
 		}
-		$rBackups = array();
+		$rBackups = [];
 
 		foreach ($rFiles as $rFile) {
 			try {
@@ -169,11 +168,11 @@ class BackupService {
 	 * @param string $rFilename Local destination path.
 	 * @return bool True on success.
 	 */
-	public static function downloadRemote($rPath, $rFilename) {
+	public static function downloadRemote(string $rPath, string $rFilename) {
 		$rClient = new DropboxClient();
 
 		try {
-			$rClient->SetBearerToken(array('t' => SettingsManager::get('dropbox_token')));
+			$rClient->SetBearerToken(['t' => SettingsManager::get('dropbox_token')]);
 			$rClient->downloadFile($rPath, $rFilename);
 
 			return true;
@@ -190,15 +189,15 @@ class BackupService {
 	 * @param bool   $rOverwrite Overwrite an existing remote file.
 	 * @return mixed Upload result, or an object with an 'error' key on failure.
 	 */
-	public static function uploadRemote($rPath, $rFilename, $rOverwrite = true) {
+	public static function uploadRemote(string $rPath, string $rFilename, bool $rOverwrite = true) {
 		$rClient = new DropboxClient();
 
 		try {
-			$rClient->SetBearerToken(array('t' => SettingsManager::get('dropbox_token')));
+			$rClient->SetBearerToken(['t' => SettingsManager::get('dropbox_token')]);
 
 			return $rClient->UploadFile($rFilename, $rPath, $rOverwrite);
 		} catch (\exception $e) {
-			return (object) array('error' => $e);
+			return (object) ['error' => $e];
 		}
 	}
 
@@ -208,11 +207,11 @@ class BackupService {
 	 * @param string $rPath Remote path to delete.
 	 * @return bool True on success.
 	 */
-	public static function deleteRemote($rPath) {
+	public static function deleteRemote(string $rPath) {
 		$rClient = new DropboxClient();
 
 		try {
-			$rClient->SetBearerToken(array('t' => SettingsManager::get('dropbox_token')));
+			$rClient->SetBearerToken(['t' => SettingsManager::get('dropbox_token')]);
 			$rClient->Delete($rPath);
 
 			return true;
diff --git a/src/Core/Cache/CacheInterface.php b/src/Core/Cache/CacheInterface.php
index 717494e3..ce178f02 100644
--- a/src/Core/Cache/CacheInterface.php
+++ b/src/Core/Cache/CacheInterface.php
@@ -42,47 +42,46 @@ namespace XcVm\Core\Cache;
  */
 
 interface CacheInterface {
+	/**
+	 * Retrieve a value from cache
+	 *
+	 * @param string $key Cache key
+	 * @param int|null $maxAge Maximum age in seconds (null = no limit)
+	 * @return mixed|false Cached data or false if not found / expired
+	 */
+	public function get(string $key, ?int $maxAge = null);
 
-    /**
-     * Retrieve a value from cache
-     *
-     * @param string $key Cache key
-     * @param int|null $maxAge Maximum age in seconds (null = no limit)
-     * @return mixed|false Cached data or false if not found / expired
-     */
-    public function get($key, $maxAge = null);
+	/**
+	 * Store a value in cache
+	 *
+	 * @param string $key Cache key
+	 * @param mixed $data Data to store
+	 * @param int $ttl Time to live in seconds (0 = forever)
+	 * @return bool Success
+	 */
+	public function set(string $key, mixed $data, int $ttl = 0);
 
-    /**
-     * Store a value in cache
-     *
-     * @param string $key Cache key
-     * @param mixed $data Data to store
-     * @param int $ttl Time to live in seconds (0 = forever)
-     * @return bool Success
-     */
-    public function set($key, $data, $ttl = 0);
+	/**
+	 * Delete a cache entry
+	 *
+	 * @param string $key Cache key
+	 * @return bool Success
+	 */
+	public function delete(string $key);
 
-    /**
-     * Delete a cache entry
-     *
-     * @param string $key Cache key
-     * @return bool Success
-     */
-    public function delete($key);
+	/**
+	 * Check if a cache key exists (and is not expired)
+	 *
+	 * @param string $key Cache key
+	 * @param int|null $maxAge Maximum age in seconds (null = no limit)
+	 * @return bool
+	 */
+	public function has(string $key, ?int $maxAge = null);
 
-    /**
-     * Check if a cache key exists (and is not expired)
-     *
-     * @param string $key Cache key
-     * @param int|null $maxAge Maximum age in seconds (null = no limit)
-     * @return bool
-     */
-    public function has($key, $maxAge = null);
-
-    /**
-     * Clear all cache entries
-     *
-     * @return bool Success
-     */
-    public function flush();
+	/**
+	 * Clear all cache entries
+	 *
+	 * @return bool Success
+	 */
+	public function flush();
 }
diff --git a/src/Core/Cache/FileCache.php b/src/Core/Cache/FileCache.php
index f024e5a5..01f5dd38 100644
--- a/src/Core/Cache/FileCache.php
+++ b/src/Core/Cache/FileCache.php
@@ -34,278 +34,275 @@ namespace XcVm\Core\Cache;
  */
 
 class FileCache implements CacheInterface {
+	/** @var string Base directory for cache files */
+	protected $basePath;
 
-    /** @var string Base directory for cache files */
-    protected $basePath;
+	/** @var bool Whether igbinary extension is available */
+	protected $useIgbinary;
 
-    /** @var bool Whether igbinary extension is available */
-    protected $useIgbinary;
+	/**
+	 * @param string $basePath Directory for cache files (must end with /)
+	 */
+	public function __construct(string $basePath) {
+		$this->basePath = rtrim($basePath, '/') . '/';
+		$this->useIgbinary = function_exists('igbinary_serialize');
 
-    /**
-     * @param string $basePath Directory for cache files (must end with /)
-     */
-    public function __construct($basePath) {
-        $this->basePath = rtrim($basePath, '/') . '/';
-        $this->useIgbinary = function_exists('igbinary_serialize');
+		if (!is_dir($this->basePath)) {
+			@mkdir($this->basePath, 0755, true);
+		}
+		// A root-context boot (installer, `console.php status`) must leave the
+		// cache dir owned by the panel user, or xc_vm processes cannot create
+		// cache files in it afterwards. Same pattern as set().
+		if (function_exists('posix_geteuid') && posix_geteuid() === 0) {
+			@chown($this->basePath, 'xc_vm');
+			@chgrp($this->basePath, 'xc_vm');
+		}
+	}
 
-        if (!is_dir($this->basePath)) {
-            @mkdir($this->basePath, 0755, true);
-        }
-        // A root-context boot (installer, `console.php status`) must leave the
-        // cache dir owned by the panel user, or xc_vm processes cannot create
-        // cache files in it afterwards. Same pattern as set().
-        if (function_exists('posix_geteuid') && posix_geteuid() === 0) {
-            @chown($this->basePath, 'xc_vm');
-            @chgrp($this->basePath, 'xc_vm');
-        }
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($key, $maxAge = null) {
+		$file = $this->basePath . $key;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function get($key, $maxAge = null) {
-        $file = $this->basePath . $key;
+		if (!file_exists($file)) {
+			return false;
+		}
 
-        if (!file_exists($file)) {
-            return false;
-        }
+		// Check TTL based on file modification time
+		if ($maxAge !== null) {
+			$age = time() - filemtime($file);
+			if ($age >= $maxAge) {
+				return false;
+			}
+		}
 
-        // Check TTL based on file modification time
-        if ($maxAge !== null) {
-            $age = time() - filemtime($file);
-            if ($age >= $maxAge) {
-                return false;
-            }
-        }
+		$data = @file_get_contents($file);
 
-        $data = @file_get_contents($file);
+		if ($data === false || $data === '') {
+			@unlink($file);
+			return false;
+		}
 
-        if ($data === false || $data === '') {
-            @unlink($file);
-            return false;
-        }
+		$result = $this->deserialize($data);
 
-        $result = $this->deserialize($data);
+		if ($result === false) {
+			@unlink($file);
+		}
 
-        if ($result === false) {
-            @unlink($file);
-        }
+		return $result;
+	}
 
-        return $result;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set($key, $data, $ttl = 0) {
+		$file = $this->basePath . $key;
+		$serialized = $this->serialize($data);
 
-    /**
-     * {@inheritdoc}
-     */
-    public function set($key, $data, $ttl = 0) {
-        $file = $this->basePath . $key;
-        $serialized = $this->serialize($data);
+		$tmp = $file . '.' . getmypid() . '.tmp';
+		if (@file_put_contents($tmp, $serialized, LOCK_EX) === false) {
+			@unlink($tmp);
+			$this->warnWriteFailure($file);
+			return false;
+		}
+		if (!@rename($tmp, $file)) {
+			@unlink($tmp);
+			$this->warnWriteFailure($file);
+			return false;
+		}
+		// A root-context write (installer, `console.php status`) must stay
+		// owned by the panel user, or xc_vm daemons cannot refresh the file
+		// later. Same pattern as Logger.
+		if (function_exists('posix_geteuid') && posix_geteuid() === 0) {
+			@chown($file, 'xc_vm');
+			@chgrp($file, 'xc_vm');
+		}
+		return true;
+	}
 
-        $tmp = $file . '.' . getmypid() . '.tmp';
-        if (@file_put_contents($tmp, $serialized, LOCK_EX) === false) {
-            @unlink($tmp);
-            $this->warnWriteFailure($file);
-            return false;
-        }
-        if (!@rename($tmp, $file)) {
-            @unlink($tmp);
-            $this->warnWriteFailure($file);
-            return false;
-        }
-        // A root-context write (installer, `console.php status`) must stay
-        // owned by the panel user, or xc_vm daemons cannot refresh the file
-        // later. Same pattern as Logger.
-        if (function_exists('posix_geteuid') && posix_geteuid() === 0) {
-            @chown($file, 'xc_vm');
-            @chgrp($file, 'xc_vm');
-        }
-        return true;
-    }
+	/**
+	 * Report a failed cache write once per process.
+	 *
+	 * A silently stale cache (bad tmp/ ownership, full or missing tmpfs) keeps
+	 * the panel running on outdated settings with no visible symptom, so the
+	 * first failure must reach the panel log via the error handler.
+	 *
+	 * @param string $file Cache file path that could not be written.
+	 */
+	protected function warnWriteFailure(string $file) {
+		static $warned = false;
+		if ($warned) {
+			return;
+		}
+		$warned = true;
+		trigger_error('FileCache: cache write failed for ' . $file . ' — serving stale cache', E_USER_WARNING);
+	}
 
-    /**
-     * Report a failed cache write once per process.
-     *
-     * A silently stale cache (bad tmp/ ownership, full or missing tmpfs) keeps
-     * the panel running on outdated settings with no visible symptom, so the
-     * first failure must reach the panel log via the error handler.
-     *
-     * @param string $file Cache file path that could not be written.
-     */
-    protected function warnWriteFailure($file) {
-        static $warned = false;
-        if ($warned) {
-            return;
-        }
-        $warned = true;
-        trigger_error('FileCache: cache write failed for ' . $file . ' — serving stale cache', E_USER_WARNING);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function delete($key) {
+		$file = $this->basePath . $key;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function delete($key) {
-        $file = $this->basePath . $key;
+		if (file_exists($file)) {
+			return unlink($file);
+		}
 
-        if (file_exists($file)) {
-            return unlink($file);
-        }
+		return true;
+	}
 
-        return true;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function has($key, $maxAge = null) {
+		$file = $this->basePath . $key;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function has($key, $maxAge = null) {
-        $file = $this->basePath . $key;
+		if (!file_exists($file)) {
+			return false;
+		}
 
-        if (!file_exists($file)) {
-            return false;
-        }
+		if ($maxAge !== null) {
+			$age = time() - filemtime($file);
+			if ($age >= $maxAge) {
+				return false;
+			}
+		}
 
-        if ($maxAge !== null) {
-            $age = time() - filemtime($file);
-            if ($age >= $maxAge) {
-                return false;
-            }
-        }
+		return true;
+	}
 
-        return true;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function flush() {
+		$files = glob($this->basePath . '*');
 
-    /**
-     * {@inheritdoc}
-     */
-    public function flush() {
-        $files = glob($this->basePath . '*');
+		if ($files === false) {
+			return false;
+		}
 
-        if ($files === false) {
-            return false;
-        }
+		foreach ($files as $file) {
+			if (is_file($file)) {
+				unlink($file);
+			}
+		}
 
-        foreach ($files as $file) {
-            if (is_file($file)) {
-                unlink($file);
-            }
-        }
+		return true;
+	}
 
-        return true;
-    }
+	/**
+	 * Get the file path for a cache key
+	 *
+	 * Useful for direct file operations (e.g., file_exists checks
+	 * in legacy code during migration).
+	 *
+	 * @param string $key Cache key
+	 * @return string Full file path
+	 */
+	public function getPath(string $key) {
+		return $this->basePath . $key;
+	}
 
-    /**
-     * Get the file path for a cache key
-     *
-     * Useful for direct file operations (e.g., file_exists checks
-     * in legacy code during migration).
-     *
-     * @param string $key Cache key
-     * @return string Full file path
-     */
-    public function getPath($key) {
-        return $this->basePath . $key;
-    }
+	/**
+	 * Get the base directory path
+	 *
+	 * @return string
+	 */
+	public function getBasePath() {
+		return $this->basePath;
+	}
 
-    /**
-     * Get the base directory path
-     *
-     * @return string
-     */
-    public function getBasePath() {
-        return $this->basePath;
-    }
+	/**
+	 * Get modification time of a cache entry
+	 *
+	 * @param string $key Cache key
+	 * @return int|false Unix timestamp or false if not found
+	 */
+	public function getAge(string $key) {
+		$file = $this->basePath . $key;
 
-    /**
-     * Get modification time of a cache entry
-     *
-     * @param string $key Cache key
-     * @return int|false Unix timestamp or false if not found
-     */
-    public function getAge($key) {
-        $file = $this->basePath . $key;
+		if (!file_exists($file)) {
+			return false;
+		}
 
-        if (!file_exists($file)) {
-            return false;
-        }
+		return time() - filemtime($file);
+	}
 
-        return time() - filemtime($file);
-    }
+	/**
+	 * Serialize data using igbinary (if available) or PHP serialize
+	 *
+	 * @return string
+	 */
+	protected function serialize(mixed $data) {
+		if ($this->useIgbinary) {
+			return igbinary_serialize($data);
+		}
 
-    /**
-     * Serialize data using igbinary (if available) or PHP serialize
-     *
-     * @param mixed $data
-     * @return string
-     */
-    protected function serialize($data) {
-        if ($this->useIgbinary) {
-            return igbinary_serialize($data);
-        }
+		return serialize($data);
+	}
 
-        return serialize($data);
-    }
+	/**
+	 * Deserialize data using igbinary (if available) or PHP unserialize
+	 *
+	 * Returns false on corrupted data (cache miss).
+	 *
+	 * @return mixed|false
+	 */
+	protected function deserialize(string $data) {
+		if ($this->useIgbinary) {
+			$result = @igbinary_unserialize($data);
+			if ($result === false && $data !== igbinary_serialize(false)) {
+				return false;
+			}
+			return $result;
+		}
 
-    /**
-     * Deserialize data using igbinary (if available) or PHP unserialize
-     *
-     * Returns false on corrupted data (cache miss).
-     *
-     * @param string $data
-     * @return mixed|false
-     */
-    protected function deserialize($data) {
-        if ($this->useIgbinary) {
-            $result = @igbinary_unserialize($data);
-            if ($result === false && $data !== igbinary_serialize(false)) {
-                return false;
-            }
-            return $result;
-        }
+		$result = @unserialize($data);
+		if ($result === false && $data !== serialize(false)) {
+			return false;
+		}
+		return $result;
+	}
 
-        $result = @unserialize($data);
-        if ($result === false && $data !== serialize(false)) {
-            return false;
-        }
-        return $result;
-    }
+	// ------------------------------------------------------------------
+	//  Static convenience API (drop-in replacement for CoreUtilities)
+	// ------------------------------------------------------------------
 
-    // ------------------------------------------------------------------
-    //  Static convenience API (drop-in replacement for CoreUtilities)
-    // ------------------------------------------------------------------
+	/** @var self|null Singleton instance for static calls */
+	private static $defaultInstance;
 
-    /** @var self|null Singleton instance for static calls */
-    private static $defaultInstance;
+	/**
+	 * Get the default singleton instance (uses CACHE_TMP_PATH)
+	 *
+	 * @return self
+	 */
+	private static function getDefault() {
+		if (!self::$defaultInstance) {
+			self::$defaultInstance = new self(CACHE_TMP_PATH);
+		}
+		return self::$defaultInstance;
+	}
 
-    /**
-     * Get the default singleton instance (uses CACHE_TMP_PATH)
-     *
-     * @return self
-     */
-    private static function getDefault() {
-        if (!self::$defaultInstance) {
-            self::$defaultInstance = new self(CACHE_TMP_PATH);
-        }
-        return self::$defaultInstance;
-    }
+	/**
+	 * Static write — drop-in for CoreUtilities::setCache()
+	 *
+	 * @param string $key   Cache key
+	 * @param mixed  $data  Data to cache
+	 * @return bool
+	 */
+	public static function setCache(string $key, mixed $data) {
+		return self::getDefault()->set($key, $data);
+	}
 
-    /**
-     * Static write — drop-in for CoreUtilities::setCache()
-     *
-     * @param string $key   Cache key
-     * @param mixed  $data  Data to cache
-     * @return bool
-     */
-    public static function setCache($key, $data) {
-        return self::getDefault()->set($key, $data);
-    }
-
-    /**
-     * Static read — drop-in for CoreUtilities::getCache()
-     *
-     * @param string $key     Cache key
-     * @param int|null $maxAge  Maximum age in seconds (null = no limit)
-     * @return mixed|false
-     */
-    public static function getCache($key, $maxAge = null) {
-        return self::getDefault()->get($key, $maxAge);
-    }
+	/**
+	 * Static read — drop-in for CoreUtilities::getCache()
+	 *
+	 * @param string $key     Cache key
+	 * @param int|null $maxAge  Maximum age in seconds (null = no limit)
+	 * @return mixed|false
+	 */
+	public static function getCache(string $key, ?int $maxAge = null) {
+		return self::getDefault()->get($key, $maxAge);
+	}
 }
diff --git a/src/Core/Cache/RedisCache.php b/src/Core/Cache/RedisCache.php
index c45224c8..dd384304 100644
--- a/src/Core/Cache/RedisCache.php
+++ b/src/Core/Cache/RedisCache.php
@@ -41,217 +41,216 @@ use XcVm\Infrastructure\Redis\RedisManager;
  */
 
 class RedisCache implements CacheInterface {
+	/** @var \Redis|null phpredis connection */
+	protected $redis = null;
 
-    /** @var \Redis|null phpredis connection */
-    protected $redis = null;
+	/** @var string \Redis host */
+	protected $host;
 
-    /** @var string \Redis host */
-    protected $host;
+	/** @var int \Redis port */
+	protected $port;
 
-    /** @var int \Redis port */
-    protected $port;
+	/** @var string|null \Redis password */
+	protected $password;
 
-    /** @var string|null \Redis password */
-    protected $password;
+	/** @var bool Whether connection is established */
+	protected $connected = false;
 
-    /** @var bool Whether connection is established */
-    protected $connected = false;
+	/** @var string Key prefix to avoid collisions */
+	protected $prefix = '';
 
-    /** @var string Key prefix to avoid collisions */
-    protected $prefix = '';
+	/**
+	 * @param string $host \Redis host
+	 * @param int $port \Redis port
+	 * @param string|null $password \Redis AUTH password
+	 * @param string $prefix Optional key prefix
+	 */
+	public function __construct(string $host = '127.0.0.1', int $port = 6379, ?string $password = null, string $prefix = '') {
+		$this->host = $host;
+		$this->port = $port;
+		$this->password = $password;
+		$this->prefix = $prefix;
+	}
 
-    /**
-     * @param string $host \Redis host
-     * @param int $port \Redis port
-     * @param string|null $password \Redis AUTH password
-     * @param string $prefix Optional key prefix
-     */
-    public function __construct($host = '127.0.0.1', $port = 6379, $password = null, $prefix = '') {
-        $this->host = $host;
-        $this->port = $port;
-        $this->password = $password;
-        $this->prefix = $prefix;
-    }
+	/**
+	 * Establish \Redis connection (lazy — called on first operation)
+	 *
+	 * @return bool
+	 */
+	public function connect() {
+		if ($this->connected && $this->redis !== null) {
+			return true;
+		}
 
-    /**
-     * Establish \Redis connection (lazy — called on first operation)
-     *
-     * @return bool
-     */
-    public function connect() {
-        if ($this->connected && $this->redis !== null) {
-            return true;
-        }
+		try {
+			$this->redis = new \Redis();
+			$this->redis->connect($this->host, $this->port);
 
-        try {
-            $this->redis = new \Redis();
-            $this->redis->connect($this->host, $this->port);
+			if ($this->password) {
+				$this->redis->auth($this->password);
+			}
 
-            if ($this->password) {
-                $this->redis->auth($this->password);
-            }
+			// Use igbinary serializer if available for consistency with FileCache
+			if (defined('Redis::SERIALIZER_IGBINARY')) {
+				$this->redis->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_IGBINARY);
+			}
 
-            // Use igbinary serializer if available for consistency with FileCache
-            if (defined('Redis::SERIALIZER_IGBINARY')) {
-                $this->redis->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_IGBINARY);
-            }
+			$this->connected = true;
+			return true;
+		} catch (\Exception $e) {
+			$this->redis = null;
+			$this->connected = false;
+			return false;
+		}
+	}
 
-            $this->connected = true;
-            return true;
-        } catch (\Exception $e) {
-            $this->redis = null;
-            $this->connected = false;
-            return false;
-        }
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get($key, $maxAge = null) {
+		if (!$this->ensureConnected()) {
+			return false;
+		}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function get($key, $maxAge = null) {
-        if (!$this->ensureConnected()) {
-            return false;
-        }
+		$prefixedKey = $this->prefix . $key;
+		$data = $this->redis->get($prefixedKey);
 
-        $prefixedKey = $this->prefix . $key;
-        $data = $this->redis->get($prefixedKey);
+		if ($data === false) {
+			return false;
+		}
 
-        if ($data === false) {
-            return false;
-        }
+		// maxAge is handled by \Redis TTL, not by us
+		// But if caller wants to check age, we can't — \Redis doesn't store creation time
+		// For file-based TTL compat, we ignore maxAge here (\Redis uses its own TTL)
 
-        // maxAge is handled by \Redis TTL, not by us
-        // But if caller wants to check age, we can't — \Redis doesn't store creation time
-        // For file-based TTL compat, we ignore maxAge here (\Redis uses its own TTL)
+		return $data;
+	}
 
-        return $data;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set($key, $data, $ttl = 0) {
+		if (!$this->ensureConnected()) {
+			return false;
+		}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function set($key, $data, $ttl = 0) {
-        if (!$this->ensureConnected()) {
-            return false;
-        }
+		$prefixedKey = $this->prefix . $key;
 
-        $prefixedKey = $this->prefix . $key;
+		if ($ttl > 0) {
+			return $this->redis->setex($prefixedKey, $ttl, $data);
+		}
 
-        if ($ttl > 0) {
-            return $this->redis->setex($prefixedKey, $ttl, $data);
-        }
+		return $this->redis->set($prefixedKey, $data);
+	}
 
-        return $this->redis->set($prefixedKey, $data);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function delete($key) {
+		if (!$this->ensureConnected()) {
+			return false;
+		}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function delete($key) {
-        if (!$this->ensureConnected()) {
-            return false;
-        }
+		$prefixedKey = $this->prefix . $key;
+		$this->redis->del($prefixedKey);
 
-        $prefixedKey = $this->prefix . $key;
-        $this->redis->del($prefixedKey);
+		return true;
+	}
 
-        return true;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function has($key, $maxAge = null) {
+		if (!$this->ensureConnected()) {
+			return false;
+		}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function has($key, $maxAge = null) {
-        if (!$this->ensureConnected()) {
-            return false;
-        }
+		$prefixedKey = $this->prefix . $key;
 
-        $prefixedKey = $this->prefix . $key;
+		return (bool) $this->redis->exists($prefixedKey);
+	}
 
-        return (bool) $this->redis->exists($prefixedKey);
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * WARNING: Flushes the ENTIRE \Redis database. Use with caution.
+	 */
+	public function flush() {
+		if (!$this->ensureConnected()) {
+			return false;
+		}
 
-    /**
-     * {@inheritdoc}
-     *
-     * WARNING: Flushes the ENTIRE \Redis database. Use with caution.
-     */
-    public function flush() {
-        if (!$this->ensureConnected()) {
-            return false;
-        }
+		return $this->redis->flushDB();
+	}
 
-        return $this->redis->flushDB();
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Raw \Redis Access (for migration period)
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Raw \Redis Access (for migration period)
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Get the raw phpredis connection
+	 *
+	 * Allows legacy code to use \Redis-specific operations (sorted sets,
+	 * pipelines, pub/sub, etc.) that don't fit the CacheInterface.
+	 *
+	 * @return \Redis|null
+	 */
+	public function getConnection() {
+		$this->ensureConnected();
+		return $this->redis;
+	}
 
-    /**
-     * Get the raw phpredis connection
-     *
-     * Allows legacy code to use \Redis-specific operations (sorted sets,
-     * pipelines, pub/sub, etc.) that don't fit the CacheInterface.
-     *
-     * @return \Redis|null
-     */
-    public function getConnection() {
-        $this->ensureConnected();
-        return $this->redis;
-    }
+	/**
+	 * Check if connection is alive
+	 *
+	 * @return bool
+	 */
+	public function isConnected() {
+		if (!$this->connected || !$this->redis) {
+			return false;
+		}
 
-    /**
-     * Check if connection is alive
-     *
-     * @return bool
-     */
-    public function isConnected() {
-        if (!$this->connected || !$this->redis) {
-            return false;
-        }
+		try {
+			return $this->redis->ping() !== false;
+		} catch (\Exception $e) {
+			$this->connected = false;
+			return false;
+		}
+	}
 
-        try {
-            return $this->redis->ping() !== false;
-        } catch (\Exception $e) {
-            $this->connected = false;
-            return false;
-        }
-    }
+	/**
+	 * Close connection
+	 */
+	public function disconnect() {
+		if ($this->redis) {
+			try {
+				$this->redis->close();
+			} catch (\Exception $e) {
+				// ignore
+			}
+		}
 
-    /**
-     * Close connection
-     */
-    public function disconnect() {
-        if ($this->redis) {
-            try {
-                $this->redis->close();
-            } catch (\Exception $e) {
-                // ignore
-            }
-        }
+		$this->redis = null;
+		$this->connected = false;
+	}
 
-        $this->redis = null;
-        $this->connected = false;
-    }
+	/**
+	 * Ensure connection is active, reconnect if needed
+	 *
+	 * @return bool
+	 */
+	protected function ensureConnected() {
+		if ($this->connected && $this->redis !== null) {
+			return true;
+		}
 
-    /**
-     * Ensure connection is active, reconnect if needed
-     *
-     * @return bool
-     */
-    protected function ensureConnected() {
-        if ($this->connected && $this->redis !== null) {
-            return true;
-        }
+		return $this->connect();
+	}
 
-        return $this->connect();
-    }
-
-    /**
-     * Disconnect from \Redis when the instance is destroyed.
-     */
-    public function __destruct() {
-        $this->disconnect();
-    }
+	/**
+	 * Disconnect from \Redis when the instance is destroyed.
+	 */
+	public function __destruct() {
+		$this->disconnect();
+	}
 }
diff --git a/src/Core/Config/AppConfig.php b/src/Core/Config/AppConfig.php
index c4d70659..39b944d6 100644
--- a/src/Core/Config/AppConfig.php
+++ b/src/Core/Config/AppConfig.php
@@ -32,14 +32,14 @@ define('DEV_MODE', false);
 
 define('XC_VM_VERSION', '2.5.1');
 
-define('GIT_OWNER',       'Vateron-Media');
-define('GIT_REPO_MAIN',   'XC_VM');
+define('GIT_OWNER', 'Vateron-Media');
+define('GIT_REPO_MAIN', 'XC_VM');
 define('GIT_REPO_UPDATE', 'XC_VM_Update');
-define('GIT_REPO_BIN',    'XC_VM_Binaries');
+define('GIT_REPO_BIN', 'XC_VM_Binaries');
 define('GIT_REPO_FANOUT', 'XC_VM_Fanout'); // xc_fanout daemon: source repo, binaries as release assets
-define('GIT_REPO_PROXY',  'XC_VM_Proxy');
+define('GIT_REPO_PROXY', 'XC_VM_Proxy');
 
 // ── Miscellaneous Settings ─────────────────────────────────────
 
 define('MONITOR_CALLS', 3);          // Number of retry attempts for monitoring tasks
-define('OPENSSL_EXTRA', 'fNiu3XD448xTDa27xoY4'); // Additional OpenSSL entropy/seed (review necessity)
\ No newline at end of file
+define('OPENSSL_EXTRA', 'fNiu3XD448xTDa27xoY4'); // Additional OpenSSL entropy/seed (review necessity)
diff --git a/src/Core/Config/Binaries.php b/src/Core/Config/Binaries.php
index e32a2be5..350dffb1 100644
--- a/src/Core/Config/Binaries.php
+++ b/src/Core/Config/Binaries.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * Пути к бинарным файлам
  *
@@ -15,14 +14,14 @@
  */
 
 // ── PHP & утилиты ─────────────────────────────────────────────
-define('PHP_BIN',     BIN_PATH . 'php/bin/php');
+define('PHP_BIN', BIN_PATH . 'php/bin/php');
 define('YOUTUBE_BIN', BIN_PATH . 'yt-dlp');
 define('FFMPEG_FONT', BIN_PATH . 'free-sans.ttf');
 
 // ── GeoIP базы данных ─────────────────────────────────────────
-define('GEOLITE2_BIN',  BIN_PATH . 'maxmind/GeoLite2-Country.mmdb');
+define('GEOLITE2_BIN', BIN_PATH . 'maxmind/GeoLite2-Country.mmdb');
 define('GEOLITE2C_BIN', BIN_PATH . 'maxmind/GeoLite2-City.mmdb');
-define('GEOISP_BIN',    BIN_PATH . 'maxmind/GeoIP2-ISP.mmdb');
+define('GEOISP_BIN', BIN_PATH . 'maxmind/GeoIP2-ISP.mmdb');
 
 // ── FFmpeg/FFprobe — legacy 4.0 "DTS" build anchor ────────────
 // Only the 4.0 build is pinned as a constant: it is the legacy/DTS-safe binary
@@ -30,5 +29,5 @@ define('GEOISP_BIN',    BIN_PATH . 'maxmind/GeoIP2-ISP.mmdb');
 // other version is resolved dynamically from bin/ffmpeg_bin/<version>/ by
 // FfmpegPaths (paths) and FfmpegBinaries (discovery + capabilities) — no more
 // per-version constants to keep in sync with what actually ships in the folder.
-define('FFMPEG_BIN_40',  BIN_PATH . 'ffmpeg_bin/4.0/ffmpeg');
+define('FFMPEG_BIN_40', BIN_PATH . 'ffmpeg_bin/4.0/ffmpeg');
 define('FFPROBE_BIN_40', BIN_PATH . 'ffmpeg_bin/4.0/ffprobe');
diff --git a/src/Core/Config/ConfigReader.php b/src/Core/Config/ConfigReader.php
index fcff4ec6..8b61728c 100644
--- a/src/Core/Config/ConfigReader.php
+++ b/src/Core/Config/ConfigReader.php
@@ -39,7 +39,7 @@ class ConfigReader {
 	 * @param mixed  $default Значение по умолчанию
 	 * @return mixed
 	 */
-	public static function get(string $key, $default = null) {
+	public static function get(string $key, mixed $default = null) {
 		return self::getAll()[$key] ?? $default;
 	}
 }
diff --git a/src/Core/Config/DomainResolver.php b/src/Core/Config/DomainResolver.php
index 0aeeb9a9..e549b948 100644
--- a/src/Core/Config/DomainResolver.php
+++ b/src/Core/Config/DomainResolver.php
@@ -27,7 +27,7 @@ class DomainResolver {
 	 * @param bool $rForceSSL Force the https protocol.
 	 * @return string Public base URL (trailing slash), or '' if no proxy is available.
 	 */
-	public static function resolve($rServerID, $rForceSSL = false) {
+	public static function resolve(int $rServerID, bool $rForceSSL = false) {
 		global $rServers, $rSettings;
 		$rOriginatorID = null;
 		if ($rForceSSL) {
@@ -62,14 +62,14 @@ class DomainResolver {
 		}
 
 		if ($rProxied || $rSettings['use_mdomain_in_lists'] == 1) {
-			$rResellerDomains = CacheReader::get('reseller_domains') ?: array();
+			$rResellerDomains = CacheReader::get('reseller_domains') ?: [];
 			if (!(strlen($rDomain) > 0 && in_array(strtolower($rDomain), $rResellerDomains))) {
 				if (empty($rServers[$rServerID]['domain_name'])) {
 					$rDomain = escapeshellcmd($rServers[$rServerID]['server_ip']);
-				} else if (filter_var($rDomain, FILTER_VALIDATE_IP)) {
+				} elseif (filter_var($rDomain, FILTER_VALIDATE_IP)) {
 					$rDomain = escapeshellcmd($rServers[$rServerID]['server_ip']);
 				} else {
-					$rDomain = str_replace(array('http://', '/', 'https://'), '', escapeshellcmd(explode(',', $rServers[$rServerID]['domain_name'])[0]));
+					$rDomain = str_replace(['http://', '/', 'https://'], '', escapeshellcmd(explode(',', $rServers[$rServerID]['domain_name'])[0]));
 				}
 			}
 		} else {
@@ -77,7 +77,7 @@ class DomainResolver {
 				if (empty($rServers[$rServerID]['domain_name'])) {
 					$rDomain = escapeshellcmd($rServers[$rServerID]['server_ip']);
 				} else {
-					$rDomain = str_replace(array('http://', '/', 'https://'), '', escapeshellcmd(explode(',', $rServers[$rServerID]['domain_name'])[0]));
+					$rDomain = str_replace(['http://', '/', 'https://'], '', escapeshellcmd(explode(',', $rServers[$rServerID]['domain_name'])[0]));
 				}
 			}
 		}
diff --git a/src/Core/Config/Paths.php b/src/Core/Config/Paths.php
index 61cdb19b..73dc8e0d 100644
--- a/src/Core/Config/Paths.php
+++ b/src/Core/Config/Paths.php
@@ -25,66 +25,66 @@
 // ─────────────────────────────────────────────────────────────────
 
 if (!defined('CONTENT_PATH')) {
-    define('CONTENT_PATH', MAIN_HOME . 'content/');
+	define('CONTENT_PATH', MAIN_HOME . 'content/');
 }
 
 if (!defined('TMP_PATH')) {
-    define('TMP_PATH', MAIN_HOME . 'tmp/');
+	define('TMP_PATH', MAIN_HOME . 'tmp/');
 }
 
 // ─────────────────────────────────────────────────────────────────
 //  2. Системные директории
 // ─────────────────────────────────────────────────────────────────
 
-define('CONFIG_PATH',   MAIN_HOME . 'config/');
-define('BIN_PATH',      MAIN_HOME . 'bin/');
-define('STORAGE_PATH',  MAIN_HOME . 'storage/');
-define('SIGNALS_PATH',  MAIN_HOME . 'signals/');
+define('CONFIG_PATH', MAIN_HOME . 'config/');
+define('BIN_PATH', MAIN_HOME . 'bin/');
+define('STORAGE_PATH', MAIN_HOME . 'storage/');
+define('SIGNALS_PATH', MAIN_HOME . 'signals/');
 
 // xc_fanout daemon sockets (ADR 0002, P2/P3). Kept in the app bin tree next to
 // the daemon binary, mirroring the php-fpm sockets layout (bin/php/sockets/):
 // FANOUT_HTTP_SOCK is the nginx-facing client surface, FANOUT_CTL_SOCK the
 // PHP-only control surface. A unix socket stores no stream bytes (IPC only), so
 // this is orthogonal to the tmpfs-free byte-path goal.
-define('FANOUT_RUN_PATH',  BIN_PATH . 'xc_fanout/sockets/');
-define('FANOUT_CTL_SOCK',  FANOUT_RUN_PATH . 'control.sock');
+define('FANOUT_RUN_PATH', BIN_PATH . 'xc_fanout/sockets/');
+define('FANOUT_CTL_SOCK', FANOUT_RUN_PATH . 'control.sock');
 define('FANOUT_HTTP_SOCK', FANOUT_RUN_PATH . 'http.sock');
 
 // ─────────────────────────────────────────────────────────────────
 //  3. Контент-директории
 // ─────────────────────────────────────────────────────────────────
 
-define('STREAMS_PATH',  CONTENT_PATH . 'streams/');
-define('EPG_PATH',      CONTENT_PATH . 'epg/');
-define('VOD_PATH',      CONTENT_PATH . 'vod/');
-define('ARCHIVE_PATH',  CONTENT_PATH . 'archive/');
-define('CREATED_PATH',  CONTENT_PATH . 'created/');
-define('DELAY_PATH',    CONTENT_PATH . 'delayed/');
-define('VIDEO_PATH',    CONTENT_PATH . 'video/');
+define('STREAMS_PATH', CONTENT_PATH . 'streams/');
+define('EPG_PATH', CONTENT_PATH . 'epg/');
+define('VOD_PATH', CONTENT_PATH . 'vod/');
+define('ARCHIVE_PATH', CONTENT_PATH . 'archive/');
+define('CREATED_PATH', CONTENT_PATH . 'created/');
+define('DELAY_PATH', CONTENT_PATH . 'delayed/');
+define('VIDEO_PATH', CONTENT_PATH . 'video/');
 define('PLAYLIST_PATH', CONTENT_PATH . 'playlists/');
 
 // ─────────────────────────────────────────────────────────────────
 //  4. Временные директории
 // ─────────────────────────────────────────────────────────────────
 
-define('CONS_TMP_PATH',       TMP_PATH . 'opened_cons/');
-define('CRONS_TMP_PATH',      TMP_PATH . 'crons/');
-define('CIDR_TMP_PATH',       TMP_PATH . 'cidr/');
-define('CACHE_TMP_PATH',      TMP_PATH . 'cache/');
-define('STREAMS_TMP_PATH',    TMP_PATH . 'cache/streams/');
-define('SERIES_TMP_PATH',     TMP_PATH . 'cache/series/');
-define('LINES_TMP_PATH',      TMP_PATH . 'cache/lines/');
+define('CONS_TMP_PATH', TMP_PATH . 'opened_cons/');
+define('CRONS_TMP_PATH', TMP_PATH . 'crons/');
+define('CIDR_TMP_PATH', TMP_PATH . 'cidr/');
+define('CACHE_TMP_PATH', TMP_PATH . 'cache/');
+define('STREAMS_TMP_PATH', TMP_PATH . 'cache/streams/');
+define('SERIES_TMP_PATH', TMP_PATH . 'cache/series/');
+define('LINES_TMP_PATH', TMP_PATH . 'cache/lines/');
 define('DIVERGENCE_TMP_PATH', TMP_PATH . 'divergence/');
-define('FLOOD_TMP_PATH',      TMP_PATH . 'flood/');
-define('PLAYER_TMP_PATH',     TMP_PATH . 'player/');
-define('MINISTRA_TMP_PATH',   TMP_PATH . 'ministra/');
-define('SIGNALS_TMP_PATH',    TMP_PATH . 'signals/');
-define('LOGS_TMP_PATH',       TMP_PATH . 'logs/');
-define('WATCH_TMP_PATH',      TMP_PATH . 'watch/');
+define('FLOOD_TMP_PATH', TMP_PATH . 'flood/');
+define('PLAYER_TMP_PATH', TMP_PATH . 'player/');
+define('MINISTRA_TMP_PATH', TMP_PATH . 'ministra/');
+define('SIGNALS_TMP_PATH', TMP_PATH . 'signals/');
+define('LOGS_TMP_PATH', TMP_PATH . 'logs/');
+define('WATCH_TMP_PATH', TMP_PATH . 'watch/');
 
 // ─────────────────────────────────────────────────────────────────
 //  5. Хранилище файлов
 // ─────────────────────────────────────────────────────────────────
 
-define('IMAGES_PATH',    STORAGE_PATH . 'images/');
+define('IMAGES_PATH', STORAGE_PATH . 'images/');
 define('E2_IMAGES_PATH', IMAGES_PATH . 'enigma2/');
diff --git a/src/Core/Config/SettingsManager.php b/src/Core/Config/SettingsManager.php
index 4eef7fe7..00a06994 100644
--- a/src/Core/Config/SettingsManager.php
+++ b/src/Core/Config/SettingsManager.php
@@ -16,7 +16,7 @@ namespace XcVm\Core\Config;
 
 class SettingsManager {
 	/** @var array */
-	private static $settings = array();
+	private static $settings = [];
 
 	/**
 	 * Сохраняет весь массив настроек.
@@ -35,11 +35,9 @@ class SettingsManager {
 	/**
 	 * Возвращает значение по ключу.
 	 *
-	 * @param string $key
-	 * @param mixed  $default
 	 * @return mixed
 	 */
-	public static function get(string $key, $default = null) {
+	public static function get(string $key, mixed $default = null) {
 		return self::$settings[$key] ?? $default;
 	}
 
@@ -53,7 +51,6 @@ class SettingsManager {
 	/**
 	 * Проверяет наличие ключа в настройках.
 	 *
-	 * @param string $key
 	 * @return bool
 	 */
 	public static function has(string $key): bool {
@@ -66,7 +63,6 @@ class SettingsManager {
 	 * Повторяет PHP-truthiness существующих проверок `if (getAll()['key'])`:
 	 * '0' и '' → false, '1' и любое непустое значение → true.
 	 *
-	 * @param string $key
 	 * @param bool   $default Значение, если ключ отсутствует.
 	 * @return bool
 	 */
@@ -77,8 +73,6 @@ class SettingsManager {
 	/**
 	 * Возвращает значение как int.
 	 *
-	 * @param string $key
-	 * @param int    $default
 	 * @return int
 	 */
 	public static function getInt(string $key, int $default = 0): int {
@@ -88,8 +82,6 @@ class SettingsManager {
 	/**
 	 * Возвращает значение как строку.
 	 *
-	 * @param string $key
-	 * @param string $default
 	 * @return string
 	 */
 	public static function getString(string $key, string $default = ''): string {
@@ -102,11 +94,9 @@ class SettingsManager {
 	 * JSON-поля декодируются в массивы ещё в SettingsRepository, поэтому здесь
 	 * достаточно проверить тип; для скаляров/null возвращается $default.
 	 *
-	 * @param string $key
-	 * @param array  $default
 	 * @return array
 	 */
-	public static function getArray(string $key, array $default = array()): array {
+	public static function getArray(string $key, array $default = []): array {
 		$rValue = self::$settings[$key] ?? null;
 		return is_array($rValue) ? $rValue : $default;
 	}
diff --git a/src/Core/Config/SettingsRepository.php b/src/Core/Config/SettingsRepository.php
index 5be5b7d2..d53194cd 100644
--- a/src/Core/Config/SettingsRepository.php
+++ b/src/Core/Config/SettingsRepository.php
@@ -21,7 +21,7 @@ class SettingsRepository {
 	 * @param bool $rForce Bypass the file cache and re-read from the database.
 	 * @return array Settings map (with normalized array fields).
 	 */
-	public static function getAll($rForce = false) {
+	public static function getAll(bool $rForce = false) {
 		global $db;
 		if (!$rForce) {
 			$rCache = FileCache::getCache('settings', 20);
@@ -30,17 +30,17 @@ class SettingsRepository {
 			}
 		}
 
-		$rOutput = array();
+		$rOutput = [];
 		$db->query('SELECT * FROM `settings`');
 		$rRows = $db->get_row();
-		foreach ($rRows ?: array() as $rKey => $rValue) {
+		foreach ($rRows ?: [] as $rKey => $rValue) {
 			$rOutput[$rKey] = $rValue;
 		}
 
 		$rOutput['allow_countries'] = json_decode($rOutput['allow_countries'] ?? '', true);
 
 		$decodedAllowedSTB = json_decode($rOutput['allowed_stb_types'] ?? '', true);
-		$rOutput['allowed_stb_types'] = array();
+		$rOutput['allowed_stb_types'] = [];
 		if (is_array($decodedAllowedSTB)) {
 			// Drop blank entries so an "empty" selection (an unset multiselect is
 			// commonly stored as [""]) collapses to a truly empty array. An empty
diff --git a/src/Core/Container/Psr/ContainerExceptionInterface.php b/src/Core/Container/Psr/ContainerExceptionInterface.php
index eb912286..d85a0e83 100644
--- a/src/Core/Container/Psr/ContainerExceptionInterface.php
+++ b/src/Core/Container/Psr/ContainerExceptionInterface.php
@@ -10,4 +10,5 @@ namespace XcVm\Core\Container\Psr;
  * @package XC_VM_Core_Container
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-interface ContainerExceptionInterface extends \Throwable {}
+interface ContainerExceptionInterface extends \Throwable {
+}
diff --git a/src/Core/Container/Psr/ContainerInterface.php b/src/Core/Container/Psr/ContainerInterface.php
index e063f402..870c2253 100644
--- a/src/Core/Container/Psr/ContainerInterface.php
+++ b/src/Core/Container/Psr/ContainerInterface.php
@@ -11,18 +11,17 @@ namespace XcVm\Core\Container\Psr;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface ContainerInterface {
+	/**
+	 * Finds an entry of the container by its identifier and returns it.
+	 *
+	 * @param string $id Identifier of the entry to look for.
+	 * @throws NotFoundExceptionInterface  No entry was found for this identifier.
+	 * @throws ContainerExceptionInterface Error while retrieving the entry.
+	 */
+	public function get(string $id): mixed;
 
-    /**
-     * Finds an entry of the container by its identifier and returns it.
-     *
-     * @param string $id Identifier of the entry to look for.
-     * @throws NotFoundExceptionInterface  No entry was found for this identifier.
-     * @throws ContainerExceptionInterface Error while retrieving the entry.
-     */
-    public function get(string $id): mixed;
-
-    /**
-     * Returns true if the container can return an entry for the given identifier.
-     */
-    public function has(string $id): bool;
+	/**
+	 * Returns true if the container can return an entry for the given identifier.
+	 */
+	public function has(string $id): bool;
 }
diff --git a/src/Core/Container/Psr/NotFoundException.php b/src/Core/Container/Psr/NotFoundException.php
index 4e9f1549..eeb134aa 100644
--- a/src/Core/Container/Psr/NotFoundException.php
+++ b/src/Core/Container/Psr/NotFoundException.php
@@ -10,4 +10,5 @@ use XcVm\Core\Exception\Container\ContainerException;
  * @package XC_VM_Core_Container
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class NotFoundException extends ContainerException implements NotFoundExceptionInterface {}
+class NotFoundException extends ContainerException implements NotFoundExceptionInterface {
+}
diff --git a/src/Core/Container/Psr/NotFoundExceptionInterface.php b/src/Core/Container/Psr/NotFoundExceptionInterface.php
index 8ffd4468..8d1f37c5 100644
--- a/src/Core/Container/Psr/NotFoundExceptionInterface.php
+++ b/src/Core/Container/Psr/NotFoundExceptionInterface.php
@@ -10,4 +10,5 @@ namespace XcVm\Core\Container\Psr;
  * @package XC_VM_Core_Container
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-interface NotFoundExceptionInterface extends ContainerExceptionInterface {}
+interface NotFoundExceptionInterface extends ContainerExceptionInterface {
+}
diff --git a/src/Core/Container/ServiceContainer.php b/src/Core/Container/ServiceContainer.php
index dca09e34..f92714e1 100644
--- a/src/Core/Container/ServiceContainer.php
+++ b/src/Core/Container/ServiceContainer.php
@@ -87,470 +87,465 @@ use XcVm\Core\Exception\XcVmException;
  */
 
 class ServiceContainer implements ContainerInterface {
+	private static ?self $instance = null;
 
-    private static ?self $instance = null;
+	/** @var array<string, callable> */
+	private array $factories = [];
 
-    /** @var array<string, callable> */
-    private array $factories = [];
+	/** @var array<string, mixed> */
+	private array $resolved = [];
 
-    /** @var array<string, mixed> */
-    private array $resolved = [];
+	private array $isFactory = [];
 
-    private array $isFactory = [];
+	private array $creating = [];
 
-    private array $creating = [];
+	/** @var array<string, string[]> */
+	private array $tags = [];
 
-    /** @var array<string, string[]> */
-    private array $tags = [];
+	/**
+	 * Decoration chains: id => priority => decorator[]
+	 * Each decorator is a class-string or callable(inner, container): mixed
+	 * @var array<string, array<int, array<class-string|callable>>>
+	 */
+	private array $decorators = [];
 
-    /**
-     * Decoration chains: id => priority => decorator[]
-     * Each decorator is a class-string or callable(inner, container): mixed
-     * @var array<string, array<int, array<class-string|callable>>>
-     */
-    private array $decorators = [];
+	/**
+	 * Services that modules are not allowed to decorate.
+	 * @var string[]
+	 */
+	private array $protectedServices = ['db', 'settings', 'config', 'auth'];
 
-    /**
-     * Services that modules are not allowed to decorate.
-     * @var string[]
-     */
-    private array $protectedServices = ['db', 'settings', 'config', 'auth'];
+	// ─────────────────────────────────────────────────────────
+	//  Singleton
+	// ─────────────────────────────────────────────────────────
 
-    // ─────────────────────────────────────────────────────────
-    //  Singleton
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Получить единственный экземпляр.
+	 *
+	 * @internal Bootstrap only. Modules receive ServiceContainer via boot(ServiceContainer $c).
+	 */
+	public static function getInstance(): self {
+		if (self::$instance === null) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
 
-    /**
-     * Получить единственный экземпляр.
-     *
-     * @internal Bootstrap only. Modules receive ServiceContainer via boot(ServiceContainer $c).
-     */
-    public static function getInstance(): self {
-        if (self::$instance === null) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
+	/**
+	 * Сбросить контейнер (для тестов).
+	 */
+	public static function resetInstance(): void {
+		if (self::$instance !== null) {
+			self::$instance->factories = [];
+			self::$instance->resolved  = [];
+			self::$instance->isFactory = [];
+			self::$instance->creating  = [];
+			self::$instance->tags      = [];
+		}
+		self::$instance = null;
+	}
 
-    /**
-     * Сбросить контейнер (для тестов).
-     */
-    public static function resetInstance(): void {
-        if (self::$instance !== null) {
-            self::$instance->factories = [];
-            self::$instance->resolved  = [];
-            self::$instance->isFactory = [];
-            self::$instance->creating  = [];
-            self::$instance->tags      = [];
-        }
-        self::$instance = null;
-    }
+	/**
+	 * Приватный конструктор (singleton).
+	 */
+	private function __construct() {
+	}
 
-    /**
-     * Приватный конструктор (singleton).
-     */
-    private function __construct() {
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Регистрация
+	// ─────────────────────────────────────────────────────────
 
-    // ─────────────────────────────────────────────────────────
-    //  Регистрация
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Зарегистрировать сервис.
+	 *
+	 * Если $value — callable (замыкание или [class, method]),
+	 * он будет вызван ОДИН раз при первом get(). Результат кэшируется.
+	 *
+	 * Если $value — не callable, сохраняется как готовое значение.
+	 *
+	 * @param string $id    Уникальный идентификатор (например, 'db', 'settings')
+	 * @param mixed  $value Фабрика (callable) или готовое значение
+	 * @return $this
+	 */
+	public function set(string $id, mixed $value): static {
+		// Удаляем ранее разрешённый сервис при перерегистрации
+		unset($this->resolved[$id]);
+		unset($this->isFactory[$id]);
 
-    /**
-     * Зарегистрировать сервис.
-     *
-     * Если $value — callable (замыкание или [class, method]),
-     * он будет вызван ОДИН раз при первом get(). Результат кэшируется.
-     *
-     * Если $value — не callable, сохраняется как готовое значение.
-     *
-     * @param string $id    Уникальный идентификатор (например, 'db', 'settings')
-     * @param mixed  $value Фабрика (callable) или готовое значение
-     * @return $this
-     */
-    public function set(string $id, mixed $value): static {
-        // Удаляем ранее разрешённый сервис при перерегистрации
-        unset($this->resolved[$id]);
-        unset($this->isFactory[$id]);
+		if (is_callable($value) && !is_string($value) && !is_array($value)) {
+			// Замыкание → ленивая фабрика (singleton)
+			$this->factories[$id] = $value;
+		} else {
+			// Готовое значение → сразу в resolved
+			$this->resolved[$id] = $value;
+		}
 
-        if (is_callable($value) && !is_string($value) && !is_array($value)) {
-            // Замыкание → ленивая фабрика (singleton)
-            $this->factories[$id] = $value;
-        } else {
-            // Готовое значение → сразу в resolved
-            $this->resolved[$id] = $value;
-        }
+		return $this;
+	}
 
-        return $this;
-    }
+	/**
+	 * Зарегистрировать фабричный сервис (новый экземпляр при каждом get).
+	 *
+	 * @param string   $id      Идентификатор
+	 * @param callable $factory Фабрика: function(ServiceContainer $c): mixed
+	 * @return $this
+	 */
+	public function factory(string $id, callable $factory): static {
+		unset($this->resolved[$id]);
+		$this->factories[$id] = $factory;
+		$this->isFactory[$id] = true;
 
-    /**
-     * Зарегистрировать фабричный сервис (новый экземпляр при каждом get).
-     *
-     * @param string   $id      Идентификатор
-     * @param callable $factory Фабрика: function(ServiceContainer $c): mixed
-     * @return $this
-     */
-    public function factory(string $id, callable $factory): static {
-        unset($this->resolved[$id]);
-        $this->factories[$id] = $factory;
-        $this->isFactory[$id] = true;
+		return $this;
+	}
 
-        return $this;
-    }
+	/**
+	 * Добавить тег к сервису.
+	 *
+	 * Теги позволяют группировать связанные сервисы и получать их пакетно.
+	 * Используются модульной системой для сбора event subscribers,
+	 * cron-задач, маршрутов и т.д.
+	 *
+	 * @param string $id  Идентификатор сервиса
+	 * @param string $tag Имя тега (например, 'event.subscriber', 'cron')
+	 * @return $this
+	 */
+	public function tag(string $id, string $tag): static {
+		if (!isset($this->tags[$tag])) {
+			$this->tags[$tag] = [];
+		}
+		if (!in_array($id, $this->tags[$tag], true)) {
+			$this->tags[$tag][] = $id;
+		}
 
-    /**
-     * Добавить тег к сервису.
-     *
-     * Теги позволяют группировать связанные сервисы и получать их пакетно.
-     * Используются модульной системой для сбора event subscribers,
-     * cron-задач, маршрутов и т.д.
-     *
-     * @param string $id  Идентификатор сервиса
-     * @param string $tag Имя тега (например, 'event.subscriber', 'cron')
-     * @return $this
-     */
-    public function tag(string $id, string $tag): static {
-        if (!isset($this->tags[$tag])) {
-            $this->tags[$tag] = [];
-        }
-        if (!in_array($id, $this->tags[$tag], true)) {
-            $this->tags[$tag][] = $id;
-        }
+		return $this;
+	}
 
-        return $this;
-    }
+	/**
+	 * Wrap a service with a decorator.
+	 *
+	 * The decorator receives the inner service as first constructor argument (class-string)
+	 * or as the first callable argument (callable form).
+	 *
+	 * Multiple decorators on the same service are applied in priority order:
+	 * highest priority wraps outermost (called first by callers).
+	 *
+	 * Example:
+	 *   $c->decorate('stream.service', \FingerprintDecorator::class, priority: 20);
+	 *   $c->decorate('stream.service', \LoggingDecorator::class, priority: 10);
+	 *   // Call order: \FingerprintDecorator → \LoggingDecorator → original
+	 *
+	 * @param string               $id        Service identifier
+	 * @param class-string|callable $decorator Class-string or callable($inner, $container): mixed
+	 * @param int                  $priority  Higher = outer layer (default 0)
+	 * @throws \RuntimeException If the service is protected or not registered as a factory
+	 */
+	public function decorate(string $id, string|callable $decorator, int $priority = 0): static {
+		if (in_array($id, $this->protectedServices, true)) {
+			throw new ContainerException(
+				"ServiceContainer: сервис '{$id}' защищён от декорирования модулями."
+			);
+		}
 
-    /**
-     * Wrap a service with a decorator.
-     *
-     * The decorator receives the inner service as first constructor argument (class-string)
-     * or as the first callable argument (callable form).
-     *
-     * Multiple decorators on the same service are applied in priority order:
-     * highest priority wraps outermost (called first by callers).
-     *
-     * Example:
-     *   $c->decorate('stream.service', \FingerprintDecorator::class, priority: 20);
-     *   $c->decorate('stream.service', \LoggingDecorator::class, priority: 10);
-     *   // Call order: \FingerprintDecorator → \LoggingDecorator → original
-     *
-     * @param string               $id        Service identifier
-     * @param class-string|callable $decorator Class-string or callable($inner, $container): mixed
-     * @param int                  $priority  Higher = outer layer (default 0)
-     * @throws \RuntimeException If the service is protected or not registered as a factory
-     */
-    public function decorate(string $id, string|callable $decorator, int $priority = 0): static {
-        if (in_array($id, $this->protectedServices, true)) {
-            throw new ContainerException(
-                "ServiceContainer: сервис '{$id}' защищён от декорирования модулями."
-            );
-        }
+		if (!isset($this->factories[$id]) && !array_key_exists($id, $this->resolved)) {
+			throw new ContainerException(
+				"ServiceContainer: невозможно декорировать незарегистрированный сервис '{$id}'."
+			);
+		}
 
-        if (!isset($this->factories[$id]) && !array_key_exists($id, $this->resolved)) {
-            throw new ContainerException(
-                "ServiceContainer: невозможно декорировать незарегистрированный сервис '{$id}'."
-            );
-        }
+		$this->decorators[$id][$priority][] = $decorator;
+		unset($this->resolved[$id]); // rebuild chain on next get()
 
-        $this->decorators[$id][$priority][] = $decorator;
-        unset($this->resolved[$id]); // rebuild chain on next get()
+		return $this;
+	}
 
-        return $this;
-    }
+	/**
+	 * Return decorator layers for a service (for debugging).
+	 *
+	 * @return array<int, array<class-string|callable>> priority => decorators[]
+	 */
+	public function getDecoratorChain(string $id): array {
+		return $this->decorators[$id] ?? [];
+	}
 
-    /**
-     * Return decorator layers for a service (for debugging).
-     *
-     * @param string $id
-     * @return array<int, array<class-string|callable>> priority => decorators[]
-     */
-    public function getDecoratorChain(string $id): array {
-        return $this->decorators[$id] ?? [];
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Получение
+	// ─────────────────────────────────────────────────────────
 
-    // ─────────────────────────────────────────────────────────
-    //  Получение
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Получить сервис по идентификатору.
+	 *
+	 * @param string $id Идентификатор
+	 * @return mixed
+	 * @throws NotFoundException           Если сервис не зарегистрирован
+	 * @throws \RuntimeException            Если обнаружена циклическая зависимость или фабрика бросила исключение
+	 */
+	public function get(string $id): mixed {
+		// 1. Уже разрешён (singleton) — мгновенный возврат
+		if (array_key_exists($id, $this->resolved) && empty($this->isFactory[$id])) {
+			return $this->resolved[$id];
+		}
 
-    /**
-     * Получить сервис по идентификатору.
-     *
-     * @param string $id Идентификатор
-     * @return mixed
-     * @throws NotFoundException           Если сервис не зарегистрирован
-     * @throws \RuntimeException            Если обнаружена циклическая зависимость или фабрика бросила исключение
-     */
-    public function get(string $id): mixed {
-        // 1. Уже разрешён (singleton) — мгновенный возврат
-        if (array_key_exists($id, $this->resolved) && empty($this->isFactory[$id])) {
-            return $this->resolved[$id];
-        }
+		// 2. Есть фабрика — вызываем
+		if (isset($this->factories[$id])) {
+			// Детекция циклических зависимостей
+			if (isset($this->creating[$id])) {
+				$this->throwCircularDependency($id);
+			}
 
-        // 2. Есть фабрика — вызываем
-        if (isset($this->factories[$id])) {
-            // Детекция циклических зависимостей
-            if (isset($this->creating[$id])) {
-                $this->throwCircularDependency($id);
-            }
+			$this->creating[$id] = true;
 
-            $this->creating[$id] = true;
+			try {
+				$service = call_user_func($this->factories[$id], $this);
+				$service = $this->applyDecorators($id, $service);
+			} catch (XcVmException $e) {
+				unset($this->creating[$id]);
+				throw $e;
+			} catch (\Exception $e) {
+				unset($this->creating[$id]);
+				throw new ServiceCreationException(
+					"ServiceContainer: ошибка при создании сервиса '{$id}': " . $e->getMessage(),
+					0,
+					$e
+				);
+			}
 
-            try {
-                $service = call_user_func($this->factories[$id], $this);
-                $service = $this->applyDecorators($id, $service);
-            } catch (XcVmException $e) {
-                unset($this->creating[$id]);
-                throw $e;
-            } catch (\Exception $e) {
-                unset($this->creating[$id]);
-                throw new ServiceCreationException(
-                    "ServiceContainer: ошибка при создании сервиса '{$id}': " . $e->getMessage(),
-                    0,
-                    $e
-                );
-            }
+			unset($this->creating[$id]);
 
-            unset($this->creating[$id]);
+			// Фабричные сервисы не кэшируются
+			if (empty($this->isFactory[$id])) {
+				$this->resolved[$id] = $service;
+			}
 
-            // Фабричные сервисы не кэшируются
-            if (empty($this->isFactory[$id])) {
-                $this->resolved[$id] = $service;
-            }
+			return $service;
+		}
 
-            return $service;
-        }
+		throw new NotFoundException(
+			"ServiceContainer: сервис '{$id}' не зарегистрирован. "
+				. "Доступные сервисы: " . implode(', ', $this->keys())
+		);
+	}
 
-        throw new NotFoundException(
-            "ServiceContainer: сервис '{$id}' не зарегистрирован. "
-                . "Доступные сервисы: " . implode(', ', $this->keys())
-        );
-    }
+	/**
+	 * Получить сервис или вернуть значение по умолчанию.
+	 *
+	 * @param string $id      Идентификатор
+	 * @param mixed  $default Значение по умолчанию (если сервис не найден)
+	 * @return mixed
+	 */
+	public function getOrDefault(string $id, mixed $default = null): mixed {
+		if ($this->has($id)) {
+			return $this->get($id);
+		}
+		return $default;
+	}
 
-    /**
-     * Получить сервис или вернуть значение по умолчанию.
-     *
-     * @param string $id      Идентификатор
-     * @param mixed  $default Значение по умолчанию (если сервис не найден)
-     * @return mixed
-     */
-    public function getOrDefault(string $id, mixed $default = null): mixed {
-        if ($this->has($id)) {
-            return $this->get($id);
-        }
-        return $default;
-    }
+	/**
+	 * Получить все сервисы с указанным тегом.
+	 *
+	 * @param string $tag Имя тега
+	 * @return array Массив сервисов [id => service]
+	 */
+	public function getTagged(string $tag): array {
+		$services = [];
+		if (isset($this->tags[$tag])) {
+			foreach ($this->tags[$tag] as $id) {
+				if ($this->has($id)) {
+					$services[$id] = $this->get($id);
+				}
+			}
+		}
+		return $services;
+	}
 
-    /**
-     * Получить все сервисы с указанным тегом.
-     *
-     * @param string $tag Имя тега
-     * @return array Массив сервисов [id => service]
-     */
-    public function getTagged(string $tag): array {
-        $services = [];
-        if (isset($this->tags[$tag])) {
-            foreach ($this->tags[$tag] as $id) {
-                if ($this->has($id)) {
-                    $services[$id] = $this->get($id);
-                }
-            }
-        }
-        return $services;
-    }
+	/**
+	 * Проверить, зарегистрирован ли сервис.
+	 *
+	 * @param string $id Идентификатор
+	 * @return bool
+	 */
+	public function has(string $id): bool {
+		return array_key_exists($id, $this->resolved) || isset($this->factories[$id]);
+	}
 
-    /**
-     * Проверить, зарегистрирован ли сервис.
-     *
-     * @param string $id Идентификатор
-     * @return bool
-     */
-    public function has(string $id): bool {
-        return array_key_exists($id, $this->resolved) || isset($this->factories[$id]);
-    }
+	/**
+	 * Список всех зарегистрированных идентификаторов.
+	 *
+	 * @return string[]
+	 */
+	public function keys(): array {
+		return array_unique(
+			array_merge(
+				array_keys($this->resolved),
+				array_keys($this->factories)
+			)
+		);
+	}
 
-    /**
-     * Список всех зарегистрированных идентификаторов.
-     *
-     * @return string[]
-     */
-    public function keys(): array {
-        return array_unique(
-            array_merge(
-                array_keys($this->resolved),
-                array_keys($this->factories)
-            )
-        );
-    }
+	/**
+	 * Удалить сервис из контейнера.
+	 *
+	 * @param string $id Идентификатор
+	 * @return $this
+	 */
+	public function remove(string $id): static {
+		unset(
+			$this->factories[$id],
+			$this->resolved[$id],
+			$this->isFactory[$id]
+		);
 
-    /**
-     * Удалить сервис из контейнера.
-     *
-     * @param string $id Идентификатор
-     * @return $this
-     */
-    public function remove(string $id): static {
-        unset(
-            $this->factories[$id],
-            $this->resolved[$id],
-            $this->isFactory[$id]
-        );
+		// Удалить из тегов
+		foreach ($this->tags as &$ids) {
+			$ids = array_values(array_filter($ids, function ($v) use ($id) {
+				return $v !== $id;
+			}));
+		}
 
-        // Удалить из тегов
-        foreach ($this->tags as &$ids) {
-            $ids = array_values(array_filter($ids, function ($v) use ($id) {
-                return $v !== $id;
-            }));
-        }
+		return $this;
+	}
 
-        return $this;
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Массовая регистрация
+	// ─────────────────────────────────────────────────────────
 
-    // ─────────────────────────────────────────────────────────
-    //  Массовая регистрация
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Зарегистрировать несколько сервисов из массива.
+	 *
+	 * @param array $services Массив [id => value/callable, ...]
+	 * @return $this
+	 */
+	public function register(array $services): static {
+		foreach ($services as $id => $value) {
+			$this->set($id, $value);
+		}
+		return $this;
+	}
 
-    /**
-     * Зарегистрировать несколько сервисов из массива.
-     *
-     * @param array $services Массив [id => value/callable, ...]
-     * @return $this
-     */
-    public function register(array $services): static {
-        foreach ($services as $id => $value) {
-            $this->set($id, $value);
-        }
-        return $this;
-    }
+	// ─────────────────────────────────────────────────────────
+	//  ArrayAccess-подобный синтаксис (без implements — не нужны интерфейсы)
+	// ─────────────────────────────────────────────────────────
 
-    // ─────────────────────────────────────────────────────────
-    //  ArrayAccess-подобный синтаксис (без implements — не нужны интерфейсы)
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Магический доступ: $container->db вместо $container->get('db')
+	 *
+	 * @return mixed
+	 */
+	public function __get(string $id): mixed {
+		return $this->get($id);
+	}
 
-    /**
-     * Магический доступ: $container->db вместо $container->get('db')
-     *
-     * @param string $id
-     * @return mixed
-     */
-    public function __get(string $id): mixed {
-        return $this->get($id);
-    }
+	/**
+	 * Магическая проверка: isset($container->db)
+	 *
+	 * @return bool
+	 */
+	public function __isset(string $id): bool {
+		return $this->has($id);
+	}
 
-    /**
-     * Магическая проверка: isset($container->db)
-     *
-     * @param string $id
-     * @return bool
-     */
-    public function __isset(string $id): bool {
-        return $this->has($id);
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Decoration
+	// ─────────────────────────────────────────────────────────
 
-    // ─────────────────────────────────────────────────────────
-    //  Decoration
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Apply registered decorators to a freshly created service.
+	 *
+	 * Decorators are sorted by priority descending so the highest-priority
+	 * decorator becomes the outermost wrapper (first to intercept callers).
+	 *
+	 * @param string $id      Service identifier
+	 * @param mixed  $service The base service instance
+	 * @return mixed Decorated service (or original if no decorators registered)
+	 */
+	private function applyDecorators(string $id, mixed $service): mixed {
+		if (empty($this->decorators[$id])) {
+			return $service;
+		}
 
-    /**
-     * Apply registered decorators to a freshly created service.
-     *
-     * Decorators are sorted by priority descending so the highest-priority
-     * decorator becomes the outermost wrapper (first to intercept callers).
-     *
-     * @param string $id      Service identifier
-     * @param mixed  $service The base service instance
-     * @return mixed Decorated service (or original if no decorators registered)
-     */
-    private function applyDecorators(string $id, mixed $service): mixed {
-        if (empty($this->decorators[$id])) {
-            return $service;
-        }
+		$buckets = $this->decorators[$id];
+		krsort($buckets); // highest priority first = outermost wrapper last in application order
 
-        $buckets = $this->decorators[$id];
-        krsort($buckets); // highest priority first = outermost wrapper last in application order
+		// Build inside-out: iterate from lowest to highest priority
+		// so the highest-priority decorator ends up as the outermost layer.
+		$layers = array_merge(...array_reverse(array_values($buckets)));
 
-        // Build inside-out: iterate from lowest to highest priority
-        // so the highest-priority decorator ends up as the outermost layer.
-        $layers = array_merge(...array_reverse(array_values($buckets)));
+		foreach ($layers as $decorator) {
+			if (is_string($decorator)) {
+				$service = new $decorator($service);
+			} else {
+				$service = $decorator($service, $this);
+			}
+		}
 
-        foreach ($layers as $decorator) {
-            if (is_string($decorator)) {
-                $service = new $decorator($service);
-            } else {
-                $service = $decorator($service, $this);
-            }
-        }
+		return $service;
+	}
 
-        return $service;
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Internal throw helpers (never return type — R2-4)
+	// ─────────────────────────────────────────────────────────
 
-    // ─────────────────────────────────────────────────────────
-    //  Internal throw helpers (never return type — R2-4)
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Throw a CircularDependencyException describing the resolution chain.
+	 *
+	 * @param string $id Service id whose creation closed the cycle.
+	 * @return never
+	 * @throws CircularDependencyException Always.
+	 */
+	private function throwCircularDependency(string $id): never {
+		throw new CircularDependencyException(
+			"ServiceContainer: циклическая зависимость при создании сервиса '{$id}'. "
+			. "Цепочка: " . implode(' → ', array_keys($this->creating)) . " → {$id}"
+		);
+	}
 
-    /**
-     * Throw a CircularDependencyException describing the resolution chain.
-     *
-     * @param string $id Service id whose creation closed the cycle.
-     * @return never
-     * @throws CircularDependencyException Always.
-     */
-    private function throwCircularDependency(string $id): never {
-        throw new CircularDependencyException(
-            "ServiceContainer: циклическая зависимость при создании сервиса '{$id}'. "
-            . "Цепочка: " . implode(' → ', array_keys($this->creating)) . " → {$id}"
-        );
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Отладка
+	// ─────────────────────────────────────────────────────────
 
-    // ─────────────────────────────────────────────────────────
-    //  Отладка
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Дамп содержимого контейнера (для отладки).
+	 *
+	 * @return array
+	 */
+	public function dump(): array {
+		$result = [];
+		foreach ($this->keys() as $id) {
+			$status = 'pending';
+			$type   = 'unknown';
 
-    /**
-     * Дамп содержимого контейнера (для отладки).
-     *
-     * @return array
-     */
-    public function dump(): array {
-        $result = [];
-        foreach ($this->keys() as $id) {
-            $status = 'pending';
-            $type   = 'unknown';
+			if (array_key_exists($id, $this->resolved)) {
+				$status = 'resolved';
+				$type   = is_object($this->resolved[$id])
+					? get_class($this->resolved[$id])
+					: gettype($this->resolved[$id]);
+			} elseif (isset($this->factories[$id])) {
+				$status = !empty($this->isFactory[$id]) ? 'factory' : 'lazy';
+				$type   = 'callable';
+			}
 
-            if (array_key_exists($id, $this->resolved)) {
-                $status = 'resolved';
-                $type   = is_object($this->resolved[$id])
-                    ? get_class($this->resolved[$id])
-                    : gettype($this->resolved[$id]);
-            } elseif (isset($this->factories[$id])) {
-                $status = !empty($this->isFactory[$id]) ? 'factory' : 'lazy';
-                $type   = 'callable';
-            }
+			$result[$id] = [
+				'status' => $status,
+				'type'   => $type,
+				'tags'   => $this->getTagsFor($id),
+			];
+		}
 
-            $result[$id] = [
-                'status' => $status,
-                'type'   => $type,
-                'tags'   => $this->getTagsFor($id),
-            ];
-        }
+		ksort($result);
+		return $result;
+	}
 
-        ksort($result);
-        return $result;
-    }
-
-    /**
-     * Получить все теги для сервиса.
-     *
-     * @param string $id
-     * @return string[]
-     */
-    private function getTagsFor(string $id): array {
-        $result = [];
-        foreach ($this->tags as $tag => $ids) {
-            if (in_array($id, $ids, true)) {
-                $result[] = $tag;
-            }
-        }
-        return $result;
-    }
+	/**
+	 * Получить все теги для сервиса.
+	 *
+	 * @return string[]
+	 */
+	private function getTagsFor(string $id): array {
+		$result = [];
+		foreach ($this->tags as $tag => $ids) {
+			if (in_array($id, $ids, true)) {
+				$result[] = $tag;
+			}
+		}
+		return $result;
+	}
 }
diff --git a/src/Core/Database/Database.php b/src/Core/Database/Database.php
index aa55d242..25aa80c1 100644
--- a/src/Core/Database/Database.php
+++ b/src/Core/Database/Database.php
@@ -16,17 +16,24 @@ use XcVm\Core\Logging\FileLogger;
 
 class Database {
 	public $result = null;
+
 	public $last_query = null;
+
 	public $dbh = null;
+
 	public $connected = false;
 
 	/** Last PDO error message (empty when the last query succeeded). */
 	protected $lastError = '';
 
 	protected $dbuser = null;
+
 	protected $dbpassword = null;
+
 	protected $dbname = null;
+
 	protected $dbhost = null;
+
 	protected $dbport = null;
 
 	/**
@@ -38,7 +45,7 @@ class Database {
 	 * @param string $host Database host
 	 * @param int $db_port Database port number
 	 */
-	public function __construct($db_user = null, $db_pass = null, $db_name = null, $host = null, $db_port = 3306, $migrate = false) {
+	public function __construct(string $db_user = null, string $db_pass = null, string $db_name = null, string $host = null, int $db_port = 3306, $migrate = false) {
 		$this->dbh = false;
 		$this->dbuser = $db_user;
 		$this->dbpassword = $db_pass;
@@ -54,7 +61,7 @@ class Database {
 	 * @param string $rHost Host name.
 	 * @return string '127.0.0.1' for 'localhost', otherwise the host unchanged.
 	 */
-	private function normalizeHost($rHost) {
+	private function normalizeHost(string $rHost) {
 		if ($rHost === 'localhost') {
 			return '127.0.0.1';
 		}
@@ -122,7 +129,7 @@ class Database {
 	 *                            null it defaults to $migrate (legacy behaviour).
 	 * @return bool True on success.
 	 */
-	public function db_connect($migrate = false, $graceful = null) {
+	public function db_connect(bool $migrate = false, ?bool $graceful = null) {
 		if ($graceful === null) {
 			$graceful = $migrate;
 		}
@@ -131,14 +138,14 @@ class Database {
 			$this->dbh = \XC_VM::db_connect($migrate);
 			if (!$this->dbh) {
 				if (!$graceful) {
-					exit(json_encode(array('error' => 'MySQL: Cannot connect to database! Please check credentials.')));
+					exit(json_encode(['error' => 'MySQL: Cannot connect to database! Please check credentials.']));
 				}
 
 				return false;
 			}
 		} catch (\PDOException $e) {
 			if (!$graceful) {
-				exit(json_encode(array('error' => 'MySQL: ' . $e->getMessage())));
+				exit(json_encode(['error' => 'MySQL: ' . $e->getMessage()]));
 			}
 			return false;
 		}
@@ -184,7 +191,7 @@ class Database {
 	 * @param string $rPassword Password.
 	 * @return bool True on success, false on failure.
 	 */
-	public function db_explicit_connect($rHost, $rPort, $rDatabase, $rUsername, $rPassword) {
+	public function db_explicit_connect(string $rHost, int $rPort, string $rDatabase, string $rUsername, string $rPassword) {
 		try {
 			$this->dbh = new \PDO('mysql:host=' . $this->normalizeHost($rHost) . ';port=' . $rPort . ';dbname=' . $rDatabase, $rUsername, $rPassword);
 		} catch (\PDOException $e) {
@@ -204,7 +211,7 @@ class Database {
 	 * @param \PDOStatement $stmt Prepared statement.
 	 * @return string The dumped parameter/SQL debug text.
 	 */
-	public function debugString($stmt) {
+	public function debugString(\PDOStatement $stmt) {
 		ob_start();
 		$stmt->debugDumpParams();
 		$r = ob_get_contents();
@@ -230,7 +237,7 @@ class Database {
 	 *                         for extraction into a dedicated unbuffered_query().
 	 * @return bool True on success, false on failure.
 	 */
-	public function query($query, $buffered = false) {
+	public function query(string $query, mixed $buffered = false) {
 		if (!$this->dbh) {
 			return false;
 		}
@@ -238,7 +245,7 @@ class Database {
 
 		$numargs = func_num_args();
 		$arg_list = func_get_args();
-		$next_arg_list = array();
+		$next_arg_list = [];
 		$i = 1;
 
 		while ($i < $numargs) {
@@ -301,7 +308,7 @@ class Database {
 	 * @param string $query Raw SQL.
 	 * @return bool True on success, false on failure.
 	 */
-	public function simple_query($query) {
+	public function simple_query(string $query) {
 		try {
 			$this->result = $this->dbh->query($query);
 		} catch (\Exception $e) {
@@ -321,19 +328,19 @@ class Database {
 	 * @param string $sub_row_id   Optional column used as the sub-key when grouping.
 	 * @return array|false Rows (cleaned), or false if no active result.
 	 */
-	public function get_rows($use_id = false, $column_as_id = '', $unique_row = true, $sub_row_id = '') {
+	public function get_rows(bool $use_id = false, string $column_as_id = '', bool $unique_row = true, string $sub_row_id = '') {
 		if (!($this->dbh && $this->result)) {
 			return false;
 		}
 
-		$rows = array();
+		$rows = [];
 
 		if (0 >= $this->result->rowCount()) {
 		} else {
 			foreach ($this->result->fetchAll(\PDO::FETCH_ASSOC) as $row) {
 				if ($use_id && array_key_exists($column_as_id, $row)) {
 					if (!isset($rows[$row[$column_as_id]])) {
-						$rows[$row[$column_as_id]] = array();
+						$rows[$row[$column_as_id]] = [];
 					}
 
 					if (!$unique_row) {
@@ -366,7 +373,7 @@ class Database {
 			return false;
 		}
 
-		$row = array();
+		$row = [];
 
 		if (0 >= $this->result->rowCount()) {
 		} else {
@@ -426,7 +433,7 @@ class Database {
 	 * @param string $string Value to quote.
 	 * @return string|null Quoted string, or null if not connected.
 	 */
-	public function escape($string) {
+	public function escape(string $string) {
 		if ($this->dbh) {
 			return $this->dbh->quote($string);
 		}
@@ -483,9 +490,9 @@ class Database {
 	 * @param string $rValue Raw value.
 	 * @return string Cleaned value ('' for empty input).
 	 */
-	public static function parseCleanValue($rValue) {
+	public static function parseCleanValue(string $rValue) {
 		if ($rValue != '') {
-			$rValue = str_replace(array("\r\n", "\n\r", "\r"), "\n", $rValue);
+			$rValue = str_replace(["\r\n", "\n\r", "\r"], "\n", $rValue);
 			$rValue = str_replace('<', '&lt;', str_replace('>', '&gt;', $rValue));
 			$rValue = str_replace('<!--', '&#60;&#33;--', $rValue);
 			$rValue = str_replace('-->', '--&#62;', $rValue);
@@ -504,7 +511,7 @@ class Database {
 	 * @param array<string, mixed> $row Associative row.
 	 * @return array<string, mixed> Row with sanitized values.
 	 */
-	public function clean_row($row) {
+	public function clean_row(array $row) {
 		foreach ($row as $key => $value) {
 			if ($value) {
 				$row[$key] = self::parseCleanValue($value);
diff --git a/src/Core/Database/DatabaseHandler.php b/src/Core/Database/DatabaseHandler.php
index 2a4cb010..0e74c65c 100644
--- a/src/Core/Database/DatabaseHandler.php
+++ b/src/Core/Database/DatabaseHandler.php
@@ -70,462 +70,461 @@ namespace XcVm\Core\Database;
  */
 
 class DatabaseHandler extends Database {
+	/** @var int Total queries executed in this request */
+	protected $queryCount = 0;
 
-    /** @var int Total queries executed in this request */
-    protected $queryCount = 0;
+	/** @var float Total query execution time (seconds) */
+	protected $queryTime = 0.0;
 
-    /** @var float Total query execution time (seconds) */
-    protected $queryTime = 0.0;
+	/** @var bool Whether a transaction is currently active */
+	protected $inTransaction = false;
 
-    /** @var bool Whether a transaction is currently active */
-    protected $inTransaction = false;
+	/** @var callable|null Optional logger callback: function(string $level, string $message, array $context) */
+	protected $logger = null;
 
-    /** @var callable|null Optional logger callback: function(string $level, string $message, array $context) */
-    protected $logger = null;
+	/** @var int Maximum reconnection attempts */
+	protected $maxReconnectAttempts = 3;
 
-    /** @var int Maximum reconnection attempts */
-    protected $maxReconnectAttempts = 3;
+	/**
+	 * Factory method — creates DatabaseHandler from config array
+	 *
+	 * @param array $config Associative array with keys:
+	 *   'username', 'password', 'database', 'hostname', 'port' (optional, default 3306)
+	 * @param bool $migrate Whether this is a migration connection (no exit on failure)
+	 * @return DatabaseHandler|false
+	 */
+	public static function create(array $config, bool $migrate = false) {
+		$port = isset($config['port']) ? (int) $config['port'] : 3306;
 
-    /**
-     * Factory method — creates DatabaseHandler from config array
-     *
-     * @param array $config Associative array with keys:
-     *   'username', 'password', 'database', 'hostname', 'port' (optional, default 3306)
-     * @param bool $migrate Whether this is a migration connection (no exit on failure)
-     * @return DatabaseHandler|false
-     */
-    public static function create(array $config, $migrate = false) {
-        $port = isset($config['port']) ? (int)$config['port'] : 3306;
+		return new self(
+			$config['username'],
+			$config['password'],
+			$config['database'],
+			$config['hostname'],
+			$port,
+			$migrate
+		);
+	}
 
-        return new self(
-            $config['username'],
-            $config['password'],
-            $config['database'],
-            $config['hostname'],
-            $port,
-            $migrate
-        );
-    }
+	/**
+	 * Set a logger callback for query and error logging
+	 *
+	 * @param callable $logger function(string $level, string $message, array $context = [])
+	 * @return $this
+	 */
+	public function setLogger(callable $logger) {
+		$this->logger = $logger;
+		return $this;
+	}
 
-    /**
-     * Set a logger callback for query and error logging
-     *
-     * @param callable $logger function(string $level, string $message, array $context = [])
-     * @return $this
-     */
-    public function setLogger($logger) {
-        $this->logger = $logger;
-        return $this;
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Transaction Support
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Transaction Support
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Begin a database transaction
+	 *
+	 * @return bool
+	 */
+	public function beginTransaction() {
+		if (!$this->dbh) {
+			return false;
+		}
 
-    /**
-     * Begin a database transaction
-     *
-     * @return bool
-     */
-    public function beginTransaction() {
-        if (!$this->dbh) {
-            return false;
-        }
+		if ($this->inTransaction) {
+			$this->log('warning', 'beginTransaction called while already in transaction');
+			return false;
+		}
 
-        if ($this->inTransaction) {
-            $this->log('warning', 'beginTransaction called while already in transaction');
-            return false;
-        }
+		$this->inTransaction = $this->dbh->beginTransaction();
+		return $this->inTransaction;
+	}
 
-        $this->inTransaction = $this->dbh->beginTransaction();
-        return $this->inTransaction;
-    }
+	/**
+	 * Commit the current transaction
+	 *
+	 * @return bool
+	 */
+	public function commit() {
+		if (!$this->dbh || !$this->inTransaction) {
+			return false;
+		}
 
-    /**
-     * Commit the current transaction
-     *
-     * @return bool
-     */
-    public function commit() {
-        if (!$this->dbh || !$this->inTransaction) {
-            return false;
-        }
+		$result = $this->dbh->commit();
+		$this->inTransaction = false;
+		return $result;
+	}
 
-        $result = $this->dbh->commit();
-        $this->inTransaction = false;
-        return $result;
-    }
+	/**
+	 * Rollback the current transaction
+	 *
+	 * @return bool
+	 */
+	public function rollback() {
+		if (!$this->dbh || !$this->inTransaction) {
+			return false;
+		}
 
-    /**
-     * Rollback the current transaction
-     *
-     * @return bool
-     */
-    public function rollback() {
-        if (!$this->dbh || !$this->inTransaction) {
-            return false;
-        }
+		$result = $this->dbh->rollBack();
+		$this->inTransaction = false;
+		return $result;
+	}
 
-        $result = $this->dbh->rollBack();
-        $this->inTransaction = false;
-        return $result;
-    }
+	/**
+	 * Execute a callback within a transaction
+	 *
+	 * Automatically commits on success, rolls back on anything thrown — an Error
+	 * (a TypeError, an undefined method) as well as an Exception, or the
+	 * transaction would stay open on the connection.
+	 *
+	 * @param callable $callback function(DatabaseHandler $db)
+	 * @return mixed The return value of the callback
+	 * @throws \Throwable Re-throws after rollback
+	 */
+	public function transactional(callable $callback) {
+		$this->beginTransaction();
 
-    /**
-     * Execute a callback within a transaction
-     *
-     * Automatically commits on success, rolls back on anything thrown — an Error
-     * (a TypeError, an undefined method) as well as an Exception, or the
-     * transaction would stay open on the connection.
-     *
-     * @param callable $callback function(DatabaseHandler $db)
-     * @return mixed The return value of the callback
-     * @throws \Throwable Re-throws after rollback
-     */
-    public function transactional($callback) {
-        $this->beginTransaction();
+		try {
+			$result = $callback($this);
+			$this->commit();
+			return $result;
+		} catch (\Throwable $e) {
+			$this->rollback();
+			throw $e;
+		}
+	}
 
-        try {
-            $result = $callback($this);
-            $this->commit();
-            return $result;
-        } catch (\Throwable $e) {
-            $this->rollback();
-            throw $e;
-        }
-    }
+	/**
+	 * Check if currently inside a transaction
+	 *
+	 * @return bool
+	 */
+	public function isInTransaction() {
+		return $this->inTransaction;
+	}
 
-    /**
-     * Check if currently inside a transaction
-     *
-     * @return bool
-     */
-    public function isInTransaction() {
-        return $this->inTransaction;
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Improved Query Methods (shorthand)
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Improved Query Methods (shorthand)
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Execute query and return all rows
+	 *
+	 * Shorthand for: $db->query(...); return $db->get_rows();
+	 *
+	 * @param string $sql SQL query with ? placeholders
+	 * @param mixed ...$params Bound parameter values
+	 * @return array|false
+	 */
+	public function fetchAll(string $sql, mixed ...$params) {
+		$args = func_get_args();
+		if (!call_user_func_array([$this, 'query'], $args)) {
+			return false;
+		}
+		return $this->get_rows();
+	}
 
-    /**
-     * Execute query and return all rows
-     *
-     * Shorthand for: $db->query(...); return $db->get_rows();
-     *
-     * @param string $sql SQL query with ? placeholders
-     * @param mixed ...$params Bound parameter values
-     * @return array|false
-     */
-    public function fetchAll($sql, ...$params) {
-        $args = func_get_args();
-        if (!call_user_func_array(array($this, 'query'), $args)) {
-            return false;
-        }
-        return $this->get_rows();
-    }
+	/**
+	 * Execute query and return all rows keyed by a column
+	 *
+	 * Shorthand for: $db->query(...); return $db->get_rows(true, $column);
+	 *
+	 * @param string $keyColumn Column name to use as array key
+	 * @param string $sql SQL query with ? placeholders
+	 * @param mixed ...$params Bound parameter values
+	 * @return array|false
+	 */
+	public function fetchAllKeyed(string $keyColumn, string $sql, mixed ...$params) {
+		$args = func_get_args();
+		array_shift($args); // remove $keyColumn
+		if (!call_user_func_array([$this, 'query'], $args)) {
+			return false;
+		}
+		return $this->get_rows(true, $keyColumn);
+	}
 
-    /**
-     * Execute query and return all rows keyed by a column
-     *
-     * Shorthand for: $db->query(...); return $db->get_rows(true, $column);
-     *
-     * @param string $keyColumn Column name to use as array key
-     * @param string $sql SQL query with ? placeholders
-     * @param mixed ...$params Bound parameter values
-     * @return array|false
-     */
-    public function fetchAllKeyed($keyColumn, $sql, ...$params) {
-        $args = func_get_args();
-        array_shift($args); // remove $keyColumn
-        if (!call_user_func_array(array($this, 'query'), $args)) {
-            return false;
-        }
-        return $this->get_rows(true, $keyColumn);
-    }
+	/**
+	 * Execute query and return single row
+	 *
+	 * Shorthand for: $db->query(...); return $db->get_row();
+	 *
+	 * @param string $sql SQL query with ? placeholders
+	 * @param mixed ...$params Bound parameter values
+	 * @return array|false
+	 */
+	public function fetchOne(string $sql, mixed ...$params) {
+		$args = func_get_args();
+		if (!call_user_func_array([$this, 'query'], $args)) {
+			return false;
+		}
+		return $this->get_row();
+	}
 
-    /**
-     * Execute query and return single row
-     *
-     * Shorthand for: $db->query(...); return $db->get_row();
-     *
-     * @param string $sql SQL query with ? placeholders
-     * @param mixed ...$params Bound parameter values
-     * @return array|false
-     */
-    public function fetchOne($sql, ...$params) {
-        $args = func_get_args();
-        if (!call_user_func_array(array($this, 'query'), $args)) {
-            return false;
-        }
-        return $this->get_row();
-    }
+	/**
+	 * Execute query and return a single scalar value
+	 *
+	 * Shorthand for: $db->query(...); return $db->get_col();
+	 *
+	 * @param string $sql SQL query with ? placeholders
+	 * @param mixed ...$params Bound parameter values
+	 * @return mixed|false
+	 */
+	public function fetchValue(string $sql, mixed ...$params) {
+		$args = func_get_args();
+		if (!call_user_func_array([$this, 'query'], $args)) {
+			return false;
+		}
+		return $this->get_col();
+	}
 
-    /**
-     * Execute query and return a single scalar value
-     *
-     * Shorthand for: $db->query(...); return $db->get_col();
-     *
-     * @param string $sql SQL query with ? placeholders
-     * @param mixed ...$params Bound parameter values
-     * @return mixed|false
-     */
-    public function fetchValue($sql, ...$params) {
-        $args = func_get_args();
-        if (!call_user_func_array(array($this, 'query'), $args)) {
-            return false;
-        }
-        return $this->get_col();
-    }
+	/**
+	 * Execute query and return a single column as flat array
+	 *
+	 * Shorthand for: $db->query(...); return $db->get_column();
+	 *
+	 * @param string $sql SQL query with ? placeholders
+	 * @param mixed ...$params Bound parameter values
+	 * @return array|false
+	 */
+	public function fetchColumn(string $sql, mixed ...$params) {
+		$args = func_get_args();
+		if (!call_user_func_array([$this, 'query'], $args)) {
+			return false;
+		}
+		return $this->get_column();
+	}
 
-    /**
-     * Execute query and return a single column as flat array
-     *
-     * Shorthand for: $db->query(...); return $db->get_column();
-     *
-     * @param string $sql SQL query with ? placeholders
-     * @param mixed ...$params Bound parameter values
-     * @return array|false
-     */
-    public function fetchColumn($sql, ...$params) {
-        $args = func_get_args();
-        if (!call_user_func_array(array($this, 'query'), $args)) {
-            return false;
-        }
-        return $this->get_column();
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Query Override with Timing and Reconnect
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Query Override with Timing and Reconnect
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Execute a prepared query with automatic reconnection and timing
+	 *
+	 * Overrides Database::query() to add:
+	 * - Query counting
+	 * - Execution time tracking
+	 * - Automatic reconnection on "MySQL server has gone away"
+	 *
+	 * @param string $query SQL with ? placeholders
+	 * @param mixed $buffered First bind value, or boolean true to disable
+	 *                        buffered query mode (legacy positional overload;
+	 *                        all args from index 1 are collected as binds).
+	 * @return bool
+	 */
+	public function query(string $query, mixed $buffered = false) {
+		$start = microtime(true);
+		$this->queryCount++;
 
-    /**
-     * Execute a prepared query with automatic reconnection and timing
-     *
-     * Overrides Database::query() to add:
-     * - Query counting
-     * - Execution time tracking
-     * - Automatic reconnection on "MySQL server has gone away"
-     *
-     * @param string $query SQL with ? placeholders
-     * @param mixed $buffered First bind value, or boolean true to disable
-     *                        buffered query mode (legacy positional overload;
-     *                        all args from index 1 are collected as binds).
-     * @return bool
-     */
-    public function query($query, $buffered = false) {
-        $start = microtime(true);
-        $this->queryCount++;
+		$result = call_user_func_array('parent::query', func_get_args());
 
-        $result = call_user_func_array('parent::query', func_get_args());
+		// If query failed — try reconnection (only if not in transaction)
+		if ($result === false && !$this->inTransaction && $this->shouldReconnect()) {
+			$this->log('warning', 'Query failed, attempting reconnect', ['query' => $query]);
 
-        // If query failed — try reconnection (only if not in transaction)
-        if ($result === false && !$this->inTransaction && $this->shouldReconnect()) {
-            $this->log('warning', 'Query failed, attempting reconnect', ['query' => $query]);
+			if ($this->reconnect()) {
+				$result = call_user_func_array('parent::query', func_get_args());
+			}
+		}
 
-            if ($this->reconnect()) {
-                $result = call_user_func_array('parent::query', func_get_args());
-            }
-        }
+		$elapsed = microtime(true) - $start;
+		$this->queryTime += $elapsed;
 
-        $elapsed = microtime(true) - $start;
-        $this->queryTime += $elapsed;
+		return $result;
+	}
 
-        return $result;
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Connection Management
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Connection Management
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Attempt to reconnect to the database
+	 *
+	 * @return bool
+	 */
+	public function reconnect() {
+		$attempts = 0;
 
-    /**
-     * Attempt to reconnect to the database
-     *
-     * @return bool
-     */
-    public function reconnect() {
-        $attempts = 0;
+		while ($attempts < $this->maxReconnectAttempts) {
+			$attempts++;
+			$this->log('info', "Reconnect attempt {$attempts}/{$this->maxReconnectAttempts}");
 
-        while ($attempts < $this->maxReconnectAttempts) {
-            $attempts++;
-            $this->log('info', "Reconnect attempt {$attempts}/{$this->maxReconnectAttempts}");
+			$this->close_mysql();
 
-            $this->close_mysql();
+			// Reconnect to the MAIN configured schema, gracefully (no exit()) so
+			// the retry/backoff loop can continue. migrate=true here would
+			// silently reconnect to `xc_vm_migrate` instead of the panel DB.
+			if ($this->db_connect(false, true)) {
+				$this->log('info', 'Reconnected successfully');
+				return true;
+			}
 
-            // Reconnect to the MAIN configured schema, gracefully (no exit()) so
-            // the retry/backoff loop can continue. migrate=true here would
-            // silently reconnect to `xc_vm_migrate` instead of the panel DB.
-            if ($this->db_connect(false, true)) {
-                $this->log('info', 'Reconnected successfully');
-                return true;
-            }
+			// Exponential backoff: 100ms, 200ms, 400ms
+			usleep(100000 * pow(2, $attempts - 1));
+		}
 
-            // Exponential backoff: 100ms, 200ms, 400ms
-            usleep(100000 * pow(2, $attempts - 1));
-        }
+		$this->log('error', 'Failed to reconnect after ' . $this->maxReconnectAttempts . ' attempts');
+		return false;
+	}
 
-        $this->log('error', 'Failed to reconnect after ' . $this->maxReconnectAttempts . ' attempts');
-        return false;
-    }
+	/**
+	 * Check if a reconnection should be attempted
+	 *
+	 * @return bool
+	 */
+	protected function shouldReconnect() {
+		if (!$this->dbh) {
+			return true;
+		}
 
-    /**
-     * Check if a reconnection should be attempted
-     *
-     * @return bool
-     */
-    protected function shouldReconnect() {
-        if (!$this->dbh) {
-            return true;
-        }
+		return !$this->ping();
+	}
 
-        return !$this->ping();
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Diagnostics
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Diagnostics
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Get total number of queries executed
+	 *
+	 * @return int
+	 */
+	public function getQueryCount() {
+		return $this->queryCount;
+	}
 
-    /**
-     * Get total number of queries executed
-     *
-     * @return int
-     */
-    public function getQueryCount() {
-        return $this->queryCount;
-    }
+	/**
+	 * Get total query execution time in seconds
+	 *
+	 * @return float
+	 */
+	public function getQueryTime() {
+		return $this->queryTime;
+	}
 
-    /**
-     * Get total query execution time in seconds
-     *
-     * @return float
-     */
-    public function getQueryTime() {
-        return $this->queryTime;
-    }
+	/**
+	 * Get diagnostic summary
+	 *
+	 * @return array
+	 */
+	public function getDiagnostics() {
+		return [
+			'connected'   => $this->connected,
+			'queryCount'  => $this->queryCount,
+			'queryTime'   => round($this->queryTime, 4),
+			'inTransaction' => $this->inTransaction,
+			'database'    => $this->dbname,
+			'host'        => $this->dbhost,
+			'port'        => $this->dbport,
+		];
+	}
 
-    /**
-     * Get diagnostic summary
-     *
-     * @return array
-     */
-    public function getDiagnostics() {
-        return [
-            'connected'   => $this->connected,
-            'queryCount'  => $this->queryCount,
-            'queryTime'   => round($this->queryTime, 4),
-            'inTransaction' => $this->inTransaction,
-            'database'    => $this->dbname,
-            'host'        => $this->dbhost,
-            'port'        => $this->dbport,
-        ];
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Bulk Operations
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Bulk Operations
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Insert a row from an associative array
+	 *
+	 * @param string $table Table name
+	 * @param array $data Associative array of column => value
+	 * @return int|false Last insert ID on success, false on failure
+	 */
+	public function insert(string $table, array $data) {
+		if (empty($data)) {
+			return false;
+		}
 
-    /**
-     * Insert a row from an associative array
-     *
-     * @param string $table Table name
-     * @param array $data Associative array of column => value
-     * @return int|false Last insert ID on success, false on failure
-     */
-    public function insert($table, array $data) {
-        if (empty($data)) {
-            return false;
-        }
+		$columns = array_keys($data);
+		$placeholders = array_fill(0, count($columns), '?');
 
-        $columns = array_keys($data);
-        $placeholders = array_fill(0, count($columns), '?');
+		$sql = sprintf(
+			'INSERT INTO `%s` (`%s`) VALUES (%s)',
+			$table,
+			implode('`, `', $columns),
+			implode(', ', $placeholders)
+		);
 
-        $sql = sprintf(
-            'INSERT INTO `%s` (`%s`) VALUES (%s)',
-            $table,
-            implode('`, `', $columns),
-            implode(', ', $placeholders)
-        );
+		$args = array_merge([$sql], array_values($data));
 
-        $args = array_merge([$sql], array_values($data));
+		if (call_user_func_array([$this, 'query'], $args)) {
+			return $this->last_insert_id();
+		}
 
-        if (call_user_func_array([$this, 'query'], $args)) {
-            return $this->last_insert_id();
-        }
+		return false;
+	}
 
-        return false;
-    }
+	/**
+	 * Update rows from an associative array
+	 *
+	 * @param string $table Table name
+	 * @param array $data Associative array of column => value
+	 * @param string $where WHERE clause (with ? placeholders)
+	 * @param mixed ...$whereParams Values for WHERE placeholders
+	 * @return bool
+	 */
+	public function update(string $table, array $data, string $where, mixed ...$whereParams) {
+		if (empty($data)) {
+			return false;
+		}
 
-    /**
-     * Update rows from an associative array
-     *
-     * @param string $table Table name
-     * @param array $data Associative array of column => value
-     * @param string $where WHERE clause (with ? placeholders)
-     * @param mixed ...$whereParams Values for WHERE placeholders
-     * @return bool
-     */
-    public function update($table, array $data, $where, ...$whereParams) {
-        if (empty($data)) {
-            return false;
-        }
+		$setParts = [];
+		$values = [];
 
-        $setParts = [];
-        $values = [];
+		foreach ($data as $column => $value) {
+			$setParts[] = "`{$column}` = ?";
+			$values[] = $value;
+		}
 
-        foreach ($data as $column => $value) {
-            $setParts[] = "`{$column}` = ?";
-            $values[] = $value;
-        }
+		$sql = sprintf(
+			'UPDATE `%s` SET %s WHERE %s',
+			$table,
+			implode(', ', $setParts),
+			$where
+		);
 
-        $sql = sprintf(
-            'UPDATE `%s` SET %s WHERE %s',
-            $table,
-            implode(', ', $setParts),
-            $where
-        );
+		// Add WHERE params from extra func_get_args
+		$allArgs = func_get_args();
+		$whereParams = array_slice($allArgs, 3);
+		$values = array_merge($values, $whereParams);
 
-        // Add WHERE params from extra func_get_args
-        $allArgs = func_get_args();
-        $whereParams = array_slice($allArgs, 3);
-        $values = array_merge($values, $whereParams);
+		$args = array_merge([$sql], $values);
 
-        $args = array_merge([$sql], $values);
+		return call_user_func_array([$this, 'query'], $args);
+	}
 
-        return call_user_func_array([$this, 'query'], $args);
-    }
+	/**
+	 * Delete rows with a WHERE clause
+	 *
+	 * @param string $table Table name
+	 * @param string $where WHERE clause with ? placeholders
+	 * @param mixed ...$params Values for WHERE placeholders
+	 * @return bool
+	 */
+	public function delete(string $table, string $where, mixed ...$params) {
+		$sql = sprintf('DELETE FROM `%s` WHERE %s', $table, $where);
 
-    /**
-     * Delete rows with a WHERE clause
-     *
-     * @param string $table Table name
-     * @param string $where WHERE clause with ? placeholders
-     * @param mixed ...$params Values for WHERE placeholders
-     * @return bool
-     */
-    public function delete($table, $where, ...$params) {
-        $sql = sprintf('DELETE FROM `%s` WHERE %s', $table, $where);
+		$allArgs = func_get_args();
+		$whereParams = array_slice($allArgs, 2);
+		$args = array_merge([$sql], $whereParams);
 
-        $allArgs = func_get_args();
-        $whereParams = array_slice($allArgs, 2);
-        $args = array_merge([$sql], $whereParams);
+		return call_user_func_array([$this, 'query'], $args);
+	}
 
-        return call_user_func_array([$this, 'query'], $args);
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Internal Logging
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Internal Logging
-    // ───────────────────────────────────────────────────────────
-
-    /**
-     * Log a message through the configured logger
-     *
-     * @param string $level 'info', 'warning', 'error'
-     * @param string $message Log message
-     * @param array $context Additional context
-     */
-    protected function log($level, $message, array $context = []) {
-        if ($this->logger) {
-            call_user_func($this->logger, $level, '[DatabaseHandler] ' . $message, $context);
-        }
-    }
+	/**
+	 * Log a message through the configured logger
+	 *
+	 * @param string $level 'info', 'warning', 'error'
+	 * @param string $message Log message
+	 * @param array $context Additional context
+	 */
+	protected function log(string $level, string $message, array $context = []) {
+		if ($this->logger) {
+			call_user_func($this->logger, $level, '[DatabaseHandler] ' . $message, $context);
+		}
+	}
 }
diff --git a/src/Core/Database/MigrationRunner.php b/src/Core/Database/MigrationRunner.php
index 98e64a25..c612dac9 100644
--- a/src/Core/Database/MigrationRunner.php
+++ b/src/Core/Database/MigrationRunner.php
@@ -13,7 +13,6 @@ namespace XcVm\Core\Database;
  */
 
 class MigrationRunner {
-
 	/**
 	 * Apply pending SQL migrations from the migrations/ directory.
 	 *
@@ -23,7 +22,7 @@ class MigrationRunner {
 	 * @param Database $db Database handle.
 	 * @return void
 	 */
-	public static function run($db): void {
+	public static function run(Database $db): void {
 		echo "Migrations\n------------------------------\n";
 
 		$db->query("CREATE TABLE IF NOT EXISTS `migrations` (
@@ -33,7 +32,7 @@ class MigrationRunner {
 		) ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
 		$db->query("SELECT `migration` FROM `migrations`;");
-		$rApplied = array();
+		$rApplied = [];
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rRow) {
 				$rApplied[] = $rRow['migration'];
diff --git a/src/Core/Database/QueryHelper.php b/src/Core/Database/QueryHelper.php
index e9a4e41f..2f959452 100644
--- a/src/Core/Database/QueryHelper.php
+++ b/src/Core/Database/QueryHelper.php
@@ -15,7 +15,7 @@ class QueryHelper {
 	 * @param string $rValue Raw column/table name.
 	 * @return string Sanitized identifier.
 	 */
-	public static function prepareColumn($rValue) {
+	public static function prepareColumn(string $rValue) {
 		return strtolower(preg_replace('/[^a-z0-9_]+/i', '', $rValue));
 	}
 
@@ -27,8 +27,8 @@ class QueryHelper {
 	 * @param array $rArray Column => value map.
 	 * @return array ['columns' => string, 'placeholder' => string, 'data' => array, 'update' => string].
 	 */
-	public static function prepareArray($rArray) {
-		$UpdateData = $rColumns = $rPlaceholder = $rData = array();
+	public static function prepareArray(array $rArray) {
+		$UpdateData = $rColumns = $rPlaceholder = $rData = [];
 
 		foreach (array_keys($rArray) as $rKey) {
 			$rColumns[] = '`' . self::prepareColumn($rKey) . '`';
@@ -48,7 +48,7 @@ class QueryHelper {
 			$rData[] = $rValue;
 		}
 
-		return array('placeholder' => implode(',', $rPlaceholder), 'columns' => implode(',', $rColumns), 'data' => $rData, 'update' => implode(',', $UpdateData));
+		return ['placeholder' => implode(',', $rPlaceholder), 'columns' => implode(',', $rColumns), 'data' => $rData, 'update' => implode(',', $UpdateData)];
 	}
 
 	/**
@@ -62,9 +62,9 @@ class QueryHelper {
 	 * @param bool   $rOnlyExisting When true, skip columns absent from $rData.
 	 * @return array Sanitized column => value map ready for prepareArray().
 	 */
-	public static function verifyPostTable($rTable, $rData = array(), $rOnlyExisting = false) {
+	public static function verifyPostTable(string $rTable, array $rData = [], bool $rOnlyExisting = false) {
 		global $db;
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `column_name`, `column_default`, `is_nullable`, `data_type` FROM `information_schema`.`columns` WHERE `table_schema` = (SELECT DATABASE()) AND `table_name` = ? ORDER BY `ordinal_position`;', $rTable);
 
 		foreach ($db->get_rows() as $rRow) {
@@ -81,7 +81,7 @@ class QueryHelper {
 
 			if ($rRow['is_nullable'] != 'NO' || $rRow['column_default']) {
 			} else {
-				if (in_array($rRow['data_type'], array('int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'))) {
+				if (in_array($rRow['data_type'], ['int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'])) {
 					$rRow['column_default'] = 0;
 				} else {
 					$rRow['column_default'] = '';
@@ -92,11 +92,11 @@ class QueryHelper {
 
 			if (array_key_exists($rRow['column_name'], $rData)) {
 				// coerce empty string for numeric columns to a safe default
-				$rNumericTypes = array('int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit');
+				$rNumericTypes = ['int', 'float', 'tinyint', 'double', 'decimal', 'smallint', 'mediumint', 'bigint', 'bit'];
 				$rValue = $rData[$rRow['column_name']];
 				if ($rValue === '' && in_array($rRow['data_type'], $rNumericTypes)) {
 					$rReturn[$rRow['column_name']] = is_null($rRow['column_default']) ? ($rForceDefault ? 0 : null) : $rRow['column_default'];
-				} else if (empty($rValue) && !is_numeric($rValue) && is_null($rRow['column_default'])) {
+				} elseif (empty($rValue) && !is_numeric($rValue) && is_null($rRow['column_default'])) {
 					$rReturn[$rRow['column_name']] = ($rForceDefault ? $rRow['column_default'] : null);
 				} else {
 					$rReturn[$rRow['column_name']] = $rValue;
@@ -122,7 +122,7 @@ class QueryHelper {
 	 * @param mixed       $rExclude       Value to exclude for $rExcludeColumn.
 	 * @return bool True if at least one matching row exists.
 	 */
-	public static function checkExists($rTable, $rColumn, $rValue, $rExcludeColumn = null, $rExclude = null) {
+	public static function checkExists(string $rTable, string $rColumn, mixed $rValue, ?string $rExcludeColumn = null, mixed $rExclude = null) {
 		global $db;
 
 		if ($rExcludeColumn && $rExclude) {
diff --git a/src/Core/Diagnostics/DiagnosticsService.php b/src/Core/Diagnostics/DiagnosticsService.php
index 0b57a73e..a29d348f 100644
--- a/src/Core/Diagnostics/DiagnosticsService.php
+++ b/src/Core/Diagnostics/DiagnosticsService.php
@@ -21,7 +21,6 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  */
 
 class DiagnosticsService {
-
 	use DatabaseAware;
 
 	/**
@@ -30,7 +29,7 @@ class DiagnosticsService {
 	 * @param string|null $certificate  Path to certificate file (auto-detects from nginx if null)
 	 * @return array|null ['serial', 'expiration', 'subject', 'path'], or null if the certificate is missing/unreadable
 	 */
-	public static function getCertificateInfo($certificate = null) {
+	public static function getCertificateInfo(?string $certificate = null) {
 		$result = ['serial' => null, 'expiration' => null, 'subject' => null, 'path' => null];
 
 		if (!$certificate) {
@@ -74,7 +73,7 @@ class DiagnosticsService {
 	 * @param bool         $allowHEVC  Whether HEVC/H265 + AC3 are allowed
 	 * @return bool
 	 */
-	public static function checkCompatibility($data, $allowHEVC = false) {
+	public static function checkCompatibility(array|string $data, bool $allowHEVC = false) {
 		if (!is_array($data)) {
 			$data = json_decode($data, true);
 		}
@@ -140,9 +139,9 @@ class DiagnosticsService {
 					'type'    => isset($error['type']) ? htmlspecialchars($error['type'], ENT_QUOTES, 'UTF-8') : 'unknown',
 					'message' => isset($error['log_message']) ? htmlspecialchars($error['log_message'], ENT_QUOTES, 'UTF-8') : '',
 					'file'    => isset($error['log_extra']) ? htmlspecialchars($error['log_extra'], ENT_QUOTES, 'UTF-8') : '',
-					'line'    => isset($error['line']) ? (int)$error['line'] : 0,
-					'date'    => isset($error['date']) ? (int)$error['date'] : 0,
-					'version' => isset($error['version']) ? htmlspecialchars((string)$error['version'], ENT_QUOTES, 'UTF-8') : '',
+					'line'    => isset($error['line']) ? (int) $error['line'] : 0,
+					'date'    => isset($error['date']) ? (int) $error['date'] : 0,
+					'version' => isset($error['version']) ? htmlspecialchars((string) $error['version'], ENT_QUOTES, 'UTF-8') : '',
 				];
 
 				try {
@@ -202,19 +201,19 @@ class DiagnosticsService {
 		$ids = [];
 
 		foreach ($rows as $row) {
-			$ts = isset($row['date']) ? (int)$row['date'] : 0;
+			$ts = isset($row['date']) ? (int) $row['date'] : 0;
 			$errorsForApi[] = [
 				'type'        => $row['type'] ?? '',
 				'log_message' => $row['log_message'] ?? '',
 				'log_extra'   => $row['log_extra'] ?? '',
-				'line'        => isset($row['line']) ? (string)$row['line'] : '',
+				'line'        => isset($row['line']) ? (string) $row['line'] : '',
 				'date'        => $ts > 0 ? gmdate('Y-m-d H:i:s', $ts) : '',
 				// Per-error panel version frozen when the error occurred. The log
 				// server attributes the entry to THIS, not the batch/current version.
 				'version'     => (string) ($row['version'] ?? ''),
 			];
 			if (isset($row['id'])) {
-				$ids[] = (int)$row['id'];
+				$ids[] = (int) $row['id'];
 			}
 		}
 
@@ -257,9 +256,9 @@ class DiagnosticsService {
 	 * @param int $rServerID Server id to query.
 	 * @return array Process info keyed/listed as returned by the server.
 	 */
-	public static function getPIDs($rServerID) {
-		$rReturn = array();
-		$rProcesses = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'get_pids')), true);
+	public static function getPIDs(int $rServerID) {
+		$rReturn = [];
+		$rProcesses = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'get_pids']), true);
 		if (!is_array($rProcesses)) {
 			return $rReturn;
 		}
@@ -269,7 +268,7 @@ class DiagnosticsService {
 			$rSplit = explode(' ', preg_replace('!\\s+!', ' ', trim($rProcess)));
 
 			if ($rSplit[0] == 'xc_vm') {
-				$rUsage = array(0, 0, 0);
+				$rUsage = [0, 0, 0];
 				$rTimer = explode('-', $rSplit[9]);
 
 				if (1 < count($rTimer)) {
@@ -322,7 +321,7 @@ class DiagnosticsService {
 					$rUsage[2] = 0;
 				}
 
-				$rReturn[] = array('user' => $rSplit[0], 'pid' => $rSplit[1], 'cpu' => $rSplit[2], 'mem' => $rSplit[3], 'vsz' => $rSplit[4], 'rss' => $rSplit[5], 'tty' => $rSplit[6], 'stat' => $rSplit[7], 'time' => $rUsage[1], 'etime' => $rUsage[0], 'load_average' => $rUsage[2], 'command' => implode(' ', array_splice($rSplit, 10, count($rSplit) - 10)));
+				$rReturn[] = ['user' => $rSplit[0], 'pid' => $rSplit[1], 'cpu' => $rSplit[2], 'mem' => $rSplit[3], 'vsz' => $rSplit[4], 'rss' => $rSplit[5], 'tty' => $rSplit[6], 'stat' => $rSplit[7], 'time' => $rUsage[1], 'etime' => $rUsage[0], 'load_average' => $rUsage[2], 'command' => implode(' ', array_splice($rSplit, 10, count($rSplit) - 10))];
 			}
 		}
 
@@ -335,9 +334,9 @@ class DiagnosticsService {
 	 * @param int $rServerID Server id to inspect.
 	 * @return array NVENC process details.
 	 */
-	public static function getNVENCProcesses($rServerID) {
+	public static function getNVENCProcesses(int $rServerID) {
 		$db = self::db();
-		$rProcesses = array();
+		$rProcesses = [];
 		$rServer = ServerRepository::getById($rServerID);
 		$rGPUInfo = json_decode($rServer['gpu_info'], true);
 
@@ -345,7 +344,7 @@ class DiagnosticsService {
 		} else {
 			foreach ($rGPUInfo['gpus'] as $rGPU) {
 				foreach ($rGPU['processes'] as $rProcess) {
-					$rArray = array('pid' => $rProcess['pid'], 'memory' => $rProcess['memory'], 'stream_id' => null);
+					$rArray = ['pid' => $rProcess['pid'], 'memory' => $rProcess['memory'], 'stream_id' => null];
 					$db->query('SELECT `stream_id` FROM `streams_servers` WHERE `pid` = ? AND `server_id` = ?;', $rProcess['pid'], $rServerID);
 
 					if (0 >= $db->num_rows()) {
diff --git a/src/Core/Enum/BootContext.php b/src/Core/Enum/BootContext.php
index 9ae93133..9dcd77b0 100644
--- a/src/Core/Enum/BootContext.php
+++ b/src/Core/Enum/BootContext.php
@@ -13,15 +13,15 @@ namespace XcVm\Core\Enum;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 enum BootContext: string {
-    /** Constants + config only. No DB. */
-    case Minimal = 'minimal';
+	/** Constants + config only. No DB. */
+	case Minimal = 'minimal';
 
-    /** + Database + LegacyInitializer. For cron jobs and CLI scripts. */
-    case Cli = 'cli';
+	/** + Database + LegacyInitializer. For cron jobs and CLI scripts. */
+	case Cli = 'cli';
 
-    /** + Database (cached). Lightweight path for streaming endpoints. */
-    case Stream = 'stream';
+	/** + Database (cached). Lightweight path for streaming endpoints. */
+	case Stream = 'stream';
 
-    /** Full initialization: DB + API + Translator + session. */
-    case Admin = 'admin';
+	/** Full initialization: DB + API + Translator + session. */
+	case Admin = 'admin';
 }
diff --git a/src/Core/Enum/ClientFilter.php b/src/Core/Enum/ClientFilter.php
index 93537a57..45e9f64c 100644
--- a/src/Core/Enum/ClientFilter.php
+++ b/src/Core/Enum/ClientFilter.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Enum;
 
@@ -18,86 +17,86 @@ namespace XcVm\Core\Enum;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 enum ClientFilter: string {
-    case LbTokenInvalid         = 'LB_TOKEN_INVALID';
-    case NotInBouquet           = 'NOT_IN_BOUQUET';
-    case BlockedAsn             = 'BLOCKED_ASN';
-    case IspLockFailed          = 'ISP_LOCK_FAILED';
-    case UserDisallowExt        = 'USER_DISALLOW_EXT';
-    case AuthFailed             = 'AUTH_FAILED';
-    case UserExpired            = 'USER_EXPIRED';
-    case UserDisabled           = 'USER_DISABLED';
-    case UserBan                = 'USER_BAN';
-    case MagTokenInvalid        = 'MAG_TOKEN_INVALID';
-    case StalkerChannelMismatch = 'STALKER_CHANNEL_MISMATCH';
-    case StalkerIpMismatch      = 'STALKER_IP_MISMATCH';
-    case StalkerKeyExpired      = 'STALKER_KEY_EXPIRED';
-    case StalkerDecryptFailed   = 'STALKER_DECRYPT_FAILED';
-    case EmptyUa                = 'EMPTY_UA';
-    case IpBan                  = 'IP_BAN';
-    case CountryDisallow        = 'COUNTRY_DISALLOW';
-    case UserAgentBan           = 'USER_AGENT_BAN';
-    case UserAlreadyConnected   = 'USER_ALREADY_CONNECTED';
-    case RestreamDetect         = 'RESTREAM_DETECT';
-    case ProxyDetect            = 'PROXY_DETECT';
-    case HostingDetect          = 'HOSTING_DETECT';
-    case LineCreateFail         = 'LINE_CREATE_FAIL';
-    case ConnectionLoop         = 'CONNECTION_LOOP';
-    case TokenExpired           = 'TOKEN_EXPIRED';
-    case IpMismatch             = 'IP_MISMATCH';
+	case LbTokenInvalid         = 'LB_TOKEN_INVALID';
+	case NotInBouquet           = 'NOT_IN_BOUQUET';
+	case BlockedAsn             = 'BLOCKED_ASN';
+	case IspLockFailed          = 'ISP_LOCK_FAILED';
+	case UserDisallowExt        = 'USER_DISALLOW_EXT';
+	case AuthFailed             = 'AUTH_FAILED';
+	case UserExpired            = 'USER_EXPIRED';
+	case UserDisabled           = 'USER_DISABLED';
+	case UserBan                = 'USER_BAN';
+	case MagTokenInvalid        = 'MAG_TOKEN_INVALID';
+	case StalkerChannelMismatch = 'STALKER_CHANNEL_MISMATCH';
+	case StalkerIpMismatch      = 'STALKER_IP_MISMATCH';
+	case StalkerKeyExpired      = 'STALKER_KEY_EXPIRED';
+	case StalkerDecryptFailed   = 'STALKER_DECRYPT_FAILED';
+	case EmptyUa                = 'EMPTY_UA';
+	case IpBan                  = 'IP_BAN';
+	case CountryDisallow        = 'COUNTRY_DISALLOW';
+	case UserAgentBan           = 'USER_AGENT_BAN';
+	case UserAlreadyConnected   = 'USER_ALREADY_CONNECTED';
+	case RestreamDetect         = 'RESTREAM_DETECT';
+	case ProxyDetect            = 'PROXY_DETECT';
+	case HostingDetect          = 'HOSTING_DETECT';
+	case LineCreateFail         = 'LINE_CREATE_FAIL';
+	case ConnectionLoop         = 'CONNECTION_LOOP';
+	case TokenExpired           = 'TOKEN_EXPIRED';
+	case IpMismatch             = 'IP_MISMATCH';
 
-    /**
-     * Human-readable filter label (as shown in the client request log).
-     */
-    public function label(): string {
-        return match ($this) {
-            self::LbTokenInvalid         => 'Token Failure',
-            self::NotInBouquet           => 'Not in Bouquet',
-            self::BlockedAsn             => 'Blocked ASN',
-            self::IspLockFailed          => 'ISP Lock Failed',
-            self::UserDisallowExt        => 'Extension Disallowed',
-            self::AuthFailed             => 'Authentication Failed',
-            self::UserExpired            => 'User Expired',
-            self::UserDisabled           => 'User Disabled',
-            self::UserBan                => 'User Banned',
-            self::MagTokenInvalid        => 'MAG Token Invalid',
-            self::StalkerChannelMismatch => 'Stalker Channel Mismatch',
-            self::StalkerIpMismatch      => 'Stalker IP Mismatch',
-            self::StalkerKeyExpired      => 'Stalker Key Expired',
-            self::StalkerDecryptFailed   => 'Stalker Decrypt Failed',
-            self::EmptyUa                => 'Empty User-Agent',
-            self::IpBan                  => 'IP Banned',
-            self::CountryDisallow        => 'Country Disallowed',
-            self::UserAgentBan           => 'User-Agent Disallowed',
-            self::UserAlreadyConnected   => 'IP Limit Reached',
-            self::RestreamDetect         => 'Restream Detected',
-            self::ProxyDetect            => 'Proxy / VPN Detected',
-            self::HostingDetect          => 'Hosting Server Detected',
-            self::LineCreateFail         => 'Connection Failed',
-            self::ConnectionLoop         => 'Connection Loop',
-            self::TokenExpired           => 'Token Expired',
-            self::IpMismatch             => 'IP Mismatch',
-        };
-    }
+	/**
+	 * Human-readable filter label (as shown in the client request log).
+	 */
+	public function label(): string {
+		return match ($this) {
+			self::LbTokenInvalid         => 'Token Failure',
+			self::NotInBouquet           => 'Not in Bouquet',
+			self::BlockedAsn             => 'Blocked ASN',
+			self::IspLockFailed          => 'ISP Lock Failed',
+			self::UserDisallowExt        => 'Extension Disallowed',
+			self::AuthFailed             => 'Authentication Failed',
+			self::UserExpired            => 'User Expired',
+			self::UserDisabled           => 'User Disabled',
+			self::UserBan                => 'User Banned',
+			self::MagTokenInvalid        => 'MAG Token Invalid',
+			self::StalkerChannelMismatch => 'Stalker Channel Mismatch',
+			self::StalkerIpMismatch      => 'Stalker IP Mismatch',
+			self::StalkerKeyExpired      => 'Stalker Key Expired',
+			self::StalkerDecryptFailed   => 'Stalker Decrypt Failed',
+			self::EmptyUa                => 'Empty User-Agent',
+			self::IpBan                  => 'IP Banned',
+			self::CountryDisallow        => 'Country Disallowed',
+			self::UserAgentBan           => 'User-Agent Disallowed',
+			self::UserAlreadyConnected   => 'IP Limit Reached',
+			self::RestreamDetect         => 'Restream Detected',
+			self::ProxyDetect            => 'Proxy / VPN Detected',
+			self::HostingDetect          => 'Hosting Server Detected',
+			self::LineCreateFail         => 'Connection Failed',
+			self::ConnectionLoop         => 'Connection Loop',
+			self::TokenExpired           => 'Token Expired',
+			self::IpMismatch             => 'IP Mismatch',
+		};
+	}
 
-    /**
-     * Resolve a raw status key to its label, falling back to the raw key
-     * itself when it is unknown (tolerant lookup for log rendering).
-     */
-    public static function labelFor(string $key): string {
-        return self::tryFrom($key)?->label() ?? $key;
-    }
+	/**
+	 * Resolve a raw status key to its label, falling back to the raw key
+	 * itself when it is unknown (tolerant lookup for log rendering).
+	 */
+	public static function labelFor(string $key): string {
+		return self::tryFrom($key)?->label() ?? $key;
+	}
 
-    /**
-     * Ordered key => label map for building select/filter dropdowns,
-     * preserving the legacy `$rClientFilters` ordering.
-     *
-     * @return array<string, string>
-     */
-    public static function options(): array {
-        $options = [];
-        foreach (self::cases() as $case) {
-            $options[$case->value] = $case->label();
-        }
-        return $options;
-    }
+	/**
+	 * Ordered key => label map for building select/filter dropdowns,
+	 * preserving the legacy `$rClientFilters` ordering.
+	 *
+	 * @return array<string, string>
+	 */
+	public static function options(): array {
+		$options = [];
+		foreach (self::cases() as $case) {
+			$options[$case->value] = $case->label();
+		}
+		return $options;
+	}
 }
diff --git a/src/Core/Enum/ModuleState.php b/src/Core/Enum/ModuleState.php
index d212f4d8..e4959629 100644
--- a/src/Core/Enum/ModuleState.php
+++ b/src/Core/Enum/ModuleState.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Enum;
 
@@ -20,40 +19,40 @@ namespace XcVm\Core\Enum;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 enum ModuleState: string {
-    /** Module is active and loaded by ModuleLoader. */
-    case Enabled    = 'enabled';
+	/** Module is active and loaded by ModuleLoader. */
+	case Enabled    = 'enabled';
 
-    /** Module is present but suppressed from loading. */
-    case Disabled   = 'disabled';
+	/** Module is present but suppressed from loading. */
+	case Disabled   = 'disabled';
 
-    /** Module install is in progress (transient; set before install(), cleared on completion). */
-    case Installing = 'installing';
+	/** Module install is in progress (transient; set before install(), cleared on completion). */
+	case Installing = 'installing';
 
-    /** Module install or update failed; manual intervention required. */
-    case Failed     = 'failed';
+	/** Module install or update failed; manual intervention required. */
+	case Failed     = 'failed';
 
-    /**
-     * Return true when this state means the module should be loaded by ModuleLoader.
-     */
-    public function isLoadable(): bool {
-        return $this === self::Enabled;
-    }
+	/**
+	 * Return true when this state means the module should be loaded by ModuleLoader.
+	 */
+	public function isLoadable(): bool {
+		return $this === self::Enabled;
+	}
 
-    /**
-     * Convert a raw overrides value (bool|string|null) to a ModuleState.
-     *
-     * Handles legacy `true` / `false` boolean values written by the old
-     * setEnabled(name, bool) API, as well as new string values.
-     *
-     * @param mixed $raw The raw value from config/modules.php overrides.
-     */
-    public static function fromRaw(mixed $raw): self {
-        if ($raw === true || $raw === null) {
-            return self::Enabled;
-        }
-        if ($raw === false) {
-            return self::Disabled;
-        }
-        return self::tryFrom((string) $raw) ?? self::Enabled;
-    }
+	/**
+	 * Convert a raw overrides value (bool|string|null) to a ModuleState.
+	 *
+	 * Handles legacy `true` / `false` boolean values written by the old
+	 * setEnabled(name, bool) API, as well as new string values.
+	 *
+	 * @param mixed $raw The raw value from config/modules.php overrides.
+	 */
+	public static function fromRaw(mixed $raw): self {
+		if ($raw === true || $raw === null) {
+			return self::Enabled;
+		}
+		if ($raw === false) {
+			return self::Disabled;
+		}
+		return self::tryFrom((string) $raw) ?? self::Enabled;
+	}
 }
diff --git a/src/Core/Enum/ResellerAction.php b/src/Core/Enum/ResellerAction.php
index 7d0e4751..beb178e5 100644
--- a/src/Core/Enum/ResellerAction.php
+++ b/src/Core/Enum/ResellerAction.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Enum;
 
@@ -18,44 +17,44 @@ namespace XcVm\Core\Enum;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 enum ResellerAction: string {
-    case New           = 'new';
-    case Extend        = 'extend';
-    case Convert       = 'convert';
-    case Edit          = 'edit';
-    case Enable        = 'enable';
-    case Disable       = 'disable';
-    case Delete        = 'delete';
-    case SendEvent     = 'send_event';
-    case AdjustCredits = 'adjust_credits';
+	case New           = 'new';
+	case Extend        = 'extend';
+	case Convert       = 'convert';
+	case Edit          = 'edit';
+	case Enable        = 'enable';
+	case Disable       = 'disable';
+	case Delete        = 'delete';
+	case SendEvent     = 'send_event';
+	case AdjustCredits = 'adjust_credits';
 
-    /**
-     * Human-readable action label (as shown in log filters).
-     */
-    public function label(): string {
-        return match ($this) {
-            self::New           => 'Create',
-            self::Extend        => 'Extend',
-            self::Convert       => 'Convert',
-            self::Edit          => 'Edit',
-            self::Enable        => 'Enable',
-            self::Disable       => 'Disable',
-            self::Delete        => 'Delete',
-            self::SendEvent     => 'MAG Event',
-            self::AdjustCredits => 'Adjust Credits',
-        };
-    }
+	/**
+	 * Human-readable action label (as shown in log filters).
+	 */
+	public function label(): string {
+		return match ($this) {
+			self::New           => 'Create',
+			self::Extend        => 'Extend',
+			self::Convert       => 'Convert',
+			self::Edit          => 'Edit',
+			self::Enable        => 'Enable',
+			self::Disable       => 'Disable',
+			self::Delete        => 'Delete',
+			self::SendEvent     => 'MAG Event',
+			self::AdjustCredits => 'Adjust Credits',
+		};
+	}
 
-    /**
-     * Ordered key => label map for building select/filter dropdowns,
-     * preserving the legacy `$rResellerActions` ordering.
-     *
-     * @return array<string, string>
-     */
-    public static function options(): array {
-        $options = [];
-        foreach (self::cases() as $case) {
-            $options[$case->value] = $case->label();
-        }
-        return $options;
-    }
+	/**
+	 * Ordered key => label map for building select/filter dropdowns,
+	 * preserving the legacy `$rResellerActions` ordering.
+	 *
+	 * @return array<string, string>
+	 */
+	public static function options(): array {
+		$options = [];
+		foreach (self::cases() as $case) {
+			$options[$case->value] = $case->label();
+		}
+		return $options;
+	}
 }
diff --git a/src/Core/Enum/ServerEnvironment.php b/src/Core/Enum/ServerEnvironment.php
index 4728a5a4..a3f499ec 100644
--- a/src/Core/Enum/ServerEnvironment.php
+++ b/src/Core/Enum/ServerEnvironment.php
@@ -14,9 +14,9 @@ namespace XcVm\Core\Enum;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 enum ServerEnvironment: string {
-    /** Standard panel installation. */
-    case Main = 'main';
+	/** Standard panel installation. */
+	case Main = 'main';
 
-    /** Load-balancer node (SERVER_TYPE=lb). */
-    case LoadBalancer = 'lb';
+	/** Load-balancer node (SERVER_TYPE=lb). */
+	case LoadBalancer = 'lb';
 }
diff --git a/src/Core/Enum/Theme.php b/src/Core/Enum/Theme.php
index e0a0d179..2eb0409c 100644
--- a/src/Core/Enum/Theme.php
+++ b/src/Core/Enum/Theme.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Enum;
 
@@ -19,50 +18,50 @@ namespace XcVm\Core\Enum;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 enum Theme: int {
-    /** Default light theme. */
-    case Light = 0;
+	/** Default light theme. */
+	case Light = 0;
 
-    /** Dark theme. */
-    case Dark = 1;
+	/** Dark theme. */
+	case Dark = 1;
 
-    /**
-     * Return true when this theme renders the dark layout variant.
-     */
-    public function isDark(): bool {
-        return $this === self::Dark;
-    }
+	/**
+	 * Return true when this theme renders the dark layout variant.
+	 */
+	public function isDark(): bool {
+		return $this === self::Dark;
+	}
 
-    /**
-     * Human-readable theme name (as shown in the profile selector).
-     */
-    public function label(): string {
-        return match ($this) {
-            self::Light => 'Light',
-            self::Dark  => 'Dark',
-        };
-    }
+	/**
+	 * Human-readable theme name (as shown in the profile selector).
+	 */
+	public function label(): string {
+		return match ($this) {
+			self::Light => 'Light',
+			self::Dark  => 'Dark',
+		};
+	}
 
-    /**
-     * Resolve a stored profile theme value to a Theme, defaulting to Light
-     * for missing or out-of-range values.
-     *
-     * @param mixed $id The raw `theme` value from the user profile.
-     */
-    public static function fromId(mixed $id): self {
-        return self::tryFrom((int) $id) ?? self::Light;
-    }
+	/**
+	 * Resolve a stored profile theme value to a Theme, defaulting to Light
+	 * for missing or out-of-range values.
+	 *
+	 * @param mixed $id The raw `theme` value from the user profile.
+	 */
+	public static function fromId(mixed $id): self {
+		return self::tryFrom((int) $id) ?? self::Light;
+	}
 
-    /**
-     * Ordered id => label map for building the theme selector, preserving
-     * the legacy `$rThemes` ordering (0 => Light, 1 => Dark).
-     *
-     * @return array<int, string>
-     */
-    public static function options(): array {
-        $options = [];
-        foreach (self::cases() as $case) {
-            $options[$case->value] = $case->label();
-        }
-        return $options;
-    }
+	/**
+	 * Ordered id => label map for building the theme selector, preserving
+	 * the legacy `$rThemes` ordering (0 => Light, 1 => Dark).
+	 *
+	 * @return array<int, string>
+	 */
+	public static function options(): array {
+		$options = [];
+		foreach (self::cases() as $case) {
+			$options[$case->value] = $case->label();
+		}
+		return $options;
+	}
 }
diff --git a/src/Core/Error/ErrorCodes.php b/src/Core/Error/ErrorCodes.php
index bbcd5c50..b39e5f6a 100644
--- a/src/Core/Error/ErrorCodes.php
+++ b/src/Core/Error/ErrorCodes.php
@@ -18,72 +18,72 @@
  */
 
 global $rErrorCodes;
-$rErrorCodes = array(
-    'API_IP_NOT_ALLOWED'       => 'IP is not allowed to access the API.',
-    'ARCHIVE_DOESNT_EXIST'     => 'Archive files are missing for this stream ID.',
-    'ASN_BLOCKED'              => 'ASN has been blocked.',
-    'BANNED'                   => 'Line has been banned.',
-    'BLOCKED_USER_AGENT'       => 'User-agent has been blocked.',
-    'DEVICE_NOT_ALLOWED'       => 'MAG & Enigma devices are not allowed to access this.',
-    'DISABLED'                 => 'Line has been disabled.',
-    'DOWNLOAD_LIMIT_REACHED'   => 'Reached the simultaneous download limit.',
-    'E2_DEVICE_LOCK_FAILED'    => 'Device lock checks failed.',
-    'E2_DISABLED'              => 'Device has been disabled.',
-    'E2_NO_TOKEN'              => 'No token has been specified.',
-    'E2_TOKEN_DOESNT_MATCH'    => "Token doesn't match records.",
-    'E2_WATCHDOG_TIMEOUT'      => 'Time limit reached.',
-    'EMPTY_USER_AGENT'         => 'Empty user-agents are disallowed.',
-    'EPG_DISABLED'             => 'EPG has been disabled.',
-    'EPG_FILE_MISSING'         => 'Cached EPG files are missing.',
-    'EXPIRED'                  => 'Line has expired.',
-    'FORCED_COUNTRY_INVALID'   => 'Country does not match forced country.',
-    'GENERATE_PLAYLIST_FAILED' => 'Playlist failed to generate.',
-    'HLS_DISABLED'             => 'HLS has been disabled.',
-    'HOSTING_DETECT'           => 'Hosting server has been detected.',
-    'INVALID_API_PASSWORD'     => 'API password is invalid.',
-    'INVALID_CREDENTIALS'      => 'Username or password is invalid.',
-    'INVALID_HOST'             => 'Domain name not recognised.',
-    'INVALID_STREAM_ID'        => "Stream ID doesn't exist.",
-    'INVALID_TYPE_TOKEN'       => "Tokens can't be used for this stream type.",
-    'IP_BLOCKED'               => 'IP has been blocked.',
-    'IP_MISMATCH'              => "Current IP doesn't match initial connection IP.",
-    'ISP_BLOCKED'              => 'ISP has been blocked.',
-    'LB_TOKEN_INVALID'         => 'AES Token cannot be decrypted.',
-    'LEGACY_EPG_DISABLED'      => 'Legacy epg.php access has been disabled.',
-    'LEGACY_GET_DISABLED'      => 'Legacy get.php access has been disabled.',
-    'LEGACY_PANEL_API_DISABLED' => 'Legacy panel_api.php access has been disabled.',
-    'LINE_CREATE_FAIL'         => 'Line failed to insert into database.',
-    'NO_CREDENTIALS'           => 'No credentials have been specified.',
-    'NO_TIMESTAMP'             => 'No archive timestamp has been specified.',
-    'NO_TOKEN_SPECIFIED'       => 'No AES encrypted token has been specified.',
-    'NOT_ENIGMA_DEVICE'        => "Line isn't an enigma device.",
-    'NOT_IN_ALLOWED_COUNTRY'   => 'Not in allowed country list.',
-    'NOT_IN_ALLOWED_IPS'       => 'Not in allowed IP list.',
-    'NOT_IN_ALLOWED_UAS'       => 'Not in allowed user-agent list.',
-    'NOT_IN_BOUQUET'           => "Line doesn't have access to this stream ID.",
-    'PLAYER_API_DISABLED'      => 'Player API has been disabled.',
-    'PROXY_DETECT'             => 'Proxy has been detected.',
-    'PROXY_NO_API_ACCESS'      => "Can't access API's via proxy.",
-    'RESTREAM_DETECT'          => 'Restreaming has been detected.',
-    'STALKER_CHANNEL_MISMATCH' => "Stream ID doesn't match stalker token.",
-    'STALKER_DECRYPT_FAILED'   => 'Failed to decrypt stalker token.',
-    'STALKER_INVALID_KEY'      => 'Invalid stalker key.',
-    'STALKER_IP_MISMATCH'      => "IP doesn't match stalker token.",
-    'STALKER_KEY_EXPIRED'      => 'Stalker token has expired.',
-    'STREAM_OFFLINE'           => 'Stream is currently offline.',
-    'THUMBNAIL_DOESNT_EXIST'   => "Thumbnail file doesn't exist.",
-    'THUMBNAILS_NOT_ENABLED'   => 'Thumbnail not enabled for this stream.',
-    'TOKEN_ERROR'              => 'AES token has incomplete data.',
-    'TOKEN_EXPIRED'            => 'AES token has expired.',
-    'TS_DISABLED'              => 'MPEG-TS has been disabled.',
-    'USER_ALREADY_CONNECTED'   => 'Line already connected on a different IP.',
-    'USER_DISALLOW_EXT'        => 'Extension is not in allowed list.',
-    'VOD_DOESNT_EXIST'         => "VOD file doesn't exist.",
-    'WAIT_TIME_EXPIRED'        => 'Stream start has timed out, failed to start.',
+$rErrorCodes = [
+	'API_IP_NOT_ALLOWED'       => 'IP is not allowed to access the API.',
+	'ARCHIVE_DOESNT_EXIST'     => 'Archive files are missing for this stream ID.',
+	'ASN_BLOCKED'              => 'ASN has been blocked.',
+	'BANNED'                   => 'Line has been banned.',
+	'BLOCKED_USER_AGENT'       => 'User-agent has been blocked.',
+	'DEVICE_NOT_ALLOWED'       => 'MAG & Enigma devices are not allowed to access this.',
+	'DISABLED'                 => 'Line has been disabled.',
+	'DOWNLOAD_LIMIT_REACHED'   => 'Reached the simultaneous download limit.',
+	'E2_DEVICE_LOCK_FAILED'    => 'Device lock checks failed.',
+	'E2_DISABLED'              => 'Device has been disabled.',
+	'E2_NO_TOKEN'              => 'No token has been specified.',
+	'E2_TOKEN_DOESNT_MATCH'    => "Token doesn't match records.",
+	'E2_WATCHDOG_TIMEOUT'      => 'Time limit reached.',
+	'EMPTY_USER_AGENT'         => 'Empty user-agents are disallowed.',
+	'EPG_DISABLED'             => 'EPG has been disabled.',
+	'EPG_FILE_MISSING'         => 'Cached EPG files are missing.',
+	'EXPIRED'                  => 'Line has expired.',
+	'FORCED_COUNTRY_INVALID'   => 'Country does not match forced country.',
+	'GENERATE_PLAYLIST_FAILED' => 'Playlist failed to generate.',
+	'HLS_DISABLED'             => 'HLS has been disabled.',
+	'HOSTING_DETECT'           => 'Hosting server has been detected.',
+	'INVALID_API_PASSWORD'     => 'API password is invalid.',
+	'INVALID_CREDENTIALS'      => 'Username or password is invalid.',
+	'INVALID_HOST'             => 'Domain name not recognised.',
+	'INVALID_STREAM_ID'        => "Stream ID doesn't exist.",
+	'INVALID_TYPE_TOKEN'       => "Tokens can't be used for this stream type.",
+	'IP_BLOCKED'               => 'IP has been blocked.',
+	'IP_MISMATCH'              => "Current IP doesn't match initial connection IP.",
+	'ISP_BLOCKED'              => 'ISP has been blocked.',
+	'LB_TOKEN_INVALID'         => 'AES Token cannot be decrypted.',
+	'LEGACY_EPG_DISABLED'      => 'Legacy epg.php access has been disabled.',
+	'LEGACY_GET_DISABLED'      => 'Legacy get.php access has been disabled.',
+	'LEGACY_PANEL_API_DISABLED' => 'Legacy panel_api.php access has been disabled.',
+	'LINE_CREATE_FAIL'         => 'Line failed to insert into database.',
+	'NO_CREDENTIALS'           => 'No credentials have been specified.',
+	'NO_TIMESTAMP'             => 'No archive timestamp has been specified.',
+	'NO_TOKEN_SPECIFIED'       => 'No AES encrypted token has been specified.',
+	'NOT_ENIGMA_DEVICE'        => "Line isn't an enigma device.",
+	'NOT_IN_ALLOWED_COUNTRY'   => 'Not in allowed country list.',
+	'NOT_IN_ALLOWED_IPS'       => 'Not in allowed IP list.',
+	'NOT_IN_ALLOWED_UAS'       => 'Not in allowed user-agent list.',
+	'NOT_IN_BOUQUET'           => "Line doesn't have access to this stream ID.",
+	'PLAYER_API_DISABLED'      => 'Player API has been disabled.',
+	'PROXY_DETECT'             => 'Proxy has been detected.',
+	'PROXY_NO_API_ACCESS'      => "Can't access API's via proxy.",
+	'RESTREAM_DETECT'          => 'Restreaming has been detected.',
+	'STALKER_CHANNEL_MISMATCH' => "Stream ID doesn't match stalker token.",
+	'STALKER_DECRYPT_FAILED'   => 'Failed to decrypt stalker token.',
+	'STALKER_INVALID_KEY'      => 'Invalid stalker key.',
+	'STALKER_IP_MISMATCH'      => "IP doesn't match stalker token.",
+	'STALKER_KEY_EXPIRED'      => 'Stalker token has expired.',
+	'STREAM_OFFLINE'           => 'Stream is currently offline.',
+	'THUMBNAIL_DOESNT_EXIST'   => "Thumbnail file doesn't exist.",
+	'THUMBNAILS_NOT_ENABLED'   => 'Thumbnail not enabled for this stream.',
+	'TOKEN_ERROR'              => 'AES token has incomplete data.',
+	'TOKEN_EXPIRED'            => 'AES token has expired.',
+	'TS_DISABLED'              => 'MPEG-TS has been disabled.',
+	'USER_ALREADY_CONNECTED'   => 'Line already connected on a different IP.',
+	'USER_DISALLOW_EXT'        => 'Extension is not in allowed list.',
+	'VOD_DOESNT_EXIST'         => "VOD file doesn't exist.",
+	'WAIT_TIME_EXPIRED'        => 'Stream start has timed out, failed to start.',
 
-    // ── Дополнительные коды (из stream/init.php) ──────────────
-    'CACHE_INCOMPLETE'         => 'Cache is being generated...',
-    'SUBTITLE_DOESNT_EXIST'    => "Subtitle file doesn't exist.",
-    'NO_SERVERS_AVAILABLE'     => 'No servers are currently available for this stream.',
-    'PROXY_ACCESS_DENIED'      => 'You cannot access this stream directly while proxy is enabled.',
-);
+	// ── Дополнительные коды (из stream/init.php) ──────────────
+	'CACHE_INCOMPLETE'         => 'Cache is being generated...',
+	'SUBTITLE_DOESNT_EXIST'    => "Subtitle file doesn't exist.",
+	'NO_SERVERS_AVAILABLE'     => 'No servers are currently available for this stream.',
+	'PROXY_ACCESS_DENIED'      => 'You cannot access this stream directly while proxy is enabled.',
+];
diff --git a/src/Core/Error/ErrorHandler.php b/src/Core/Error/ErrorHandler.php
index 8c432a96..d54e0350 100644
--- a/src/Core/Error/ErrorHandler.php
+++ b/src/Core/Error/ErrorHandler.php
@@ -32,28 +32,28 @@
  * @param bool      $rKill  Завершить выполнение после вывода (default: true)
  * @param int|null  $rCode  HTTP-код ответа (null = 404)
  */
-function generateError($rError, $rKill = true, $rCode = null) {
-    global $rErrorCodes;
-    global $rSettings;
+function generateError(string $rError, bool $rKill = true, ?int $rCode = null) {
+	global $rErrorCodes;
+	global $rSettings;
 
-    if (isset($rSettings['debug_show_errors']) && $rSettings['debug_show_errors']) {
-        $rErrorDescription = (isset($rErrorCodes[$rError]) ? $rErrorCodes[$rError] : '');
-        $rStyle = '*{-webkit-box-sizing:border-box;box-sizing:border-box}body{padding:0;margin:0}#notfound{position:relative;height:100vh}#notfound .notfound{position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.notfound{max-width:520px;width:100%;line-height:1.4;text-align:center}.notfound .notfound-404{position:relative;height:200px;margin:0 auto 20px;z-index:-1}.notfound .notfound-404 h1{font-family:Montserrat,sans-serif;font-size:236px;font-weight:200;margin:0;color:#211b19;text-transform:uppercase;position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.notfound .notfound-404 h2{font-family:Montserrat,sans-serif;font-size:28px;font-weight:400;text-transform:uppercase;color:#211b19;background:#fff;padding:10px 5px;margin:auto;display:inline-block;position:absolute;bottom:0;left:0;right:0}.notfound p{font-family:Montserrat,sans-serif;font-size:14px;font-weight:300;text-transform:uppercase}@media only screen and (max-width:767px){.notfound .notfound-404 h1{font-size:148px}}@media only screen and (max-width:480px){.notfound .notfound-404{height:148px;margin:0 auto 10px}.notfound .notfound-404 h1{font-size:86px}.notfound .notfound-404 h2{font-size:16px}}';
-        echo '<html><head><title>XC_VM - Debug Mode</title><link href="https://fonts.googleapis.com/css?family=Montserrat:200,400,700" rel="stylesheet"><style>' . $rStyle . '</style></head><body><div id="notfound"><div class="notfound"><div class="notfound-404"><h1>XC_VM</h1><h2>' . $rError . '</h2><br/></div><p>' . $rErrorDescription . '</p></div></div></body></html>';
+	if (isset($rSettings['debug_show_errors']) && $rSettings['debug_show_errors']) {
+		$rErrorDescription = (isset($rErrorCodes[$rError]) ? $rErrorCodes[$rError] : '');
+		$rStyle = '*{-webkit-box-sizing:border-box;box-sizing:border-box}body{padding:0;margin:0}#notfound{position:relative;height:100vh}#notfound .notfound{position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.notfound{max-width:520px;width:100%;line-height:1.4;text-align:center}.notfound .notfound-404{position:relative;height:200px;margin:0 auto 20px;z-index:-1}.notfound .notfound-404 h1{font-family:Montserrat,sans-serif;font-size:236px;font-weight:200;margin:0;color:#211b19;text-transform:uppercase;position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.notfound .notfound-404 h2{font-family:Montserrat,sans-serif;font-size:28px;font-weight:400;text-transform:uppercase;color:#211b19;background:#fff;padding:10px 5px;margin:auto;display:inline-block;position:absolute;bottom:0;left:0;right:0}.notfound p{font-family:Montserrat,sans-serif;font-size:14px;font-weight:300;text-transform:uppercase}@media only screen and (max-width:767px){.notfound .notfound-404 h1{font-size:148px}}@media only screen and (max-width:480px){.notfound .notfound-404{height:148px;margin:0 auto 10px}.notfound .notfound-404 h1{font-size:86px}.notfound .notfound-404 h2{font-size:16px}}';
+		echo '<html><head><title>XC_VM - Debug Mode</title><link href="https://fonts.googleapis.com/css?family=Montserrat:200,400,700" rel="stylesheet"><style>' . $rStyle . '</style></head><body><div id="notfound"><div class="notfound"><div class="notfound-404"><h1>XC_VM</h1><h2>' . $rError . '</h2><br/></div><p>' . $rErrorDescription . '</p></div></div></body></html>';
 
-        if ($rKill) {
-            exit();
-        }
-    } else {
-        if ($rKill) {
-            if (!$rCode) {
-                generate404();
-            } else {
-                http_response_code($rCode);
-                exit();
-            }
-        }
-    }
+		if ($rKill) {
+			exit();
+		}
+	} else {
+		if ($rKill) {
+			if (!$rCode) {
+				generate404();
+			} else {
+				http_response_code($rCode);
+				exit();
+			}
+		}
+	}
 }
 
 /**
@@ -61,11 +61,11 @@ function generateError($rError, $rKill = true, $rCode = null) {
  *
  * @param bool $rKill Завершить выполнение после вывода (default: true)
  */
-function generate404($rKill = true) {
-    echo '<html>' . "\r\n" . '<head><title>404 Not Found</title></head>' . "\r\n" . '<body>' . "\r\n" . '<center><h1>404 Not Found</h1></center>' . "\r\n" . '<hr><center>nginx</center>' . "\r\n" . '</body>' . "\r\n" . '</html>' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->';
-    http_response_code(404);
+function generate404(bool $rKill = true) {
+	echo '<html>' . "\r\n" . '<head><title>404 Not Found</title></head>' . "\r\n" . '<body>' . "\r\n" . '<center><h1>404 Not Found</h1></center>' . "\r\n" . '<hr><center>nginx</center>' . "\r\n" . '</body>' . "\r\n" . '</html>' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->' . "\r\n" . '<!-- a padding to disable MSIE and Chrome friendly error page -->';
+	http_response_code(404);
 
-    if ($rKill) {
-        exit();
-    }
+	if ($rKill) {
+		exit();
+	}
 }
diff --git a/src/Core/Events/AbstractEvent.php b/src/Core/Events/AbstractEvent.php
index 43c99e02..2b804dc6 100644
--- a/src/Core/Events/AbstractEvent.php
+++ b/src/Core/Events/AbstractEvent.php
@@ -16,24 +16,23 @@ use XcVm\Core\Events\Contract\StoppableEventInterface;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 abstract class AbstractEvent implements StoppableEventInterface {
+	private bool $propagationStopped = false;
 
-    private bool $propagationStopped = false;
+	/**
+	 * Whether a listener has stopped propagation of this event.
+	 *
+	 * @return bool True if propagation was stopped.
+	 */
+	public function isPropagationStopped(): bool {
+		return $this->propagationStopped;
+	}
 
-    /**
-     * Whether a listener has stopped propagation of this event.
-     *
-     * @return bool True if propagation was stopped.
-     */
-    public function isPropagationStopped(): bool {
-        return $this->propagationStopped;
-    }
-
-    /**
-     * Stop propagation so no further listeners receive this event.
-     *
-     * @return void
-     */
-    public function stopPropagation(): void {
-        $this->propagationStopped = true;
-    }
+	/**
+	 * Stop propagation so no further listeners receive this event.
+	 *
+	 * @return void
+	 */
+	public function stopPropagation(): void {
+		$this->propagationStopped = true;
+	}
 }
diff --git a/src/Core/Events/Auth/UserAuthenticatedEvent.php b/src/Core/Events/Auth/UserAuthenticatedEvent.php
index b0fea934..80a7aee3 100644
--- a/src/Core/Events/Auth/UserAuthenticatedEvent.php
+++ b/src/Core/Events/Auth/UserAuthenticatedEvent.php
@@ -11,16 +11,17 @@ namespace XcVm\Core\Events\Auth;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class UserAuthenticatedEvent {
-    /**
-     * @param int    $userId          Authenticated user id.
-     * @param string $username        Authenticated username.
-     * @param string $role            User role.
-     * @param float  $authenticatedAt Unix timestamp (with microseconds) of authentication.
-     */
-    public function __construct(
-        public readonly int    $userId,
-        public readonly string $username,
-        public readonly string $role,
-        public readonly float  $authenticatedAt,
-    ) {}
+	/**
+	 * @param int    $userId          Authenticated user id.
+	 * @param string $username        Authenticated username.
+	 * @param string $role            User role.
+	 * @param float  $authenticatedAt Unix timestamp (with microseconds) of authentication.
+	 */
+	public function __construct(
+		public readonly int $userId,
+		public readonly string $username,
+		public readonly string $role,
+		public readonly float $authenticatedAt,
+	) {
+	}
 }
diff --git a/src/Core/Events/Auth/UserLoggedOutEvent.php b/src/Core/Events/Auth/UserLoggedOutEvent.php
index 2a4f9d4a..c6f72987 100644
--- a/src/Core/Events/Auth/UserLoggedOutEvent.php
+++ b/src/Core/Events/Auth/UserLoggedOutEvent.php
@@ -11,14 +11,15 @@ namespace XcVm\Core\Events\Auth;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class UserLoggedOutEvent {
-    /**
-     * @param int    $userId      User that logged out.
-     * @param string $username    Username that logged out.
-     * @param float  $loggedOutAt Unix timestamp (with microseconds) of logout.
-     */
-    public function __construct(
-        public readonly int    $userId,
-        public readonly string $username,
-        public readonly float  $loggedOutAt,
-    ) {}
+	/**
+	 * @param int    $userId      User that logged out.
+	 * @param string $username    Username that logged out.
+	 * @param float  $loggedOutAt Unix timestamp (with microseconds) of logout.
+	 */
+	public function __construct(
+		public readonly int $userId,
+		public readonly string $username,
+		public readonly float $loggedOutAt,
+	) {
+	}
 }
diff --git a/src/Core/Events/Bouquet/BouquetDeletedEvent.php b/src/Core/Events/Bouquet/BouquetDeletedEvent.php
index 81b607d2..21e76b05 100644
--- a/src/Core/Events/Bouquet/BouquetDeletedEvent.php
+++ b/src/Core/Events/Bouquet/BouquetDeletedEvent.php
@@ -14,10 +14,11 @@ namespace XcVm\Core\Events\Bouquet;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class BouquetDeletedEvent {
-    /**
-     * @param int $bouquetId Id of the bouquet that was deleted.
-     */
-    public function __construct(
-        public readonly int $bouquetId,
-    ) {}
+	/**
+	 * @param int $bouquetId Id of the bouquet that was deleted.
+	 */
+	public function __construct(
+		public readonly int $bouquetId,
+	) {
+	}
 }
diff --git a/src/Core/Events/Contract/StoppableEventInterface.php b/src/Core/Events/Contract/StoppableEventInterface.php
index 26b26c1e..33ee707c 100644
--- a/src/Core/Events/Contract/StoppableEventInterface.php
+++ b/src/Core/Events/Contract/StoppableEventInterface.php
@@ -11,11 +11,10 @@ namespace XcVm\Core\Events\Contract;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface StoppableEventInterface {
-
-    /**
-     * Whether propagation has been stopped by a previous listener.
-     *
-     * When true, EventDispatcher must not call any further listeners.
-     */
-    public function isPropagationStopped(): bool;
+	/**
+	 * Whether propagation has been stopped by a previous listener.
+	 *
+	 * When true, EventDispatcher must not call any further listeners.
+	 */
+	public function isPropagationStopped(): bool;
 }
diff --git a/src/Core/Events/EventDispatcher.php b/src/Core/Events/EventDispatcher.php
index 6f24439c..7b4486a7 100644
--- a/src/Core/Events/EventDispatcher.php
+++ b/src/Core/Events/EventDispatcher.php
@@ -60,128 +60,124 @@ use XcVm\Core\Events\Contract\StoppableEventInterface;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class EventDispatcher {
+	// ── Singleton management ──────────────────────────────────────
+	private static ?self $instance = null;
 
-    // ── Singleton management ──────────────────────────────────────
+	/**
+	 * Return the active singleton instance, creating one on first call.
+	 *
+	 * In production: wired by bootstrap via setInstance(new EventDispatcher()).
+	 * In tests: call setInstance() with a fresh instance per-test.
+	 */
+	public static function getInstance(): self {
+		if (self::$instance === null) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
 
-    private static ?self $instance = null;
+	/**
+	 * Replace the active singleton (used by bootstrap and test setUp).
+	 */
+	public static function setInstance(self $instance): void {
+		self::$instance = $instance;
+	}
 
-    /**
-     * Return the active singleton instance, creating one on first call.
-     *
-     * In production: wired by bootstrap via setInstance(new EventDispatcher()).
-     * In tests: call setInstance() with a fresh instance per-test.
-     */
-    public static function getInstance(): self {
-        if (self::$instance === null) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
+	/**
+	 * Null-out the singleton so the next getInstance() call creates a fresh one.
+	 *
+	 * Primarily for test tearDown to prevent listener state leaking between tests.
+	 */
+	public static function resetInstance(): void {
+		self::$instance = null;
+	}
 
-    /**
-     * Replace the active singleton (used by bootstrap and test setUp).
-     */
-    public static function setInstance(self $instance): void {
-        self::$instance = $instance;
-    }
+	// ── Instance state ────────────────────────────────────────────
+	private ListenerProvider $provider;
 
-    /**
-     * Null-out the singleton so the next getInstance() call creates a fresh one.
-     *
-     * Primarily for test tearDown to prevent listener state leaking between tests.
-     */
-    public static function resetInstance(): void {
-        self::$instance = null;
-    }
+	/**
+	 * Create a dispatcher backed by a fresh ListenerProvider.
+	 */
+	public function __construct() {
+		$this->provider = new ListenerProvider();
+	}
 
-    // ── Instance state ────────────────────────────────────────────
+	// ─────────────────────────────────────────────────────────
+	//  PSR-14-style API — static methods delegate to getInstance()
+	// ─────────────────────────────────────────────────────────
 
-    private ListenerProvider $provider;
+	/**
+	 * Dispatch a typed event object to all registered listeners.
+	 *
+	 * Listeners are called in priority order (highest first).
+	 * Stops early if event implements StoppableEventInterface and propagation was stopped.
+	 *
+	 * @template T of object
+	 * @param T $event
+	 * @return T The same event, possibly mutated by listeners
+	 */
+	public static function dispatch(object $event): object {
+		$i = self::getInstance();
+		foreach ($i->provider->getListenersForEvent($event) as $listener) {
+			if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
+				break;
+			}
+			$listener($event);
+		}
+		return $event;
+	}
 
-    /**
-     * Create a dispatcher backed by a fresh ListenerProvider.
-     */
-    public function __construct() {
-        $this->provider = new ListenerProvider();
-    }
+	/**
+	 * Register a typed listener.
+	 *
+	 * @param class-string $eventClass Fully-qualified event class name
+	 * @param callable     $listener   Receives the event object as sole argument
+	 * @param int          $priority   Higher = called first (default 0)
+	 */
+	public static function listen(string $eventClass, callable $listener, int $priority = 0): void {
+		self::getInstance()->provider->addListener($eventClass, $listener, $priority);
+	}
 
-    // ─────────────────────────────────────────────────────────
-    //  PSR-14-style API — static methods delegate to getInstance()
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Remove a typed listener, or all listeners for an event class.
+	 *
+	 * @param class-string  $eventClass
+	 */
+	public static function unlisten(string $eventClass, ?callable $listener = null): void {
+		self::getInstance()->provider->removeListener($eventClass, $listener);
+	}
 
-    /**
-     * Dispatch a typed event object to all registered listeners.
-     *
-     * Listeners are called in priority order (highest first).
-     * Stops early if event implements StoppableEventInterface and propagation was stopped.
-     *
-     * @template T of object
-     * @param T $event
-     * @return T The same event, possibly mutated by listeners
-     */
-    public static function dispatch(object $event): object {
-        $i = self::getInstance();
-        foreach ($i->provider->getListenersForEvent($event) as $listener) {
-            if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
-                break;
-            }
-            $listener($event);
-        }
-        return $event;
-    }
+	/**
+	 * Check if any typed listeners are registered for an event class.
+	 *
+	 * @param class-string $eventClass
+	 */
+	public static function hasListeners(string $eventClass): bool {
+		return self::getInstance()->provider->hasListeners($eventClass);
+	}
 
-    /**
-     * Register a typed listener.
-     *
-     * @param class-string $eventClass Fully-qualified event class name
-     * @param callable     $listener   Receives the event object as sole argument
-     * @param int          $priority   Higher = called first (default 0)
-     */
-    public static function listen(string $eventClass, callable $listener, int $priority = 0): void {
-        self::getInstance()->provider->addListener($eventClass, $listener, $priority);
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Utility
+	// ─────────────────────────────────────────────────────────
 
-    /**
-     * Remove a typed listener, or all listeners for an event class.
-     *
-     * @param class-string  $eventClass
-     * @param callable|null $listener
-     */
-    public static function unlisten(string $eventClass, ?callable $listener = null): void {
-        self::getInstance()->provider->removeListener($eventClass, $listener);
-    }
+	/**
+	 * Clear all listeners — both typed and legacy (primarily for testing).
+	 */
+	public static function clear(): void {
+		self::getInstance()->provider->clear();
+	}
 
-    /**
-     * Check if any typed listeners are registered for an event class.
-     *
-     * @param class-string $eventClass
-     */
-    public static function hasListeners(string $eventClass): bool {
-        return self::getInstance()->provider->hasListeners($eventClass);
-    }
+	/**
+	 * Return the underlying ListenerProvider (for introspection).
+	 */
+	public static function getProvider(): ListenerProvider {
+		return self::getInstance()->provider;
+	}
 
-    // ─────────────────────────────────────────────────────────
-    //  Utility
-    // ─────────────────────────────────────────────────────────
-
-    /**
-     * Clear all listeners — both typed and legacy (primarily for testing).
-     */
-    public static function clear(): void {
-        self::getInstance()->provider->clear();
-    }
-
-    /**
-     * Return the underlying ListenerProvider (for introspection).
-     */
-    public static function getProvider(): ListenerProvider {
-        return self::getInstance()->provider;
-    }
-
-    /**
-     * Replace the ListenerProvider (for testing or custom provider injection).
-     */
-    public static function setProvider(ListenerProvider $provider): void {
-        self::getInstance()->provider = $provider;
-    }
+	/**
+	 * Replace the ListenerProvider (for testing or custom provider injection).
+	 */
+	public static function setProvider(ListenerProvider $provider): void {
+		self::getInstance()->provider = $provider;
+	}
 }
diff --git a/src/Core/Events/ListenerProvider.php b/src/Core/Events/ListenerProvider.php
index a7091fda..51c151b3 100644
--- a/src/Core/Events/ListenerProvider.php
+++ b/src/Core/Events/ListenerProvider.php
@@ -14,89 +14,84 @@ namespace XcVm\Core\Events;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ListenerProvider {
+	/** @var array<string, array<int, callable[]>> */
+	private array $listeners = [];
 
-    /** @var array<string, array<int, callable[]>> */
-    private array $listeners = [];
+	/**
+	 * Register a listener for an event class.
+	 *
+	 * @param string   $eventClass Fully-qualified event class name
+	 * @param int      $priority   Higher value = called first (default 0)
+	 */
+	public function addListener(string $eventClass, callable $listener, int $priority = 0): void {
+		$this->listeners[$eventClass][$priority][] = $listener;
+	}
 
-    /**
-     * Register a listener for an event class.
-     *
-     * @param string   $eventClass Fully-qualified event class name
-     * @param callable $listener
-     * @param int      $priority   Higher value = called first (default 0)
-     */
-    public function addListener(string $eventClass, callable $listener, int $priority = 0): void {
-        $this->listeners[$eventClass][$priority][] = $listener;
-    }
+	/**
+	 * Remove all listeners for an event class, or a specific listener.
+	 *
+	 * @param callable|null $listener   If null, removes all listeners for the event
+	 */
+	public function removeListener(string $eventClass, ?callable $listener = null): void {
+		if (!isset($this->listeners[$eventClass])) {
+			return;
+		}
 
-    /**
-     * Remove all listeners for an event class, or a specific listener.
-     *
-     * @param string        $eventClass
-     * @param callable|null $listener   If null, removes all listeners for the event
-     */
-    public function removeListener(string $eventClass, ?callable $listener = null): void {
-        if (!isset($this->listeners[$eventClass])) {
-            return;
-        }
+		if ($listener === null) {
+			unset($this->listeners[$eventClass]);
+			return;
+		}
 
-        if ($listener === null) {
-            unset($this->listeners[$eventClass]);
-            return;
-        }
+		foreach ($this->listeners[$eventClass] as $priority => $group) {
+			$filtered = array_filter($group, fn($l) => $l !== $listener);
+			if (empty($filtered)) {
+				unset($this->listeners[$eventClass][$priority]);
+			} else {
+				$this->listeners[$eventClass][$priority] = array_values($filtered);
+			}
+		}
+	}
 
-        foreach ($this->listeners[$eventClass] as $priority => $group) {
-            $filtered = array_filter($group, fn($l) => $l !== $listener);
-            if (empty($filtered)) {
-                unset($this->listeners[$eventClass][$priority]);
-            } else {
-                $this->listeners[$eventClass][$priority] = array_values($filtered);
-            }
-        }
-    }
+	/**
+	 * Yield listeners for the given event in priority order (highest first).
+	 *
+	 * @return iterable<callable>
+	 */
+	public function getListenersForEvent(object $event): iterable {
+		$class = $event::class;
+		if (!isset($this->listeners[$class])) {
+			return;
+		}
 
-    /**
-     * Yield listeners for the given event in priority order (highest first).
-     *
-     * @param object $event
-     * @return iterable<callable>
-     */
-    public function getListenersForEvent(object $event): iterable {
-        $class = $event::class;
-        if (!isset($this->listeners[$class])) {
-            return;
-        }
+		$buckets = $this->listeners[$class];
+		krsort($buckets);
 
-        $buckets = $this->listeners[$class];
-        krsort($buckets);
+		foreach ($buckets as $group) {
+			yield from $group;
+		}
+	}
 
-        foreach ($buckets as $group) {
-            yield from $group;
-        }
-    }
+	/**
+	 * Check whether any listeners are registered for an event class.
+	 *
+	 */
+	public function hasListeners(string $eventClass): bool {
+		return !empty($this->listeners[$eventClass]);
+	}
 
-    /**
-     * Check whether any listeners are registered for an event class.
-     *
-     * @param string $eventClass
-     */
-    public function hasListeners(string $eventClass): bool {
-        return !empty($this->listeners[$eventClass]);
-    }
+	/**
+	 * Return all registered listeners (for debugging/introspection).
+	 *
+	 * @return array<string, array<int, callable[]>>
+	 */
+	public function all(): array {
+		return $this->listeners;
+	}
 
-    /**
-     * Return all registered listeners (for debugging/introspection).
-     *
-     * @return array<string, array<int, callable[]>>
-     */
-    public function all(): array {
-        return $this->listeners;
-    }
-
-    /**
-     * Remove all listeners (for testing).
-     */
-    public function clear(): void {
-        $this->listeners = [];
-    }
+	/**
+	 * Remove all listeners (for testing).
+	 */
+	public function clear(): void {
+		$this->listeners = [];
+	}
 }
diff --git a/src/Core/Events/ListensTo.php b/src/Core/Events/ListensTo.php
index b69f8005..db662d99 100644
--- a/src/Core/Events/ListensTo.php
+++ b/src/Core/Events/ListensTo.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Events;
 
@@ -35,13 +34,13 @@ namespace XcVm\Core\Events;
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 final class ListensTo {
-
-    /**
-     * @param class-string $eventClass Fully-qualified event class name to listen for.
-     * @param int          $priority   Dispatch priority — higher value means called first (default 0).
-     */
-    public function __construct(
-        public readonly string $eventClass,
-        public readonly int    $priority = 0,
-    ) {}
+	/**
+	 * @param class-string $eventClass Fully-qualified event class name to listen for.
+	 * @param int          $priority   Dispatch priority — higher value means called first (default 0).
+	 */
+	public function __construct(
+		public readonly string $eventClass,
+		public readonly int $priority = 0,
+	) {
+	}
 }
diff --git a/src/Core/Events/Module/ModuleBootedEvent.php b/src/Core/Events/Module/ModuleBootedEvent.php
index af3efabf..f6303aea 100644
--- a/src/Core/Events/Module/ModuleBootedEvent.php
+++ b/src/Core/Events/Module/ModuleBootedEvent.php
@@ -11,12 +11,13 @@ namespace XcVm\Core\Events\Module;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class ModuleBootedEvent {
-    /**
-     * @param string $name    Module name.
-     * @param string $version Module version.
-     */
-    public function __construct(
-        public readonly string $name,
-        public readonly string $version,
-    ) {}
+	/**
+	 * @param string $name    Module name.
+	 * @param string $version Module version.
+	 */
+	public function __construct(
+		public readonly string $name,
+		public readonly string $version,
+	) {
+	}
 }
diff --git a/src/Core/Events/Module/ModuleLoadedEvent.php b/src/Core/Events/Module/ModuleLoadedEvent.php
index badbe626..ed15af79 100644
--- a/src/Core/Events/Module/ModuleLoadedEvent.php
+++ b/src/Core/Events/Module/ModuleLoadedEvent.php
@@ -11,12 +11,13 @@ namespace XcVm\Core\Events\Module;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class ModuleLoadedEvent {
-    /**
-     * @param string $name Module name.
-     * @param string $path Filesystem path the module was loaded from.
-     */
-    public function __construct(
-        public readonly string $name,
-        public readonly string $path,
-    ) {}
+	/**
+	 * @param string $name Module name.
+	 * @param string $path Filesystem path the module was loaded from.
+	 */
+	public function __construct(
+		public readonly string $name,
+		public readonly string $path,
+	) {
+	}
 }
diff --git a/src/Core/Events/Module/PackageInstalledEvent.php b/src/Core/Events/Module/PackageInstalledEvent.php
index 23b1d9e8..1538e79f 100644
--- a/src/Core/Events/Module/PackageInstalledEvent.php
+++ b/src/Core/Events/Module/PackageInstalledEvent.php
@@ -14,16 +14,17 @@ namespace XcVm\Core\Events\Module;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class PackageInstalledEvent {
-    /**
-     * @param string $slug        Package slug.
-     * @param string $version     Installed version.
-     * @param string $path        Install path.
-     * @param int    $installedAt Unix timestamp of installation.
-     */
-    public function __construct(
-        public readonly string $slug,
-        public readonly string $version,
-        public readonly string $path,
-        public readonly int    $installedAt,
-    ) {}
+	/**
+	 * @param string $slug        Package slug.
+	 * @param string $version     Installed version.
+	 * @param string $path        Install path.
+	 * @param int    $installedAt Unix timestamp of installation.
+	 */
+	public function __construct(
+		public readonly string $slug,
+		public readonly string $version,
+		public readonly string $path,
+		public readonly int $installedAt,
+	) {
+	}
 }
diff --git a/src/Core/Events/Settings/SettingsChangedEvent.php b/src/Core/Events/Settings/SettingsChangedEvent.php
index 9b4671db..29bb20a3 100644
--- a/src/Core/Events/Settings/SettingsChangedEvent.php
+++ b/src/Core/Events/Settings/SettingsChangedEvent.php
@@ -11,25 +11,26 @@ namespace XcVm\Core\Events\Settings;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class SettingsChangedEvent {
-    /**
-     * @param array $previous  Settings before the change.
-     * @param array $current   Settings after the change.
-     * @param int   $changedBy User id that made the change.
-     * @param float $changedAt Unix timestamp (with microseconds) of the change.
-     */
-    public function __construct(
-        public readonly array  $previous,
-        public readonly array  $current,
-        public readonly int    $changedBy,
-        public readonly float  $changedAt,
-    ) {}
+	/**
+	 * @param array $previous  Settings before the change.
+	 * @param array $current   Settings after the change.
+	 * @param int   $changedBy User id that made the change.
+	 * @param float $changedAt Unix timestamp (with microseconds) of the change.
+	 */
+	public function __construct(
+		public readonly array $previous,
+		public readonly array $current,
+		public readonly int $changedBy,
+		public readonly float $changedAt,
+	) {
+	}
 
-    /**
-     * Keys whose values differ between previous and current settings.
-     *
-     * @return string[]
-     */
-    public function changedKeys(): array {
-        return array_keys(array_diff_assoc($this->current, $this->previous));
-    }
+	/**
+	 * Keys whose values differ between previous and current settings.
+	 *
+	 * @return string[]
+	 */
+	public function changedKeys(): array {
+		return array_keys(array_diff_assoc($this->current, $this->previous));
+	}
 }
diff --git a/src/Core/Events/Stream/StreamStartedEvent.php b/src/Core/Events/Stream/StreamStartedEvent.php
index 1a777540..f8a026b6 100644
--- a/src/Core/Events/Stream/StreamStartedEvent.php
+++ b/src/Core/Events/Stream/StreamStartedEvent.php
@@ -11,16 +11,17 @@ namespace XcVm\Core\Events\Stream;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class StreamStartedEvent {
-    /**
-     * @param int    $streamId  Stream that started.
-     * @param string $userId    User the stream started for.
-     * @param string $protocol  Delivery protocol.
-     * @param float  $startedAt Unix timestamp (with microseconds) of start.
-     */
-    public function __construct(
-        public readonly int    $streamId,
-        public readonly string $userId,
-        public readonly string $protocol,
-        public readonly float  $startedAt,
-    ) {}
+	/**
+	 * @param int    $streamId  Stream that started.
+	 * @param string $userId    User the stream started for.
+	 * @param string $protocol  Delivery protocol.
+	 * @param float  $startedAt Unix timestamp (with microseconds) of start.
+	 */
+	public function __construct(
+		public readonly int $streamId,
+		public readonly string $userId,
+		public readonly string $protocol,
+		public readonly float $startedAt,
+	) {
+	}
 }
diff --git a/src/Core/Events/Stream/StreamStartingEvent.php b/src/Core/Events/Stream/StreamStartingEvent.php
index eff2fe6f..c7f44fd0 100644
--- a/src/Core/Events/Stream/StreamStartingEvent.php
+++ b/src/Core/Events/Stream/StreamStartingEvent.php
@@ -16,39 +16,39 @@ use XcVm\Core\Events\AbstractEvent;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class StreamStartingEvent extends AbstractEvent {
+	private string $abortReason = '';
 
-    private string $abortReason = '';
+	/**
+	 * @param int    $streamId Stream being started.
+	 * @param string $userId   User requesting the stream.
+	 * @param string $protocol Delivery protocol (e.g. hls, mpegts).
+	 * @param array  $params   Additional request parameters.
+	 */
+	public function __construct(
+		public readonly int $streamId,
+		public readonly string $userId,
+		public readonly string $protocol,
+		public readonly array $params,
+	) {
+	}
 
-    /**
-     * @param int    $streamId Stream being started.
-     * @param string $userId   User requesting the stream.
-     * @param string $protocol Delivery protocol (e.g. hls, mpegts).
-     * @param array  $params   Additional request parameters.
-     */
-    public function __construct(
-        public readonly int    $streamId,
-        public readonly string $userId,
-        public readonly string $protocol,
-        public readonly array  $params,
-    ) {}
+	/**
+	 * Abort the stream start and stop event propagation.
+	 *
+	 * @param string $reason Human-readable abort reason.
+	 * @return void
+	 */
+	public function abort(string $reason): void {
+		$this->abortReason = $reason;
+		$this->stopPropagation();
+	}
 
-    /**
-     * Abort the stream start and stop event propagation.
-     *
-     * @param string $reason Human-readable abort reason.
-     * @return void
-     */
-    public function abort(string $reason): void {
-        $this->abortReason = $reason;
-        $this->stopPropagation();
-    }
-
-    /**
-     * Reason supplied to abort(), or '' if not aborted.
-     *
-     * @return string
-     */
-    public function getAbortReason(): string {
-        return $this->abortReason;
-    }
+	/**
+	 * Reason supplied to abort(), or '' if not aborted.
+	 *
+	 * @return string
+	 */
+	public function getAbortReason(): string {
+		return $this->abortReason;
+	}
 }
diff --git a/src/Core/Events/Stream/StreamStoppedEvent.php b/src/Core/Events/Stream/StreamStoppedEvent.php
index 721dcaf4..c96326bc 100644
--- a/src/Core/Events/Stream/StreamStoppedEvent.php
+++ b/src/Core/Events/Stream/StreamStoppedEvent.php
@@ -11,16 +11,17 @@ namespace XcVm\Core\Events\Stream;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class StreamStoppedEvent {
-    /**
-     * @param int    $streamId  Stream that stopped.
-     * @param string $userId    User the stream belonged to.
-     * @param float  $stoppedAt Unix timestamp (with microseconds) of stop.
-     * @param string $reason    Reason the stream stopped.
-     */
-    public function __construct(
-        public readonly int    $streamId,
-        public readonly string $userId,
-        public readonly float  $stoppedAt,
-        public readonly string $reason,
-    ) {}
+	/**
+	 * @param int    $streamId  Stream that stopped.
+	 * @param string $userId    User the stream belonged to.
+	 * @param float  $stoppedAt Unix timestamp (with microseconds) of stop.
+	 * @param string $reason    Reason the stream stopped.
+	 */
+	public function __construct(
+		public readonly int $streamId,
+		public readonly string $userId,
+		public readonly float $stoppedAt,
+		public readonly string $reason,
+	) {
+	}
 }
diff --git a/src/Core/Events/Stream/StreamsDeletedEvent.php b/src/Core/Events/Stream/StreamsDeletedEvent.php
index 13525d0e..ca359e87 100644
--- a/src/Core/Events/Stream/StreamsDeletedEvent.php
+++ b/src/Core/Events/Stream/StreamsDeletedEvent.php
@@ -14,10 +14,11 @@ namespace XcVm\Core\Events\Stream;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class StreamsDeletedEvent {
-    /**
-     * @param int[] $streamIds Ids of the streams that were deleted.
-     */
-    public function __construct(
-        public readonly array $streamIds,
-    ) {}
+	/**
+	 * @param int[] $streamIds Ids of the streams that were deleted.
+	 */
+	public function __construct(
+		public readonly array $streamIds,
+	) {
+	}
 }
diff --git a/src/Core/Events/Vod/VodImportedEvent.php b/src/Core/Events/Vod/VodImportedEvent.php
index b39565cc..4ab3d206 100644
--- a/src/Core/Events/Vod/VodImportedEvent.php
+++ b/src/Core/Events/Vod/VodImportedEvent.php
@@ -16,14 +16,15 @@ namespace XcVm\Core\Events\Vod;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class VodImportedEvent {
-    /**
-     * @param int    $streamId   Id of the created/updated VOD stream.
-     * @param string $sourcePath File path the item was imported from (server prefix stripped).
-     * @param int    $type       VOD type (1 = movie).
-     */
-    public function __construct(
-        public readonly int $streamId,
-        public readonly string $sourcePath,
-        public readonly int $type = 1,
-    ) {}
+	/**
+	 * @param int    $streamId   Id of the created/updated VOD stream.
+	 * @param string $sourcePath File path the item was imported from (server prefix stripped).
+	 * @param int    $type       VOD type (1 = movie).
+	 */
+	public function __construct(
+		public readonly int $streamId,
+		public readonly string $sourcePath,
+		public readonly int $type = 1,
+	) {
+	}
 }
diff --git a/src/Core/Exception/Container/CircularDependencyException.php b/src/Core/Exception/Container/CircularDependencyException.php
index 07bcea59..42d5482f 100644
--- a/src/Core/Exception/Container/CircularDependencyException.php
+++ b/src/Core/Exception/Container/CircularDependencyException.php
@@ -12,4 +12,5 @@ namespace XcVm\Core\Exception\Container;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class CircularDependencyException extends ContainerException {}
+class CircularDependencyException extends ContainerException {
+}
diff --git a/src/Core/Exception/Container/ContainerException.php b/src/Core/Exception/Container/ContainerException.php
index 6b895729..6128624e 100644
--- a/src/Core/Exception/Container/ContainerException.php
+++ b/src/Core/Exception/Container/ContainerException.php
@@ -16,4 +16,5 @@ use XcVm\Core\Exception\XcVmException;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class ContainerException extends XcVmException implements ContainerExceptionInterface {}
+class ContainerException extends XcVmException implements ContainerExceptionInterface {
+}
diff --git a/src/Core/Exception/Container/ServiceCreationException.php b/src/Core/Exception/Container/ServiceCreationException.php
index 902a5a52..ada419a8 100644
--- a/src/Core/Exception/Container/ServiceCreationException.php
+++ b/src/Core/Exception/Container/ServiceCreationException.php
@@ -13,4 +13,5 @@ namespace XcVm\Core\Exception\Container;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class ServiceCreationException extends ContainerException {}
+class ServiceCreationException extends ContainerException {
+}
diff --git a/src/Core/Exception/Module/ModuleCycleException.php b/src/Core/Exception/Module/ModuleCycleException.php
index 5d028c1d..c1ad6033 100644
--- a/src/Core/Exception/Module/ModuleCycleException.php
+++ b/src/Core/Exception/Module/ModuleCycleException.php
@@ -12,4 +12,5 @@ namespace XcVm\Core\Exception\Module;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class ModuleCycleException extends ModuleException {}
+class ModuleCycleException extends ModuleException {
+}
diff --git a/src/Core/Exception/Module/ModuleException.php b/src/Core/Exception/Module/ModuleException.php
index e4cc926e..020d47f6 100644
--- a/src/Core/Exception/Module/ModuleException.php
+++ b/src/Core/Exception/Module/ModuleException.php
@@ -12,4 +12,5 @@ use XcVm\Core\Exception\XcVmException;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class ModuleException extends XcVmException {}
+class ModuleException extends XcVmException {
+}
diff --git a/src/Core/Exception/Module/ModuleLoadException.php b/src/Core/Exception/Module/ModuleLoadException.php
index fc867889..5fa7fe2b 100644
--- a/src/Core/Exception/Module/ModuleLoadException.php
+++ b/src/Core/Exception/Module/ModuleLoadException.php
@@ -10,4 +10,5 @@ namespace XcVm\Core\Exception\Module;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class ModuleLoadException extends ModuleException {}
+class ModuleLoadException extends ModuleException {
+}
diff --git a/src/Core/Exception/Module/ModuleManifestException.php b/src/Core/Exception/Module/ModuleManifestException.php
index 33cc55a7..a4d666f4 100644
--- a/src/Core/Exception/Module/ModuleManifestException.php
+++ b/src/Core/Exception/Module/ModuleManifestException.php
@@ -10,4 +10,5 @@ namespace XcVm\Core\Exception\Module;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class ModuleManifestException extends ModuleException {}
+class ModuleManifestException extends ModuleException {
+}
diff --git a/src/Core/Exception/Module/ModuleNotFoundException.php b/src/Core/Exception/Module/ModuleNotFoundException.php
index 629cb11f..e20688a6 100644
--- a/src/Core/Exception/Module/ModuleNotFoundException.php
+++ b/src/Core/Exception/Module/ModuleNotFoundException.php
@@ -10,4 +10,5 @@ namespace XcVm\Core\Exception\Module;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class ModuleNotFoundException extends ModuleException {}
+class ModuleNotFoundException extends ModuleException {
+}
diff --git a/src/Core/Exception/XcVmException.php b/src/Core/Exception/XcVmException.php
index 58096dfd..9412fa66 100644
--- a/src/Core/Exception/XcVmException.php
+++ b/src/Core/Exception/XcVmException.php
@@ -18,4 +18,5 @@ namespace XcVm\Core\Exception;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class XcVmException extends \RuntimeException {}
+class XcVmException extends \RuntimeException {
+}
diff --git a/src/Core/GeoIP/AsnCatalogSync.php b/src/Core/GeoIP/AsnCatalogSync.php
index 6aac03ba..b8cf584e 100644
--- a/src/Core/GeoIP/AsnCatalogSync.php
+++ b/src/Core/GeoIP/AsnCatalogSync.php
@@ -103,25 +103,25 @@ class AsnCatalogSync {
 	public static function sync(): array {
 		$rPath = self::path();
 		if (!is_file($rPath)) {
-			return array('upserted' => 0, 'removed' => 0, 'skipped' => 'no-file');
+			return ['upserted' => 0, 'removed' => 0, 'skipped' => 'no-file'];
 		}
 
 		$rRaw = @file_get_contents($rPath);
 		if ($rRaw === false || $rRaw === '') {
-			return array('upserted' => 0, 'removed' => 0, 'skipped' => 'empty');
+			return ['upserted' => 0, 'removed' => 0, 'skipped' => 'empty'];
 		}
 		// Transparently gunzip (the release ships .gz; a plain .json also works).
 		if (substr($rRaw, 0, 2) === "\x1f\x8b") {
 			$rRaw = @gzdecode($rRaw);
 			if ($rRaw === false) {
-				return array('upserted' => 0, 'removed' => 0, 'skipped' => 'bad-gzip');
+				return ['upserted' => 0, 'removed' => 0, 'skipped' => 'bad-gzip'];
 			}
 		}
 
 		$rRecords = json_decode($rRaw, true);
 		unset($rRaw);
 		if (!is_array($rRecords) || count($rRecords) === 0) {
-			return array('upserted' => 0, 'removed' => 0, 'skipped' => 'bad-json');
+			return ['upserted' => 0, 'removed' => 0, 'skipped' => 'bad-json'];
 		}
 
 		$db = self::db();
@@ -130,8 +130,8 @@ class AsnCatalogSync {
 		$db->query('CREATE TEMPORARY TABLE `tmp_asns` (`asn` INT PRIMARY KEY) ENGINE=MEMORY;');
 
 		$rUpserted = 0;
-		$rUpsertBatch = array();
-		$rTmpBatch = array();
+		$rUpsertBatch = [];
+		$rTmpBatch = [];
 
 		foreach ($rRecords as $rRow) {
 			$rAsn = isset($rRow['asn']) ? intval($rRow['asn']) : 0;
@@ -140,21 +140,21 @@ class AsnCatalogSync {
 			}
 
 			$rDomain = (isset($rRow['domain']) && $rRow['domain'] !== '') ? (string) $rRow['domain'] : null;
-			$rUpsertBatch[] = array(
+			$rUpsertBatch[] = [
 				$rAsn,
 				isset($rRow['isp']) ? (string) $rRow['isp'] : null,
 				$rDomain,
 				isset($rRow['country']) ? (string) $rRow['country'] : null,
 				isset($rRow['num_ips']) ? intval($rRow['num_ips']) : 0,
 				isset($rRow['type']) ? (string) $rRow['type'] : null,
-			);
+			];
 			$rTmpBatch[] = $rAsn;
 
 			if (count($rUpsertBatch) >= self::BATCH) {
 				$rUpserted += self::flushUpsert($db, $rUpsertBatch);
 				self::flushTmp($db, $rTmpBatch);
-				$rUpsertBatch = array();
-				$rTmpBatch = array();
+				$rUpsertBatch = [];
+				$rTmpBatch = [];
 			}
 		}
 		if (count($rUpsertBatch) > 0) {
@@ -169,20 +169,19 @@ class AsnCatalogSync {
 		$db->query('DELETE `b` FROM `blocked_asns` `b` LEFT JOIN `tmp_asns` `t` ON `b`.`asn` = `t`.`asn` WHERE `t`.`asn` IS NULL AND `b`.`blocked` = 0;');
 		$db->query('DROP TEMPORARY TABLE IF EXISTS `tmp_asns`;');
 
-		return array('upserted' => $rUpserted, 'removed' => $rRemoved);
+		return ['upserted' => $rUpserted, 'removed' => $rRemoved];
 	}
 
 	/**
 	 * Multi-row upsert of one batch. `blocked` is intentionally absent from the
 	 * column list, so it is never overwritten (new rows take its default 0).
 	 *
-	 * @param object                       $db
 	 * @param array<int, array<int, mixed>> $rBatch Rows [asn, isp, domain, country, num_ips, type].
 	 * @return int Rows sent.
 	 */
-	private static function flushUpsert($db, array $rBatch): int {
+	private static function flushUpsert(object $db, array $rBatch): int {
 		$rPlaceholders = implode(',', array_fill(0, count($rBatch), '(?,?,?,?,?,?)'));
-		$rParams = array();
+		$rParams = [];
 		foreach ($rBatch as $rCols) {
 			foreach ($rCols as $rVal) {
 				$rParams[] = $rVal;
@@ -198,10 +197,9 @@ class AsnCatalogSync {
 	/**
 	 * Batch-insert ASNs into the temp snapshot table used by the prune step.
 	 *
-	 * @param object     $db
 	 * @param array<int> $rAsns
 	 */
-	private static function flushTmp($db, array $rAsns): void {
+	private static function flushTmp(object $db, array $rAsns): void {
 		if (count($rAsns) === 0) {
 			return;
 		}
diff --git a/src/Core/GeoIP/GeoIPService.php b/src/Core/GeoIP/GeoIPService.php
index ebdfcd16..f48d57f7 100644
--- a/src/Core/GeoIP/GeoIPService.php
+++ b/src/Core/GeoIP/GeoIPService.php
@@ -17,16 +17,14 @@ use XcVm\Core\Util\GeoIP;
  */
 
 class GeoIPService {
-
 	/**
 	 * Получить GeoIP-информацию по IP-адресу (GeoLite2).
 	 *
 	 * Результат кэшируется в файл CONS_TMP_PATH/md5(ip)_geo2.
 	 *
-	 * @param string $rIP
 	 * @return array|false
 	 */
-	public static function getIPInfo($rIP) {
+	public static function getIPInfo(string $rIP) {
 		if (!empty($rIP)) {
 			if (!file_exists(CONS_TMP_PATH . md5($rIP) . '_geo2')) {
 				$rGeoIP = new \MaxMind\Db\Reader(GEOLITE2_BIN);
@@ -47,10 +45,9 @@ class GeoIPService {
 	 *
 	 * Результат кэшируется в файл CONS_TMP_PATH/md5(ip)_isp.
 	 *
-	 * @param string $rIP
 	 * @return array|false
 	 */
-	public static function getISP($rIP) {
+	public static function getISP(string $rIP) {
 		if (!empty($rIP)) {
 			$rResponse = (file_exists(CONS_TMP_PATH . md5($rIP) . '_isp') ? json_decode(file_get_contents(CONS_TMP_PATH . md5($rIP) . '_isp'), true) : null);
 			if (!is_array($rResponse)) {
@@ -73,7 +70,7 @@ class GeoIPService {
 	 * @param string $rIP IP address
 	 * @return array|null Matching CIDR data or null
 	 */
-	public static function matchCIDR($rASN, $rIP) {
+	public static function matchCIDR(string $rASN, string $rIP) {
 		if (file_exists(CIDR_TMP_PATH . $rASN)) {
 			$rCIDRs = json_decode(file_get_contents(CIDR_TMP_PATH . $rASN), true);
 			foreach ($rCIDRs as $rData) {
diff --git a/src/Core/GeoIP/GeoLiteReleaseUpdater.php b/src/Core/GeoIP/GeoLiteReleaseUpdater.php
index f70d0b05..e5370c21 100644
--- a/src/Core/GeoIP/GeoLiteReleaseUpdater.php
+++ b/src/Core/GeoIP/GeoLiteReleaseUpdater.php
@@ -18,125 +18,123 @@ use XcVm\Core\Updates\UpdateChannels;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class GeoLiteReleaseUpdater {
+	private const DIR = '/home/xc_vm/bin/maxmind/';
+	private const VERSION_FILE = self::DIR . 'version.json';
+	private const GEOLITE_FILES = ['GeoLite2-City.mmdb', 'GeoLite2-Country.mmdb'];
+	private const ISP_FILE = 'GeoIP2-ISP.mmdb';
 
-    private const DIR = '/home/xc_vm/bin/maxmind/';
-    private const VERSION_FILE = self::DIR . 'version.json';
-    private const GEOLITE_FILES = array('GeoLite2-City.mmdb', 'GeoLite2-Country.mmdb');
-    private const ISP_FILE = 'GeoIP2-ISP.mmdb';
+	private GitHubReleases $rRepo;
 
-    private GitHubReleases $rRepo;
+	public function __construct(?GitHubReleases $rRepo = null) {
+		$this->rRepo = $rRepo ?? new GitHubReleases(GIT_OWNER, GIT_REPO_UPDATE, UpdateChannels::forRepo(GIT_REPO_UPDATE));
+	}
 
-    public function __construct(?GitHubReleases $rRepo = null) {
-        $this->rRepo = $rRepo ?? new GitHubReleases(GIT_OWNER, GIT_REPO_UPDATE, UpdateChannels::forRepo(GIT_REPO_UPDATE));
-    }
+	/**
+	 * Download the GeoLite2 databases from the latest release and record the
+	 * version. Returns true when any file failed to download.
+	 */
+	public function updateGeoLite(bool $rForce): bool {
+		$rVersion = $this->rRepo->getReleases()[0] ?? null;
+		if ($rVersion === null) {
+			echo "[ERROR] GeoLite2: release metadata unavailable\n";
+			return true;
+		}
 
-    /**
-     * Download the GeoLite2 databases from the latest release and record the
-     * version. Returns true when any file failed to download.
-     */
-    public function updateGeoLite(bool $rForce): bool {
-        $rVersion = $this->rRepo->getReleases()[0] ?? null;
-        if ($rVersion === null) {
-            echo "[ERROR] GeoLite2: release metadata unavailable\n";
-            return true;
-        }
+		$rHadError = false;
+		foreach (self::GEOLITE_FILES as $rFile) {
+			if ($this->downloadReleaseFile($this->assetSpec($rVersion, $rFile), $rForce) === null) {
+				$rHadError = true;
+			}
+		}
 
-        $rHadError = false;
-        foreach (self::GEOLITE_FILES as $rFile) {
-            if ($this->downloadReleaseFile($this->assetSpec($rVersion, $rFile), $rForce) === null) {
-                $rHadError = true;
-            }
-        }
+		$this->recordVersion('geolite2_version', $rVersion);
+		return $rHadError;
+	}
 
-        $this->recordVersion('geolite2_version', $rVersion);
-        return $rHadError;
-    }
+	/**
+	 * Sync the free GeoIP2-ISP database from the latest release and record its
+	 * version — the exact same path as {@see updateGeoLite()}.
+	 */
+	public function updateIsp(bool $rForce): void {
+		$rVersion = $this->rRepo->getReleases()[0] ?? null;
+		if ($rVersion === null) {
+			return;
+		}
 
-    /**
-     * Sync the free GeoIP2-ISP database from the latest release and record its
-     * version — the exact same path as {@see updateGeoLite()}.
-     */
-    public function updateIsp(bool $rForce): void {
-        $rVersion = $this->rRepo->getReleases()[0] ?? null;
-        if ($rVersion === null) {
-            return;
-        }
+		if ($this->downloadReleaseFile($this->assetSpec($rVersion, self::ISP_FILE), $rForce) !== null) {
+			$this->recordVersion('geoisp_version', $rVersion);
+		}
+	}
 
-        if ($this->downloadReleaseFile($this->assetSpec($rVersion, self::ISP_FILE), $rForce) !== null) {
-            $this->recordVersion('geoisp_version', $rVersion);
-        }
-    }
+	/**
+	 * Build the download spec for one maxmind asset in a given release.
+	 *
+	 * @return array{fileurl: string, path: string, md5: ?string}
+	 */
+	private function assetSpec(string $rVersion, string $rFile): array {
+		return [
+			'fileurl' => $this->rRepo->assetUrl($rVersion, $rFile),
+			'path'    => self::DIR . $rFile,
+			'md5'     => $this->rRepo->getAssetHash($rVersion, $rFile),
+		];
+	}
 
-    /**
-     * Build the download spec for one maxmind asset in a given release.
-     *
-     * @return array{fileurl: string, path: string, md5: ?string}
-     */
-    private function assetSpec(string $rVersion, string $rFile): array {
-        return array(
-            'fileurl' => $this->rRepo->assetUrl($rVersion, $rFile),
-            'path'    => self::DIR . $rFile,
-            'md5'     => $this->rRepo->getAssetHash($rVersion, $rFile),
-        );
-    }
+	/**
+	 * Merge a single key into maxmind/version.json.
+	 *
+	 */
+	protected function recordVersion(string $rKey, mixed $rVersion): void {
+		$rData = json_decode(@file_get_contents(self::VERSION_FILE), true) ?: [];
+		$rData[$rKey] = $rVersion;
+		file_put_contents(self::VERSION_FILE, json_encode($rData, JSON_PRETTY_PRINT));
+	}
 
-    /**
-     * Merge a single key into maxmind/version.json.
-     *
-     * @param mixed $rVersion
-     */
-    protected function recordVersion(string $rKey, $rVersion): void {
-        $rData = json_decode(@file_get_contents(self::VERSION_FILE), true) ?: array();
-        $rData[$rKey] = $rVersion;
-        file_put_contents(self::VERSION_FILE, json_encode($rData, JSON_PRETTY_PRINT));
-    }
+	/**
+	 * Download one release asset: md5-gated skip, create the target dir if
+	 * missing, and ALWAYS save a successfully downloaded file (the checksum only
+	 * sets the status line — the release `hashes.md5` can time out over SSL or
+	 * lag a release, and GeoIP data is non-critical).
+	 *
+	 * @param array{fileurl: string, path: string, md5: ?string} $rFile
+	 * @return bool|null true = downloaded, false = skipped (up to date), null = error.
+	 */
+	protected function downloadReleaseFile(array $rFile, bool $rForce): ?bool {
+		if (!$rForce && is_file($rFile['path']) && !empty($rFile['md5']) && md5_file($rFile['path']) === $rFile['md5']) {
+			echo '[SKIP]  ' . $rFile['path'] . ': already up to date' . "\n";
+			return false;
+		}
 
-    /**
-     * Download one release asset: md5-gated skip, create the target dir if
-     * missing, and ALWAYS save a successfully downloaded file (the checksum only
-     * sets the status line — the release `hashes.md5` can time out over SSL or
-     * lag a release, and GeoIP data is non-critical).
-     *
-     * @param array{fileurl: string, path: string, md5: ?string} $rFile
-     * @return bool|null true = downloaded, false = skipped (up to date), null = error.
-     */
-    protected function downloadReleaseFile(array $rFile, bool $rForce): ?bool {
-        if (!$rForce && is_file($rFile['path']) && !empty($rFile['md5']) && md5_file($rFile['path']) === $rFile['md5']) {
-            echo '[SKIP]  ' . $rFile['path'] . ': already up to date' . "\n";
-            return false;
-        }
+		$rFolderPath = pathinfo($rFile['path'])['dirname'] . '/';
+		if (!file_exists($rFolderPath)) {
+			shell_exec('sudo mkdir -p "' . $rFolderPath . '"');
+		}
 
-        $rFolderPath = pathinfo($rFile['path'])['dirname'] . '/';
-        if (!file_exists($rFolderPath)) {
-            shell_exec('sudo mkdir -p "' . $rFolderPath . '"');
-        }
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $rFile['fileurl']);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 300);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36');
+		$rData = curl_exec($ch);
+		curl_close($ch);
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $rFile['fileurl']);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 300);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36');
-        $rData = curl_exec($ch);
-        curl_close($ch);
+		if ($rData === false || $rData === '') {
+			echo '[ERROR] ' . $rFile['path'] . ': download failed' . "\n";
+			return null;
+		}
 
-        if ($rData === false || $rData === '') {
-            echo '[ERROR] ' . $rFile['path'] . ': download failed' . "\n";
-            return null;
-        }
+		if (empty($rFile['md5'])) {
+			echo '[WARN]  ' . $rFile['path'] . ': saved without checksum (hash unavailable)' . "\n";
+		} elseif ($rFile['md5'] === md5($rData)) {
+			echo '[OK]    ' . $rFile['path'] . ': updated' . "\n";
+		} else {
+			echo '[WARN]  ' . $rFile['path'] . ': checksum mismatch — saved anyway' . "\n";
+		}
 
-        if (empty($rFile['md5'])) {
-            echo '[WARN]  ' . $rFile['path'] . ': saved without checksum (hash unavailable)' . "\n";
-        } elseif ($rFile['md5'] === md5($rData)) {
-            echo '[OK]    ' . $rFile['path'] . ': updated' . "\n";
-        } else {
-            echo '[WARN]  ' . $rFile['path'] . ': checksum mismatch — saved anyway' . "\n";
-        }
-
-        file_put_contents($rFile['path'], $rData);
-        chown($rFile['path'], 'xc_vm');
-        chmod($rFile['path'], 0750);
-        return true;
-    }
+		file_put_contents($rFile['path'], $rData);
+		chown($rFile['path'], 'xc_vm');
+		chmod($rFile['path'], 0750);
+		return true;
+	}
 }
diff --git a/src/Core/GeoIP/MaxMindUpdater.php b/src/Core/GeoIP/MaxMindUpdater.php
index 3d7e6f14..367f1227 100644
--- a/src/Core/GeoIP/MaxMindUpdater.php
+++ b/src/Core/GeoIP/MaxMindUpdater.php
@@ -20,14 +20,15 @@ use XcVm\Core\Util\GeoIP;
  * Implemented for: https://github.com/Vateron-Media/XC_VM/issues/102
  */
 class MaxMindUpdater {
-
 	private const DOWNLOAD_URL = 'https://download.maxmind.com/geoip/databases/%s/download?suffix=tar.gz';
 	private const MAXMIND_DIR  = '/home/xc_vm/bin/maxmind/';
 	private const VERSION_FILE = '/home/xc_vm/bin/maxmind/version.json';
 	private const TIMEOUT      = 300;
 
 	private string $accountId;
+
 	private string $licenseKey;
+
 	/** @var string[] */
 	private array $editions;
 
@@ -244,4 +245,4 @@ class MaxMindUpdater {
 			'GeoIP2-Anonymous-IP' => 'GeoIP2-Anonymous-IP (paid)',
 		];
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/Http/ApiClient.php b/src/Core/Http/ApiClient.php
index 3c1083e5..f47bdaf2 100644
--- a/src/Core/Http/ApiClient.php
+++ b/src/Core/Http/ApiClient.php
@@ -23,7 +23,7 @@ class ApiClient {
 	 * @param int   $rTimeout Connect/read timeout in seconds.
 	 * @return string|bool Response body, or false on failure.
 	 */
-	public static function request($rData, $rTimeout = 5) {
+	public static function request(array $rData, int $rTimeout = 5) {
 		ini_set('default_socket_timeout', $rTimeout);
 		$rAPI = 'http://127.0.0.1:' . intval(ServerRepository::getAll()[SERVER_ID]['http_broadcast_port']) . '/admin/api';
 
@@ -51,7 +51,7 @@ class ApiClient {
 	 * @param int   $rTimeout  Connect/read timeout in seconds.
 	 * @return string|null Response body, or null if the server is offline/unknown.
 	 */
-	public static function systemRequest($rServerID, $rData, $rTimeout = 5) {
+	public static function systemRequest(int $rServerID, array $rData, int $rTimeout = 5) {
 		ini_set('default_socket_timeout', $rTimeout);
 		global $rServers, $rSettings;
 		if (!is_array($rServers) || !isset($rServers[$rServerID])) {
@@ -83,19 +83,19 @@ class ApiClient {
 	 * @param array $rData      Request payload sent to each server.
 	 * @return array ['result' => true].
 	 */
-	public static function asyncRequest($rServerIDs, $rData) {
-		$rURLs = array();
+	public static function asyncRequest(array $rServerIDs, array $rData) {
+		$rURLs = [];
 		global $rServers;
 
 		foreach ($rServerIDs as $rServerID) {
 			if (!$rServers[$rServerID]['server_online']) {
 			} else {
-				$rURLs[$rServerID] = array('url' => $rServers[$rServerID]['api_url'], 'postdata' => $rData);
+				$rURLs[$rServerID] = ['url' => $rServers[$rServerID]['api_url'], 'postdata' => $rData];
 			}
 		}
 		CurlClient::getMultiCURL($rURLs);
 
-		return array('result' => true);
+		return ['result' => true];
 	}
 
 	/**
@@ -106,8 +106,8 @@ class ApiClient {
 	 * @param string[]|null $rAllowed   Allowed file extensions filter.
 	 * @return array|null Decoded directory listing, or null on failure.
 	 */
-	public static function scanRecursive($rServerID, $rDirectory, $rAllowed = null) {
-		return json_decode(self::systemRequest($rServerID, array('action' => 'scandir_recursive', 'dir' => $rDirectory, 'allowed' => implode('|', $rAllowed))), true);
+	public static function scanRecursive(int $rServerID, string $rDirectory, ?array $rAllowed = null) {
+		return json_decode(self::systemRequest($rServerID, ['action' => 'scandir_recursive', 'dir' => $rDirectory, 'allowed' => implode('|', $rAllowed)]), true);
 	}
 
 	/**
@@ -118,7 +118,7 @@ class ApiClient {
 	 * @param string[]|null $rAllowed   Allowed file extensions filter.
 	 * @return array|null Decoded directory listing, or null on failure.
 	 */
-	public static function listDir($rServerID, $rDirectory, $rAllowed = null) {
-		return json_decode(self::systemRequest($rServerID, array('action' => 'scandir', 'dir' => $rDirectory, 'allowed' => implode('|', $rAllowed))), true);
+	public static function listDir(int $rServerID, string $rDirectory, ?array $rAllowed = null) {
+		return json_decode(self::systemRequest($rServerID, ['action' => 'scandir', 'dir' => $rDirectory, 'allowed' => implode('|', $rAllowed)]), true);
 	}
 }
diff --git a/src/Core/Http/CurlClient.php b/src/Core/Http/CurlClient.php
index 1aefdeb3..b42f22d6 100644
--- a/src/Core/Http/CurlClient.php
+++ b/src/Core/Http/CurlClient.php
@@ -21,15 +21,15 @@ class CurlClient {
 	 * @param int           $rTimeout Per-request timeout in seconds.
 	 * @return array Map of serverId => response (false for offline servers).
 	 */
-	public static function getMultiCURL($rURLs, $callback = null, $rTimeout = 5) {
+	public static function getMultiCURL(array $rURLs, ?callable $callback = null, int $rTimeout = 5) {
 		global $rServers;
 		if (empty($rURLs)) {
-			return array();
+			return [];
 		}
 
-		$rOffline = array();
-		$rCurl = array();
-		$rResults = array();
+		$rOffline = [];
+		$rCurl = [];
+		$rResults = [];
 		$rMulti = curl_multi_init();
 
 		foreach ($rURLs as $rKey => $rValue) {
@@ -95,7 +95,7 @@ class CurlClient {
 	 * @param bool   $rWait Return the response body (true) or fire-and-forget (false).
 	 * @return string|bool Response body, or the curl result.
 	 */
-	public static function getURL($rURL, $rWait = true) {
+	public static function getURL(string $rURL, bool $rWait = true) {
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);
 		curl_setopt($ch, CURLOPT_TIMEOUT, 3);
@@ -115,7 +115,7 @@ class CurlClient {
 	 * @param array  $rPostData Optional POST fields.
 	 * @return string|bool Response body, or false if the server is offline/unreachable.
 	 */
-	public static function serverRequest($rServerID, $rURL, $rPostData = array()) {
+	public static function serverRequest(int $rServerID, string $rURL, array $rPostData = []) {
 		global $rServers;
 		if (!(is_array($rServers) && isset($rServers[$rServerID]) && $rServers[$rServerID]['server_online'])) {
 			return false;
diff --git a/src/Core/Http/Pipeline/StreamContext.php b/src/Core/Http/Pipeline/StreamContext.php
index 8025b7be..1630573e 100644
--- a/src/Core/Http/Pipeline/StreamContext.php
+++ b/src/Core/Http/Pipeline/StreamContext.php
@@ -15,101 +15,103 @@ namespace XcVm\Core\Http\Pipeline;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class StreamContext {
+	private bool $aborted     = false;
 
-    private bool   $aborted     = false;
-    private string $abortReason = '';
-    private int    $abortCode   = 0;
+	private string $abortReason = '';
 
-    /** @var array<string, mixed> Arbitrary data bag for middleware communication */
-    private array $attributes = [];
+	private int $abortCode   = 0;
 
-    /**
-     * @param int    $streamId Stream being processed.
-     * @param string $userId   User requesting the stream.
-     * @param string $protocol Delivery protocol.
-     * @param array  $params   Request parameters.
-     */
-    public function __construct(
-        public readonly int    $streamId,
-        public readonly string $userId,
-        public readonly string $protocol,
-        public readonly array  $params,
-    ) {}
+	/** @var array<string, mixed> Arbitrary data bag for middleware communication */
+	private array $attributes = [];
 
-    // ─────────────────────────────────────────────────────────
-    //  Abort control
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * @param int    $streamId Stream being processed.
+	 * @param string $userId   User requesting the stream.
+	 * @param string $protocol Delivery protocol.
+	 * @param array  $params   Request parameters.
+	 */
+	public function __construct(
+		public readonly int $streamId,
+		public readonly string $userId,
+		public readonly string $protocol,
+		public readonly array $params,
+	) {
+	}
 
-    /**
-     * Abort pipeline execution with a reason and optional HTTP-style code.
-     *
-     * Once aborted, StreamPipeline will not call further middleware.
-     *
-     * @param string $reason Human-readable reason (logged / returned to client)
-     * @param int    $code   Application-level error code (0 = unspecified)
-     */
-    public function abort(string $reason, int $code = 0): void {
-        $this->aborted     = true;
-        $this->abortReason = $reason;
-        $this->abortCode   = $code;
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Abort control
+	// ─────────────────────────────────────────────────────────
 
-    /**
-     * Whether the pipeline has been aborted.
-     *
-     * @return bool
-     */
-    public function isAborted(): bool {
-        return $this->aborted;
-    }
+	/**
+	 * Abort pipeline execution with a reason and optional HTTP-style code.
+	 *
+	 * Once aborted, StreamPipeline will not call further middleware.
+	 *
+	 * @param string $reason Human-readable reason (logged / returned to client)
+	 * @param int    $code   Application-level error code (0 = unspecified)
+	 */
+	public function abort(string $reason, int $code = 0): void {
+		$this->aborted     = true;
+		$this->abortReason = $reason;
+		$this->abortCode   = $code;
+	}
 
-    /**
-     * Reason passed to abort(), or '' if not aborted.
-     *
-     * @return string
-     */
-    public function getAbortReason(): string {
-        return $this->abortReason;
-    }
+	/**
+	 * Whether the pipeline has been aborted.
+	 *
+	 * @return bool
+	 */
+	public function isAborted(): bool {
+		return $this->aborted;
+	}
 
-    /**
-     * Application-level abort code (0 = unspecified).
-     *
-     * @return int
-     */
-    public function getAbortCode(): int {
-        return $this->abortCode;
-    }
+	/**
+	 * Reason passed to abort(), or '' if not aborted.
+	 *
+	 * @return string
+	 */
+	public function getAbortReason(): string {
+		return $this->abortReason;
+	}
 
-    // ─────────────────────────────────────────────────────────
-    //  Attribute bag (middleware communication)
-    // ─────────────────────────────────────────────────────────
+	/**
+	 * Application-level abort code (0 = unspecified).
+	 *
+	 * @return int
+	 */
+	public function getAbortCode(): int {
+		return $this->abortCode;
+	}
 
-    /**
-     * Store an arbitrary value for downstream middleware to read.
-     */
-    public function set(string $key, mixed $value): void {
-        $this->attributes[$key] = $value;
-    }
+	// ─────────────────────────────────────────────────────────
+	//  Attribute bag (middleware communication)
+	// ─────────────────────────────────────────────────────────
 
-    /**
-     * Read an attribute set by an earlier middleware.
-     *
-     * @param string $key     Attribute key.
-     * @param mixed  $default Value returned when the key is absent.
-     * @return mixed The stored value, or $default.
-     */
-    public function get(string $key, mixed $default = null): mixed {
-        return $this->attributes[$key] ?? $default;
-    }
+	/**
+	 * Store an arbitrary value for downstream middleware to read.
+	 */
+	public function set(string $key, mixed $value): void {
+		$this->attributes[$key] = $value;
+	}
 
-    /**
-     * Whether an attribute exists in the bag.
-     *
-     * @param string $key Attribute key.
-     * @return bool
-     */
-    public function has(string $key): bool {
-        return array_key_exists($key, $this->attributes);
-    }
+	/**
+	 * Read an attribute set by an earlier middleware.
+	 *
+	 * @param string $key     Attribute key.
+	 * @param mixed  $default Value returned when the key is absent.
+	 * @return mixed The stored value, or $default.
+	 */
+	public function get(string $key, mixed $default = null): mixed {
+		return $this->attributes[$key] ?? $default;
+	}
+
+	/**
+	 * Whether an attribute exists in the bag.
+	 *
+	 * @param string $key Attribute key.
+	 * @return bool
+	 */
+	public function has(string $key): bool {
+		return array_key_exists($key, $this->attributes);
+	}
 }
diff --git a/src/Core/Http/Pipeline/StreamMiddlewareInterface.php b/src/Core/Http/Pipeline/StreamMiddlewareInterface.php
index cca46a20..c3936e48 100644
--- a/src/Core/Http/Pipeline/StreamMiddlewareInterface.php
+++ b/src/Core/Http/Pipeline/StreamMiddlewareInterface.php
@@ -18,24 +18,23 @@ namespace XcVm\Core\Http\Pipeline;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface StreamMiddlewareInterface {
+	/**
+	 * Handle the stream context and pass control to the next middleware.
+	 *
+	 * @param StreamContext       $ctx  Mutable context object
+	 * @param callable(StreamContext): StreamContext $next Next middleware in chain
+	 */
+	public function handle(StreamContext $ctx, callable $next): StreamContext;
 
-    /**
-     * Handle the stream context and pass control to the next middleware.
-     *
-     * @param StreamContext       $ctx  Mutable context object
-     * @param callable(StreamContext): StreamContext $next Next middleware in chain
-     */
-    public function handle(StreamContext $ctx, callable $next): StreamContext;
-
-    /**
-     * Execution priority — higher value runs first.
-     *
-     * Core reserved ranges:
-     *   100 = AuthStreamMiddleware
-     *   90  = PermissionMiddleware
-     *   80  = ConnectionLimitMiddleware
-     *   0–79 = module middleware
-     *   -1  = ExecuteMiddleware (terminal)
-     */
-    public function getPriority(): int;
+	/**
+	 * Execution priority — higher value runs first.
+	 *
+	 * Core reserved ranges:
+	 *   100 = AuthStreamMiddleware
+	 *   90  = PermissionMiddleware
+	 *   80  = ConnectionLimitMiddleware
+	 *   0–79 = module middleware
+	 *   -1  = ExecuteMiddleware (terminal)
+	 */
+	public function getPriority(): int;
 }
diff --git a/src/Core/Http/Pipeline/StreamPipeline.php b/src/Core/Http/Pipeline/StreamPipeline.php
index e7fdc51e..15398c05 100644
--- a/src/Core/Http/Pipeline/StreamPipeline.php
+++ b/src/Core/Http/Pipeline/StreamPipeline.php
@@ -39,76 +39,75 @@ namespace XcVm\Core\Http\Pipeline;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class StreamPipeline {
+	/** @var StreamMiddlewareInterface[] Sorted by priority descending */
+	private array $middleware = [];
 
-    /** @var StreamMiddlewareInterface[] Sorted by priority descending */
-    private array $middleware = [];
+	private bool $sorted = true;
 
-    private bool $sorted = true;
+	/**
+	 * Add a middleware to the pipeline.
+	 *
+	 * Inserting middleware triggers a re-sort on next run().
+	 */
+	public function pipe(StreamMiddlewareInterface $middleware): static {
+		$this->middleware[] = $middleware;
+		$this->sorted       = false;
+		return $this;
+	}
 
-    /**
-     * Add a middleware to the pipeline.
-     *
-     * Inserting middleware triggers a re-sort on next run().
-     */
-    public function pipe(StreamMiddlewareInterface $middleware): static {
-        $this->middleware[] = $middleware;
-        $this->sorted       = false;
-        return $this;
-    }
+	/**
+	 * Execute the pipeline against the given context.
+	 *
+	 * Builds a recursive closure chain and invokes it. Each middleware in
+	 * the chain may call $next($ctx) to continue, or skip it to abort.
+	 * Aborted contexts are passed through without calling further middleware.
+	 */
+	public function run(StreamContext $ctx): StreamContext {
+		if (!$this->sorted) {
+			usort(
+				$this->middleware,
+				fn(StreamMiddlewareInterface $a, StreamMiddlewareInterface $b) =>
+					$b->getPriority() <=> $a->getPriority()
+			);
+			$this->sorted = true;
+		}
 
-    /**
-     * Execute the pipeline against the given context.
-     *
-     * Builds a recursive closure chain and invokes it. Each middleware in
-     * the chain may call $next($ctx) to continue, or skip it to abort.
-     * Aborted contexts are passed through without calling further middleware.
-     */
-    public function run(StreamContext $ctx): StreamContext {
-        if (!$this->sorted) {
-            usort(
-                $this->middleware,
-                fn(StreamMiddlewareInterface $a, StreamMiddlewareInterface $b) =>
-                    $b->getPriority() <=> $a->getPriority()
-            );
-            $this->sorted = true;
-        }
+		$chain = $this->buildChain($this->middleware);
+		return $chain($ctx);
+	}
 
-        $chain = $this->buildChain($this->middleware);
-        return $chain($ctx);
-    }
+	/**
+	 * Return all registered middleware in their current sort order.
+	 *
+	 * @return StreamMiddlewareInterface[]
+	 */
+	public function getMiddleware(): array {
+		return $this->middleware;
+	}
 
-    /**
-     * Return all registered middleware in their current sort order.
-     *
-     * @return StreamMiddlewareInterface[]
-     */
-    public function getMiddleware(): array {
-        return $this->middleware;
-    }
+	/**
+	 * Build the recursive closure chain from the middleware array.
+	 *
+	 * Iterates in reverse so the first element in $stack becomes the
+	 * outermost function (called first when the chain is invoked).
+	 *
+	 * @param StreamMiddlewareInterface[] $stack
+	 * @return callable(StreamContext): StreamContext
+	 */
+	private function buildChain(array $stack): callable {
+		$terminal = static fn(StreamContext $ctx): StreamContext => $ctx;
 
-    /**
-     * Build the recursive closure chain from the middleware array.
-     *
-     * Iterates in reverse so the first element in $stack becomes the
-     * outermost function (called first when the chain is invoked).
-     *
-     * @param StreamMiddlewareInterface[] $stack
-     * @return callable(StreamContext): StreamContext
-     */
-    private function buildChain(array $stack): callable {
-        $terminal = static fn(StreamContext $ctx): StreamContext => $ctx;
-
-        return array_reduce(
-            array_reverse($stack),
-            static function (callable $next, StreamMiddlewareInterface $mw): callable {
-                return static function (StreamContext $ctx) use ($mw, $next): StreamContext {
-                    if ($ctx->isAborted()) {
-                        return $ctx;
-                    }
-                    return $mw->handle($ctx, $next);
-                };
-            },
-            $terminal
-        );
-    }
+		return array_reduce(
+			array_reverse($stack),
+			static function (callable $next, StreamMiddlewareInterface $mw): callable {
+				return static function (StreamContext $ctx) use ($mw, $next): StreamContext {
+					if ($ctx->isAborted()) {
+						return $ctx;
+					}
+					return $mw->handle($ctx, $next);
+				};
+			},
+			$terminal
+		);
+	}
 }
diff --git a/src/Core/Http/Request.php b/src/Core/Http/Request.php
index 79c3bcb6..1211364b 100644
--- a/src/Core/Http/Request.php
+++ b/src/Core/Http/Request.php
@@ -26,407 +26,397 @@ namespace XcVm\Core\Http;
  */
 
 class Request {
+	/** @var array Cleaned $_GET data */
+	protected $query = [];
 
-    /** @var array Cleaned $_GET data */
-    protected $query = [];
+	/** @var array Cleaned $_POST data */
+	protected $post = [];
 
-    /** @var array Cleaned $_POST data */
-    protected $post = [];
+	/** @var array Cleaned $_COOKIE data */
+	protected $cookies = [];
 
-    /** @var array Cleaned $_COOKIE data */
-    protected $cookies = [];
+	/** @var array $_SERVER data (not cleaned — contains binary/paths) */
+	protected $server = [];
 
-    /** @var array $_SERVER data (not cleaned — contains binary/paths) */
-    protected $server = [];
+	/** @var array Merged input (post + query) */
+	protected $input = [];
 
-    /** @var array Merged input (post + query) */
-    protected $input = [];
+	/** @var string Raw POST body */
+	protected $rawBody = null;
 
-    /** @var string Raw POST body */
-    protected $rawBody = null;
+	/** @var string Client IP address */
+	protected $clientIp = null;
 
-    /** @var string Client IP address */
-    protected $clientIp = null;
+	/** @var Request|null Captured singleton for static access */
+	protected static $captured = null;
 
-    /** @var Request|null Captured singleton for static access */
-    protected static $captured = null;
+	/**
+	 * Create from raw superglobals
+	 *
+	 * @param array $query $_GET
+	 * @param array $post $_POST
+	 * @param array $server $_SERVER
+	 * @param array $cookies $_COOKIE
+	 */
+	public function __construct(array $query = [], array $post = [], array $server = [], array $cookies = []) {
+		// Clean input data
+		self::cleanGlobals($query);
+		self::cleanGlobals($post);
+		self::cleanGlobals($cookies);
 
-    /**
-     * Create from raw superglobals
-     *
-     * @param array $query $_GET
-     * @param array $post $_POST
-     * @param array $server $_SERVER
-     * @param array $cookies $_COOKIE
-     */
-    public function __construct(array $query = [], array $post = [], array $server = [], array $cookies = []) {
-        // Clean input data
-        self::cleanGlobals($query);
-        self::cleanGlobals($post);
-        self::cleanGlobals($cookies);
+		$this->query   = self::parseIncomingRecursively($query);
+		$this->post    = self::parseIncomingRecursively($post);
+		$this->cookies = $cookies;
+		$this->server  = $server;
 
-        $this->query   = self::parseIncomingRecursively($query);
-        $this->post    = self::parseIncomingRecursively($post);
-        $this->cookies = $cookies;
-        $this->server  = $server;
+		// POST takes priority over GET (same as $_REQUEST default)
+		$this->input = array_merge($this->query, $this->post);
+	}
 
-        // POST takes priority over GET (same as $_REQUEST default)
-        $this->input = array_merge($this->query, $this->post);
-    }
+	/**
+	 * Capture current request from PHP superglobals
+	 *
+	 * Creates a Request object from the current $_GET, $_POST,
+	 * $_SERVER, $_COOKIE. Also cleans the original superglobals
+	 * for backward compatibility.
+	 *
+	 * @return Request
+	 */
+	public static function capture() {
+		if (self::$captured !== null) {
+			return self::$captured;
+		}
 
-    /**
-     * Capture current request from PHP superglobals
-     *
-     * Creates a Request object from the current $_GET, $_POST,
-     * $_SERVER, $_COOKIE. Also cleans the original superglobals
-     * for backward compatibility.
-     *
-     * @return Request
-     */
-    public static function capture() {
-        if (self::$captured !== null) {
-            return self::$captured;
-        }
+		// Clean original superglobals (backward compat — old code reads them directly)
+		self::cleanGlobals($_GET);
+		self::cleanGlobals($_POST);
+		self::cleanGlobals($_REQUEST);
+		self::cleanGlobals($_COOKIE);
 
-        // Clean original superglobals (backward compat — old code reads them directly)
-        self::cleanGlobals($_GET);
-        self::cleanGlobals($_POST);
-        self::cleanGlobals($_REQUEST);
-        self::cleanGlobals($_COOKIE);
+		self::$captured = new self($_GET, $_POST, $_SERVER, $_COOKIE);
 
-        self::$captured = new self($_GET, $_POST, $_SERVER, $_COOKIE);
+		return self::$captured;
+	}
 
-        return self::$captured;
-    }
+	/**
+	 * Get the current captured instance (or null if not captured)
+	 *
+	 * @return Request|null
+	 */
+	public static function getInstance() {
+		return self::$captured;
+	}
 
-    /**
-     * Get the current captured instance (or null if not captured)
-     *
-     * @return Request|null
-     */
-    public static function getInstance() {
-        return self::$captured;
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Input Access
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Input Access
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Get a value from merged input (POST first, then GET)
+	 *
+	 * @param string $key Parameter name
+	 * @param mixed $default Default if not found
+	 * @return mixed
+	 */
+	public function input(string $key, mixed $default = null) {
+		return isset($this->input[$key]) ? $this->input[$key] : $default;
+	}
 
-    /**
-     * Get a value from merged input (POST first, then GET)
-     *
-     * @param string $key Parameter name
-     * @param mixed $default Default if not found
-     * @return mixed
-     */
-    public function input($key, $default = null) {
-        return isset($this->input[$key]) ? $this->input[$key] : $default;
-    }
+	/**
+	 * Get a value from $_GET (query string)
+	 *
+	 * @param string|null $key Parameter name (null returns all)
+	 * @param mixed $default Default if not found
+	 * @return mixed
+	 */
+	public function get(?string $key = null, mixed $default = null) {
+		if ($key === null) {
+			return $this->query;
+		}
+		return isset($this->query[$key]) ? $this->query[$key] : $default;
+	}
 
-    /**
-     * Get a value from $_GET (query string)
-     *
-     * @param string|null $key Parameter name (null returns all)
-     * @param mixed $default Default if not found
-     * @return mixed
-     */
-    public function get($key = null, $default = null) {
-        if ($key === null) {
-            return $this->query;
-        }
-        return isset($this->query[$key]) ? $this->query[$key] : $default;
-    }
+	/**
+	 * Get a value from $_POST
+	 *
+	 * @param string|null $key Parameter name (null returns all)
+	 * @param mixed $default Default if not found
+	 * @return mixed
+	 */
+	public function post(?string $key = null, mixed $default = null) {
+		if ($key === null) {
+			return $this->post;
+		}
+		return isset($this->post[$key]) ? $this->post[$key] : $default;
+	}
 
-    /**
-     * Get a value from $_POST
-     *
-     * @param string|null $key Parameter name (null returns all)
-     * @param mixed $default Default if not found
-     * @return mixed
-     */
-    public function post($key = null, $default = null) {
-        if ($key === null) {
-            return $this->post;
-        }
-        return isset($this->post[$key]) ? $this->post[$key] : $default;
-    }
+	/**
+	 * Get all merged input data
+	 *
+	 * @return array
+	 */
+	public function all() {
+		return $this->input;
+	}
 
-    /**
-     * Get all merged input data
-     *
-     * @return array
-     */
-    public function all() {
-        return $this->input;
-    }
+	/**
+	 * Check if a key exists in input
+	 *
+	 * @return bool
+	 */
+	public function has(string $key) {
+		return isset($this->input[$key]);
+	}
 
-    /**
-     * Check if a key exists in input
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function has($key) {
-        return isset($this->input[$key]);
-    }
+	/**
+	 * Get an integer value from input
+	 *
+	 * @return int
+	 */
+	public function getInt(string $key, int $default = 0) {
+		return intval($this->input($key, $default));
+	}
 
-    /**
-     * Get an integer value from input
-     *
-     * @param string $key
-     * @param int $default
-     * @return int
-     */
-    public function getInt($key, $default = 0) {
-        return intval($this->input($key, $default));
-    }
+	/**
+	 * Get a boolean value from input
+	 *
+	 * @return bool
+	 */
+	public function getBool(string $key, bool $default = false) {
+		$val = $this->input($key, $default);
+		return filter_var($val, FILTER_VALIDATE_BOOLEAN);
+	}
 
-    /**
-     * Get a boolean value from input
-     *
-     * @param string $key
-     * @param bool $default
-     * @return bool
-     */
-    public function getBool($key, $default = false) {
-        $val = $this->input($key, $default);
-        return filter_var($val, FILTER_VALIDATE_BOOLEAN);
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Server / Headers
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Server / Headers
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Get a $_SERVER value
+	 *
+	 * @param string $key Server key (e.g., 'REQUEST_METHOD')
+	 * @return mixed
+	 */
+	public function server(string $key, mixed $default = null) {
+		return isset($this->server[$key]) ? $this->server[$key] : $default;
+	}
 
-    /**
-     * Get a $_SERVER value
-     *
-     * @param string $key Server key (e.g., 'REQUEST_METHOD')
-     * @param mixed $default
-     * @return mixed
-     */
-    public function server($key, $default = null) {
-        return isset($this->server[$key]) ? $this->server[$key] : $default;
-    }
+	/**
+	 * Get a cookie value
+	 *
+	 * @param string $key Cookie name
+	 * @return mixed
+	 */
+	public function cookie(string $key, mixed $default = null) {
+		return isset($this->cookies[$key]) ? $this->cookies[$key] : $default;
+	}
 
-    /**
-     * Get a cookie value
-     *
-     * @param string $key Cookie name
-     * @param mixed $default
-     * @return mixed
-     */
-    public function cookie($key, $default = null) {
-        return isset($this->cookies[$key]) ? $this->cookies[$key] : $default;
-    }
+	/**
+	 * Get HTTP request method
+	 *
+	 * @return string GET, POST, PUT, DELETE, etc.
+	 */
+	public function method() {
+		return $this->server('REQUEST_METHOD', 'GET');
+	}
 
-    /**
-     * Get HTTP request method
-     *
-     * @return string GET, POST, PUT, DELETE, etc.
-     */
-    public function method() {
-        return $this->server('REQUEST_METHOD', 'GET');
-    }
+	/**
+	 * Check if request is POST
+	 *
+	 * @return bool
+	 */
+	public function isPost() {
+		return $this->method() === 'POST';
+	}
 
-    /**
-     * Check if request is POST
-     *
-     * @return bool
-     */
-    public function isPost() {
-        return $this->method() === 'POST';
-    }
+	/**
+	 * Check if request appears to be AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAjax() {
+		return strtolower($this->server('HTTP_X_REQUESTED_WITH', '')) === 'xmlhttprequest';
+	}
 
-    /**
-     * Check if request appears to be AJAX
-     *
-     * @return bool
-     */
-    public function isAjax() {
-        return strtolower($this->server('HTTP_X_REQUESTED_WITH', '')) === 'xmlhttprequest';
-    }
+	/**
+	 * Get the request URI
+	 *
+	 * @return string
+	 */
+	public function uri() {
+		return $this->server('REQUEST_URI', '/');
+	}
 
-    /**
-     * Get the request URI
-     *
-     * @return string
-     */
-    public function uri() {
-        return $this->server('REQUEST_URI', '/');
-    }
+	/**
+	 * Get the User-Agent string
+	 *
+	 * @return string
+	 */
+	public function userAgent() {
+		return $this->server('HTTP_USER_AGENT', '');
+	}
 
-    /**
-     * Get the User-Agent string
-     *
-     * @return string
-     */
-    public function userAgent() {
-        return $this->server('HTTP_USER_AGENT', '');
-    }
+	/**
+	 * Get the client IP address
+	 *
+	 * Checks X-Forwarded-For and X-Real-IP headers for proxied requests.
+	 *
+	 * @return string
+	 */
+	public function ip() {
+		if ($this->clientIp !== null) {
+			return $this->clientIp;
+		}
 
-    /**
-     * Get the client IP address
-     *
-     * Checks X-Forwarded-For and X-Real-IP headers for proxied requests.
-     *
-     * @return string
-     */
-    public function ip() {
-        if ($this->clientIp !== null) {
-            return $this->clientIp;
-        }
+		// Check common proxy headers
+		$headers = ['HTTP_X_FORWARDED_FOR', 'HTTP_X_REAL_IP', 'REMOTE_ADDR'];
 
-        // Check common proxy headers
-        $headers = ['HTTP_X_FORWARDED_FOR', 'HTTP_X_REAL_IP', 'REMOTE_ADDR'];
+		foreach ($headers as $header) {
+			$value = $this->server($header);
+			if (!empty($value)) {
+				// X-Forwarded-For may contain multiple IPs — take the first
+				$ip = trim(explode(',', $value)[0]);
+				if (filter_var($ip, FILTER_VALIDATE_IP)) {
+					$this->clientIp = $ip;
+					return $ip;
+				}
+			}
+		}
 
-        foreach ($headers as $header) {
-            $value = $this->server($header);
-            if (!empty($value)) {
-                // X-Forwarded-For may contain multiple IPs — take the first
-                $ip = trim(explode(',', $value)[0]);
-                if (filter_var($ip, FILTER_VALIDATE_IP)) {
-                    $this->clientIp = $ip;
-                    return $ip;
-                }
-            }
-        }
+		$this->clientIp = '0.0.0.0';
+		return $this->clientIp;
+	}
 
-        $this->clientIp = '0.0.0.0';
-        return $this->clientIp;
-    }
+	/**
+	 * Get the raw POST body
+	 *
+	 * @return string
+	 */
+	public function rawBody() {
+		if ($this->rawBody === null) {
+			$this->rawBody = file_get_contents('php://input') ?: '';
+		}
+		return $this->rawBody;
+	}
 
-    /**
-     * Get the raw POST body
-     *
-     * @return string
-     */
-    public function rawBody() {
-        if ($this->rawBody === null) {
-            $this->rawBody = file_get_contents('php://input') ?: '';
-        }
-        return $this->rawBody;
-    }
+	/**
+	 * Decode JSON from POST body
+	 *
+	 * @param bool $assoc Return as associative array
+	 * @return mixed|null
+	 */
+	public function json(bool $assoc = true) {
+		$body = $this->rawBody();
+		if (empty($body)) {
+			return null;
+		}
+		return json_decode($body, $assoc);
+	}
 
-    /**
-     * Decode JSON from POST body
-     *
-     * @param bool $assoc Return as associative array
-     * @return mixed|null
-     */
-    public function json($assoc = true) {
-        $body = $this->rawBody();
-        if (empty($body)) {
-            return null;
-        }
-        return json_decode($body, $assoc);
-    }
+	/**
+	 * Get the Host header
+	 *
+	 * @return string
+	 */
+	public function host() {
+		return $this->server('HTTP_HOST', $this->server('SERVER_NAME', ''));
+	}
 
-    /**
-     * Get the Host header
-     *
-     * @return string
-     */
-    public function host() {
-        return $this->server('HTTP_HOST', $this->server('SERVER_NAME', ''));
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Static Sanitization Methods (backward compatibility)
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Static Sanitization Methods (backward compatibility)
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Clean dangerous characters from input data (recursive)
+	 *
+	 * Replaces NULL bytes, path traversal, and RTL override characters.
+	 * Modifies the input array IN PLACE.
+	 *
+	 * @param array &$rData Input data (modified in place)
+	 * @param int $rIteration Recursion depth counter
+	 */
+	public static function cleanGlobals(array &$rData, int $rIteration = 0) {
+		if (10 > $rIteration) {
+			foreach ($rData as $rKey => $rValue) {
+				if (is_array($rValue)) {
+					self::cleanGlobals($rData[$rKey], ++$rIteration);
+				} else {
+					$rValue = str_replace(chr(0), '', $rValue);
+					$rValue = str_replace("\x0", '', $rValue);
+					$rValue = str_replace('../', '&#46;&#46;/', $rValue);
+					$rValue = str_replace('&#8238;', '', $rValue);
+					$rData[$rKey] = $rValue;
+				}
+			}
+		} else {
+			return null;
+		}
+	}
 
-    /**
-     * Clean dangerous characters from input data (recursive)
-     *
-     * Replaces NULL bytes, path traversal, and RTL override characters.
-     * Modifies the input array IN PLACE.
-     *
-     * @param array &$rData Input data (modified in place)
-     * @param int $rIteration Recursion depth counter
-     */
-    public static function cleanGlobals(&$rData, $rIteration = 0) {
-        if (10 > $rIteration) {
-            foreach ($rData as $rKey => $rValue) {
-                if (is_array($rValue)) {
-                    self::cleanGlobals($rData[$rKey], ++$rIteration);
-                } else {
-                    $rValue = str_replace(chr(0), '', $rValue);
-                    $rValue = str_replace("\x0", '', $rValue);
-                    $rValue = str_replace('../', '&#46;&#46;/', $rValue);
-                    $rValue = str_replace('&#8238;', '', $rValue);
-                    $rData[$rKey] = $rValue;
-                }
-            }
-        } else {
-            return null;
-        }
-    }
+	/**
+	 * Parse and clean input recursively
+	 *
+	 * Sanitizes both keys and values. Returns a new clean array.
+	 *
+	 * @param array &$rData Raw input data
+	 * @param array $rInput Accumulator (internal use)
+	 * @param int $rIteration Recursion depth counter
+	 * @return array Cleaned data
+	 */
+	public static function parseIncomingRecursively(array &$rData, array $rInput = [], int $rIteration = 0) {
+		if (20 > $rIteration) {
+			if (is_array($rData)) {
+				foreach ($rData as $rKey => $rValue) {
+					if (is_array($rValue)) {
+						$rInput[$rKey] = self::parseIncomingRecursively($rData[$rKey], [], $rIteration + 1);
+					} else {
+						$rKey = self::parseCleanKey($rKey);
+						$rValue = self::parseCleanValue($rValue);
+						$rInput[$rKey] = $rValue;
+					}
+				}
+				return $rInput;
+			} else {
+				return $rInput;
+			}
+		} else {
+			return $rInput;
+		}
+	}
 
-    /**
-     * Parse and clean input recursively
-     *
-     * Sanitizes both keys and values. Returns a new clean array.
-     *
-     * @param array &$rData Raw input data
-     * @param array $rInput Accumulator (internal use)
-     * @param int $rIteration Recursion depth counter
-     * @return array Cleaned data
-     */
-    public static function parseIncomingRecursively(&$rData, $rInput = [], $rIteration = 0) {
-        if (20 > $rIteration) {
-            if (is_array($rData)) {
-                foreach ($rData as $rKey => $rValue) {
-                    if (is_array($rValue)) {
-                        $rInput[$rKey] = self::parseIncomingRecursively($rData[$rKey], [], $rIteration + 1);
-                    } else {
-                        $rKey = self::parseCleanKey($rKey);
-                        $rValue = self::parseCleanValue($rValue);
-                        $rInput[$rKey] = $rValue;
-                    }
-                }
-                return $rInput;
-            } else {
-                return $rInput;
-            }
-        } else {
-            return $rInput;
-        }
-    }
+	/**
+	 * Sanitize an input key
+	 *
+	 * @return string
+	 */
+	public static function parseCleanKey(string $rKey) {
+		if ($rKey !== '') {
+			$rKey = htmlspecialchars(urldecode($rKey));
+			$rKey = str_replace('..', '', $rKey);
+			$rKey = preg_replace('/\\_\\_(.+?)\\_\\_/', '', $rKey);
+			return preg_replace('/^([\\w\\.\\-\\_]+)$/', '$1', $rKey);
+		}
+		return '';
+	}
 
-    /**
-     * Sanitize an input key
-     *
-     * @param string $rKey
-     * @return string
-     */
-    public static function parseCleanKey($rKey) {
-        if ($rKey !== '') {
-            $rKey = htmlspecialchars(urldecode($rKey));
-            $rKey = str_replace('..', '', $rKey);
-            $rKey = preg_replace('/\\_\\_(.+?)\\_\\_/', '', $rKey);
-            return preg_replace('/^([\\w\\.\\-\\_]+)$/', '$1', $rKey);
-        }
-        return '';
-    }
-
-    /**
-     * Sanitize an input value
-     *
-     * Strips dangerous HTML patterns and normalizes line breaks.
-     *
-     * @param string $rValue
-     * @return string
-     */
-    public static function parseCleanValue($rValue) {
-        if ($rValue != '') {
-            $rValue = str_replace('&#032;', ' ', stripslashes($rValue));
-            $rValue = str_replace(["\r\n", "\n\r", "\r"], "\n", $rValue);
-            $rValue = str_replace('<!--', '&#60;&#33;--', $rValue);
-            $rValue = str_replace('-->', '--&#62;', $rValue);
-            $rValue = str_ireplace('<script', '&#60;script', $rValue);
-            $rValue = preg_replace('/&amp;#([0-9]+);/s', '&#\\1;', $rValue);
-            $rValue = preg_replace('/&#(\\d+?)([^\\d;])/i', '&#\\1;\\2', $rValue);
-            return trim($rValue);
-        }
-        return '';
-    }
+	/**
+	 * Sanitize an input value
+	 *
+	 * Strips dangerous HTML patterns and normalizes line breaks.
+	 *
+	 * @return string
+	 */
+	public static function parseCleanValue(string $rValue) {
+		if ($rValue != '') {
+			$rValue = str_replace('&#032;', ' ', stripslashes($rValue));
+			$rValue = str_replace(["\r\n", "\n\r", "\r"], "\n", $rValue);
+			$rValue = str_replace('<!--', '&#60;&#33;--', $rValue);
+			$rValue = str_replace('-->', '--&#62;', $rValue);
+			$rValue = str_ireplace('<script', '&#60;script', $rValue);
+			$rValue = preg_replace('/&amp;#([0-9]+);/s', '&#\\1;', $rValue);
+			$rValue = preg_replace('/&#(\\d+?)([^\\d;])/i', '&#\\1;\\2', $rValue);
+			return trim($rValue);
+		}
+		return '';
+	}
 }
diff --git a/src/Core/Http/RequestGuard.php b/src/Core/Http/RequestGuard.php
index bbe1469c..93ae3f33 100644
--- a/src/Core/Http/RequestGuard.php
+++ b/src/Core/Http/RequestGuard.php
@@ -31,35 +31,35 @@ use XcVm\Core\Logging\Logger;
 $rShowErrors = false;
 
 if (!isset($_SERVER['argc'])) {
-    $rIP = $_SERVER['REMOTE_ADDR'];
-    if (empty($rIP) || !file_exists(FLOOD_TMP_PATH . 'block_' . $rIP)) {
-        define('HOST', trim(explode(':', $_SERVER['HTTP_HOST'])[0]));
+	$rIP = $_SERVER['REMOTE_ADDR'];
+	if (empty($rIP) || !file_exists(FLOOD_TMP_PATH . 'block_' . $rIP)) {
+		define('HOST', trim(explode(':', $_SERVER['HTTP_HOST'])[0]));
 
-        if (file_exists(CACHE_TMP_PATH . 'settings')) {
-            $rData = file_get_contents(CACHE_TMP_PATH . 'settings');
-            $rSettings = igbinary_unserialize($rData);
+		if (file_exists(CACHE_TMP_PATH . 'settings')) {
+			$rData = file_get_contents(CACHE_TMP_PATH . 'settings');
+			$rSettings = igbinary_unserialize($rData);
 
-            if (is_array($rSettings) && file_exists(CACHE_TMP_PATH . 'allowed_domains') && $rSettings['verify_host']) {
-                $rData = file_get_contents(CACHE_TMP_PATH . 'allowed_domains');
-                $rAllowedDomains = igbinary_unserialize($rData);
+			if (is_array($rSettings) && file_exists(CACHE_TMP_PATH . 'allowed_domains') && $rSettings['verify_host']) {
+				$rData = file_get_contents(CACHE_TMP_PATH . 'allowed_domains');
+				$rAllowedDomains = igbinary_unserialize($rData);
 
-                if (!(is_array($rAllowedDomains) && !in_array(HOST, $rAllowedDomains) && HOST != 'xc_vm') || filter_var(HOST, FILTER_VALIDATE_IP)) {
-                } else {
-                    generateError('INVALID_HOST');
-                }
-            }
+				if (!(is_array($rAllowedDomains) && !in_array(HOST, $rAllowedDomains) && HOST != 'xc_vm') || filter_var(HOST, FILTER_VALIDATE_IP)) {
+				} else {
+					generateError('INVALID_HOST');
+				}
+			}
 
-            $rShowErrors = (isset($rSettings['debug_show_errors']) ? $rSettings['debug_show_errors'] : false);
-        }
-    } else {
-        http_response_code(403);
+			$rShowErrors = (isset($rSettings['debug_show_errors']) ? $rSettings['debug_show_errors'] : false);
+		}
+	} else {
+		http_response_code(403);
 
-        exit();
-    }
+		exit();
+	}
 }
 
 if (defined('DEV_MODE') && DEV_MODE) {
-    $rShowErrors = true;
+	$rShowErrors = true;
 }
 
 define('PHP_ERRORS', $rShowErrors);
@@ -67,6 +67,6 @@ define('PHP_ERRORS', $rShowErrors);
 // ── Logger ─────────────────────────────────────────────────────
 require_once MAIN_HOME . 'Core/Logging/Logger.php';
 Logger::init(
-    PHP_ERRORS,
-    LOGS_TMP_PATH . 'error_log.log'
+	PHP_ERRORS,
+	LOGS_TMP_PATH . 'error_log.log'
 );
diff --git a/src/Core/Http/RequestManager.php b/src/Core/Http/RequestManager.php
index 7ecf1339..a6bc7125 100644
--- a/src/Core/Http/RequestManager.php
+++ b/src/Core/Http/RequestManager.php
@@ -17,7 +17,7 @@ namespace XcVm\Core\Http;
 
 class RequestManager {
 	/** @var array */
-	private static $request = array();
+	private static $request = [];
 
 	/**
 	 * Сохраняет весь массив параметров запроса.
@@ -36,11 +36,9 @@ class RequestManager {
 	/**
 	 * Возвращает значение по ключу.
 	 *
-	 * @param string $key
-	 * @param mixed  $default
 	 * @return mixed
 	 */
-	public static function get(string $key, $default = null) {
+	public static function get(string $key, mixed $default = null) {
 		return self::$request[$key] ?? $default;
 	}
 
@@ -57,7 +55,6 @@ class RequestManager {
 	 * Прямая замена `isset(getAll()['key'])` — `isset()` нельзя применять к
 	 * результату get(), поэтому для проверок существования нужен этот метод.
 	 *
-	 * @param string $key
 	 * @return bool
 	 */
 	public static function has(string $key): bool {
diff --git a/src/Core/Http/Response.php b/src/Core/Http/Response.php
index 7ff0aa5c..a65c2fad 100644
--- a/src/Core/Http/Response.php
+++ b/src/Core/Http/Response.php
@@ -36,110 +36,108 @@ namespace XcVm\Core\Http;
  */
 
 class Response {
+	/**
+	 * Send a JSON response and exit
+	 *
+	 * @param mixed $data Data to JSON-encode
+	 * @param int $statusCode HTTP status code
+	 * @param int $options json_encode options
+	 */
+	public static function json(mixed $data, int $statusCode = 200, int $options = 0) {
+		http_response_code($statusCode);
+		header('Content-Type: application/json; charset=utf-8');
+		echo json_encode($data, $options);
+		exit;
+	}
 
-    /**
-     * Send a JSON response and exit
-     *
-     * @param mixed $data Data to JSON-encode
-     * @param int $statusCode HTTP status code
-     * @param int $options json_encode options
-     */
-    public static function json($data, $statusCode = 200, $options = 0) {
-        http_response_code($statusCode);
-        header('Content-Type: application/json; charset=utf-8');
-        echo json_encode($data, $options);
-        exit;
-    }
+	/**
+	 * Send a JSON error response and exit
+	 *
+	 * @param string $message Error message
+	 * @param int $statusCode HTTP status code
+	 * @param array $extra Additional fields to include
+	 */
+	public static function jsonError(string $message, int $statusCode = 400, array $extra = []) {
+		$payload = array_merge(['error' => $message], $extra);
+		self::json($payload, $statusCode);
+	}
 
-    /**
-     * Send a JSON error response and exit
-     *
-     * @param string $message Error message
-     * @param int $statusCode HTTP status code
-     * @param array $extra Additional fields to include
-     */
-    public static function jsonError($message, $statusCode = 400, array $extra = []) {
-        $payload = array_merge(['error' => $message], $extra);
-        self::json($payload, $statusCode);
-    }
+	/**
+	 * Send a redirect response and exit
+	 *
+	 * @param string $url Target URL
+	 * @param int $statusCode 301 (permanent) or 302 (temporary)
+	 */
+	public static function redirect(string $url, int $statusCode = 302) {
+		http_response_code($statusCode);
+		header('Location: ' . $url);
+		exit;
+	}
 
-    /**
-     * Send a redirect response and exit
-     *
-     * @param string $url Target URL
-     * @param int $statusCode 301 (permanent) or 302 (temporary)
-     */
-    public static function redirect($url, $statusCode = 302) {
-        http_response_code($statusCode);
-        header('Location: ' . $url);
-        exit;
-    }
+	/**
+	 * Send a 404 Not Found response and exit
+	 *
+	 * @param string $message Optional message
+	 */
+	public static function notFound(string $message = 'Not Found') {
+		http_response_code(404);
+		header('Content-Type: text/plain');
+		echo $message;
+		exit;
+	}
 
-    /**
-     * Send a 404 Not Found response and exit
-     *
-     * @param string $message Optional message
-     */
-    public static function notFound($message = 'Not Found') {
-        http_response_code(404);
-        header('Content-Type: text/plain');
-        echo $message;
-        exit;
-    }
+	/**
+	 * Send arbitrary HTTP header
+	 *
+	 * @param string $name Header name
+	 * @param string $value Header value
+	 */
+	public static function header(string $name, string $value) {
+		header($name . ': ' . $value);
+	}
 
-    /**
-     * Send arbitrary HTTP header
-     *
-     * @param string $name Header name
-     * @param string $value Header value
-     */
-    public static function header($name, $value) {
-        header($name . ': ' . $value);
-    }
+	/**
+	 * Set CORS headers (Access-Control-Allow-Origin: *)
+	 *
+	 * Matches current behavior in nginx config and auth.php
+	 */
+	public static function cors() {
+		header('Access-Control-Allow-Origin: *');
+		header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
+		header('Access-Control-Allow-Headers: Content-Type, Authorization');
+	}
 
-    /**
-     * Set CORS headers (Access-Control-Allow-Origin: *)
-     *
-     * Matches current behavior in nginx config and auth.php
-     */
-    public static function cors() {
-        header('Access-Control-Allow-Origin: *');
-        header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
-        header('Access-Control-Allow-Headers: Content-Type, Authorization');
-    }
+	/**
+	 * Set no-cache headers
+	 *
+	 * Used for HLS playlists and auth responses that must not be cached.
+	 */
+	public static function noCache() {
+		header('Cache-Control: no-store, no-cache, must-revalidate');
+		header('Pragma: no-cache');
+		header('Expires: 0');
+	}
 
-    /**
-     * Set no-cache headers
-     *
-     * Used for HLS playlists and auth responses that must not be cached.
-     */
-    public static function noCache() {
-        header('Cache-Control: no-store, no-cache, must-revalidate');
-        header('Pragma: no-cache');
-        header('Expires: 0');
-    }
+	/**
+	 * Send raw content with content type and exit
+	 *
+	 * @param string $content Body content
+	 * @param string $contentType MIME type
+	 * @param int $statusCode HTTP status code
+	 */
+	public static function raw(string $content, string $contentType = 'text/plain', int $statusCode = 200) {
+		http_response_code($statusCode);
+		header('Content-Type: ' . $contentType);
+		echo $content;
+		exit;
+	}
 
-    /**
-     * Send raw content with content type and exit
-     *
-     * @param string $content Body content
-     * @param string $contentType MIME type
-     * @param int $statusCode HTTP status code
-     */
-    public static function raw($content, $contentType = 'text/plain', $statusCode = 200) {
-        http_response_code($statusCode);
-        header('Content-Type: ' . $contentType);
-        echo $content;
-        exit;
-    }
-
-    /**
-     * Send an empty response with status code and exit
-     *
-     * @param int $statusCode
-     */
-    public static function empty($statusCode = 204) {
-        http_response_code($statusCode);
-        exit;
-    }
+	/**
+	 * Send an empty response with status code and exit
+	 *
+	 */
+	public static function empty(int $statusCode = 204) {
+		http_response_code($statusCode);
+		exit;
+	}
 }
diff --git a/src/Core/Http/Router.php b/src/Core/Http/Router.php
index d9b27ea2..3cb55f11 100644
--- a/src/Core/Http/Router.php
+++ b/src/Core/Http/Router.php
@@ -73,406 +73,402 @@ use XcVm\Core\Util\AdminHelpers;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class Router {
+	/**
+	 * Registered GET (page) routes.
+	 * Shape: ['route/path' => ['handler' => callable, 'middleware' => [...], 'permission' => [...]]]
+	 * @var array<string, array{handler:mixed,middleware:array,permission:mixed}>
+	 */
+	protected array $getRoutes = [];
 
-    /**
-     * Registered GET (page) routes.
-     * Shape: ['route/path' => ['handler' => callable, 'middleware' => [...], 'permission' => [...]]]
-     * @var array<string, array{handler:mixed,middleware:array,permission:mixed}>
-     */
-    protected array $getRoutes = [];
+	/**
+	 * Registered POST routes.
+	 * @var array<string, array{handler:mixed,middleware:array,permission:mixed}>
+	 */
+	protected array $postRoutes = [];
 
-    /**
-     * Registered POST routes.
-     * @var array<string, array{handler:mixed,middleware:array,permission:mixed}>
-     */
-    protected array $postRoutes = [];
+	/**
+	 * API routes (JSON response), keyed by action name.
+	 * @var array<string, array{handler:mixed,middleware:array,permission:mixed}>
+	 */
+	protected array $apiRoutes = [];
 
-    /**
-     * API routes (JSON response), keyed by action name.
-     * @var array<string, array{handler:mixed,middleware:array,permission:mixed}>
-     */
-    protected array $apiRoutes = [];
+	/**
+	 * Preserve existing routes during the module registration phase.
+	 * When enabled, duplicate route keys are skipped instead of overwritten.
+	 */
+	protected bool $preserveExistingRoutes = false;
 
-    /**
-     * Preserve existing routes during the module registration phase.
-     * When enabled, duplicate route keys are skipped instead of overwritten.
-     */
-    protected bool $preserveExistingRoutes = false;
+	/**
+	 * Route/API collisions collected during the preserve phase.
+	 * @var array<int, array{type:string,key:string}>
+	 */
+	protected array $routeCollisions = [];
 
-    /**
-     * Route/API collisions collected during the preserve phase.
-     * @var array<int, array{type:string,key:string}>
-     */
-    protected array $routeCollisions = [];
+	/** Current group prefix. */
+	protected string $groupPrefix = '';
 
-    /** Current group prefix. */
-    protected string $groupPrefix = '';
+	/**
+	 * Current middleware stack for the active group.
+	 * @var array<int, callable>
+	 */
+	protected array $groupMiddleware = [];
 
-    /**
-     * Current middleware stack for the active group.
-     * @var array<int, callable>
-     */
-    protected array $groupMiddleware = [];
+	/**
+	 * Current permission spec for the active group.
+	 * @var array
+	 */
+	protected array $groupPermission = [];
 
-    /**
-     * Current permission spec for the active group.
-     * @var array
-     */
-    protected array $groupPermission = [];
+	/** Singleton instance. */
+	protected static ?Router $instance = null;
 
-    /** Singleton instance. */
-    protected static ?Router $instance = null;
+	/**
+	 * Get the singleton instance.
+	 */
+	public static function getInstance(): self {
+		if (self::$instance === null) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
 
-    /**
-     * Get the singleton instance.
-     */
-    public static function getInstance(): self {
-        if (self::$instance === null) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
+	/**
+	 * Reset the singleton (used by tests).
+	 */
+	public static function resetInstance(): void {
+		self::$instance = null;
+	}
 
-    /**
-     * Reset the singleton (used by tests).
-     */
-    public static function resetInstance(): void {
-        self::$instance = null;
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Route registration
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Route registration
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Register a GET route (page).
+	 *
+	 * @param string $route Route path (e.g. 'watch', 'watch/add')
+	 * @param callable|array $handler Handler: [ClassName, 'method'] or a callable
+	 * @param array $options Extra options: 'permission' => ['type', 'key'], 'middleware' => [...]
+	 */
+	public function get(string $route, callable|array $handler, array $options = []): self {
+		$fullRoute = $this->buildRoute($route);
 
-    /**
-     * Register a GET route (page).
-     *
-     * @param string $route Route path (e.g. 'watch', 'watch/add')
-     * @param callable|array $handler Handler: [ClassName, 'method'] or a callable
-     * @param array $options Extra options: 'permission' => ['type', 'key'], 'middleware' => [...]
-     */
-    public function get(string $route, $handler, array $options = []): self {
-        $fullRoute = $this->buildRoute($route);
+		if ($this->preserveExistingRoutes && isset($this->getRoutes[$fullRoute])) {
+			$this->routeCollisions[] = ['type' => 'get', 'key' => $fullRoute];
+			return $this;
+		}
 
-        if ($this->preserveExistingRoutes && isset($this->getRoutes[$fullRoute])) {
-            $this->routeCollisions[] = ['type' => 'get', 'key' => $fullRoute];
-            return $this;
-        }
+		$this->getRoutes[$fullRoute] = $this->buildRouteEntry($handler, $options);
+		return $this;
+	}
 
-        $this->getRoutes[$fullRoute] = $this->buildRouteEntry($handler, $options);
-        return $this;
-    }
+	/**
+	 * Register a POST route (form handling).
+	 *
+	 * @param string $route Route path
+	 * @param callable|array $handler Handler
+	 * @param array $options Extra options
+	 */
+	public function post(string $route, callable|array $handler, array $options = []): self {
+		$fullRoute = $this->buildRoute($route);
 
-    /**
-     * Register a POST route (form handling).
-     *
-     * @param string $route Route path
-     * @param callable|array $handler Handler
-     * @param array $options Extra options
-     */
-    public function post(string $route, $handler, array $options = []): self {
-        $fullRoute = $this->buildRoute($route);
+		if ($this->preserveExistingRoutes && isset($this->postRoutes[$fullRoute])) {
+			$this->routeCollisions[] = ['type' => 'post', 'key' => $fullRoute];
+			return $this;
+		}
 
-        if ($this->preserveExistingRoutes && isset($this->postRoutes[$fullRoute])) {
-            $this->routeCollisions[] = ['type' => 'post', 'key' => $fullRoute];
-            return $this;
-        }
+		$this->postRoutes[$fullRoute] = $this->buildRouteEntry($handler, $options);
+		return $this;
+	}
 
-        $this->postRoutes[$fullRoute] = $this->buildRouteEntry($handler, $options);
-        return $this;
-    }
+	/**
+	 * Register a route for both GET and POST.
+	 *
+	 * @param string $route Route path
+	 * @param callable|array $handler Handler
+	 * @param array $options Extra options
+	 */
+	public function any(string $route, callable|array $handler, array $options = []): self {
+		$this->get($route, $handler, $options);
+		$this->post($route, $handler, $options);
+		return $this;
+	}
 
-    /**
-     * Register a route for both GET and POST.
-     *
-     * @param string $route Route path
-     * @param callable|array $handler Handler
-     * @param array $options Extra options
-     */
-    public function any(string $route, $handler, array $options = []): self {
-        $this->get($route, $handler, $options);
-        $this->post($route, $handler, $options);
-        return $this;
-    }
+	/**
+	 * Register an API route (JSON response via action=...).
+	 *
+	 * API routes are dispatched through admin/api.php by action name. When
+	 * $router->dispatchApi('watch_enable') is called, the Router looks up the
+	 * registered route and invokes its handler.
+	 *
+	 * @param string $action Action name (e.g. 'enable_watch', 'disable_plex')
+	 * @param callable|array $handler Handler
+	 * @param array $options Extra options: 'permission' => ['type', 'key']
+	 */
+	public function api(string $action, callable|array $handler, array $options = []): self {
+		$fullAction = $this->groupPrefix ? $this->groupPrefix . '_' . $action : $action;
 
-    /**
-     * Register an API route (JSON response via action=...).
-     *
-     * API routes are dispatched through admin/api.php by action name. When
-     * $router->dispatchApi('watch_enable') is called, the Router looks up the
-     * registered route and invokes its handler.
-     *
-     * @param string $action Action name (e.g. 'enable_watch', 'disable_plex')
-     * @param callable|array $handler Handler
-     * @param array $options Extra options: 'permission' => ['type', 'key']
-     */
-    public function api(string $action, $handler, array $options = []): self {
-        $fullAction = $this->groupPrefix ? $this->groupPrefix . '_' . $action : $action;
+		if ($this->preserveExistingRoutes && isset($this->apiRoutes[$fullAction])) {
+			$this->routeCollisions[] = ['type' => 'api', 'key' => $fullAction];
+			return $this;
+		}
 
-        if ($this->preserveExistingRoutes && isset($this->apiRoutes[$fullAction])) {
-            $this->routeCollisions[] = ['type' => 'api', 'key' => $fullAction];
-            return $this;
-        }
+		$this->apiRoutes[$fullAction] = $this->buildRouteEntry($handler, $options);
+		return $this;
+	}
 
-        $this->apiRoutes[$fullAction] = $this->buildRouteEntry($handler, $options);
-        return $this;
-    }
+	/**
+	 * Enable safe module registration mode.
+	 * Existing routes keep priority; duplicates are collected as collisions.
+	 *
+	 */
+	public function beginModuleRegistration(): self {
+		$this->preserveExistingRoutes = true;
+		return $this;
+	}
 
-    /**
-     * Enable safe module registration mode.
-     * Existing routes keep priority; duplicates are collected as collisions.
-     *
-     */
-    public function beginModuleRegistration(): self {
-        $this->preserveExistingRoutes = true;
-        return $this;
-    }
+	/**
+	 * Disable safe module registration mode.
+	 *
+	 */
+	public function endModuleRegistration(): self {
+		$this->preserveExistingRoutes = false;
+		return $this;
+	}
 
-    /**
-     * Disable safe module registration mode.
-     *
-     */
-    public function endModuleRegistration(): self {
-        $this->preserveExistingRoutes = false;
-        return $this;
-    }
+	/**
+	 * Return and clear the collected route collisions.
+	 *
+	 * @return array<int, array{type:string,key:string}>
+	 */
+	public function drainRouteCollisions(): array {
+		$collisions = $this->routeCollisions;
+		$this->routeCollisions = [];
+		return $collisions;
+	}
 
-    /**
-     * Return and clear the collected route collisions.
-     *
-     * @return array<int, array{type:string,key:string}>
-     */
-    public function drainRouteCollisions(): array {
-        $collisions = $this->routeCollisions;
-        $this->routeCollisions = [];
-        return $collisions;
-    }
+	/**
+	 * Group routes under a shared prefix, middleware and permissions.
+	 *
+	 * @param string $prefix Prefix (e.g. 'watch', 'plex')
+	 * @param callable $callback function(Router $router) — registers the routes in the group
+	 * @param array $options Group options: 'middleware' => [...], 'permission' => [...]
+	 */
+	public function group(string $prefix, callable $callback, array $options = []): self {
+		// Save the current context
+		$prevPrefix     = $this->groupPrefix;
+		$prevMiddleware = $this->groupMiddleware;
+		$prevPermission = $this->groupPermission;
 
-    /**
-     * Group routes under a shared prefix, middleware and permissions.
-     *
-     * @param string $prefix Prefix (e.g. 'watch', 'plex')
-     * @param callable $callback function(Router $router) — registers the routes in the group
-     * @param array $options Group options: 'middleware' => [...], 'permission' => [...]
-     */
-    public function group(string $prefix, callable $callback, array $options = []): self {
-        // Save the current context
-        $prevPrefix     = $this->groupPrefix;
-        $prevMiddleware = $this->groupMiddleware;
-        $prevPermission = $this->groupPermission;
+		// Set the new context
+		$this->groupPrefix     = $prevPrefix ? $prevPrefix . '/' . $prefix : $prefix;
+		$this->groupMiddleware = array_merge($prevMiddleware, $options['middleware'] ?? []);
+		$this->groupPermission = $options['permission'] ?? $prevPermission;
 
-        // Set the new context
-        $this->groupPrefix     = $prevPrefix ? $prevPrefix . '/' . $prefix : $prefix;
-        $this->groupMiddleware = array_merge($prevMiddleware, $options['middleware'] ?? []);
-        $this->groupPermission = $options['permission'] ?? $prevPermission;
+		// Invoke the callback, which registers the routes
+		$callback($this);
 
-        // Invoke the callback, which registers the routes
-        $callback($this);
+		// Restore the previous context
+		$this->groupPrefix     = $prevPrefix;
+		$this->groupMiddleware = $prevMiddleware;
+		$this->groupPermission = $prevPermission;
 
-        // Restore the previous context
-        $this->groupPrefix     = $prevPrefix;
-        $this->groupMiddleware = $prevMiddleware;
-        $this->groupPermission = $prevPermission;
+		return $this;
+	}
 
-        return $this;
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Dispatch
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Dispatch
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Resolve the page route and invoke its handler.
+	 *
+	 * @param string $page Page name from the URL (e.g. 'watch', 'plex_add' → 'plex/add')
+	 * @param string $method HTTP method ('GET' or 'POST')
+	 * @return bool true if a route was found and executed, false otherwise
+	 */
+	public function dispatch(string $page, string $method = 'GET'): bool {
+		// Normalize: 'plex_add' → 'plex/add', 'watch' → 'watch'
+		$route = $this->normalizePage($page);
 
-    /**
-     * Resolve the page route and invoke its handler.
-     *
-     * @param string $page Page name from the URL (e.g. 'watch', 'plex_add' → 'plex/add')
-     * @param string $method HTTP method ('GET' or 'POST')
-     * @return bool true if a route was found and executed, false otherwise
-     */
-    public function dispatch(string $page, string $method = 'GET'): bool {
-        // Normalize: 'plex_add' → 'plex/add', 'watch' → 'watch'
-        $route = $this->normalizePage($page);
+		// Pick the route set based on the method
+		$routes = ($method === 'POST') ? $this->postRoutes : $this->getRoutes;
 
-        // Pick the route set based on the method
-        $routes = ($method === 'POST') ? $this->postRoutes : $this->getRoutes;
+		// Fallback: if no POST route matches, look it up among GET routes
+		if ($method === 'POST' && !isset($routes[$route]) && isset($this->getRoutes[$route])) {
+			$routes = $this->getRoutes;
+		}
 
-        // Fallback: if no POST route matches, look it up among GET routes
-        if ($method === 'POST' && !isset($routes[$route]) && isset($this->getRoutes[$route])) {
-            $routes = $this->getRoutes;
-        }
+		if (!isset($routes[$route])) {
+			return false;
+		}
 
-        if (!isset($routes[$route])) {
-            return false;
-        }
+		$entry = $routes[$route];
 
-        $entry = $routes[$route];
+		if (!$this->checkPermission($entry)) {
+			$this->denyAccess();
+			return true;
+		}
 
-        if (!$this->checkPermission($entry)) {
-            $this->denyAccess();
-            return true;
-        }
+		// Run middleware
+		foreach ($entry['middleware'] as $mw) {
+			if (is_callable($mw)) {
+				$result = call_user_func($mw);
+				if ($result === false) {
+					return true; // middleware halted execution
+				}
+			}
+		}
 
-        // Run middleware
-        foreach ($entry['middleware'] as $mw) {
-            if (is_callable($mw)) {
-                $result = call_user_func($mw);
-                if ($result === false) {
-                    return true; // middleware halted execution
-                }
-            }
-        }
+		$this->callHandler($entry['handler']);
+		return true;
+	}
 
-        $this->callHandler($entry['handler']);
-        return true;
-    }
+	/**
+	 * Resolve an API route and invoke its handler.
+	 *
+	 * Used in admin/api.php as a fallback for module-provided actions. Example:
+	 * if action='enable_watch' was registered by a module, the Router invokes
+	 * [WatchController::class, 'apiEnable'].
+	 *
+	 * @param string $action Action name (from $_GET['action'])
+	 * @return bool true if a route was found and executed, false otherwise
+	 */
+	public function dispatchApi(string $action): bool {
+		if (!isset($this->apiRoutes[$action])) {
+			return false;
+		}
 
-    /**
-     * Resolve an API route and invoke its handler.
-     *
-     * Used in admin/api.php as a fallback for module-provided actions. Example:
-     * if action='enable_watch' was registered by a module, the Router invokes
-     * [WatchController::class, 'apiEnable'].
-     *
-     * @param string $action Action name (from $_GET['action'])
-     * @return bool true if a route was found and executed, false otherwise
-     */
-    public function dispatchApi(string $action): bool {
-        if (!isset($this->apiRoutes[$action])) {
-            return false;
-        }
+		$entry = $this->apiRoutes[$action];
 
-        $entry = $this->apiRoutes[$action];
+		if (!$this->checkPermission($entry)) {
+			echo json_encode(['result' => false]);
+			exit();
+		}
 
-        if (!$this->checkPermission($entry)) {
-            echo json_encode(['result' => false]);
-            exit();
-        }
+		$this->callHandler($entry['handler']);
+		return true;
+	}
 
-        $this->callHandler($entry['handler']);
-        return true;
-    }
+	// ───────────────────────────────────────────────────────────
+	//  Internal helpers
+	// ───────────────────────────────────────────────────────────
 
-    // ───────────────────────────────────────────────────────────
-    //  Internal helpers
-    // ───────────────────────────────────────────────────────────
+	/**
+	 * Build the full path taking groupPrefix into account.
+	 */
+	protected function buildRoute(string $route): string {
+		if ($this->groupPrefix && $route !== '') {
+			$full = $this->groupPrefix . '/' . $route;
+		} else {
+			$full = $this->groupPrefix ?: $route;
+		}
+		// Normalize on registration so dispatch() looks up the same key
+		return $this->normalizePage($full);
+	}
 
-    /**
-     * Build the full path taking groupPrefix into account.
-     */
-    protected function buildRoute(string $route): string {
-        if ($this->groupPrefix && $route !== '') {
-            $full = $this->groupPrefix . '/' . $route;
-        } else {
-            $full = $this->groupPrefix ?: $route;
-        }
-        // Normalize on registration so dispatch() looks up the same key
-        return $this->normalizePage($full);
-    }
+	/**
+	 * Assemble a route entry.
+	 *
+	 * @return array{handler:mixed,middleware:array,permission:mixed}
+	 */
+	protected function buildRouteEntry(callable|array $handler, array $options): array {
+		return [
+			'handler'    => $handler,
+			'middleware' => array_merge($this->groupMiddleware, $options['middleware'] ?? []),
+			'permission' => $options['permission'] ?? $this->groupPermission,
+		];
+	}
 
-    /**
-     * Assemble a route entry.
-     *
-     * @param callable|array $handler
-     * @param array $options
-     * @return array{handler:mixed,middleware:array,permission:mixed}
-     */
-    protected function buildRouteEntry($handler, array $options): array {
-        return [
-            'handler'    => $handler,
-            'middleware' => array_merge($this->groupMiddleware, $options['middleware'] ?? []),
-            'permission' => $options['permission'] ?? $this->groupPermission,
-        ];
-    }
+	/**
+	 * Normalize a page name into a route.
+	 *
+	 * Converts legacy (admin-style) names into route format:
+	 *   'watch'          → 'watch'
+	 *   'watch_add'      → 'watch/add'
+	 *   'settings_watch' → 'settings/watch'
+	 *   'plex_add'       → 'plex/add'
+	 *   'settings_plex'  → 'settings/plex'
+	 */
+	protected function normalizePage(string $page): string {
+		// Strip a trailing .php if present
+		$page = preg_replace('/\.php$/', '', $page);
+		// Convert _ to /
+		return str_replace('_', '/', $page);
+	}
 
-    /**
-     * Normalize a page name into a route.
-     *
-     * Converts legacy (admin-style) names into route format:
-     *   'watch'          → 'watch'
-     *   'watch_add'      → 'watch/add'
-     *   'settings_watch' → 'settings/watch'
-     *   'plex_add'       → 'plex/add'
-     *   'settings_plex'  → 'settings/plex'
-     */
-    protected function normalizePage(string $page): string {
-        // Strip a trailing .php if present
-        $page = preg_replace('/\.php$/', '', $page);
-        // Convert _ to /
-        return str_replace('_', '/', $page);
-    }
+	/**
+	 * Check the permissions for a route.
+	 *
+	 * @param array $entry Route entry
+	 */
+	protected function checkPermission(array $entry): bool {
+		if (empty($entry['permission'])) {
+			return true;
+		}
 
-    /**
-     * Check the permissions for a route.
-     *
-     * @param array $entry Route entry
-     */
-    protected function checkPermission(array $entry): bool {
-        if (empty($entry['permission'])) {
-            return true;
-        }
+		$perm = $entry['permission'];
 
-        $perm = $entry['permission'];
+		// Support the ['type', 'key'] format for Authorization::check()
+		if (is_array($perm) && count($perm) === 2 && is_string($perm[0])) {
+			return Authorization::check($perm[0], $perm[1]);
+		}
 
-        // Support the ['type', 'key'] format for Authorization::check()
-        if (is_array($perm) && count($perm) === 2 && is_string($perm[0])) {
-            return Authorization::check($perm[0], $perm[1]);
-        }
+		// Arbitrary callable
+		if (is_callable($perm)) {
+			return call_user_func($perm);
+		}
 
-        // Arbitrary callable
-        if (is_callable($perm)) {
-            return call_user_func($perm);
-        }
+		return true;
+	}
 
-        return true;
-    }
+	/**
+	 * Invoke a route handler.
+	 *
+	 * Supports:
+	 *   - [ClassName::class, 'method'] → (new ClassName())->method()
+	 *   - callable (closure)
+	 *   - [object, 'method']
+	 *
+	 */
+	protected function callHandler(callable|array $handler): void {
+		if (is_array($handler) && count($handler) === 2 && is_string($handler[0])) {
+			// [ClassName, 'method'] → instantiate (via the DI container if available)
+			$class  = $handler[0];
+			$method = $handler[1];
 
-    /**
-     * Invoke a route handler.
-     *
-     * Supports:
-     *   - [ClassName::class, 'method'] → (new ClassName())->method()
-     *   - callable (closure)
-     *   - [object, 'method']
-     *
-     * @param callable|array $handler
-     */
-    protected function callHandler($handler): void {
-        if (is_array($handler) && count($handler) === 2 && is_string($handler[0])) {
-            // [ClassName, 'method'] → instantiate (via the DI container if available)
-            $class  = $handler[0];
-            $method = $handler[1];
+			// Resolve through the ServiceContainer (DI) when it is already loaded
+			if (class_exists(ServiceContainer::class, false)) {
+				$container = ServiceContainer::getInstance();
+				try {
+					$obj = $container->get($class);
+				} catch (\Throwable) {
+					// Fallback: parameterless constructor
+					$obj = new $class();
+				}
+			} else {
+				$obj = new $class();
+			}
 
-            // Resolve through the ServiceContainer (DI) when it is already loaded
-            if (class_exists(ServiceContainer::class, false)) {
-                $container = ServiceContainer::getInstance();
-                try {
-                    $obj = $container->get($class);
-                } catch (\Throwable) {
-                    // Fallback: parameterless constructor
-                    $obj = new $class();
-                }
-            } else {
-                $obj = new $class();
-            }
+			$obj->$method();
+		} elseif (is_callable($handler)) {
+			call_user_func($handler);
+		}
+	}
 
-            $obj->$method();
-        } elseif (is_callable($handler)) {
-            call_user_func($handler);
-        }
-    }
+	/**
+	 * Send an "access denied" response.
+	 *
+	 * Prefers redirecting an authenticated-but-unauthorized user to the
+	 * dashboard; falls back to a bare 403 if the helper is unavailable.
+	 */
+	protected function denyAccess(): void {
+		if (class_exists(AdminHelpers::class)) {
+			AdminHelpers::goHome(); // redirects and exits
+		}
 
-    /**
-     * Send an "access denied" response.
-     *
-     * Prefers redirecting an authenticated-but-unauthorized user to the
-     * dashboard; falls back to a bare 403 if the helper is unavailable.
-     */
-    protected function denyAccess(): void {
-        if (class_exists(AdminHelpers::class)) {
-            AdminHelpers::goHome(); // redirects and exits
-        }
-
-        http_response_code(403);
-        echo 'Access denied';
-        exit();
-    }
+		http_response_code(403);
+		echo 'Access denied';
+		exit();
+	}
 }
diff --git a/src/Core/Init/LegacyInitializer.php b/src/Core/Init/LegacyInitializer.php
index e6e38246..6b79162f 100644
--- a/src/Core/Init/LegacyInitializer.php
+++ b/src/Core/Init/LegacyInitializer.php
@@ -38,7 +38,7 @@ class LegacyInitializer {
 	 * @param bool $rUseCache Load settings from cache instead of the database.
 	 * @return void
 	 */
-	public static function initCore($rUseCache = false) {
+	public static function initCore(bool $rUseCache = false) {
 		if (!empty($_GET)) {
 			InputValidator::cleanGlobals($_GET);
 		}
@@ -104,14 +104,7 @@ class LegacyInitializer {
 		$db->query("SELECT * FROM `crontab` WHERE `enabled` = 1;");
 		foreach ($db->get_rows() as $rRow) {
 			$rJobs[] =
-				$rRow["time"] .
-				" " .
-				PHP_BIN .
-				" " .
-				MAIN_HOME .
-				"console.php cron:" .
-				$rRow["filename"] .
-				" # XC_VM";
+				$rRow["time"] . " " . PHP_BIN . " " . MAIN_HOME . "console.php cron:" . $rRow["filename"] . " # XC_VM";
 		}
 
 		shell_exec("crontab -r");
diff --git a/src/Core/Localization/Translator.php b/src/Core/Localization/Translator.php
index 97d289f2..258596cc 100644
--- a/src/Core/Localization/Translator.php
+++ b/src/Core/Localization/Translator.php
@@ -224,4 +224,4 @@ class Translator {
 		flock($fp, LOCK_UN);
 		fclose($fp);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/Logging/DatabaseLogger.php b/src/Core/Logging/DatabaseLogger.php
index 7bcbd79a..df89d956 100644
--- a/src/Core/Logging/DatabaseLogger.php
+++ b/src/Core/Logging/DatabaseLogger.php
@@ -26,160 +26,160 @@ namespace XcVm\Core\Logging;
 require_once __DIR__ . '/LoggerInterface.php';
 
 class DatabaseLogger implements LoggerInterface {
-    /**
-     * Путь к файлу лога клиентских запросов.
-     *
-     * @var string|null
-     */
-    private static ?string $logFile = null;
+	/**
+	 * Путь к файлу лога клиентских запросов.
+	 *
+	 * @var string|null
+	 */
+	private static ?string $logFile = null;
 
-    /**
-     * Настройка: включено ли сохранение клиентских логов.
-     * Соответствует настройке client_logs_save из $rSettings.
-     *
-     * @var int|null null = не задано (проверяем через StreamingUtilities), 0 = выкл, 1+ = вкл
-     */
-    private static ?int $enabled = null;
+	/**
+	 * Настройка: включено ли сохранение клиентских логов.
+	 * Соответствует настройке client_logs_save из $rSettings.
+	 *
+	 * @var int|null null = не задано (проверяем через StreamingUtilities), 0 = выкл, 1+ = вкл
+	 */
+	private static ?int $enabled = null;
 
-    /**
-     * Установить путь к файлу лога.
-     *
-     * @param string $path Полный путь к файлу
-     */
-    public static function setLogFile(string $path): void {
-        self::$logFile = $path;
-    }
+	/**
+	 * Установить путь к файлу лога.
+	 *
+	 * @param string $path Полный путь к файлу
+	 */
+	public static function setLogFile(string $path): void {
+		self::$logFile = $path;
+	}
 
-    /**
-     * Установить, включено ли логирование клиентских запросов.
-     *
-     * @param int $value 0 — выключено, 1+ — включено
-     */
-    public static function setEnabled(int $value): void {
-        self::$enabled = $value;
-    }
+	/**
+	 * Установить, включено ли логирование клиентских запросов.
+	 *
+	 * @param int $value 0 — выключено, 1+ — включено
+	 */
+	public static function setEnabled(int $value): void {
+		self::$enabled = $value;
+	}
 
-    /**
-     * Получить текущий путь к файлу лога.
-     *
-     * @return string
-     */
-    public static function getLogFile(): string {
-        if (self::$logFile !== null) {
-            return self::$logFile;
-        }
+	/**
+	 * Получить текущий путь к файлу лога.
+	 *
+	 * @return string
+	 */
+	public static function getLogFile(): string {
+		if (self::$logFile !== null) {
+			return self::$logFile;
+		}
 
-        if (defined('LOGS_TMP_PATH')) {
-            return LOGS_TMP_PATH . 'client_request.log';
-        }
+		if (defined('LOGS_TMP_PATH')) {
+			return LOGS_TMP_PATH . 'client_request.log';
+		}
 
-        return '/tmp/xc_vm_client.log';
-    }
+		return '/tmp/xc_vm_client.log';
+	}
 
-    /**
-     * Записать клиентское событие стриминга.
-     *
-     * Соответствует старому формату StreamingUtilities::clientLog().
-     * Сигнатура через LoggerInterface, но внутренне хранит расширенные данные.
-     *
-     * @param string     $type    Действие (AUTH_FAILED, USER_EXPIRED, и т.д.)
-     * @param string     $message Не используется для клиентских логов (передавать '')
-     * @param string|int $extra   Дополнительные данные
-     * @param int        $line    Не используется (совместимость с LoggerInterface)
-     */
-    public static function log(string $type, string $message, $extra = '', int $line = 0): void {
-        // По умолчанию логирование включено (если не задано явно)
-        if (self::$enabled !== null && self::$enabled == 0) {
-            return;
-        }
+	/**
+	 * Записать клиентское событие стриминга.
+	 *
+	 * Соответствует старому формату StreamingUtilities::clientLog().
+	 * Сигнатура через LoggerInterface, но внутренне хранит расширенные данные.
+	 *
+	 * @param string     $type    Действие (AUTH_FAILED, USER_EXPIRED, и т.д.)
+	 * @param string     $message Не используется для клиентских логов (передавать '')
+	 * @param string|int $extra   Дополнительные данные
+	 * @param int        $line    Не используется (совместимость с LoggerInterface)
+	 */
+	public static function log(string $type, string $message, string|int $extra = '', int $line = 0): void {
+		// По умолчанию логирование включено (если не задано явно)
+		if (self::$enabled !== null && self::$enabled == 0) {
+			return;
+		}
 
-        $rUserAgent = (!empty($_SERVER['HTTP_USER_AGENT'])
-            ? htmlentities($_SERVER['HTTP_USER_AGENT'])
-            : '');
+		$rUserAgent = (!empty($_SERVER['HTTP_USER_AGENT'])
+			? htmlentities($_SERVER['HTTP_USER_AGENT'])
+			: '');
 
-        $rQueryString = (!empty($_SERVER['QUERY_STRING'])
-            ? htmlentities($_SERVER['QUERY_STRING'])
-            : '');
+		$rQueryString = (!empty($_SERVER['QUERY_STRING'])
+			? htmlentities($_SERVER['QUERY_STRING'])
+			: '');
 
-        $rData = [
-            'user_id'      => 0,
-            'stream_id'    => 0,
-            'action'       => $type,
-            'query_string' => $rQueryString,
-            'user_agent'   => $rUserAgent,
-            'user_ip'      => '',
-            'time'         => time(),
-            'extra_data'   => (string) $extra,
-        ];
+		$rData = [
+			'user_id'      => 0,
+			'stream_id'    => 0,
+			'action'       => $type,
+			'query_string' => $rQueryString,
+			'user_agent'   => $rUserAgent,
+			'user_ip'      => '',
+			'time'         => time(),
+			'extra_data'   => (string) $extra,
+		];
 
-        file_put_contents(
-            self::getLogFile(),
-            base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . "\n",
-            FILE_APPEND
-        );
-    }
+		file_put_contents(
+			self::getLogFile(),
+			base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . "\n",
+			FILE_APPEND
+		);
+	}
 
-    /**
-     * Записать клиентское событие стриминга (расширенная версия).
-     *
-     * Прямой аналог StreamingUtilities::clientLog() с полными параметрами.
-     *
-     * @param int    $streamID ID потока
-     * @param int    $userID   ID пользователя
-     * @param string $action   Действие (AUTH_FAILED, USER_EXPIRED, и т.д.)
-     * @param string $ip       IP-адрес клиента
-     * @param string $data     Дополнительные данные (JSON или строка)
-     * @param bool   $bypass   Записать даже если логирование выключено
-     */
-    public static function clientLog(
-        int $streamID,
-        int $userID,
-        string $action,
-        string $ip,
-        string $data = '',
-        bool $bypass = false
-    ): void {
-        // Проверяем настройку: включено ли логирование
-        if (!$bypass) {
-            // Если задано через setEnabled
-            if (self::$enabled !== null && self::$enabled == 0) {
-                return;
-            }
+	/**
+	 * Записать клиентское событие стриминга (расширенная версия).
+	 *
+	 * Прямой аналог StreamingUtilities::clientLog() с полными параметрами.
+	 *
+	 * @param int    $streamID ID потока
+	 * @param int    $userID   ID пользователя
+	 * @param string $action   Действие (AUTH_FAILED, USER_EXPIRED, и т.д.)
+	 * @param string $ip       IP-адрес клиента
+	 * @param string $data     Дополнительные данные (JSON или строка)
+	 * @param bool   $bypass   Записать даже если логирование выключено
+	 */
+	public static function clientLog(
+		int $streamID,
+		int $userID,
+		string $action,
+		string $ip,
+		string $data = '',
+		bool $bypass = false
+	): void {
+		// Проверяем настройку: включено ли логирование
+		if (!$bypass) {
+			// Если задано через setEnabled
+			if (self::$enabled !== null && self::$enabled == 0) {
+				return;
+			}
 
-            // Если не задано — проверяем через глобальные настройки (обратная совместимость)
-            if (self::$enabled === null && !empty($GLOBALS['rSettings'])) {
-                if (
-                    isset($GLOBALS['rSettings']['client_logs_save'])
-                    && $GLOBALS['rSettings']['client_logs_save'] == 0
-                ) {
-                    return;
-                }
-            }
-        }
+			// Если не задано — проверяем через глобальные настройки (обратная совместимость)
+			if (self::$enabled === null && !empty($GLOBALS['rSettings'])) {
+				if (
+					isset($GLOBALS['rSettings']['client_logs_save'])
+					&& $GLOBALS['rSettings']['client_logs_save'] == 0
+				) {
+					return;
+				}
+			}
+		}
 
-        $rUserAgent = (!empty($_SERVER['HTTP_USER_AGENT'])
-            ? htmlentities($_SERVER['HTTP_USER_AGENT'])
-            : '');
+		$rUserAgent = (!empty($_SERVER['HTTP_USER_AGENT'])
+			? htmlentities($_SERVER['HTTP_USER_AGENT'])
+			: '');
 
-        $rQueryString = (!empty($_SERVER['QUERY_STRING'])
-            ? htmlentities($_SERVER['QUERY_STRING'])
-            : '');
+		$rQueryString = (!empty($_SERVER['QUERY_STRING'])
+			? htmlentities($_SERVER['QUERY_STRING'])
+			: '');
 
-        $rData = [
-            'user_id'      => $userID,
-            'stream_id'    => $streamID,
-            'action'       => $action,
-            'query_string' => $rQueryString,
-            'user_agent'   => $rUserAgent,
-            'user_ip'      => $ip,
-            'time'         => time(),
-            'extra_data'   => $data,
-        ];
+		$rData = [
+			'user_id'      => $userID,
+			'stream_id'    => $streamID,
+			'action'       => $action,
+			'query_string' => $rQueryString,
+			'user_agent'   => $rUserAgent,
+			'user_ip'      => $ip,
+			'time'         => time(),
+			'extra_data'   => $data,
+		];
 
-        file_put_contents(
-            self::getLogFile(),
-            base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . "\n",
-            FILE_APPEND
-        );
-    }
+		file_put_contents(
+			self::getLogFile(),
+			base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . "\n",
+			FILE_APPEND
+		);
+	}
 }
diff --git a/src/Core/Logging/FileLogger.php b/src/Core/Logging/FileLogger.php
index 3eb4b3db..b9698bc4 100644
--- a/src/Core/Logging/FileLogger.php
+++ b/src/Core/Logging/FileLogger.php
@@ -27,111 +27,111 @@ namespace XcVm\Core\Logging;
 require_once __DIR__ . '/LoggerInterface.php';
 
 class FileLogger implements LoggerInterface {
-    /**
-     * Путь к файлу лога.
-     * По умолчанию используется LOGS_TMP_PATH . 'error_log.log'
-     *
-     * @var string|null
-     */
-    private static ?string $logFile = null;
+	/**
+	 * Путь к файлу лога.
+	 * По умолчанию используется LOGS_TMP_PATH . 'error_log.log'
+	 *
+	 * @var string|null
+	 */
+	private static ?string $logFile = null;
 
-    /**
-     * Установить путь к файлу лога.
-     *
-     * @param string $path Полный путь к файлу
-     */
-    public static function setLogFile(string $path): void {
-        self::$logFile = $path;
-    }
+	/**
+	 * Установить путь к файлу лога.
+	 *
+	 * @param string $path Полный путь к файлу
+	 */
+	public static function setLogFile(string $path): void {
+		self::$logFile = $path;
+	}
 
-    /**
-     * Получить текущий путь к файлу лога.
-     * Если не установлен явно, используется LOGS_TMP_PATH . 'error_log.log'
-     *
-     * @return string
-     */
-    public static function getLogFile(): string {
-        if (self::$logFile !== null) {
-            return self::$logFile;
-        }
+	/**
+	 * Получить текущий путь к файлу лога.
+	 * Если не установлен явно, используется LOGS_TMP_PATH . 'error_log.log'
+	 *
+	 * @return string
+	 */
+	public static function getLogFile(): string {
+		if (self::$logFile !== null) {
+			return self::$logFile;
+		}
 
-        if (defined('LOGS_TMP_PATH')) {
-            return LOGS_TMP_PATH . 'error_log.log';
-        }
+		if (defined('LOGS_TMP_PATH')) {
+			return LOGS_TMP_PATH . 'error_log.log';
+		}
 
-        return '/tmp/xc_vm_error.log';
-    }
+		return '/tmp/xc_vm_error.log';
+	}
 
-    /**
-     * Записать лог-сообщение в файл.
-     *
-     * Перед записью проверяется фильтр: шумные ошибки MySQL и рекурсивные
-     * обращения к panel_logs игнорируются.
-     *
-     * @param string     $type    Тип события ('pdo', 'epg', 'error', и т.д.)
-     * @param string     $message Текст сообщения
-     * @param string|int $extra   Дополнительные данные (SQL-запрос, trace, и т.д.)
-     * @param int        $line    Номер строки (опционально)
-     */
-    public static function log(string $type, string $message, $extra = '', int $line = 0): void {
-        $extra = (string) $extra;
+	/**
+	 * Записать лог-сообщение в файл.
+	 *
+	 * Перед записью проверяется фильтр: шумные ошибки MySQL и рекурсивные
+	 * обращения к panel_logs игнорируются.
+	 *
+	 * @param string     $type    Тип события ('pdo', 'epg', 'error', и т.д.)
+	 * @param string     $message Текст сообщения
+	 * @param string|int $extra   Дополнительные данные (SQL-запрос, trace, и т.д.)
+	 * @param int        $line    Номер строки (опционально)
+	 */
+	public static function log(string $type, string $message, string|int $extra = '', int $line = 0): void {
+		$extra = (string) $extra;
 
-        $rTrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-        $rCaller = $rTrace[1] ?? [];
-        $rFile = (string) ($rCaller['file'] ?? '');
-        if ($line <= 0 && isset($rCaller['line'])) {
-            $line = (int) $rCaller['line'];
-        }
+		$rTrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+		$rCaller = $rTrace[1] ?? [];
+		$rFile = (string) ($rCaller['file'] ?? '');
+		if ($line <= 0 && isset($rCaller['line'])) {
+			$line = (int) $rCaller['line'];
+		}
 
-        // Фильтрация шумных / рекурсивных записей
-        if (self::shouldSkip($message, $extra)) {
-            return;
-        }
+		// Фильтрация шумных / рекурсивных записей
+		if (self::shouldSkip($message, $extra)) {
+			return;
+		}
 
-        $rData = [
-            'type'    => $type,
-            'message' => $message,
-            'extra'   => $extra,
-            'file'    => $rFile,
-            'line'    => $line,
-            'time'    => time(),
-            'env'     => php_sapi_name(),
-            'server_id' => defined('SERVER_ID') ? SERVER_ID : null,
-        ];
+		$rData = [
+			'type'    => $type,
+			'message' => $message,
+			'extra'   => $extra,
+			'file'    => $rFile,
+			'line'    => $line,
+			'time'    => time(),
+			'env'     => php_sapi_name(),
+			'server_id' => defined('SERVER_ID') ? SERVER_ID : null,
+		];
 
-        $logLine = base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . "\n";
+		$logLine = base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . "\n";
 
-        $rFile = self::getLogFile();
-        $rDir = dirname($rFile);
-        if (!is_dir($rDir)) {
-            @mkdir($rDir, 0775, true);
-        }
-        file_put_contents($rFile, $logLine, FILE_APPEND | LOCK_EX);
-    }
+		$rFile = self::getLogFile();
+		$rDir = dirname($rFile);
+		if (!is_dir($rDir)) {
+			@mkdir($rDir, 0775, true);
+		}
+		file_put_contents($rFile, $logLine, FILE_APPEND | LOCK_EX);
+	}
 
-    /**
-     * Проверить, нужно ли пропустить запись (фильтрация шума).
-     *
-     * @param string $message Текст сообщения
-     * @param string $extra   Дополнительные данные
-     *
-     * @return bool true — пропустить, false — записать
-     */
-    private static function shouldSkip(string $message, string $extra): bool {
-        // Рекурсивный лог: запись о таблице panel_logs
-        if (stripos($extra, 'panel_logs') !== false) {
-            return true;
-        }
+	/**
+	 * Проверить, нужно ли пропустить запись (фильтрация шума).
+	 *
+	 * @param string $message Текст сообщения
+	 * @param string $extra   Дополнительные данные
+	 *
+	 * @return bool true — пропустить, false — записать
+	 */
+	private static function shouldSkip(string $message, string $extra): bool {
+		// Рекурсивный лог: запись о таблице panel_logs
+		if (stripos($extra, 'panel_logs') !== false) {
+			return true;
+		}
 
-        // Шумные ошибки MySQL — пропускаем
-        $noisy = ['timeout exceeded', 'lock wait timeout', 'duplicate entry'];
-        $messageLower = strtolower($message);
-        foreach ($noisy as $pattern) {
-            if (strpos($messageLower, $pattern) !== false) {
-                return true;
-            }
-        }
+		// Шумные ошибки MySQL — пропускаем
+		$noisy = ['timeout exceeded', 'lock wait timeout', 'duplicate entry'];
+		$messageLower = strtolower($message);
+		foreach ($noisy as $pattern) {
+			if (strpos($messageLower, $pattern) !== false) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }
diff --git a/src/Core/Logging/Logger.php b/src/Core/Logging/Logger.php
index f932dec3..18fd3458 100644
--- a/src/Core/Logging/Logger.php
+++ b/src/Core/Logging/Logger.php
@@ -14,282 +14,282 @@ namespace XcVm\Core\Logging;
  */
 
 final class Logger {
-    /** @var bool Whether errors should be displayed on screen */
-    private static bool $showErrors = false;
+	/** @var bool Whether errors should be displayed on screen */
+	private static bool $showErrors = false;
 
-    /** @var string Full path to the log file */
-    private static string $logFile;
+	/** @var string Full path to the log file */
+	private static string $logFile;
 
-    /**
-     * Initializes error, exception, and fatal error handlers.
-     *
-     * @param bool   $showErrors true to display errors, false to hide UI output
-     * @param string $logFile    Full path to the file where logs will be written
-     */
-    public static function init(bool $showErrors, string $logFile): void {
-        self::$showErrors = $showErrors;
-        self::$logFile     = $logFile;
+	/**
+	 * Initializes error, exception, and fatal error handlers.
+	 *
+	 * @param bool   $showErrors true to display errors, false to hide UI output
+	 * @param string $logFile    Full path to the file where logs will be written
+	 */
+	public static function init(bool $showErrors, string $logFile): void {
+		self::$showErrors = $showErrors;
+		self::$logFile     = $logFile;
 
-        // Set custom handlers
-        set_error_handler([self::class, 'handleError']);
-        set_exception_handler([self::class, 'handleException']);
-        register_shutdown_function([self::class, 'handleFatal']);
+		// Set custom handlers
+		set_error_handler([self::class, 'handleError']);
+		set_exception_handler([self::class, 'handleException']);
+		register_shutdown_function([self::class, 'handleFatal']);
 
-        // Always collect all errors for logging; UI visibility is controlled separately.
-        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+		// Always collect all errors for logging; UI visibility is controlled separately.
+		error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
-        if ($showErrors) {
-            ini_set('display_errors', '1');
-            ini_set('display_startup_errors', '1');
-        } else {
-            ini_set('display_errors', '0');
-            ini_set('display_startup_errors', '0');
-        }
-    }
+		if ($showErrors) {
+			ini_set('display_errors', '1');
+			ini_set('display_startup_errors', '1');
+		} else {
+			ini_set('display_errors', '0');
+			ini_set('display_startup_errors', '0');
+		}
+	}
 
-    /* ================= ERRORS ================= */
+	/* ================= ERRORS ================= */
 
-    /**
-     * Handler for regular PHP errors (trigger_error, warnings, notices, etc.).
-     *
-     * @param int    $errno   Error level (E_WARNING, E_NOTICE, etc.)
-     * @param string $message Error message
-     * @param string $file    File where the error occurred
-     * @param int    $line    Line number in the file
-     *
-     * @return bool true if the error was handled (prevents default PHP handler)
-     */
-    public static function handleError(
-        int $errno,
-        string $message,
-        string $file,
-        int $line
-    ): bool {
-        // Ignore suppressed errors (using @ operator)
-        if (!(error_reporting() & $errno)) {
-            return false;
-        }
+	/**
+	 * Handler for regular PHP errors (trigger_error, warnings, notices, etc.).
+	 *
+	 * @param int    $errno   Error level (E_WARNING, E_NOTICE, etc.)
+	 * @param string $message Error message
+	 * @param string $file    File where the error occurred
+	 * @param int    $line    Line number in the file
+	 *
+	 * @return bool true if the error was handled (prevents default PHP handler)
+	 */
+	public static function handleError(
+		int $errno,
+		string $message,
+		string $file,
+		int $line
+	): bool {
+		// Ignore suppressed errors (using @ operator)
+		if (!(error_reporting() & $errno)) {
+			return false;
+		}
 
-        self::log(
-            self::mapErrorLevel($errno),
-            $message,
-            self::buildTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS)),
-            $file,
-            $line
-        );
+		self::log(
+			self::mapErrorLevel($errno),
+			$message,
+			self::buildTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS)),
+			$file,
+			$line
+		);
 
-        return true;
-    }
+		return true;
+	}
 
-    /* ================= EXCEPTIONS ================= */
+	/* ================= EXCEPTIONS ================= */
 
-    /**
-     * Handler for uncaught exceptions.
-     *
-     * @param \Throwable $e The uncaught exception
-     */
-    public static function handleException(\Throwable $e): void {
-        self::log(
-            'EXCEPTION',
-            $e->getMessage(),
-            self::buildExceptionTrace($e),
-            $e->getFile(),
-            $e->getLine()
-        );
-    }
+	/**
+	 * Handler for uncaught exceptions.
+	 *
+	 * @param \Throwable $e The uncaught exception
+	 */
+	public static function handleException(\Throwable $e): void {
+		self::log(
+			'EXCEPTION',
+			$e->getMessage(),
+			self::buildExceptionTrace($e),
+			$e->getFile(),
+			$e->getLine()
+		);
+	}
 
-    /* ================= FATAL ================= */
+	/* ================= FATAL ================= */
 
-    /**
-     * Handler for fatal errors (E_ERROR, E_PARSE, etc.) that terminate script execution.
-     * Called via register_shutdown_function.
-     */
-    public static function handleFatal(): void {
-        $error = error_get_last();
+	/**
+	 * Handler for fatal errors (E_ERROR, E_PARSE, etc.) that terminate script execution.
+	 * Called via register_shutdown_function.
+	 */
+	public static function handleFatal(): void {
+		$error = error_get_last();
 
-        // Process only true fatal errors
-        if ($error && in_array($error['type'], [
-            E_ERROR,
-            E_PARSE,
-            E_CORE_ERROR,
-            E_COMPILE_ERROR
-        ], true)) {
-            self::log(
-                'FATAL',
-                $error['message'],
-                '', // Stack trace is not available for fatal errors
-                $error['file'],
-                $error['line']
-            );
-        }
-    }
+		// Process only true fatal errors
+		if ($error && in_array($error['type'], [
+			E_ERROR,
+			E_PARSE,
+			E_CORE_ERROR,
+			E_COMPILE_ERROR
+		], true)) {
+			self::log(
+				'FATAL',
+				$error['message'],
+				'', // Stack trace is not available for fatal errors
+				$error['file'],
+				$error['line']
+			);
+		}
+	}
 
-    /* ================= CORE LOG ================= */
+	/* ================= CORE LOG ================= */
 
-    /**
-     * Core logging method. Writes the event to the log file and optionally outputs it on screen.
-     *
-     * @param string $type    Event type (ERROR, WARNING, NOTICE, EXCEPTION, FATAL, etc.)
-     * @param string $message Message text
-     * @param string $trace   Stack trace (optional)
-     * @param string $file    File where the event occurred
-     * @param int    $line    Line number
-     */
-    public static function log(
-        string $type,
-        string $message,
-        string $trace = '',
-        string $file = '',
-        int $line = 0
-    ): void {
-        $data = [
-            'type'    => $type,
-            'log_message' => $message,
-            'file'    => $file,
-            'line'    => $line,
-            'log_extra'   => $trace,            // Process ID
-            'time'    => time(),                  // Unix timestamp
-            'env'     => php_sapi_name(),         // SAPI name (cli, fpm-fcgi, etc.)
-            'version' => defined('XC_VM_VERSION') ? XC_VM_VERSION : 'unknown',
-        ];
+	/**
+	 * Core logging method. Writes the event to the log file and optionally outputs it on screen.
+	 *
+	 * @param string $type    Event type (ERROR, WARNING, NOTICE, EXCEPTION, FATAL, etc.)
+	 * @param string $message Message text
+	 * @param string $trace   Stack trace (optional)
+	 * @param string $file    File where the event occurred
+	 * @param int    $line    Line number
+	 */
+	public static function log(
+		string $type,
+		string $message,
+		string $trace = '',
+		string $file = '',
+		int $line = 0
+	): void {
+		$data = [
+			'type'    => $type,
+			'log_message' => $message,
+			'file'    => $file,
+			'line'    => $line,
+			'log_extra'   => $trace,            // Process ID
+			'time'    => time(),                  // Unix timestamp
+			'env'     => php_sapi_name(),         // SAPI name (cli, fpm-fcgi, etc.)
+			'version' => defined('XC_VM_VERSION') ? XC_VM_VERSION : 'unknown',
+		];
 
-        // Ensure log directory exists
-        $logDir = dirname(self::$logFile);
-        if (!is_dir($logDir)) {
-            @mkdir($logDir, 0775, true);
-        }
+		// Ensure log directory exists
+		$logDir = dirname(self::$logFile);
+		if (!is_dir($logDir)) {
+			@mkdir($logDir, 0775, true);
+		}
 
-        // Write to file as base64-encoded JSON (easy to parse and prevents line corruption)
-        file_put_contents(
-            self::$logFile,
-            base64_encode(json_encode($data, JSON_UNESCAPED_UNICODE)) . "\n",
-            FILE_APPEND | LOCK_EX
-        );
+		// Write to file as base64-encoded JSON (easy to parse and prevents line corruption)
+		file_put_contents(
+			self::$logFile,
+			base64_encode(json_encode($data, JSON_UNESCAPED_UNICODE)) . "\n",
+			FILE_APPEND | LOCK_EX
+		);
 
-        // Set log file permissions if running as root (common in containers)
-        if (function_exists('posix_geteuid') && posix_geteuid() === 0) {
-            @chown(self::$logFile, 'xc_vm');
-            @chgrp(self::$logFile, 'xc_vm');
-            @chmod(self::$logFile, 0664);
-        }
+		// Set log file permissions if running as root (common in containers)
+		if (function_exists('posix_geteuid') && posix_geteuid() === 0) {
+			@chown(self::$logFile, 'xc_vm');
+			@chgrp(self::$logFile, 'xc_vm');
+			@chmod(self::$logFile, 0664);
+		}
 
-        // If UI output is enabled, display a readable message on screen
-        if (self::$showErrors) {
-            self::output($data);
-        }
-    }
+		// If UI output is enabled, display a readable message on screen
+		if (self::$showErrors) {
+			self::output($data);
+		}
+	}
 
-    /* ================= TRACE ================= */
+	/* ================= TRACE ================= */
 
-    /**
-     * Builds a stack trace for an exception chain (including previous exceptions).
-     *
-     * @param \Throwable $e The exception
-     *
-     * @return string Formatted trace string
-     */
-    private static function buildExceptionTrace(\Throwable $e): string {
-        $out = [];
+	/**
+	 * Builds a stack trace for an exception chain (including previous exceptions).
+	 *
+	 * @param \Throwable $e The exception
+	 *
+	 * @return string Formatted trace string
+	 */
+	private static function buildExceptionTrace(\Throwable $e): string {
+		$out = [];
 
-        do {
-            // Main exception info
-            $out[] = sprintf(
-                "%s: %s in %s:%d",
-                get_class($e),
-                $e->getMessage(),
-                $e->getFile(),
-                $e->getLine()
-            );
+		do {
+			// Main exception info
+			$out[] = sprintf(
+				"%s: %s in %s:%d",
+				get_class($e),
+				$e->getMessage(),
+				$e->getFile(),
+				$e->getLine()
+			);
 
-            // Call stack for the current exception
-            foreach ($e->getTrace() as $i => $t) {
-                $out[] = sprintf(
-                    "#%d %s(%s): %s()",
-                    $i,
-                    $t['file'] ?? '[internal]',
-                    $t['line'] ?? '?',
-                    $t['function']
-                );
-            }
+			// Call stack for the current exception
+			foreach ($e->getTrace() as $i => $t) {
+				$out[] = sprintf(
+					"#%d %s(%s): %s()",
+					$i,
+					$t['file'] ?? '[internal]',
+					$t['line'] ?? '?',
+					$t['function']
+				);
+			}
 
-            $e = $e->getPrevious();
-            if ($e) {
-                $out[] = "---- CAUSED BY ----";
-            }
-        } while ($e);
+			$e = $e->getPrevious();
+			if ($e) {
+				$out[] = "---- CAUSED BY ----";
+			}
+		} while ($e);
 
-        return implode("\n", $out);
-    }
+		return implode("\n", $out);
+	}
 
-    /**
-     * Builds a stack trace from the array returned by debug_backtrace().
-     *
-     * @param array $trace Backtrace array
-     *
-     * @return string Formatted trace string
-     */
-    private static function buildTrace(array $trace): string {
-        $out = [];
+	/**
+	 * Builds a stack trace from the array returned by debug_backtrace().
+	 *
+	 * @param array $trace Backtrace array
+	 *
+	 * @return string Formatted trace string
+	 */
+	private static function buildTrace(array $trace): string {
+		$out = [];
 
-        foreach ($trace as $i => $t) {
-            $out[] = sprintf(
-                "#%d %s(%s): %s()",
-                $i,
-                $t['file'] ?? '[internal]',
-                $t['line'] ?? '?',
-                $t['function']
-            );
-        }
+		foreach ($trace as $i => $t) {
+			$out[] = sprintf(
+				"#%d %s(%s): %s()",
+				$i,
+				$t['file'] ?? '[internal]',
+				$t['line'] ?? '?',
+				$t['function']
+			);
+		}
 
-        return implode("\n", $out);
-    }
+		return implode("\n", $out);
+	}
 
-    /* ================= HELPERS ================= */
+	/* ================= HELPERS ================= */
 
-    /**
-     * Maps a PHP error constant to a human-readable string.
-     *
-     * @param int $errno Error level constant
-     *
-     * @return string Error type (ERROR, WARNING, NOTICE, INFO)
-     */
-    private static function mapErrorLevel(int $errno): string {
-        return match ($errno) {
-            E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR => 'ERROR',
-            E_WARNING, E_USER_WARNING             => 'WARNING',
-            E_NOTICE, E_USER_NOTICE               => 'NOTICE',
-            default                               => 'INFO',
-        };
-    }
+	/**
+	 * Maps a PHP error constant to a human-readable string.
+	 *
+	 * @param int $errno Error level constant
+	 *
+	 * @return string Error type (ERROR, WARNING, NOTICE, INFO)
+	 */
+	private static function mapErrorLevel(int $errno): string {
+		return match ($errno) {
+			E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR => 'ERROR',
+			E_WARNING, E_USER_WARNING             => 'WARNING',
+			E_NOTICE, E_USER_NOTICE               => 'NOTICE',
+			default                               => 'INFO',
+		};
+	}
 
-    /**
-     * Outputs error/exception information to the screen in a readable format.
-     * Format depends on the environment (CLI or Web).
-     *
-     * @param array $d Event data (from the log method)
-     */
-    private static function output(array $d): void {
-        if (php_sapi_name() === 'cli') {
-            // Color scheme for terminal
-            $color = match ($d['type']) {
-                'FATAL', 'ERROR' => "\033[41m\033[97m", // red background, white text
-                'WARNING'       => "\033[43m\033[30m", // yellow background, black text
-                'NOTICE'        => "\033[44m\033[97m", // blue background, white text
-                default         => "\033[45m\033[97m", // magenta background, white text
-            };
+	/**
+	 * Outputs error/exception information to the screen in a readable format.
+	 * Format depends on the environment (CLI or Web).
+	 *
+	 * @param array $d Event data (from the log method)
+	 */
+	private static function output(array $d): void {
+		if (php_sapi_name() === 'cli') {
+			// Color scheme for terminal
+			$color = match ($d['type']) {
+				'FATAL', 'ERROR' => "\033[41m\033[97m", // red background, white text
+				'WARNING'       => "\033[43m\033[30m", // yellow background, black text
+				'NOTICE'        => "\033[44m\033[97m", // blue background, white text
+				default         => "\033[45m\033[97m", // magenta background, white text
+			};
 
-            echo "\n{$color} {$d['type']} \033[0m ";
-            echo date('Y-m-d H:i:s', $d['time']) . "\n";
-            echo "{$d['log_message']}\n";
-            echo "{$d['file']}:{$d['line']}\n";
+			echo "\n{$color} {$d['type']} \033[0m ";
+			echo date('Y-m-d H:i:s', $d['time']) . "\n";
+			echo "{$d['log_message']}\n";
+			echo "{$d['file']}:{$d['line']}\n";
 
-            if (!empty($d['log_extra'])) {
-                echo str_repeat('-', 60) . "\n";
-                echo $d['log_extra'] . "\n";
-            }
-        } else {
-            // Web environment output
-            echo "<div style='
+			if (!empty($d['log_extra'])) {
+				echo str_repeat('-', 60) . "\n";
+				echo $d['log_extra'] . "\n";
+			}
+		} else {
+			// Web environment output
+			echo "<div style='
                 border:2px solid #f00;
                 background:#fff0f0;
                 padding:10px;
@@ -297,17 +297,17 @@ final class Logger {
                 font-family:monospace;
                 color:#000;
             '>";
-            echo "<b>{$d['type']}</b> ";
-            echo "<small>" . date('Y-m-d H:i:s', $d['time']) . "</small><br>";
-            echo htmlspecialchars($d['log_message'], ENT_SUBSTITUTE) . "<br>";
-            echo "<small>{$d['file']}:{$d['line']}</small>";
+			echo "<b>{$d['type']}</b> ";
+			echo "<small>" . date('Y-m-d H:i:s', $d['time']) . "</small><br>";
+			echo htmlspecialchars($d['log_message'], ENT_SUBSTITUTE) . "<br>";
+			echo "<small>{$d['file']}:{$d['line']}</small>";
 
-            if (!empty($d['log_extra'])) {
-                echo "<pre style='margin-top:10px;background:#fff;padding:10px;border:1px solid #ccc;'>";
-                echo htmlspecialchars($d['log_extra'], ENT_SUBSTITUTE);
-                echo "</pre>";
-            }
-            echo "</div>";
-        }
-    }
+			if (!empty($d['log_extra'])) {
+				echo "<pre style='margin-top:10px;background:#fff;padding:10px;border:1px solid #ccc;'>";
+				echo htmlspecialchars($d['log_extra'], ENT_SUBSTITUTE);
+				echo "</pre>";
+			}
+			echo "</div>";
+		}
+	}
 }
diff --git a/src/Core/Logging/LoggerInterface.php b/src/Core/Logging/LoggerInterface.php
index bfe07dba..f826387c 100644
--- a/src/Core/Logging/LoggerInterface.php
+++ b/src/Core/Logging/LoggerInterface.php
@@ -19,15 +19,15 @@ namespace XcVm\Core\Logging;
  */
 
 interface LoggerInterface {
-    /**
-     * Записать лог-сообщение.
-     *
-     * @param string     $type    Тип события (например: 'pdo', 'epg', 'AUTH_FAILED')
-     * @param string     $message Текст сообщения
-     * @param string|int $extra   Дополнительные данные (trace, query, и т.д.)
-     * @param int        $line    Номер строки (опционально)
-     *
-     * @return void
-     */
-    public static function log(string $type, string $message, $extra = '', int $line = 0): void;
+	/**
+	 * Записать лог-сообщение.
+	 *
+	 * @param string     $type    Тип события (например: 'pdo', 'epg', 'AUTH_FAILED')
+	 * @param string     $message Текст сообщения
+	 * @param string|int $extra   Дополнительные данные (trace, query, и т.д.)
+	 * @param int        $line    Номер строки (опционально)
+	 *
+	 * @return void
+	 */
+	public static function log(string $type, string $message, string|int $extra = '', int $line = 0): void;
 }
diff --git a/src/Core/Logging/UpdateLogger.php b/src/Core/Logging/UpdateLogger.php
index e99087bd..998d1163 100644
--- a/src/Core/Logging/UpdateLogger.php
+++ b/src/Core/Logging/UpdateLogger.php
@@ -18,7 +18,6 @@ namespace XcVm\Core\Logging;
  */
 
 class UpdateLogger {
-
 	/**
 	 * Path to the update log file (outside tmp/ so cron cleanup won't delete it).
 	 *
diff --git a/src/Core/Module/BaseModule.php b/src/Core/Module/BaseModule.php
index ca0dc157..aa5e28f5 100644
--- a/src/Core/Module/BaseModule.php
+++ b/src/Core/Module/BaseModule.php
@@ -27,123 +27,128 @@ use XcVm\Core\Module\Contract\TopbarProviderInterface;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 abstract class BaseModule implements ModuleInterface, MigratableInterface, CronProviderInterface, TopbarProviderInterface, TableProviderInterface, PermissionProviderInterface, QuickToolsProviderInterface {
+	/**
+	 * Unique module identifier.
+	 *
+	 * @return string
+	 */
+	abstract public function getName(): string;
 
-    /**
-     * Unique module identifier.
-     *
-     * @return string
-     */
-    abstract public function getName(): string;
+	/**
+	 * Module version string.
+	 *
+	 * @return string
+	 */
+	abstract public function getVersion(): string;
 
-    /**
-     * Module version string.
-     *
-     * @return string
-     */
-    abstract public function getVersion(): string;
+	/**
+	 * Boot hook: register services/bindings into the container. No-op by default.
+	 *
+	 * @param ServiceContainer $container The DI container.
+	 * @return void
+	 */
+	public function boot(ServiceContainer $container): void {
+	}
 
-    /**
-     * Boot hook: register services/bindings into the container. No-op by default.
-     *
-     * @param ServiceContainer $container The DI container.
-     * @return void
-     */
-    public function boot(ServiceContainer $container): void {}
+	/**
+	 * Event subscribers provided by the module. Empty by default.
+	 *
+	 * @return array Map/list of event subscribers.
+	 */
+	public function getEventSubscribers(): array {
+		return [];
+	}
 
-    /**
-     * Event subscribers provided by the module. Empty by default.
-     *
-     * @return array Map/list of event subscribers.
-     */
-    public function getEventSubscribers(): array {
-        return [];
-    }
+	/**
+	 * Register the module's HTTP routes. No-op by default.
+	 *
+	 * @param Router $router The application router.
+	 * @return void
+	 */
+	public function registerRoutes(Router $router): void {
+	}
 
-    /**
-     * Register the module's HTTP routes. No-op by default.
-     *
-     * @param Router $router The application router.
-     * @return void
-     */
-    public function registerRoutes(Router $router): void {}
+	/**
+	 * Register the module's CLI commands. No-op by default.
+	 *
+	 * @param CommandRegistry $registry The CLI command registry.
+	 * @return void
+	 */
+	public function registerCommands(CommandRegistry $registry): void {
+	}
 
-    /**
-     * Register the module's CLI commands. No-op by default.
-     *
-     * @param CommandRegistry $registry The CLI command registry.
-     * @return void
-     */
-    public function registerCommands(CommandRegistry $registry): void {}
+	/**
+	 * Register the module's navbar entries. No-op by default.
+	 *
+	 * @param NavbarRegistry $registry The navbar registry.
+	 * @return void
+	 */
+	public function registerNavbar(NavbarRegistry $registry): void {
+	}
 
-    /**
-     * Register the module's navbar entries. No-op by default.
-     *
-     * @param NavbarRegistry $registry The navbar registry.
-     * @return void
-     */
-    public function registerNavbar(NavbarRegistry $registry): void {}
+	/**
+	 * No-op default — override to contribute per-page topbar buttons.
+	 *
+	 * @return void
+	 */
+	public function registerTopbar(TopbarRegistry $registry): void {
+	}
 
-    /**
-     * No-op default — override to contribute per-page topbar buttons.
-     *
-     * @param TopbarRegistry $registry
-     * @return void
-     */
-    public function registerTopbar(TopbarRegistry $registry): void {}
+	/**
+	 * No-op default — override to register serverSide DataTable handlers.
+	 *
+	 * @return void
+	 */
+	public function registerTables(TableRegistry $registry): void {
+	}
 
-    /**
-     * No-op default — override to register serverSide DataTable handlers.
-     *
-     * @param TableRegistry $registry
-     * @return void
-     */
-    public function registerTables(TableRegistry $registry): void {}
+	/**
+	 * No-op default — override to register reseller sub-permission keys.
+	 *
+	 * @return void
+	 */
+	public function registerPermissions(PermissionRegistry $registry): void {
+	}
 
-    /**
-     * No-op default — override to register reseller sub-permission keys.
-     *
-     * @param PermissionRegistry $registry
-     * @return void
-     */
-    public function registerPermissions(PermissionRegistry $registry): void {}
+	/**
+	 * No-op default — override to register one-shot Quick Tools actions.
+	 *
+	 * @return void
+	 */
+	public function registerQuickTools(QuickToolsRegistry $registry): void {
+	}
 
-    /**
-     * No-op default — override to register one-shot Quick Tools actions.
-     *
-     * @param QuickToolsRegistry $registry
-     * @return void
-     */
-    public function registerQuickTools(QuickToolsRegistry $registry): void {}
+	/**
+	 * Installation hook, run when the module is installed. No-op by default.
+	 *
+	 * @return void
+	 */
+	public function install(): void {
+	}
 
-    /**
-     * Installation hook, run when the module is installed. No-op by default.
-     *
-     * @return void
-     */
-    public function install(): void {}
+	/**
+	 * Uninstallation hook, run when the module is removed. No-op by default.
+	 *
+	 * @return void
+	 */
+	public function uninstall(): void {
+	}
 
-    /**
-     * Uninstallation hook, run when the module is removed. No-op by default.
-     *
-     * @return void
-     */
-    public function uninstall(): void {}
+	/**
+	 * Database migrations provided by the module. Empty by default.
+	 *
+	 * @return array Migration descriptors.
+	 */
+	public function getMigrations(): array {
+		return [];
+	}
 
-    /**
-     * Database migrations provided by the module. Empty by default.
-     *
-     * @return array Migration descriptors.
-     */
-    public function getMigrations(): array {
-        return [];
-    }
-
-    /**
-     * Cron entries provided by the module. Empty by default.
-     *
-     * @return array Cron entry descriptors.
-     */
-    public function getCronEntries(): array {
-        return [];
-    }
+	/**
+	 * Cron entries provided by the module. Empty by default.
+	 *
+	 * @return array Cron entry descriptors.
+	 */
+	public function getCronEntries(): array {
+		return [];
+	}
 }
diff --git a/src/Core/Module/Contract/CommandProviderInterface.php b/src/Core/Module/Contract/CommandProviderInterface.php
index 01a95044..3710fb46 100644
--- a/src/Core/Module/Contract/CommandProviderInterface.php
+++ b/src/Core/Module/Contract/CommandProviderInterface.php
@@ -11,14 +11,12 @@ use XcVm\Cli\CommandRegistry;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface CommandProviderInterface {
-
-    /**
-     * Register CLI commands and cron jobs for this module.
-     *
-     * Module explicitly instantiates and registers CommandInterface instances.
-     * No filesystem scanning — all registration is explicit PHP.
-     *
-     * @param CommandRegistry $registry
-     */
-    public function registerCommands(CommandRegistry $registry): void;
+	/**
+	 * Register CLI commands and cron jobs for this module.
+	 *
+	 * Module explicitly instantiates and registers CommandInterface instances.
+	 * No filesystem scanning — all registration is explicit PHP.
+	 *
+	 */
+	public function registerCommands(CommandRegistry $registry): void;
 }
diff --git a/src/Core/Module/Contract/CronProviderInterface.php b/src/Core/Module/Contract/CronProviderInterface.php
index b5de7c4f..9bb23dd5 100644
--- a/src/Core/Module/Contract/CronProviderInterface.php
+++ b/src/Core/Module/Contract/CronProviderInterface.php
@@ -19,19 +19,18 @@ namespace XcVm\Core\Module\Contract;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface CronProviderInterface {
-
-    /**
-     * Return the cron schedule entries this module requires.
-     *
-     * Keys are standard cron time expressions; values are console command names.
-     * The caller (StartupCommand / StatusCommand) resolves PHP_BIN, MAIN_HOME,
-     * and the comment suffix automatically.
-     *
-     * Example:
-     *   return ['* * * * *' => 'cron:watch'];
-     *   // Produces: "* * * * * /usr/bin/php /opt/xc_vm/console.php cron:watch # XC_VM"
-     *
-     * @return array<string, string>  cron-expression => console-command-name
-     */
-    public function getCronEntries(): array;
+	/**
+	 * Return the cron schedule entries this module requires.
+	 *
+	 * Keys are standard cron time expressions; values are console command names.
+	 * The caller (StartupCommand / StatusCommand) resolves PHP_BIN, MAIN_HOME,
+	 * and the comment suffix automatically.
+	 *
+	 * Example:
+	 *   return ['* * * * *' => 'cron:watch'];
+	 *   // Produces: "* * * * * /usr/bin/php /opt/xc_vm/console.php cron:watch # XC_VM"
+	 *
+	 * @return array<string, string>  cron-expression => console-command-name
+	 */
+	public function getCronEntries(): array;
 }
diff --git a/src/Core/Module/Contract/NavbarProviderInterface.php b/src/Core/Module/Contract/NavbarProviderInterface.php
index 8ff4dc76..01111ac6 100644
--- a/src/Core/Module/Contract/NavbarProviderInterface.php
+++ b/src/Core/Module/Contract/NavbarProviderInterface.php
@@ -11,12 +11,11 @@ use XcVm\Core\Module\NavbarRegistry;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface NavbarProviderInterface {
-
-    /**
-     * Register navbar items via the provided NavbarRegistry.
-     *
-     * Called in bootAll() after all modules have been booted.
-     * Use $registry->add() instead of NavbarRegistry::add() (static).
-     */
-    public function registerNavbar(NavbarRegistry $registry): void;
+	/**
+	 * Register navbar items via the provided NavbarRegistry.
+	 *
+	 * Called in bootAll() after all modules have been booted.
+	 * Use $registry->add() instead of NavbarRegistry::add() (static).
+	 */
+	public function registerNavbar(NavbarRegistry $registry): void;
 }
diff --git a/src/Core/Module/Contract/PermissionProviderInterface.php b/src/Core/Module/Contract/PermissionProviderInterface.php
index edd58fb8..021614e2 100644
--- a/src/Core/Module/Contract/PermissionProviderInterface.php
+++ b/src/Core/Module/Contract/PermissionProviderInterface.php
@@ -11,12 +11,11 @@ use XcVm\Core\Module\PermissionRegistry;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface PermissionProviderInterface {
-
-    /**
-     * Register reseller sub-permission keys via the provided PermissionRegistry.
-     *
-     * Called in bootAll() (same phase as the other providers). The keys appear
-     * in the group editor's permission catalogue with `permission_<key>` labels.
-     */
-    public function registerPermissions(PermissionRegistry $registry): void;
+	/**
+	 * Register reseller sub-permission keys via the provided PermissionRegistry.
+	 *
+	 * Called in bootAll() (same phase as the other providers). The keys appear
+	 * in the group editor's permission catalogue with `permission_<key>` labels.
+	 */
+	public function registerPermissions(PermissionRegistry $registry): void;
 }
diff --git a/src/Core/Module/Contract/QuickToolsProviderInterface.php b/src/Core/Module/Contract/QuickToolsProviderInterface.php
index e1f05399..84f93cb3 100644
--- a/src/Core/Module/Contract/QuickToolsProviderInterface.php
+++ b/src/Core/Module/Contract/QuickToolsProviderInterface.php
@@ -11,13 +11,12 @@ use XcVm\Core\Module\QuickToolsRegistry;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface QuickToolsProviderInterface {
-
-    /**
-     * Register one-shot Quick Tools actions via the provided registry.
-     *
-     * Called in bootAll() (same phase as the other providers), before the Quick
-     * Tools page renders and before post.php dispatches the action. Each tool
-     * contributes a button and a handler owned by the module.
-     */
-    public function registerQuickTools(QuickToolsRegistry $registry): void;
+	/**
+	 * Register one-shot Quick Tools actions via the provided registry.
+	 *
+	 * Called in bootAll() (same phase as the other providers), before the Quick
+	 * Tools page renders and before post.php dispatches the action. Each tool
+	 * contributes a button and a handler owned by the module.
+	 */
+	public function registerQuickTools(QuickToolsRegistry $registry): void;
 }
diff --git a/src/Core/Module/Contract/RouteProviderInterface.php b/src/Core/Module/Contract/RouteProviderInterface.php
index d636715c..edf7b7d9 100644
--- a/src/Core/Module/Contract/RouteProviderInterface.php
+++ b/src/Core/Module/Contract/RouteProviderInterface.php
@@ -11,13 +11,11 @@ use XcVm\Core\Http\Router;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface RouteProviderInterface {
-
-    /**
-     * Register HTTP routes for this module.
-     *
-     * Called after boot(). Module registers GET/POST routes and API handlers.
-     *
-     * @param Router $router
-     */
-    public function registerRoutes(Router $router): void;
+	/**
+	 * Register HTTP routes for this module.
+	 *
+	 * Called after boot(). Module registers GET/POST routes and API handlers.
+	 *
+	 */
+	public function registerRoutes(Router $router): void;
 }
diff --git a/src/Core/Module/Contract/ServiceProviderInterface.php b/src/Core/Module/Contract/ServiceProviderInterface.php
index 9df19d23..521a541b 100644
--- a/src/Core/Module/Contract/ServiceProviderInterface.php
+++ b/src/Core/Module/Contract/ServiceProviderInterface.php
@@ -11,24 +11,21 @@ use XcVm\Core\Container\ServiceContainer;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface ServiceProviderInterface {
+	/**
+	 * Register module services in the DI container.
+	 *
+	 * Called once per request during module boot phase.
+	 *
+	 */
+	public function boot(ServiceContainer $container): void;
 
-    /**
-     * Register module services in the DI container.
-     *
-     * Called once per request during module boot phase.
-     *
-     * @param ServiceContainer $container
-     */
-    public function boot(ServiceContainer $container): void;
-
-    /**
-     * Return event subscribers declared by this module.
-     *
-     * Key is a fully-qualified event class name, value is a callable
-     * or [callable, int $priority] tuple.
-     *
-     * @return array<class-string, callable|array{callable, int}>
-     */
-    public function getEventSubscribers(): array;
-
+	/**
+	 * Return event subscribers declared by this module.
+	 *
+	 * Key is a fully-qualified event class name, value is a callable
+	 * or [callable, int $priority] tuple.
+	 *
+	 * @return array<class-string, callable|array{callable, int}>
+	 */
+	public function getEventSubscribers(): array;
 }
diff --git a/src/Core/Module/Contract/StreamMiddlewareProviderInterface.php b/src/Core/Module/Contract/StreamMiddlewareProviderInterface.php
index 2b21993c..6892a946 100644
--- a/src/Core/Module/Contract/StreamMiddlewareProviderInterface.php
+++ b/src/Core/Module/Contract/StreamMiddlewareProviderInterface.php
@@ -23,14 +23,13 @@ use XcVm\Core\Http\Pipeline\StreamPipeline;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface StreamMiddlewareProviderInterface {
-
-    /**
-     * Return stream middleware instances to inject into StreamPipeline.
-     *
-     * Modules return one or more middleware objects. Each must implement
-     * StreamMiddlewareInterface and declare its own priority via getPriority().
-     *
-     * @return StreamMiddlewareInterface[]
-     */
-    public function getStreamMiddleware(): array;
+	/**
+	 * Return stream middleware instances to inject into StreamPipeline.
+	 *
+	 * Modules return one or more middleware objects. Each must implement
+	 * StreamMiddlewareInterface and declare its own priority via getPriority().
+	 *
+	 * @return StreamMiddlewareInterface[]
+	 */
+	public function getStreamMiddleware(): array;
 }
diff --git a/src/Core/Module/Contract/TableProviderInterface.php b/src/Core/Module/Contract/TableProviderInterface.php
index e5defeb6..d3555e42 100644
--- a/src/Core/Module/Contract/TableProviderInterface.php
+++ b/src/Core/Module/Contract/TableProviderInterface.php
@@ -11,13 +11,12 @@ use XcVm\Core\Module\TableRegistry;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface TableProviderInterface {
-
-    /**
-     * Register serverSide DataTable handlers via the provided TableRegistry.
-     *
-     * Called in bootAll() (same phase as registerNavbar/registerTopbar), before
-     * the ./table request dispatches. Register a handler for each table id the
-     * module owns so its builder lives in the module, not in core TableController.
-     */
-    public function registerTables(TableRegistry $registry): void;
+	/**
+	 * Register serverSide DataTable handlers via the provided TableRegistry.
+	 *
+	 * Called in bootAll() (same phase as registerNavbar/registerTopbar), before
+	 * the ./table request dispatches. Register a handler for each table id the
+	 * module owns so its builder lives in the module, not in core TableController.
+	 */
+	public function registerTables(TableRegistry $registry): void;
 }
diff --git a/src/Core/Module/Contract/TopbarProviderInterface.php b/src/Core/Module/Contract/TopbarProviderInterface.php
index de6739cb..bfcb9465 100644
--- a/src/Core/Module/Contract/TopbarProviderInterface.php
+++ b/src/Core/Module/Contract/TopbarProviderInterface.php
@@ -11,14 +11,13 @@ use XcVm\Core\Module\TopbarRegistry;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface TopbarProviderInterface {
-
-    /**
-     * Register per-page topbar buttons via the provided TopbarRegistry.
-     *
-     * Called in bootAll() after all modules have been booted (same phase as
-     * registerNavbar). A module may add buttons to its OWN pages and to
-     * existing core pages (e.g. inject a "Watch Folder" button into 'movies').
-     * Use $registry->add() (static under the hood, mirrors NavbarRegistry).
-     */
-    public function registerTopbar(TopbarRegistry $registry): void;
+	/**
+	 * Register per-page topbar buttons via the provided TopbarRegistry.
+	 *
+	 * Called in bootAll() after all modules have been booted (same phase as
+	 * registerNavbar). A module may add buttons to its OWN pages and to
+	 * existing core pages (e.g. inject a "Watch Folder" button into 'movies').
+	 * Use $registry->add() (static under the hood, mirrors NavbarRegistry).
+	 */
+	public function registerTopbar(TopbarRegistry $registry): void;
 }
diff --git a/src/Core/Module/CoreNavbarProvider.php b/src/Core/Module/CoreNavbarProvider.php
index d986f70c..98874517 100644
--- a/src/Core/Module/CoreNavbarProvider.php
+++ b/src/Core/Module/CoreNavbarProvider.php
@@ -20,595 +20,594 @@ use XcVm\Core\Module\Contract\NavbarProviderInterface;
  */
 
 class CoreNavbarProvider implements NavbarProviderInterface {
+	/**
+	 * NavbarProviderInterface implementation — delegates to register().
+	 */
+	public function registerNavbar(NavbarRegistry $registry): void {
+		self::register();
+	}
 
-    /**
-     * NavbarProviderInterface implementation — delegates to register().
-     */
-    public function registerNavbar(NavbarRegistry $registry): void {
-        self::register();
-    }
+	/**
+	 * Register all core navigation items with the NavbarRegistry.
+	 *
+	 * @return void
+	 */
+	public static function register(): void {
+		self::_dashboard();
+		self::_servers();
+		self::_users();
+		self::_content();
+		self::_vod();
+		self::_distribution();
+		self::_logs();
+		self::_management();
+		self::_profile();
+	}
 
-    /**
-     * Register all core navigation items with the NavbarRegistry.
-     *
-     * @return void
-     */
-    public static function register(): void {
-        self::_dashboard();
-        self::_servers();
-        self::_users();
-        self::_content();
-        self::_vod();
-        self::_distribution();
-        self::_logs();
-        self::_management();
-        self::_profile();
-    }
+	// ── Dashboard ─────────────────────────────────────────────────
 
-    // ── Dashboard ─────────────────────────────────────────────────
+	/**
+	 * Register Dashboard navigation items.
+	 *
+	 * Adds the main dashboard menu item and its live connections sub-item.
+	 *
+	 * @return void
+	 */
+	private static function _dashboard(): void {
+		NavbarRegistry::add((new NavbarItem('dashboard'))
+			->url('index')->label('dashboard')
+			->icon('fe-activity')->noMobileSubmenu()->order(100));
 
-    /**
-     * Register Dashboard navigation items.
-     * 
-     * Adds the main dashboard menu item and its live connections sub-item.
-     *
-     * @return void
-     */
-    private static function _dashboard(): void {
-        NavbarRegistry::add((new NavbarItem('dashboard'))
-            ->url('index')->label('dashboard')
-            ->icon('fe-activity')->noMobileSubmenu()->order(100));
+		NavbarRegistry::add((new NavbarItem('dashboard.home'))
+			->parent('dashboard')->url('dashboard')
+			->label('home')->order(1));
+	}
 
-        NavbarRegistry::add((new NavbarItem('dashboard.home'))
-            ->parent('dashboard')->url('dashboard')
-            ->label('home')->order(1));
-    }
+	// ── Servers ───────────────────────────────────────────────────
 
-    // ── Servers ───────────────────────────────────────────────────
+	/**
+	 * Register Servers navigation items.
+	 *
+	 * Adds server management items including load balancer installation,
+	 * server/proxy management, ordering, and process monitoring.
+	 *
+	 * @return void
+	 */
+	private static function _servers(): void {
+		NavbarRegistry::add((new NavbarItem('servers'))
+			->url('#')->label('servers')
+			->icon('fas fa-server')->order(200));
 
-    /**
-     * Register Servers navigation items.
-     * 
-     * Adds server management items including load balancer installation,
-     * server/proxy management, ordering, and process monitoring.
-     *
-     * @return void
-     */
-    private static function _servers(): void {
-        NavbarRegistry::add((new NavbarItem('servers'))
-            ->url('#')->label('servers')
-            ->icon('fas fa-server')->order(200));
+		NavbarRegistry::add((new NavbarItem('servers.install'))
+			->parent('servers')->url('server_install')
+			->label('install_load_balancer')->permissions(['servers'])->order(10));
 
-        NavbarRegistry::add((new NavbarItem('servers.install'))
-            ->parent('servers')->url('server_install')
-            ->label('install_load_balancer')->permissions(['servers'])->order(10));
+		NavbarRegistry::add((new NavbarItem('servers.manage'))
+			->parent('servers')->url('servers')
+			->label('manage_servers')->permissions(['servers'])->order(20));
 
-        NavbarRegistry::add((new NavbarItem('servers.manage'))
-            ->parent('servers')->url('servers')
-            ->label('manage_servers')->permissions(['servers'])->order(20));
+		NavbarRegistry::add((new NavbarItem('servers.proxies'))
+			->parent('servers')->url('proxies')
+			->label('manage_proxies')->permissions(['proxies'])->order(30));
 
-        NavbarRegistry::add((new NavbarItem('servers.proxies'))
-            ->parent('servers')->url('proxies')
-            ->label('manage_proxies')->permissions(['proxies'])->order(30));
+		NavbarRegistry::add((new NavbarItem('servers.order'))
+			->parent('servers')->url('server_order')
+			->label('server_order')->permissions(['server_order'])->order(40));
 
-        NavbarRegistry::add((new NavbarItem('servers.order'))
-            ->parent('servers')->url('server_order')
-            ->label('server_order')->permissions(['server_order'])->order(40));
+		NavbarRegistry::add((new NavbarItem('servers.process_monitor'))
+			->parent('servers')->url('process_monitor')
+			->label('process_monitor')->permissions(['process_monitor'])->order(50));
+	}
 
-        NavbarRegistry::add((new NavbarItem('servers.process_monitor'))
-            ->parent('servers')->url('process_monitor')
-            ->label('process_monitor')->permissions(['process_monitor'])->order(50));
-    }
+	// ── Users ─────────────────────────────────────────────────────
 
-    // ── Users ─────────────────────────────────────────────────────
+	/**
+	 * Register Users navigation items.
+	 *
+	 * Adds complete user management structure including Lines, MAG devices,
+	 * Enigma2 devices, and Reseller management with their respective
+	 * add/manage/mass-edit operations.
+	 *
+	 * @return void
+	 */
+	private static function _users(): void {
+		NavbarRegistry::add((new NavbarItem('users'))
+			->url('#')->label('users')
+			->icon('fas fa-desktop')->order(300));
 
-    /**
-     * Register Users navigation items.
-     * 
-     * Adds complete user management structure including Lines, MAG devices,
-     * Enigma2 devices, and Reseller management with their respective
-     * add/manage/mass-edit operations.
-     *
-     * @return void
-     */
-    private static function _users(): void {
-        NavbarRegistry::add((new NavbarItem('users'))
-            ->url('#')->label('users')
-            ->icon('fas fa-desktop')->order(300));
+		// Lines
+		NavbarRegistry::add((new NavbarItem('users.lines'))
+			->parent('users')->url('#')
+			->label('user_lines')->permissions(['add_user', 'users'])->order(10));
+		NavbarRegistry::add((new NavbarItem('users.lines.add'))
+			->parent('users.lines')->url('line')
+			->label('add_line')->permissions(['add_user'])->order(10));
+		NavbarRegistry::add((new NavbarItem('users.lines.manage'))
+			->parent('users.lines')->url('lines')
+			->label('manage_lines')->permissions(['users'])->order(20));
+		NavbarRegistry::add((new NavbarItem('users.lines.mass'))
+			->parent('users.lines')->url('line_mass')
+			->label('mass_edit_lines')->permissions(['mass_edit_lines'])->order(30));
 
-        // Lines
-        NavbarRegistry::add((new NavbarItem('users.lines'))
-            ->parent('users')->url('#')
-            ->label('user_lines')->permissions(['add_user', 'users'])->order(10));
-        NavbarRegistry::add((new NavbarItem('users.lines.add'))
-            ->parent('users.lines')->url('line')
-            ->label('add_line')->permissions(['add_user'])->order(10));
-        NavbarRegistry::add((new NavbarItem('users.lines.manage'))
-            ->parent('users.lines')->url('lines')
-            ->label('manage_lines')->permissions(['users'])->order(20));
-        NavbarRegistry::add((new NavbarItem('users.lines.mass'))
-            ->parent('users.lines')->url('line_mass')
-            ->label('mass_edit_lines')->permissions(['mass_edit_lines'])->order(30));
+		// Active Codes
+		NavbarRegistry::add((new NavbarItem('users.active_codes'))
+			->parent('users')->url('#')
+			->label('active_codes')->permissions(['add_user', 'users'])->order(15));
+		NavbarRegistry::add((new NavbarItem('users.active_codes.add'))
+			->parent('users.active_codes')->url('active_code')
+			->label('generate_codes')->permissions(['add_user'])->order(10));
+		NavbarRegistry::add((new NavbarItem('users.active_codes.manage'))
+			->parent('users.active_codes')->url('active_codes')
+			->label('manage_active_codes')->permissions(['users'])->order(20));
+		NavbarRegistry::add((new NavbarItem('users.active_codes.batch'))
+			->parent('users.active_codes')->url('active_codes_batch')
+			->label('batch_manager')->permissions(['users'])->order(25));
+		NavbarRegistry::add((new NavbarItem('users.active_codes.mass'))
+			->parent('users.active_codes')->url('active_codes_mass')
+			->label('mass_edit_active_codes')->permissions(['mass_edit_lines'])->order(30));
 
-        // Active Codes
-        NavbarRegistry::add((new NavbarItem('users.active_codes'))
-            ->parent('users')->url('#')
-            ->label('active_codes')->permissions(['add_user', 'users'])->order(15));
-        NavbarRegistry::add((new NavbarItem('users.active_codes.add'))
-            ->parent('users.active_codes')->url('active_code')
-            ->label('generate_codes')->permissions(['add_user'])->order(10));
-        NavbarRegistry::add((new NavbarItem('users.active_codes.manage'))
-            ->parent('users.active_codes')->url('active_codes')
-            ->label('manage_active_codes')->permissions(['users'])->order(20));
-        NavbarRegistry::add((new NavbarItem('users.active_codes.batch'))
-            ->parent('users.active_codes')->url('active_codes_batch')
-            ->label('batch_manager')->permissions(['users'])->order(25));
-        NavbarRegistry::add((new NavbarItem('users.active_codes.mass'))
-            ->parent('users.active_codes')->url('active_codes_mass')
-            ->label('mass_edit_active_codes')->permissions(['mass_edit_lines'])->order(30));
+		// MAG
+		NavbarRegistry::add((new NavbarItem('users.mag'))
+			->parent('users')->url('#')
+			->label('mag_devices')->permissions(['add_mag', 'manage_mag'])->order(20));
+		NavbarRegistry::add((new NavbarItem('users.mag.add'))
+			->parent('users.mag')->url('mag')
+			->label('add_mag')->permissions(['add_mag'])->order(10));
+		NavbarRegistry::add((new NavbarItem('users.mag.manage'))
+			->parent('users.mag')->url('mags')
+			->label('manage_mag_devices')->permissions(['manage_mag'])->order(20));
+		NavbarRegistry::add((new NavbarItem('users.mag.mass'))
+			->parent('users.mag')->url('mag_mass')
+			->label('mass_edit_mags')->permissions(['mass_edit_mags'])->order(30));
 
-        // MAG
-        NavbarRegistry::add((new NavbarItem('users.mag'))
-            ->parent('users')->url('#')
-            ->label('mag_devices')->permissions(['add_mag', 'manage_mag'])->order(20));
-        NavbarRegistry::add((new NavbarItem('users.mag.add'))
-            ->parent('users.mag')->url('mag')
-            ->label('add_mag')->permissions(['add_mag'])->order(10));
-        NavbarRegistry::add((new NavbarItem('users.mag.manage'))
-            ->parent('users.mag')->url('mags')
-            ->label('manage_mag_devices')->permissions(['manage_mag'])->order(20));
-        NavbarRegistry::add((new NavbarItem('users.mag.mass'))
-            ->parent('users.mag')->url('mag_mass')
-            ->label('mass_edit_mags')->permissions(['mass_edit_mags'])->order(30));
+		// Enigma
+		NavbarRegistry::add((new NavbarItem('users.e2'))
+			->parent('users')->url('#')
+			->label('enigma_devices')->permissions(['add_e2', 'manage_e2'])->order(30));
+		NavbarRegistry::add((new NavbarItem('users.e2.add'))
+			->parent('users.e2')->url('enigma')
+			->label('add_enigma')->permissions(['add_e2'])->order(10));
+		NavbarRegistry::add((new NavbarItem('users.e2.manage'))
+			->parent('users.e2')->url('enigmas')
+			->label('manage_enigma_devices')->permissions(['manage_e2'])->order(20));
+		NavbarRegistry::add((new NavbarItem('users.e2.mass'))
+			->parent('users.e2')->url('enigma_mass')
+			->label('mass_edit_enigmas')->permissions(['mass_edit_enigmas'])->order(30));
 
-        // Enigma
-        NavbarRegistry::add((new NavbarItem('users.e2'))
-            ->parent('users')->url('#')
-            ->label('enigma_devices')->permissions(['add_e2', 'manage_e2'])->order(30));
-        NavbarRegistry::add((new NavbarItem('users.e2.add'))
-            ->parent('users.e2')->url('enigma')
-            ->label('add_enigma')->permissions(['add_e2'])->order(10));
-        NavbarRegistry::add((new NavbarItem('users.e2.manage'))
-            ->parent('users.e2')->url('enigmas')
-            ->label('manage_enigma_devices')->permissions(['manage_e2'])->order(20));
-        NavbarRegistry::add((new NavbarItem('users.e2.mass'))
-            ->parent('users.e2')->url('enigma_mass')
-            ->label('mass_edit_enigmas')->permissions(['mass_edit_enigmas'])->order(30));
+		// Reseller
+		NavbarRegistry::add((new NavbarItem('users.reseller'))
+			->parent('users')->url('#')
+			->label('reseller')->permissions(['add_reguser', 'mng_regusers'])->order(40));
+		NavbarRegistry::add((new NavbarItem('users.reseller.add'))
+			->parent('users.reseller')->url('user')
+			->label('add_registered_user')->permissions(['add_reguser'])->order(10));
+		NavbarRegistry::add((new NavbarItem('users.reseller.manage'))
+			->parent('users.reseller')->url('users')
+			->label('manage_registered_user')->permissions(['mng_regusers'])->order(20));
+		NavbarRegistry::add((new NavbarItem('users.reseller.mass'))
+			->parent('users.reseller')->url('user_mass')
+			->label('mass_edit_resellers')->permissions(['mass_edit_users'])->order(30));
+	}
 
-        // Reseller
-        NavbarRegistry::add((new NavbarItem('users.reseller'))
-            ->parent('users')->url('#')
-            ->label('reseller')->permissions(['add_reguser', 'mng_regusers'])->order(40));
-        NavbarRegistry::add((new NavbarItem('users.reseller.add'))
-            ->parent('users.reseller')->url('user')
-            ->label('add_registered_user')->permissions(['add_reguser'])->order(10));
-        NavbarRegistry::add((new NavbarItem('users.reseller.manage'))
-            ->parent('users.reseller')->url('users')
-            ->label('manage_registered_user')->permissions(['mng_regusers'])->order(20));
-        NavbarRegistry::add((new NavbarItem('users.reseller.mass'))
-            ->parent('users.reseller')->url('user_mass')
-            ->label('mass_edit_resellers')->permissions(['mass_edit_users'])->order(30));
-    }
+	// ── Content ───────────────────────────────────────────────────
 
-    // ── Content ───────────────────────────────────────────────────
+	/**
+	 * Register Content (Streaming) navigation items.
+	 *
+	 * Live-streaming content: Streams, Created Channels and Radio Stations.
+	 * VOD (Movies/Series) moved to _vod(); Bouquets/Suppliers/Recordings/TV Guide
+	 * moved to _distribution(). Labelled "Streaming"; the key stays 'content'.
+	 *
+	 * @return void
+	 */
+	private static function _content(): void {
+		NavbarRegistry::add((new NavbarItem('content'))
+			->url('#')->label('', 'Streaming')
+			->icon('fas fa-play')->order(400));
 
-    /**
-     * Register Content (Streaming) navigation items.
-     *
-     * Live-streaming content: Streams, Created Channels and Radio Stations.
-     * VOD (Movies/Series) moved to _vod(); Bouquets/Suppliers/Recordings/TV Guide
-     * moved to _distribution(). Labelled "Streaming"; the key stays 'content'.
-     *
-     * @return void
-     */
-    private static function _content(): void {
-        NavbarRegistry::add((new NavbarItem('content'))
-            ->url('#')->label('', 'Streaming')
-            ->icon('fas fa-play')->order(400));
+		// Streams
+		NavbarRegistry::add((new NavbarItem('content.streams'))
+			->parent('content')->url('#')
+			->label('streams')->permissions(['add_stream', 'streams'])->order(10));
+		NavbarRegistry::add((new NavbarItem('content.streams.add'))
+			->parent('content.streams')->url('stream')
+			->label('add_stream')->permissions(['add_stream'])->order(10));
+		NavbarRegistry::add((new NavbarItem('content.streams.import'))
+			->parent('content.streams')->url('stream?import=1')
+			->label('import_multiple_stream')->permissions(['import_streams'])->order(20));
+		NavbarRegistry::add((new NavbarItem('content.streams.import_review'))
+			->parent('content.streams')->url('review?type=1')
+			->label('import_review_stream')->permissions(['import_streams'])->order(30));
+		NavbarRegistry::add((new NavbarItem('content.streams.manage'))
+			->parent('content.streams')->url('streams')
+			->label('manage_streams')->permissions(['streams'])->order(40));
+		NavbarRegistry::add((new NavbarItem('content.streams.mass'))
+			->parent('content.streams')->url('stream_mass')
+			->label('mass_edit_streams')->permissions(['mass_edit_streams'])->order(50));
 
-        // Streams
-        NavbarRegistry::add((new NavbarItem('content.streams'))
-            ->parent('content')->url('#')
-            ->label('streams')->permissions(['add_stream', 'streams'])->order(10));
-        NavbarRegistry::add((new NavbarItem('content.streams.add'))
-            ->parent('content.streams')->url('stream')
-            ->label('add_stream')->permissions(['add_stream'])->order(10));
-        NavbarRegistry::add((new NavbarItem('content.streams.import'))
-            ->parent('content.streams')->url('stream?import=1')
-            ->label('import_multiple_stream')->permissions(['import_streams'])->order(20));
-        NavbarRegistry::add((new NavbarItem('content.streams.import_review'))
-            ->parent('content.streams')->url('review?type=1')
-            ->label('import_review_stream')->permissions(['import_streams'])->order(30));
-        NavbarRegistry::add((new NavbarItem('content.streams.manage'))
-            ->parent('content.streams')->url('streams')
-            ->label('manage_streams')->permissions(['streams'])->order(40));
-        NavbarRegistry::add((new NavbarItem('content.streams.mass'))
-            ->parent('content.streams')->url('stream_mass')
-            ->label('mass_edit_streams')->permissions(['mass_edit_streams'])->order(50));
+		// Created channels
+		NavbarRegistry::add((new NavbarItem('content.channels'))
+			->parent('content')->url('#')
+			->label('created_channels')->permissions(['create_channel', 'streams'])->order(20));
+		NavbarRegistry::add((new NavbarItem('content.channels.add'))
+			->parent('content.channels')->url('created_channel')
+			->label('create_channel')->permissions(['create_channel'])->order(10));
+		NavbarRegistry::add((new NavbarItem('content.channels.manage'))
+			->parent('content.channels')->url('created_channels')
+			->label('manage_created_channels')->permissions(['streams'])->order(20));
+		NavbarRegistry::add((new NavbarItem('content.channels.mass'))
+			->parent('content.channels')->url('created_channel_mass')
+			->label('mass_edit_created_channels')->permissions(['streams'])->order(30));
 
-        // Created channels
-        NavbarRegistry::add((new NavbarItem('content.channels'))
-            ->parent('content')->url('#')
-            ->label('created_channels')->permissions(['create_channel', 'streams'])->order(20));
-        NavbarRegistry::add((new NavbarItem('content.channels.add'))
-            ->parent('content.channels')->url('created_channel')
-            ->label('create_channel')->permissions(['create_channel'])->order(10));
-        NavbarRegistry::add((new NavbarItem('content.channels.manage'))
-            ->parent('content.channels')->url('created_channels')
-            ->label('manage_created_channels')->permissions(['streams'])->order(20));
-        NavbarRegistry::add((new NavbarItem('content.channels.mass'))
-            ->parent('content.channels')->url('created_channel_mass')
-            ->label('mass_edit_created_channels')->permissions(['streams'])->order(30));
+		// Radio stations
+		NavbarRegistry::add((new NavbarItem('content.stations'))
+			->parent('content')->url('#')
+			->label('stations')->permissions(['add_radio', 'radio'])->order(30));
+		NavbarRegistry::add((new NavbarItem('content.stations.add'))
+			->parent('content.stations')->url('radio')
+			->label('add_station')->permissions(['add_radio'])->order(10));
+		NavbarRegistry::add((new NavbarItem('content.stations.manage'))
+			->parent('content.stations')->url('radios')
+			->label('manage_stations')->permissions(['radio'])->order(20));
+		NavbarRegistry::add((new NavbarItem('content.stations.mass'))
+			->parent('content.stations')->url('radio_mass')
+			->label('mass_edit_stations')->permissions(['mass_edit_radio'])->order(30));
+	}
 
-        // Radio stations
-        NavbarRegistry::add((new NavbarItem('content.stations'))
-            ->parent('content')->url('#')
-            ->label('stations')->permissions(['add_radio', 'radio'])->order(30));
-        NavbarRegistry::add((new NavbarItem('content.stations.add'))
-            ->parent('content.stations')->url('radio')
-            ->label('add_station')->permissions(['add_radio'])->order(10));
-        NavbarRegistry::add((new NavbarItem('content.stations.manage'))
-            ->parent('content.stations')->url('radios')
-            ->label('manage_stations')->permissions(['radio'])->order(20));
-        NavbarRegistry::add((new NavbarItem('content.stations.mass'))
-            ->parent('content.stations')->url('radio_mass')
-            ->label('mass_edit_stations')->permissions(['mass_edit_radio'])->order(30));
-    }
+	// ── VOD (Movies / Series) ─────────────────────────────────────
 
-    // ── VOD (Movies / Series) ─────────────────────────────────────
+	/**
+	 * Register VOD navigation items (top-level tab, order 410).
+	 *
+	 * On-demand catalogue split out of Content: Movies and Series with their
+	 * add/import/manage/mass operations. Each leaf keeps its original
+	 * url/permissions/label; only the parent key changed (content.* → vod.*).
+	 *
+	 * @return void
+	 */
+	private static function _vod(): void {
+		NavbarRegistry::add((new NavbarItem('vod'))
+			->url('#')->label('', 'VOD')
+			->icon('fas fa-film')->order(410));
 
-    /**
-     * Register VOD navigation items (top-level tab, order 410).
-     *
-     * On-demand catalogue split out of Content: Movies and Series with their
-     * add/import/manage/mass operations. Each leaf keeps its original
-     * url/permissions/label; only the parent key changed (content.* → vod.*).
-     *
-     * @return void
-     */
-    private static function _vod(): void {
-        NavbarRegistry::add((new NavbarItem('vod'))
-            ->url('#')->label('', 'VOD')
-            ->icon('fas fa-film')->order(410));
+		// Movies
+		NavbarRegistry::add((new NavbarItem('vod.movies'))
+			->parent('vod')->url('#')
+			->label('movies')->permissions(['add_movie', 'import_movies', 'movies'])->order(10));
+		NavbarRegistry::add((new NavbarItem('vod.movies.add'))
+			->parent('vod.movies')->url('movie')
+			->label('add_movie')->permissions(['add_movie'])->order(10));
+		NavbarRegistry::add((new NavbarItem('vod.movies.import'))
+			->parent('vod.movies')->url('movie?import=1')
+			->label('import_multiple_movies')->permissions(['import_movies'])->order(20));
+		NavbarRegistry::add((new NavbarItem('vod.movies.import_review'))
+			->parent('vod.movies')->url('review?type=2')
+			->label('import_review_movies')->permissions(['import_movies'])->order(30));
+		NavbarRegistry::add((new NavbarItem('vod.movies.manage'))
+			->parent('vod.movies')->url('movies')
+			->label('manage_movies')->permissions(['movies'])->order(40));
+		NavbarRegistry::add((new NavbarItem('vod.movies.mass'))
+			->parent('vod.movies')->url('movie_mass')
+			->label('mass_edit_movies')->permissions(['mass_sedits_vod'])->order(50));
 
-        // Movies
-        NavbarRegistry::add((new NavbarItem('vod.movies'))
-            ->parent('vod')->url('#')
-            ->label('movies')->permissions(['add_movie', 'import_movies', 'movies'])->order(10));
-        NavbarRegistry::add((new NavbarItem('vod.movies.add'))
-            ->parent('vod.movies')->url('movie')
-            ->label('add_movie')->permissions(['add_movie'])->order(10));
-        NavbarRegistry::add((new NavbarItem('vod.movies.import'))
-            ->parent('vod.movies')->url('movie?import=1')
-            ->label('import_multiple_movies')->permissions(['import_movies'])->order(20));
-        NavbarRegistry::add((new NavbarItem('vod.movies.import_review'))
-            ->parent('vod.movies')->url('review?type=2')
-            ->label('import_review_movies')->permissions(['import_movies'])->order(30));
-        NavbarRegistry::add((new NavbarItem('vod.movies.manage'))
-            ->parent('vod.movies')->url('movies')
-            ->label('manage_movies')->permissions(['movies'])->order(40));
-        NavbarRegistry::add((new NavbarItem('vod.movies.mass'))
-            ->parent('vod.movies')->url('movie_mass')
-            ->label('mass_edit_movies')->permissions(['mass_sedits_vod'])->order(50));
+		// Series
+		NavbarRegistry::add((new NavbarItem('vod.series'))
+			->parent('vod')->url('#')
+			->label('series')->permissions(['add_series', 'series', 'episodes'])->order(20));
+		NavbarRegistry::add((new NavbarItem('vod.series.add'))
+			->parent('vod.series')->url('serie')
+			->label('add_series')->permissions(['add_series'])->order(10));
+		NavbarRegistry::add((new NavbarItem('vod.series.manage'))
+			->parent('vod.series')->url('series')
+			->label('manage_series')->permissions(['series'])->order(20));
+		NavbarRegistry::add((new NavbarItem('vod.series.episodes'))
+			->parent('vod.series')->url('episodes')
+			->label('manage_episodes')->permissions(['episodes'])->order(30));
+		NavbarRegistry::add((new NavbarItem('vod.series.mass'))
+			->parent('vod.series')->url('series_mass')
+			->label('', 'Mass Edit Series')->permissions(['mass_sedits'])->order(40));
+		NavbarRegistry::add((new NavbarItem('vod.series.episodes_mass'))
+			->parent('vod.series')->url('episodes_mass')
+			->label('', 'Mass Edit Episodes')->permissions(['mass_sedits'])->order(50));
+	}
 
-        // Series
-        NavbarRegistry::add((new NavbarItem('vod.series'))
-            ->parent('vod')->url('#')
-            ->label('series')->permissions(['add_series', 'series', 'episodes'])->order(20));
-        NavbarRegistry::add((new NavbarItem('vod.series.add'))
-            ->parent('vod.series')->url('serie')
-            ->label('add_series')->permissions(['add_series'])->order(10));
-        NavbarRegistry::add((new NavbarItem('vod.series.manage'))
-            ->parent('vod.series')->url('series')
-            ->label('manage_series')->permissions(['series'])->order(20));
-        NavbarRegistry::add((new NavbarItem('vod.series.episodes'))
-            ->parent('vod.series')->url('episodes')
-            ->label('manage_episodes')->permissions(['episodes'])->order(30));
-        NavbarRegistry::add((new NavbarItem('vod.series.mass'))
-            ->parent('vod.series')->url('series_mass')
-            ->label('', 'Mass Edit Series')->permissions(['mass_sedits'])->order(40));
-        NavbarRegistry::add((new NavbarItem('vod.series.episodes_mass'))
-            ->parent('vod.series')->url('episodes_mass')
-            ->label('', 'Mass Edit Episodes')->permissions(['mass_sedits'])->order(50));
-    }
+	// ── Distribution (Bouquets / Suppliers / Recordings / Guide) ──
 
-    // ── Distribution (Bouquets / Suppliers / Recordings / Guide) ──
+	/**
+	 * Register Distribution navigation items (top-level tab, order 420).
+	 *
+	 * Content organisation & delivery split out of Content: Bouquets, Suppliers,
+	 * Recordings and TV Guide. Each leaf keeps its original url/permissions/label;
+	 * only the parent key changed (content.* → distribution.*).
+	 *
+	 * @return void
+	 */
+	private static function _distribution(): void {
+		NavbarRegistry::add((new NavbarItem('distribution'))
+			->url('#')->label('', 'Distribution')
+			->icon('fas fa-sitemap')->order(420));
 
-    /**
-     * Register Distribution navigation items (top-level tab, order 420).
-     *
-     * Content organisation & delivery split out of Content: Bouquets, Suppliers,
-     * Recordings and TV Guide. Each leaf keeps its original url/permissions/label;
-     * only the parent key changed (content.* → distribution.*).
-     *
-     * @return void
-     */
-    private static function _distribution(): void {
-        NavbarRegistry::add((new NavbarItem('distribution'))
-            ->url('#')->label('', 'Distribution')
-            ->icon('fas fa-sitemap')->order(420));
+		// Bouquets
+		NavbarRegistry::add((new NavbarItem('distribution.bouquets'))
+			->parent('distribution')->url('#')
+			->label('bouquets')->permissions(['add_bouquet', 'bouquets', 'bouquet_order'])->order(10));
+		NavbarRegistry::add((new NavbarItem('distribution.bouquets.add'))
+			->parent('distribution.bouquets')->url('bouquet')
+			->label('add_bouquet')->permissions(['add_bouquet'])->order(10));
+		NavbarRegistry::add((new NavbarItem('distribution.bouquets.manage'))
+			->parent('distribution.bouquets')->url('bouquets')
+			->label('manage_bouquets')->permissions(['bouquets'])->order(20));
+		NavbarRegistry::add((new NavbarItem('distribution.bouquets.order'))
+			->parent('distribution.bouquets')->url('bouquet_order')
+			->label('bouquet_order')->permissions(['bouquet_order'])
+			->desktopOnly()->order(30));
 
-        // Bouquets
-        NavbarRegistry::add((new NavbarItem('distribution.bouquets'))
-            ->parent('distribution')->url('#')
-            ->label('bouquets')->permissions(['add_bouquet', 'bouquets', 'bouquet_order'])->order(10));
-        NavbarRegistry::add((new NavbarItem('distribution.bouquets.add'))
-            ->parent('distribution.bouquets')->url('bouquet')
-            ->label('add_bouquet')->permissions(['add_bouquet'])->order(10));
-        NavbarRegistry::add((new NavbarItem('distribution.bouquets.manage'))
-            ->parent('distribution.bouquets')->url('bouquets')
-            ->label('manage_bouquets')->permissions(['bouquets'])->order(20));
-        NavbarRegistry::add((new NavbarItem('distribution.bouquets.order'))
-            ->parent('distribution.bouquets')->url('bouquet_order')
-            ->label('bouquet_order')->permissions(['bouquet_order'])
-            ->desktopOnly()->order(30));
+		// Suppliers
+		NavbarRegistry::add((new NavbarItem('distribution.suppliers'))
+			->parent('distribution')->url('#')
+			->label('suppliers')->permissions(['streams'])->order(20));
+		NavbarRegistry::add((new NavbarItem('distribution.suppliers.add'))
+			->parent('distribution.suppliers')->url('provider')
+			->label('add_providers')->permissions(['streams'])->order(10));
+		NavbarRegistry::add((new NavbarItem('distribution.suppliers.manage'))
+			->parent('distribution.suppliers')->url('providers')
+			->label('stream_providers')->permissions(['streams'])->order(20));
 
-        // Suppliers
-        NavbarRegistry::add((new NavbarItem('distribution.suppliers'))
-            ->parent('distribution')->url('#')
-            ->label('suppliers')->permissions(['streams'])->order(20));
-        NavbarRegistry::add((new NavbarItem('distribution.suppliers.add'))
-            ->parent('distribution.suppliers')->url('provider')
-            ->label('add_providers')->permissions(['streams'])->order(10));
-        NavbarRegistry::add((new NavbarItem('distribution.suppliers.manage'))
-            ->parent('distribution.suppliers')->url('providers')
-            ->label('stream_providers')->permissions(['streams'])->order(20));
+		// Recordings
+		NavbarRegistry::add((new NavbarItem('distribution.recordings'))
+			->parent('distribution')->url('archive')
+			->label('recordings')->permissions(['movies'])->order(30));
 
-        // Recordings
-        NavbarRegistry::add((new NavbarItem('distribution.recordings'))
-            ->parent('distribution')->url('archive')
-            ->label('recordings')->permissions(['movies'])->order(30));
+		// TV Guide
+		NavbarRegistry::add((new NavbarItem('distribution.tv_guide'))
+			->parent('distribution')->url('epg_view')
+			->label('tv_guide')->permissions(['streams'])
+			->desktopOnly()->order(40));
+	}
 
-        // TV Guide
-        NavbarRegistry::add((new NavbarItem('distribution.tv_guide'))
-            ->parent('distribution')->url('epg_view')
-            ->label('tv_guide')->permissions(['streams'])
-            ->desktopOnly()->order(40));
-    }
+	// ── Logs ──────────────────────────────────────────────────────
 
-    // ── Logs ──────────────────────────────────────────────────────
+	/**
+	 * Register Logs navigation items.
+	 *
+	 * Promoted to its own top-level tab (formerly the 'management.logs'
+	 * megamenu). The ~16 log screens are grouped into four submenus —
+	 * Connections, Streams, System, Users — for scannability. Each leaf keeps
+	 * its original url/permissions/label; only the parent key changed.
+	 *
+	 * Modules inject extra log screens under 'logs' (or one of its subgroups)
+	 * at order 500+.
+	 *
+	 * @return void
+	 */
+	private static function _logs(): void {
+		NavbarRegistry::add((new NavbarItem('logs'))
+			->url('#')->label('logs')
+			->icon('fas fa-clipboard-list')
+			->permissions(['movies', 'streams', 'connection_logs', 'client_request_log', 'login_logs', 'panel_logs', 'credits_log', 'live_connections', 'manage_events', 'reg_userlog', 'stream_errors', 'restream_logs', 'episodes', 'series'])
+			->order(500));
 
-    /**
-     * Register Logs navigation items.
-     *
-     * Promoted to its own top-level tab (formerly the 'management.logs'
-     * megamenu). The ~16 log screens are grouped into four submenus —
-     * Connections, Streams, System, Users — for scannability. Each leaf keeps
-     * its original url/permissions/label; only the parent key changed.
-     *
-     * Modules inject extra log screens under 'logs' (or one of its subgroups)
-     * at order 500+.
-     *
-     * @return void
-     */
-    private static function _logs(): void {
-        NavbarRegistry::add((new NavbarItem('logs'))
-            ->url('#')->label('logs')
-            ->icon('fas fa-clipboard-list')
-            ->permissions(['movies', 'streams', 'connection_logs', 'client_request_log', 'login_logs', 'panel_logs', 'credits_log', 'live_connections', 'manage_events', 'reg_userlog', 'stream_errors', 'restream_logs', 'episodes', 'series'])
-            ->order(500));
+		// Connections
+		NavbarRegistry::add((new NavbarItem('logs.connections'))
+			->parent('logs')->url('#')
+			->label('logs_group_connections')->permissions(['connection_logs', 'live_connections', 'client_request_log'])->order(10));
+		NavbarRegistry::add((new NavbarItem('logs.connections.activity'))
+			->parent('logs.connections')->url('line_activity')
+			->label('activity_logs')->permissions(['connection_logs'])->order(10));
+		NavbarRegistry::add((new NavbarItem('logs.connections.live'))
+			->parent('logs.connections')->url('live_connections')
+			->label('live_connections')->permissions(['live_connections'])->order(20));
+		NavbarRegistry::add((new NavbarItem('logs.connections.line_ips'))
+			->parent('logs.connections')->url('line_ips')
+			->label('ips_per_line')->permissions(['connection_logs'])->order(30));
+		NavbarRegistry::add((new NavbarItem('logs.connections.client'))
+			->parent('logs.connections')->url('client_logs')
+			->label('client_logs')->permissions(['client_request_log'])->order(40));
 
-        // Connections
-        NavbarRegistry::add((new NavbarItem('logs.connections'))
-            ->parent('logs')->url('#')
-            ->label('logs_group_connections')->permissions(['connection_logs', 'live_connections', 'client_request_log'])->order(10));
-        NavbarRegistry::add((new NavbarItem('logs.connections.activity'))
-            ->parent('logs.connections')->url('line_activity')
-            ->label('activity_logs')->permissions(['connection_logs'])->order(10));
-        NavbarRegistry::add((new NavbarItem('logs.connections.live'))
-            ->parent('logs.connections')->url('live_connections')
-            ->label('live_connections')->permissions(['live_connections'])->order(20));
-        NavbarRegistry::add((new NavbarItem('logs.connections.line_ips'))
-            ->parent('logs.connections')->url('line_ips')
-            ->label('ips_per_line')->permissions(['connection_logs'])->order(30));
-        NavbarRegistry::add((new NavbarItem('logs.connections.client'))
-            ->parent('logs.connections')->url('client_logs')
-            ->label('client_logs')->permissions(['client_request_log'])->order(40));
+		// Streams
+		NavbarRegistry::add((new NavbarItem('logs.streams'))
+			->parent('logs')->url('#')
+			->label('logs_group_streams')->permissions(['stream_errors', 'streams', 'restream_logs'])->order(20));
+		NavbarRegistry::add((new NavbarItem('logs.streams.errors'))
+			->parent('logs.streams')->url('stream_errors')
+			->label('stream_errors')->permissions(['stream_errors'])->order(10));
+		NavbarRegistry::add((new NavbarItem('logs.streams.rank'))
+			->parent('logs.streams')->url('stream_rank')
+			->label('', 'Stream Rank')->permissions(['streams'])->order(20));
+		NavbarRegistry::add((new NavbarItem('logs.streams.ondemand'))
+			->parent('logs.streams')->url('ondemand')
+			->label('', 'On-Demand Scanner')->permissions(['streams'])->order(30));
+		NavbarRegistry::add((new NavbarItem('logs.streams.restream'))
+			->parent('logs.streams')->url('restream_logs')
+			->label('', 'Restream Detection')->permissions(['restream_logs'])->order(40));
 
-        // Streams
-        NavbarRegistry::add((new NavbarItem('logs.streams'))
-            ->parent('logs')->url('#')
-            ->label('logs_group_streams')->permissions(['stream_errors', 'streams', 'restream_logs'])->order(20));
-        NavbarRegistry::add((new NavbarItem('logs.streams.errors'))
-            ->parent('logs.streams')->url('stream_errors')
-            ->label('stream_errors')->permissions(['stream_errors'])->order(10));
-        NavbarRegistry::add((new NavbarItem('logs.streams.rank'))
-            ->parent('logs.streams')->url('stream_rank')
-            ->label('', 'Stream Rank')->permissions(['streams'])->order(20));
-        NavbarRegistry::add((new NavbarItem('logs.streams.ondemand'))
-            ->parent('logs.streams')->url('ondemand')
-            ->label('', 'On-Demand Scanner')->permissions(['streams'])->order(30));
-        NavbarRegistry::add((new NavbarItem('logs.streams.restream'))
-            ->parent('logs.streams')->url('restream_logs')
-            ->label('', 'Restream Detection')->permissions(['restream_logs'])->order(40));
+		// System
+		NavbarRegistry::add((new NavbarItem('logs.system'))
+			->parent('logs')->url('#')
+			->label('logs_group_system')->permissions(['panel_logs', 'login_logs', 'streams', 'episodes', 'series'])->order(30));
+		NavbarRegistry::add((new NavbarItem('logs.system.panel'))
+			->parent('logs.system')->url('panel_logs')
+			->label('', 'Panel Errors')->permissions(['panel_logs'])->order(10));
+		NavbarRegistry::add((new NavbarItem('logs.system.syslog'))
+			->parent('logs.system')->url('mysql_syslog')
+			->label('', 'System Logs')->permissions(['panel_logs'])->order(20));
+		NavbarRegistry::add((new NavbarItem('logs.system.login'))
+			->parent('logs.system')->url('login_logs')
+			->label('', 'Login Logs')->permissions(['login_logs'])->order(30));
+		NavbarRegistry::add((new NavbarItem('logs.system.queue'))
+			->parent('logs.system')->url('queue')
+			->label('', 'Encoding Queue')->permissions(['streams', 'episodes', 'series'])->order(40));
 
-        // System
-        NavbarRegistry::add((new NavbarItem('logs.system'))
-            ->parent('logs')->url('#')
-            ->label('logs_group_system')->permissions(['panel_logs', 'login_logs', 'streams', 'episodes', 'series'])->order(30));
-        NavbarRegistry::add((new NavbarItem('logs.system.panel'))
-            ->parent('logs.system')->url('panel_logs')
-            ->label('', 'Panel Errors')->permissions(['panel_logs'])->order(10));
-        NavbarRegistry::add((new NavbarItem('logs.system.syslog'))
-            ->parent('logs.system')->url('mysql_syslog')
-            ->label('', 'System Logs')->permissions(['panel_logs'])->order(20));
-        NavbarRegistry::add((new NavbarItem('logs.system.login'))
-            ->parent('logs.system')->url('login_logs')
-            ->label('', 'Login Logs')->permissions(['login_logs'])->order(30));
-        NavbarRegistry::add((new NavbarItem('logs.system.queue'))
-            ->parent('logs.system')->url('queue')
-            ->label('', 'Encoding Queue')->permissions(['streams', 'episodes', 'series'])->order(40));
+		// Users
+		NavbarRegistry::add((new NavbarItem('logs.users'))
+			->parent('logs')->url('#')
+			->label('logs_group_users')->permissions(['reg_userlog', 'credits_log', 'manage_events', 'movies'])->order(40));
+		NavbarRegistry::add((new NavbarItem('logs.users.reseller'))
+			->parent('logs.users')->url('user_logs')
+			->label('reseller_logs')->permissions(['reg_userlog'])->order(10));
+		NavbarRegistry::add((new NavbarItem('logs.users.credit'))
+			->parent('logs.users')->url('credit_logs')
+			->label('credit_logs')->permissions(['credits_log'])->order(20));
+		NavbarRegistry::add((new NavbarItem('logs.users.mag_events'))
+			->parent('logs.users')->url('mag_events')
+			->label('mag_event_logs')->permissions(['manage_events'])->order(30));
+		NavbarRegistry::add((new NavbarItem('logs.users.vod_theft'))
+			->parent('logs.users')->url('theft_detection')
+			->label('', 'VOD Theft Detection')->permissions(['movies'])->order(40));
+	}
 
-        // Users
-        NavbarRegistry::add((new NavbarItem('logs.users'))
-            ->parent('logs')->url('#')
-            ->label('logs_group_users')->permissions(['reg_userlog', 'credits_log', 'manage_events', 'movies'])->order(40));
-        NavbarRegistry::add((new NavbarItem('logs.users.reseller'))
-            ->parent('logs.users')->url('user_logs')
-            ->label('reseller_logs')->permissions(['reg_userlog'])->order(10));
-        NavbarRegistry::add((new NavbarItem('logs.users.credit'))
-            ->parent('logs.users')->url('credit_logs')
-            ->label('credit_logs')->permissions(['credits_log'])->order(20));
-        NavbarRegistry::add((new NavbarItem('logs.users.mag_events'))
-            ->parent('logs.users')->url('mag_events')
-            ->label('mag_event_logs')->permissions(['manage_events'])->order(30));
-        NavbarRegistry::add((new NavbarItem('logs.users.vod_theft'))
-            ->parent('logs.users')->url('theft_detection')
-            ->label('', 'VOD Theft Detection')->permissions(['movies'])->order(40));
-    }
+	// ── Management ────────────────────────────────────────────────
 
-    // ── Management ────────────────────────────────────────────────
+	/**
+	 * Register Management navigation items (labelled "System").
+	 *
+	 * Adds system management structure including Service Setup, Access Codes,
+	 * Security, Tools, and Tickets. Logs live in their own top-level tab now
+	 * (see _logs()).
+	 *
+	 * @return void
+	 */
+	private static function _management(): void {
+		// The former "System" group is flattened: its sections (Service Setup,
+		// Access Codes, Security, Tools, Tickets) are now self-standing top-level
+		// items. The registry KEYS stay 'management.*' so the reserved child slots
+		// (management.service_setup 60+, etc.) and every child ->parent() keep working.
 
-    /**
-     * Register Management navigation items (labelled "System").
-     *
-     * Adds system management structure including Service Setup, Access Codes,
-     * Security, Tools, and Tickets. Logs live in their own top-level tab now
-     * (see _logs()).
-     *
-     * @return void
-     */
-    private static function _management(): void {
-        // The former "System" group is flattened: its sections (Service Setup,
-        // Access Codes, Security, Tools, Tickets) are now self-standing top-level
-        // items. The registry KEYS stay 'management.*' so the reserved child slots
-        // (management.service_setup 60+, etc.) and every child ->parent() keep working.
+		// Service setup
+		NavbarRegistry::add((new NavbarItem('management.service_setup'))
+			->url('#')->icon('fas fa-cog')
+			->label('service_setup')->permissions(['mng_packages', 'categories', 'mng_groups', 'epg', 'tprofiles', 'folder_watch'])->order(600));
+		NavbarRegistry::add((new NavbarItem('management.service_setup.packages'))
+			->parent('management.service_setup')->url('packages')
+			->label('packages')->permissions(['mng_packages'])->order(10));
+		NavbarRegistry::add((new NavbarItem('management.service_setup.categories'))
+			->parent('management.service_setup')->url('stream_categories')
+			->label('categories')->permissions(['categories'])->order(20));
+		NavbarRegistry::add((new NavbarItem('management.service_setup.groups'))
+			->parent('management.service_setup')->url('groups')
+			->label('groups')->permissions(['mng_groups'])->order(30));
+		NavbarRegistry::add((new NavbarItem('management.service_setup.epg'))
+			->parent('management.service_setup')->url('epgs')
+			->label('epgs')->permissions(['epg'])->order(40));
+		NavbarRegistry::add((new NavbarItem('management.service_setup.profiles'))
+			->parent('management.service_setup')->url('profiles')
+			->label('transcode_profiles')->permissions(['tprofiles'])->order(50));
+		// Modules inject at order 60+
 
-        // Service setup
-        NavbarRegistry::add((new NavbarItem('management.service_setup'))
-            ->url('#')->icon('fas fa-cog')
-            ->label('service_setup')->permissions(['mng_packages', 'categories', 'mng_groups', 'epg', 'tprofiles', 'folder_watch'])->order(600));
-        NavbarRegistry::add((new NavbarItem('management.service_setup.packages'))
-            ->parent('management.service_setup')->url('packages')
-            ->label('packages')->permissions(['mng_packages'])->order(10));
-        NavbarRegistry::add((new NavbarItem('management.service_setup.categories'))
-            ->parent('management.service_setup')->url('stream_categories')
-            ->label('categories')->permissions(['categories'])->order(20));
-        NavbarRegistry::add((new NavbarItem('management.service_setup.groups'))
-            ->parent('management.service_setup')->url('groups')
-            ->label('groups')->permissions(['mng_groups'])->order(30));
-        NavbarRegistry::add((new NavbarItem('management.service_setup.epg'))
-            ->parent('management.service_setup')->url('epgs')
-            ->label('epgs')->permissions(['epg'])->order(40));
-        NavbarRegistry::add((new NavbarItem('management.service_setup.profiles'))
-            ->parent('management.service_setup')->url('profiles')
-            ->label('transcode_profiles')->permissions(['tprofiles'])->order(50));
-        // Modules inject at order 60+
+		// Access codes
+		NavbarRegistry::add((new NavbarItem('management.access_codes'))
+			->url('#')->icon('fas fa-key')
+			->label('', 'Access Codes')->permissions(['add_code'])->order(610));
+		NavbarRegistry::add((new NavbarItem('management.access_codes.add'))
+			->parent('management.access_codes')->url('code')
+			->label('add_access_codes')->permissions(['add_code'])->order(10));
+		NavbarRegistry::add((new NavbarItem('management.access_codes.manage'))
+			->parent('management.access_codes')->url('codes')
+			->label('menage_access_codes')->permissions(['add_code'])->order(20));
 
-        // Access codes
-        NavbarRegistry::add((new NavbarItem('management.access_codes'))
-            ->url('#')->icon('fas fa-key')
-            ->label('', 'Access Codes')->permissions(['add_code'])->order(610));
-        NavbarRegistry::add((new NavbarItem('management.access_codes.add'))
-            ->parent('management.access_codes')->url('code')
-            ->label('add_access_codes')->permissions(['add_code'])->order(10));
-        NavbarRegistry::add((new NavbarItem('management.access_codes.manage'))
-            ->parent('management.access_codes')->url('codes')
-            ->label('menage_access_codes')->permissions(['add_code'])->order(20));
+		// Security
+		NavbarRegistry::add((new NavbarItem('management.security'))
+			->url('#')->icon('fas fa-shield-alt')
+			->label('', 'Security')->permissions(['block_asns', 'block_ips', 'block_isps', 'block_uas', 'add_hmac', 'rtmp', 'manage_mag'])->order(620));
+		NavbarRegistry::add((new NavbarItem('management.security.asns'))
+			->parent('management.security')->url('asns')
+			->label('blocked_asns')->permissions(['block_asns'])->order(10));
+		NavbarRegistry::add((new NavbarItem('management.security.ips'))
+			->parent('management.security')->url('ips')
+			->label('blocked_ips')->permissions(['block_ips'])->order(20));
+		NavbarRegistry::add((new NavbarItem('management.security.isps'))
+			->parent('management.security')->url('isps')
+			->label('blocked_isps')->permissions(['block_isps'])->order(30));
+		NavbarRegistry::add((new NavbarItem('management.security.uas'))
+			->parent('management.security')->url('useragents')
+			->label('blocked_uas')->permissions(['block_uas'])->order(40));
+		NavbarRegistry::add((new NavbarItem('management.security.hmac'))
+			->parent('management.security')->url('hmacs')
+			->label('hmac_keys')->permissions(['add_hmac'])->order(50));
+		NavbarRegistry::add((new NavbarItem('management.security.rtmp'))
+			->parent('management.security')->url('rtmp_ips')
+			->label('rtmp_ips')->permissions(['rtmp'])->order(60));
+		NavbarRegistry::add((new NavbarItem('management.security.magscan'))
+			->parent('management.security')->url('magscan_settings')
+			->label('magscan_settings')->permissions(['manage_mag'])->order(70));
 
-        // Security
-        NavbarRegistry::add((new NavbarItem('management.security'))
-            ->url('#')->icon('fas fa-shield-alt')
-            ->label('', 'Security')->permissions(['block_asns', 'block_ips', 'block_isps', 'block_uas', 'add_hmac', 'rtmp', 'manage_mag'])->order(620));
-        NavbarRegistry::add((new NavbarItem('management.security.asns'))
-            ->parent('management.security')->url('asns')
-            ->label('blocked_asns')->permissions(['block_asns'])->order(10));
-        NavbarRegistry::add((new NavbarItem('management.security.ips'))
-            ->parent('management.security')->url('ips')
-            ->label('blocked_ips')->permissions(['block_ips'])->order(20));
-        NavbarRegistry::add((new NavbarItem('management.security.isps'))
-            ->parent('management.security')->url('isps')
-            ->label('blocked_isps')->permissions(['block_isps'])->order(30));
-        NavbarRegistry::add((new NavbarItem('management.security.uas'))
-            ->parent('management.security')->url('useragents')
-            ->label('blocked_uas')->permissions(['block_uas'])->order(40));
-        NavbarRegistry::add((new NavbarItem('management.security.hmac'))
-            ->parent('management.security')->url('hmacs')
-            ->label('hmac_keys')->permissions(['add_hmac'])->order(50));
-        NavbarRegistry::add((new NavbarItem('management.security.rtmp'))
-            ->parent('management.security')->url('rtmp_ips')
-            ->label('rtmp_ips')->permissions(['rtmp'])->order(60));
-        NavbarRegistry::add((new NavbarItem('management.security.magscan'))
-            ->parent('management.security')->url('magscan_settings')
-            ->label('magscan_settings')->permissions(['manage_mag'])->order(70));
+		NavbarRegistry::add((new NavbarItem('management.tools'))
+			->url('#')->icon('fas fa-wrench')
+			->label('tools')->permissions(['channel_order', 'fingerprint', 'mass_delete', 'quick_tools', 'rtmp', 'stream_tools'])->order(630));
+		NavbarRegistry::add((new NavbarItem('management.tools.channel_order'))
+			->parent('management.tools')->url('channel_order')
+			->label('channel_order')->permissions(['channel_order'])->desktopOnly()->order(10));
+		NavbarRegistry::add((new NavbarItem('management.tools.fingerprint'))
+			->parent('management.tools')->url('fingerprint')
+			->label('fingerprint')->permissions(['fingerprint'])->order(20));
+		NavbarRegistry::add((new NavbarItem('management.tools.mass_delete'))
+			->parent('management.tools')->url('mass_delete')
+			->label('mass_delete')->permissions(['mass_delete'])->order(30));
+		NavbarRegistry::add((new NavbarItem('management.tools.quick_tools'))
+			->parent('management.tools')->url('quick_tools')
+			->label('quick_tools')->permissions(['quick_tools'])->order(40));
+		NavbarRegistry::add((new NavbarItem('management.tools.rtmp_monitor'))
+			->parent('management.tools')->url('rtmp_monitor')
+			->label('', 'RTMP Monitor')->permissions(['rtmp'])->order(50));
+		NavbarRegistry::add((new NavbarItem('management.tools.stream_tools'))
+			->parent('management.tools')->url('stream_tools')
+			->label('stream_tools')->permissions(['stream_tools'])->order(60));
 
-        NavbarRegistry::add((new NavbarItem('management.tools'))
-            ->url('#')->icon('fas fa-wrench')
-            ->label('tools')->permissions(['channel_order', 'fingerprint', 'mass_delete', 'quick_tools', 'rtmp', 'stream_tools'])->order(630));
-        NavbarRegistry::add((new NavbarItem('management.tools.channel_order'))
-            ->parent('management.tools')->url('channel_order')
-            ->label('channel_order')->permissions(['channel_order'])->desktopOnly()->order(10));
-        NavbarRegistry::add((new NavbarItem('management.tools.fingerprint'))
-            ->parent('management.tools')->url('fingerprint')
-            ->label('fingerprint')->permissions(['fingerprint'])->order(20));
-        NavbarRegistry::add((new NavbarItem('management.tools.mass_delete'))
-            ->parent('management.tools')->url('mass_delete')
-            ->label('mass_delete')->permissions(['mass_delete'])->order(30));
-        NavbarRegistry::add((new NavbarItem('management.tools.quick_tools'))
-            ->parent('management.tools')->url('quick_tools')
-            ->label('quick_tools')->permissions(['quick_tools'])->order(40));
-        NavbarRegistry::add((new NavbarItem('management.tools.rtmp_monitor'))
-            ->parent('management.tools')->url('rtmp_monitor')
-            ->label('', 'RTMP Monitor')->permissions(['rtmp'])->order(50));
-        NavbarRegistry::add((new NavbarItem('management.tools.stream_tools'))
-            ->parent('management.tools')->url('stream_tools')
-            ->label('stream_tools')->permissions(['stream_tools'])->order(60));
+		// Logs moved to its own top-level tab — see _logs().
 
-        // Logs moved to its own top-level tab — see _logs().
+		NavbarRegistry::add((new NavbarItem('management.tickets'))
+			->url('tickets')->icon('fas fa-ticket-alt')
+			->label('tickets')->permissions(['manage_tickets'])
+			->settingDisabled('show_tickets')->order(640));
+	}
 
-        NavbarRegistry::add((new NavbarItem('management.tickets'))
-            ->url('tickets')->icon('fas fa-ticket-alt')
-            ->label('tickets')->permissions(['manage_tickets'])
-            ->settingDisabled('show_tickets')->order(640));
-    }
+	// ── Profile dropdown ──────────────────────────────────────────
 
-    // ── Profile dropdown ──────────────────────────────────────────
+	/**
+	 * Register the top-right user/profile dropdown items.
+	 *
+	 * These live under the reserved 'profile' parent key. There is
+	 * intentionally no top-level 'profile' NavbarItem, so these never leak
+	 * into the main navigation (NavbarRegistry::getTopLevel()); the admin
+	 * header renders them explicitly via NavbarRegistry::getChildren('profile').
+	 *
+	 * Modules inject their own entries (e.g. the plex/watch "settings" links
+	 * that used to be hard-coded in header.php) at order 100+, keeping logout
+	 * pinned to the bottom:
+	 *   NavbarRegistry::add((new NavbarItem('profile.watch_settings'))
+	 *       ->parent('profile')->url('settings_watch')
+	 *       ->label('watch_settings')->permissions(['folder_watch_settings'])->order(110));
+	 *
+	 * @return void
+	 */
+	private static function _profile(): void {
+		NavbarRegistry::add((new NavbarItem('profile.edit'))
+			->parent('profile')->url('edit_profile')
+			->label('user_profile')->order(10));
 
-    /**
-     * Register the top-right user/profile dropdown items.
-     *
-     * These live under the reserved 'profile' parent key. There is
-     * intentionally no top-level 'profile' NavbarItem, so these never leak
-     * into the main navigation (NavbarRegistry::getTopLevel()); the admin
-     * header renders them explicitly via NavbarRegistry::getChildren('profile').
-     *
-     * Modules inject their own entries (e.g. the plex/watch "settings" links
-     * that used to be hard-coded in header.php) at order 100+, keeping logout
-     * pinned to the bottom:
-     *   NavbarRegistry::add((new NavbarItem('profile.watch_settings'))
-     *       ->parent('profile')->url('settings_watch')
-     *       ->label('watch_settings')->permissions(['folder_watch_settings'])->order(110));
-     *
-     * @return void
-     */
-    private static function _profile(): void {
-        NavbarRegistry::add((new NavbarItem('profile.edit'))
-            ->parent('profile')->url('edit_profile')
-            ->label('user_profile')->order(10));
+		NavbarRegistry::add((new NavbarItem('profile.settings'))
+			->parent('profile')->url('settings')
+			->label('general_settings')->permissions(['settings'])->order(20));
 
-        NavbarRegistry::add((new NavbarItem('profile.settings'))
-            ->parent('profile')->url('settings')
-            ->label('general_settings')->permissions(['settings'])->order(20));
+		NavbarRegistry::add((new NavbarItem('profile.backups'))
+			->parent('profile')->url('backups')
+			->label('backup_settings')->permissions(['database'])->order(30));
 
-        NavbarRegistry::add((new NavbarItem('profile.backups'))
-            ->parent('profile')->url('backups')
-            ->label('backup_settings')->permissions(['database'])->order(30));
+		NavbarRegistry::add((new NavbarItem('profile.cache'))
+			->parent('profile')->url('cache')
+			->label('cache_redis')->permissions(['database'])->order(40));
 
-        NavbarRegistry::add((new NavbarItem('profile.cache'))
-            ->parent('profile')->url('cache')
-            ->label('cache_redis')->permissions(['database'])->order(40));
+		NavbarRegistry::add((new NavbarItem('profile.modules'))
+			->parent('profile')->url('modules')
+			->label('', 'Modules')->permissions(['settings'])->order(50));
 
-        NavbarRegistry::add((new NavbarItem('profile.modules'))
-            ->parent('profile')->url('modules')
-            ->label('', 'Modules')->permissions(['settings'])->order(50));
+		// Reserved slot 100–980 for module-provided profile links.
 
-        // Reserved slot 100–980 for module-provided profile links.
+		NavbarRegistry::add((new NavbarItem('profile.logout_divider'))
+			->parent('profile')->makeDivider()->order(990));
 
-        NavbarRegistry::add((new NavbarItem('profile.logout_divider'))
-            ->parent('profile')->makeDivider()->order(990));
-
-        NavbarRegistry::add((new NavbarItem('profile.logout'))
-            ->parent('profile')->url('logout')
-            ->label('logout')->order(1000));
-    }
+		NavbarRegistry::add((new NavbarItem('profile.logout'))
+			->parent('profile')->url('logout')
+			->label('logout')->order(1000));
+	}
 }
diff --git a/src/Core/Module/MigratableInterface.php b/src/Core/Module/MigratableInterface.php
index c44248d6..b22b0ed0 100644
--- a/src/Core/Module/MigratableInterface.php
+++ b/src/Core/Module/MigratableInterface.php
@@ -30,14 +30,14 @@ use XcVm\Core\Container\ServiceContainer;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface MigratableInterface {
-    /**
-     * Return module migrations keyed by target version string.
-     *
-     * Keys are semver strings (e.g. "1.1.0"). Values are callables
-     * that perform the schema or data change for that version step.
-     * Each callable receives the ServiceContainer — use it to access db, settings, etc.
-     *
-     * @return array<string, callable(ServiceContainer): void>
-     */
-    public function getMigrations(): array;
+	/**
+	 * Return module migrations keyed by target version string.
+	 *
+	 * Keys are semver strings (e.g. "1.1.0"). Values are callables
+	 * that perform the schema or data change for that version step.
+	 * Each callable receives the ServiceContainer — use it to access db, settings, etc.
+	 *
+	 * @return array<string, callable(ServiceContainer): void>
+	 */
+	public function getMigrations(): array;
 }
diff --git a/src/Core/Module/ModuleInterface.php b/src/Core/Module/ModuleInterface.php
index 66da3dc5..0a987e0b 100644
--- a/src/Core/Module/ModuleInterface.php
+++ b/src/Core/Module/ModuleInterface.php
@@ -42,32 +42,31 @@ use XcVm\Core\Module\Contract\ServiceProviderInterface;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface ModuleInterface extends
-    ServiceProviderInterface,
-    RouteProviderInterface,
-    CommandProviderInterface,
-    NavbarProviderInterface
-{
-    /**
-     * Unique module name — must match the directory name in modules/.
-     */
-    public function getName(): string;
+	ServiceProviderInterface,
+	RouteProviderInterface,
+	CommandProviderInterface,
+	NavbarProviderInterface {
+	/**
+	 * Unique module name — must match the directory name in modules/.
+	 */
+	public function getName(): string;
 
-    /**
-     * Module version (semver).
-     */
-    public function getVersion(): string;
+	/**
+	 * Module version (semver).
+	 */
+	public function getVersion(): string;
 
-    /**
-     * Run once when the module is enabled.
-     *
-     * Creates tables, seeds initial data.
-     */
-    public function install(): void;
+	/**
+	 * Run once when the module is enabled.
+	 *
+	 * Creates tables, seeds initial data.
+	 */
+	public function install(): void;
 
-    /**
-     * Run once when the module is disabled or removed.
-     *
-     * Drops tables, clears settings entries, removes cron records.
-     */
-    public function uninstall(): void;
+	/**
+	 * Run once when the module is disabled or removed.
+	 *
+	 * Drops tables, clears settings entries, removes cron records.
+	 */
+	public function uninstall(): void;
 }
diff --git a/src/Core/Module/ModuleLoader.php b/src/Core/Module/ModuleLoader.php
index 6ce499bf..c26d978e 100644
--- a/src/Core/Module/ModuleLoader.php
+++ b/src/Core/Module/ModuleLoader.php
@@ -49,973 +49,969 @@ use XcVm\Core\Module\Contract\TopbarProviderInterface;
  */
 
 class ModuleLoader {
-    /**
-     * Former modules whose functionality now ships in the core codebase.
-     *
-     * Released module archives may still declare them in `dependencies`
-     * (e.g. watch/plex depend on 'tmdb'); such dependencies are considered
-     * always satisfied and are stripped during manifest normalization.
-     *
-     * @var string[]
-     */
-    public const CORE_PROVIDED_MODULES = ['tmdb'];
-
-    /** @var ModuleInterface[] Loaded module instances, keyed by module name */
-    private array $modules = [];
-
-    /** @var array Module overrides from config/modules.php (enabled/disabled, class names) */
-    private array $overrides = [];
-
-    /** @var array Normalized manifest data from module.json files (name => manifest array) */
-    private array $manifests = [];
-
-    /** @var array<string, true> Module paths that already have an autoloader registered */
-    private static array $autoloadedPaths = [];
-
-    /**
-     * Loads all discovered modules from modules/ directory.
-     *
-     * Performs automatic discovery, dependency validation, load order resolution,
-     * and environment filtering (main / lb / any). Modules are loaded in topological
-     * order to satisfy dependencies.
-     *
-     * @param string|null $modulesDir Path to modules directory. If null, auto-detected via MAIN_HOME or src/modules.
-     * @return self Fluent interface for chaining.
-     * @throws \RuntimeException If a module fails to load, dependency is missing, or manifest is invalid.
-     */
-    public function loadAll(?string $modulesDir = null): self {
-        if ($modulesDir === null) {
-            $modulesDir = defined('MAIN_HOME')
-                ? MAIN_HOME . 'Modules'
-                : dirname(__DIR__, 2) . '/Modules';
-        }
-
-        $this->modules = [];
-        $this->manifests = [];
-
-        $this->loadOverrides();
-
-        $jsonFiles = glob($modulesDir . '/*/module.json') ?: [];
-
-        // Also discover modules installed as Composer packages (type: xcvm-module).
-        // vendor/ is expected to be a sibling of the modules/ directory.
-        $vendorDir = $this->resolveVendorDir($modulesDir);
-        if ($vendorDir !== null) {
-            foreach ($this->collectComposerModuleManifests($vendorDir) as $manifest) {
-                if (!in_array($manifest, $jsonFiles, true)) {
-                    $jsonFiles[] = $manifest;
-                }
-            }
-        }
-
-        if (empty($jsonFiles)) {
-            return $this;
-        }
-
-        sort($jsonFiles, SORT_STRING);
-
-        $currentEnvironment = $this->getCurrentEnvironment();
-        $discovered = $this->discoverModules($jsonFiles, $currentEnvironment);
-
-        $loadOrder = $this->resolveLoadOrder($discovered);
-
-        // A single broken module must NOT abort the whole load — that would brick the
-        // panel and CLI (see the philosophy: "removing a module causes no fatal
-        // errors"). Log the failure, mark the module failed, and carry on so healthy
-        // modules still load. loadOrder is topologically sorted, so a failed module's
-        // dependents (which come later) are skipped too — loading a module without its
-        // dependency present could fatal at boot.
-        $failed = [];
-        foreach ($loadOrder as $name) {
-            $deps      = $discovered[$name]['manifest']['dependencies'] ?? [];
-            $blockedBy = array_values(array_intersect($deps, $failed));
-            if ($blockedBy !== []) {
-                error_log("ModuleLoader: skipping module '{$name}' — dependency failed to load: " . implode(', ', $blockedBy));
-                $failed[] = $name;
-                continue;
-            }
-
-            if (!$this->load($name, $discovered[$name]['path'])) {
-                error_log("ModuleLoader: failed to load module '{$name}' — skipping (panel stays up)");
-                $failed[] = $name;
-                continue;
-            }
-
-            $this->manifests[$name] = $discovered[$name]['manifest'];
-        }
-
-        return $this;
-    }
-
-    /**
-     * Loads a single module by name.
-     *
-     * Resolves the class name from module name (or override config), includes the class file,
-     * and instantiates the module. Verifies that the module implements ModuleInterface.
-     *
-     * @param string $name Module name (directory name in modules/).
-     * @param string|null $modulePath Full path to module directory. If null, auto-detected via getModulePath().
-     * @return bool True if successfully loaded, false if class not found or doesn't implement ModuleInterface.
-     */
-    public function load(string $name, ?string $modulePath = null): bool {
-        if (isset($this->modules[$name])) {
-            return true;
-        }
-
-        if ($modulePath === null) {
-            $modulePath = $this->getModulePath($name);
-        }
-
-        // Resolve the class from the module's OWN manifest name, not the passed
-        // $name. Platform installs use the marketplace slug (e.g. "watch-d2bho")
-        // as the directory, but the module's class follows its canonical manifest
-        // name (e.g. "watch" -> XcVm\Module\Watch\WatchModule). This mirrors
-        // discoverModules(), which already keys class resolution on manifest name.
-        $className = $this->resolveClassName($this->manifestName($modulePath, $name));
-
-        // Register a PSR-4 autoloader for this module's namespace before loading,
-        // so multi-file modules (including encrypted ones) can reference their own
-        // classes. The base namespace is the module FQCN minus its short class name
-        // (e.g. XcVm\Module\Watch), mapped onto $modulePath.
-        $baseNamespace = ($nsPos = strrpos($className, '\\')) !== false ? substr($className, 0, $nsPos) : '';
-        $this->registerModuleAutoloader($modulePath, $baseNamespace);
-
-        // NB: class_exists() with autoload=false. The module's main class file is
-        // at the deterministic path modulePath/{ShortName}.php and is require'd
-        // below — we must NOT let class_exists() trigger the global autoloader,
-        // whose miss-path runs a full recursive directory rescan
-        // (Autoloader::warmCache) on EVERY request (workers are short-lived under
-        // pm=ondemand), which pegged php-fpm at high CPU.
-        if (!class_exists($className, false)) {
-            // Strip namespace prefix — the file lives at modulePath/{ShortName}.php.
-            // Guard the no-namespace case (strrpos → false) so the first char isn't dropped.
-            $pos       = strrpos($className, '\\');
-            $shortName = $pos === false ? $className : substr($className, $pos + 1);
-            $classFile = $modulePath . '/' . $shortName . '.php';
-            if (file_exists($classFile)) {
-                if ($this->isFileEncrypted($classFile) && !extension_loaded('xcvm_core')) {
-                    error_log("ModuleLoader: module '{$name}' is encrypted but xcvm_core is not loaded");
-                    return false;
-                }
-                require_once $classFile;
-            }
-
-            if (!class_exists($className, false)) {
-                error_log("ModuleLoader: class '{$className}' not found for module '{$name}'");
-                return false;
-            }
-        }
-
-        $module = new $className();
-
-        if (!$module instanceof ModuleInterface) {
-            error_log("ModuleLoader: class '{$className}' does not implement ModuleInterface");
-            return false;
-        }
-
-        $this->modules[$name] = $module;
-        return true;
-    }
-
-    /**
-     * Boots all loaded modules in web context.
-     *
-     * Checks each sub-interface via instanceof so modules can implement
-     * only the contracts they need. Core navbar is registered first.
-     *
-     * @param ServiceContainer $container Service container for dependency injection.
-     * @param Router|null $router Optional router for module route registration.
-     * @param StreamPipeline|null $pipeline Optional stream pipeline for middleware registration.
-     * @return void
-     */
-    public function bootAll(ServiceContainer $container, ?Router $router = null, ?StreamPipeline $pipeline = null): void {
-        $navbarRegistry = new NavbarRegistry();
-        (new CoreNavbarProvider())->registerNavbar($navbarRegistry);
-
-        // Module topbar contributions are merged on top of Topbar's core literal
-        // (see XcVm\Core\Util\Topbar::config). Reset so a re-boot in the same
-        // process (tests/CLI) does not accumulate stale entries.
-        $topbarRegistry = new TopbarRegistry();
-        TopbarRegistry::reset();
-
-        // Module serverSide table handlers (TableController looks them up for
-        // non-core ids). Reset so a re-boot does not accumulate stale handlers.
-        $tableRegistry = new TableRegistry();
-        TableRegistry::reset();
-
-        // Module reseller-permission keys (merged into the group editor catalogue).
-        $permissionRegistry = new PermissionRegistry();
-        PermissionRegistry::reset();
-
-        // Module one-shot Quick Tools actions (button + handler).
-        $quickToolsRegistry = new QuickToolsRegistry();
-        QuickToolsRegistry::reset();
-
-        foreach ($this->modules as $module) {
-            if ($module instanceof ServiceProviderInterface) {
-                $module->boot($container);
-                $this->registerEventSubscribers($module, $container);
-            }
-
-            if ($pipeline !== null) {
-                $this->registerStreamMiddleware($module, $pipeline);
-            }
-
-            if ($module instanceof RouteProviderInterface && $router !== null) {
-                $module->registerRoutes($router);
-            }
-
-            if ($module instanceof NavbarProviderInterface) {
-                $module->registerNavbar($navbarRegistry);
-            }
-
-            if ($module instanceof TopbarProviderInterface) {
-                $module->registerTopbar($topbarRegistry);
-            }
-
-            if ($module instanceof TableProviderInterface) {
-                $module->registerTables($tableRegistry);
-            }
-
-            if ($module instanceof PermissionProviderInterface) {
-                $module->registerPermissions($permissionRegistry);
-            }
-
-            if ($module instanceof QuickToolsProviderInterface) {
-                $module->registerQuickTools($quickToolsRegistry);
-            }
-        }
-    }
-
-    /**
-     * Registers CLI commands for all loaded modules.
-     *
-     * Only calls registerCommands() on modules implementing CommandProviderInterface.
-     * Used in CLI context (console.php).
-     *
-     * @param CommandRegistry $registry Command registry for registering module commands.
-     * @return void
-     */
-    public function registerAllCommands(CommandRegistry $registry): void {
-        foreach ($this->modules as $name => $module) {
-            if (!$module instanceof CommandProviderInterface) {
-                continue;
-            }
-            try {
-                $module->registerCommands($registry);
-            } catch (\Throwable $e) {
-                // A module with a missing/broken command class (e.g. a partial
-                // deploy) must not brick EVERY CLI command — skip it, keep the rest.
-                error_log("ModuleLoader: registerCommands failed for module '{$name}': " . $e->getMessage());
-            }
-        }
-    }
-
-    /**
-     * Collects system crontab entries declared by loaded modules.
-     *
-     * Iterates over all loaded modules implementing CronProviderInterface and
-     * assembles ready-to-write crontab lines. Callers (StartupCommand,
-     * StatusCommand) append these to the crontab without touching module code.
-     *
-     * @return string[] Complete crontab lines, each ending with "# XC_VM".
-     */
-    public function collectCronEntries(): array {
-        if (!defined('PHP_BIN') || !defined('MAIN_HOME')) {
-            return [];
-        }
-
-        $lines = [];
-        foreach ($this->modules as $module) {
-            if (!$module instanceof CronProviderInterface) {
-                continue;
-            }
-            foreach ($module->getCronEntries() as $expression => $command) {
-                $lines[] = $expression . ' ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php ' . $command . ' # XC_VM';
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Checks whether a module is loaded.
-     *
-     * @param string $name Module name to check.
-     * @return bool True if module is loaded and instantiated, false otherwise.
-     */
-    public function isLoaded(string $name): bool {
-        return isset($this->modules[$name]);
-    }
-
-    /**
-     * Retrieves a loaded module instance by name.
-     *
-     * @param string $name Module name.
-     * @return ModuleInterface|null Module instance if loaded, null otherwise.
-     */
-    public function getModule(string $name): ?ModuleInterface {
-        return $this->modules[$name] ?? null;
-    }
-
-    /**
-     * Retrieves all loaded module instances.
-     *
-     * @return ModuleInterface[] Associative array of loaded modules (name => instance).
-     */
-    public function getModules(): array {
-        return $this->modules;
-    }
-
-    /**
-     * Retrieves the normalized manifest for a loaded module.
-     *
-     * @param string $name Module name.
-     * @return array|null Manifest array (name, description, version, requires_core, environment, dependencies, has_navbar, has_settings) if loaded, null otherwise.
-     */
-    public function getManifest(string $name): ?array {
-        return $this->manifests[$name] ?? null;
-    }
-
-    /**
-     * Retrieves all manifests for loaded modules.
-     *
-     * @return array Associative array of normalized manifests (name => manifest array).
-     */
-    public function getManifests(): array {
-        return $this->manifests;
-    }
-
-    /**
-     * Constructs the full path to a module directory.
-     *
-     * @param string $name Module name.
-     * @return string Full path to module directory (modules/{name}).
-     */
-    public function getModulePath(string $name): string {
-        $base = defined('MAIN_HOME') ? MAIN_HOME : dirname(__DIR__, 2) . '/';
-        return $base . 'Modules/' . $name;
-    }
-
-    /**
-     * Loads module override configuration from config/modules.php.
-     *
-     * Overrides can disable modules, override class names, or provide other module-specific settings.
-     *
-     * @return void
-     */
-    protected function loadOverrides(): void {
-        $overridesPath = defined('CONFIG_PATH')
-            ? CONFIG_PATH . 'modules.php'
-            : dirname(__DIR__, 2) . '/config/modules.php';
-
-        if (file_exists($overridesPath)) {
-            $this->overrides = require $overridesPath;
-            if (!is_array($this->overrides)) {
-                $this->overrides = [];
-            }
-        }
-    }
-
-    /**
-     * Discovers and filters modules based on manifest files and environment.
-     *
-     * Reads all module.json manifests, normalizes manifest data, checks override disabling,
-     * and filters modules to current environment (main/lb). Returns discovered modules
-     * with their paths and normalized manifest data.
-     *
-     * @param array           $jsonFiles          Array of full paths to module.json files.
-     * @param ServerEnvironment $currentEnvironment Current server environment.
-     * @return array Associative array of discovered modules: name => [path, manifest].
-     * @throws \RuntimeException If manifest has invalid environment value or JSON is malformed.
-     */
-    protected function discoverModules(array $jsonFiles, ServerEnvironment $currentEnvironment): array {
-        $discovered = [];
-
-        foreach ($jsonFiles as $jsonFile) {
-            // Derive a provisional name from directory — used only as fallback in readManifest().
-            $dirName = basename(dirname($jsonFile));
-
-            // Check overrides by directory name before spending I/O on the manifest.
-            if (!$this->resolveState($dirName)->isLoadable()) {
-                continue;
-            }
-
-            $manifest = $this->readManifest($jsonFile, $dirName);
-
-            // Canonical name: always from the manifest (handles module-path subdirs in Composer packages).
-            $name = $manifest['name'];
-
-            // Re-check overrides by canonical name (in case it differs from directory name).
-            if (!$this->resolveState($name)->isLoadable()) {
-                continue;
-            }
-
-            if (!in_array($manifest['environment'], ['main', 'lb', 'any'], true)) {
-                throw new ModuleManifestException("ModuleLoader: invalid environment in module.json for module {$name}");
-            }
-
-            // Filter by environment: skip if module is for different environment (skip lb-only on main, etc)
-            if ($manifest['environment'] !== 'any' && $manifest['environment'] !== $currentEnvironment->value) {
-                continue;
-            }
-
-            $discovered[$name] = [
-                'path'     => dirname($jsonFile),
-                'manifest' => $manifest,
-            ];
-        }
-
-        return $discovered;
-    }
-
-    /**
-     * Resolves the class name for a module from its name.
-     *
-     * Checks for override in config first. If not overridden, converts kebab-case name to PascalCase
-     * and appends 'Module' suffix.
-     *
-     * Example: 'watch-manager' -> 'WatchManagerModule'
-     *
-     * @param string $name Module name (kebab-case).
-     * @return string Resolved class name (PascalCase).
-     */
-    protected function resolveClassName(string $name): string {
-        if (isset($this->overrides[$name]['class'])) {
-            $class = $this->overrides[$name]['class'];
-            // Override must be an FQN. If it's a bare class name, build the FQN using convention.
-            if (!str_contains($class, '\\')) {
-                $pascal = implode('', array_map('ucfirst', explode('-', $name)));
-                return 'XcVm\\Module\\' . $pascal . '\\' . $class;
-            }
-            return $class;
-        }
-
-        // Convert kebab-case to PascalCase: 'my-module' → 'MyModule'
-        $parts  = explode('-', $name);
-        $pascal = implode('', array_map('ucfirst', $parts));
-
-        // Return fully-qualified class name: XcVm\Module\{Pascal}\{Pascal}Module
-        return 'XcVm\\Module\\' . $pascal . '\\' . $pascal . 'Module';
-    }
-
-    /**
-     * The module's canonical name as declared in its module.json ("name"), used
-     * for class resolution. Falls back to $fallback (the directory/slug) when the
-     * manifest is missing or has no usable name. This lets a module installed
-     * under a marketplace slug still resolve to the class the developer authored.
-     *
-     * @param string|null $modulePath Module directory (contains module.json).
-     * @param string      $fallback   Name to use when the manifest has none.
-     * @return string Canonical module name (kebab-case).
-     */
-    private function manifestName(?string $modulePath, string $fallback): string {
-        if ($modulePath === null) {
-            return $fallback;
-        }
-        $jsonFile = $modulePath . '/module.json';
-        if (is_file($jsonFile)) {
-            $meta = json_decode((string) @file_get_contents($jsonFile), true);
-            if (is_array($meta) && isset($meta['name']) && is_string($meta['name']) && $meta['name'] !== '') {
-                return $meta['name'];
-            }
-        }
-        return $fallback;
-    }
-
-    /**
-     * Detects the current environment (main or load-balancer).
-     *
-     * Checks SERVER_TYPE constant. Returns LoadBalancer if set to 'lb' (case-insensitive), else Main.
-     */
-    protected function getCurrentEnvironment(): ServerEnvironment {
-        if (defined('SERVER_TYPE') && strtolower((string) constant('SERVER_TYPE')) === 'lb') {
-            return ServerEnvironment::LoadBalancer;
-        }
-        return ServerEnvironment::Main;
-    }
-
-    /**
-     * Reads and normalizes a module manifest from JSON file.
-     *
-     * Parses module.json, validates all fields, normalizes dependency arrays (trim, dedup, sort),
-     * and fills in default values. Performs strict type checking to catch configuration errors early.
-     *
-     * Supported fields:
-     *   dependencies          — required; missing dep causes load failure
-     *   optional_dependencies — optional; missing dep is silently skipped
-     *   priority              — load order weight (higher = earlier, default 0)
-     *
-     * @param string $jsonFile Full path to module.json file.
-     * @param string $name Module name (used for error messages).
-     * @return array Normalized manifest.
-     * @throws \RuntimeException If JSON is invalid, dependencies not array, or dependency names not strings.
-     */
-    protected function readManifest(string $jsonFile, string $name): array {
-        $raw = @file_get_contents($jsonFile);
-        $manifest = json_decode((string) $raw, true);
-
-        if (!is_array($manifest)) {
-            throw new ModuleManifestException("ModuleLoader: invalid JSON in module manifest for module {$name}");
-        }
-
-        $normalizeDepArray = function (mixed $raw, string $field) use ($name): array {
-            if (!is_array($raw)) {
-                throw new ModuleManifestException("ModuleLoader: {$field} must be array for module {$name}");
-            }
-            $result = [];
-            foreach ($raw as $dep) {
-                if (!is_string($dep) || trim($dep) === '') {
-                    throw new ModuleManifestException("ModuleLoader: {$field} names must be non-empty strings for module {$name}");
-                }
-                $result[] = trim($dep);
-            }
-            sort($result, SORT_STRING);
-            return array_values(array_unique($result));
-        };
-
-        return [
-            'name'                  => $manifest['name'] ?? $name,
-            'hash_id'               => (string) ($manifest['hash_id'] ?? ''),
-            'description'           => $manifest['description'] ?? '',
-            'version'               => $manifest['version'] ?? '',
-            'requires_core'         => $manifest['requires_core'] ?? '',
-            'environment'           => strtolower((string) ($manifest['environment'] ?? 'main')),
-            'dependencies'          => self::filterCoreProvidedDependencies($normalizeDepArray($manifest['dependencies'] ?? [], 'dependencies')),
-            'optional_dependencies' => self::filterCoreProvidedDependencies($normalizeDepArray($manifest['optional_dependencies'] ?? [], 'optional_dependencies')),
-            'has_navbar'            => (bool) ($manifest['has_navbar'] ?? false),
-            'has_settings'          => (bool) ($manifest['has_settings'] ?? false),
-            'priority'              => (int) ($manifest['priority'] ?? 0),
-            'update'                => self::normalizeUpdateBlock($manifest, $manifest['name'] ?? $name),
-        ];
-    }
-
-    /**
-     * Strip dependencies that are provided by the core codebase.
-     *
-     * @param string[] $dependencies Normalized dependency names.
-     * @return string[] Dependencies that still refer to real modules.
-     */
-    public static function filterCoreProvidedDependencies(array $dependencies): array {
-        return array_values(array_diff($dependencies, self::CORE_PROVIDED_MODULES));
-    }
-
-    /**
-     * Normalize the optional `update` manifest block — where the module gets its
-     * updates from. Part of the module-update-source plan (P2).
-     *
-     * Shape:
-     *   "update": {
-     *     "source": "bundled | platform | git | url",
-     *     "repository": "https://…",   // git
-     *     "channel": "stable | beta",
-     *     "slug": "…",                  // platform (defaults to name)
-     *     "url": "https://…"            // url
-     *   }
-     *
-     * Absent or unknown source → `bundled` (files ship with the panel), so every
-     * existing module keeps working unchanged. NO network is done here — this only
-     * shapes the declared source for the later fetch/apply phases.
-     *
-     * @param array  $manifest Raw module.json.
-     * @param string $name     Module name (fallback for slug).
-     * @return array{source:string,repository:string,channel:string,slug:string,url:string}
-     */
-    public static function normalizeUpdateBlock(array $manifest, string $name): array {
-        $raw    = is_array($manifest['update'] ?? null) ? $manifest['update'] : [];
-        $source = strtolower(trim((string) ($raw['source'] ?? 'bundled')));
-        if (!in_array($source, ['bundled', 'platform', 'git', 'url'], true)) {
-            $source = 'bundled';
-        }
-
-        return [
-            'source'     => $source,
-            'repository' => trim((string) ($raw['repository'] ?? '')),
-            'channel'    => strtolower(trim((string) ($raw['channel'] ?? 'stable'))) ?: 'stable',
-            'slug'       => trim((string) ($raw['slug'] ?? '')) ?: $name,
-            'url'        => trim((string) ($raw['url'] ?? '')),
-        ];
-    }
-
-    /**
-     * Resolves deterministic load order of modules based on dependencies.
-     *
-     * Uses depth-first search (DFS) with topological sort to order modules such that
-     * dependencies are loaded before their dependents. Modules are visited in alphabetical order
-     * for determinism. Detects cyclic dependencies and throws exception.
-     *
-     * @param array $discovered Discovered modules (name => [path, manifest]).
-     * @return array Ordered module names: modules are in dependency-order (dependencies first).
-     * @throws \RuntimeException If a cyclic dependency is detected.
-     */
-    protected function resolveLoadOrder(array $discovered): array {
-        $order = [];
-        $state = [];  // 1 = visiting, 2 = visited
-
-        // Drop modules whose required dependencies are unavailable (missing on
-        // disk, disabled/uninstalled via config/modules.php, or filtered out by
-        // environment) before sorting. A single unsatisfiable module must not
-        // abort the whole load: we skip it — and, transitively, anything that
-        // requires it — with a warning, so the rest of the panel and the CLI keep
-        // working. Without this, e.g. disabling 'watch' while 'plex' (which
-        // requires it) stays enabled would throw ModuleNotFoundException out of
-        // loadAll() and brick both the admin panel and console.php.
-        $discovered = $this->pruneUnsatisfiableModules($discovered);
-
-        $names = array_keys($discovered);
-
-        // Sort by priority desc, then alphabetically for determinism within same priority
-        usort($names, function (string $a, string $b) use ($discovered): int {
-            $pa = $discovered[$a]['manifest']['priority'] ?? 0;
-            $pb = $discovered[$b]['manifest']['priority'] ?? 0;
-            if ($pa !== $pb) {
-                return $pb <=> $pa; // higher priority first
-            }
-            return strcmp($a, $b);
-        });
-
-        foreach ($names as $name) {
-            $this->visitDependencyNode($name, $discovered, $state, $order, []);
-        }
-
-        return $order;
-    }
-
-    /**
-     * Removes modules whose required dependencies are not present in the
-     * discovered set, cascading transitively.
-     *
-     * Discovery may legitimately exclude a module (disabled/uninstalled via
-     * config/modules.php, or filtered out for the current environment). When that
-     * module is a *required* dependency of another, the dependent cannot load —
-     * but that is not a fatal condition for the whole panel: we drop the dependent
-     * (and anything depending on it, in turn) and log a warning, leaving every
-     * still-satisfiable module loadable. This keeps the admin panel and CLI alive
-     * instead of throwing ModuleNotFoundException out of loadAll().
-     *
-     * Optional dependencies are ignored here — they are allowed to be absent.
-     *
-     * @param array $discovered Discovered modules (name => [path, manifest]).
-     * @return array Pruned discovered set containing only satisfiable modules.
-     */
-    protected function pruneUnsatisfiableModules(array $discovered): array {
-        do {
-            $removed = false;
-            foreach ($discovered as $name => $info) {
-                foreach ($info['manifest']['dependencies'] as $dependency) {
-                    if (!isset($discovered[$dependency])) {
-                        error_log(
-                            "ModuleLoader: skipping module '{$name}' — required dependency "
-                            . "'{$dependency}' is not available (missing, disabled, or wrong environment)"
-                        );
-                        unset($discovered[$name]);
-                        $removed = true;
-                        break;
-                    }
-                }
-            }
-        } while ($removed);
-
-        return $discovered;
-    }
-
-    /**
-     * DFS traversal to visit a module and its dependencies in dependency order.
-     *
-     * Part of topological sort algorithm. Maintains state machine:
-     * - 1 = currently visiting (used to detect cycles)
-     * - 2 = finished visiting
-     *
-     * Recursively visits all dependencies before adding module to load order.
-     *
-     * @param string $name Module name to visit.
-     * @param array $discovered Discovered modules (name => [path, manifest]).
-     * @param array &$state Visit state for each module (1=visiting, 2=visited).
-     * @param array &$order Load order being built (appends module names).
-     * @param array $stack Call stack trace (used for cycle error message).
-     * @return void
-     * @throws \RuntimeException If cyclic dependency detected or dependency not found in discovered modules.
-     */
-    protected function visitDependencyNode(
-        string $name,
-        array $discovered,
-        array &$state,
-        array &$order,
-        array $stack
-    ): void {
-        if (isset($state[$name])) {
-            if ($state[$name] === 2) {
-                // Already fully visited, skip
-                return;
-            }
-            if ($state[$name] === 1) {
-                // Currently visiting = cycle detected
-                $cycle = array_slice($stack, array_search($name, $stack, true) ?: 0);
-                $cycle[] = $name;
-                throw new ModuleCycleException('ModuleLoader: cyclic module dependency detected: ' . implode(' -> ', $cycle));
-            }
-        }
-
-        if (!isset($discovered[$name])) {
-            throw new ModuleLoadException("ModuleLoader: unknown module in dependency graph: {$name}");
-        }
-
-        // Mark as currently visiting
-        $state[$name] = 1;
-        $stack[] = $name;
-
-        // Required dependencies — throw if missing
-        foreach ($discovered[$name]['manifest']['dependencies'] as $dependency) {
-            if (!isset($discovered[$dependency])) {
-                throw new ModuleNotFoundException("ModuleLoader: module {$name} requires missing dependency {$dependency}");
-            }
-            $this->visitDependencyNode($dependency, $discovered, $state, $order, $stack);
-        }
-
-        // Optional dependencies — visit only when present, skip silently otherwise
-        foreach ($discovered[$name]['manifest']['optional_dependencies'] ?? [] as $dependency) {
-            if (isset($discovered[$dependency])) {
-                $this->visitDependencyNode($dependency, $discovered, $state, $order, $stack);
-            }
-        }
-
-        // Mark as fully visited and add to load order
-        $state[$name] = 2;
-        $order[] = $name;
-    }
-
-    /**
-     * Registers event subscribers declared by a module.
-     *
-     * Two complementary mechanisms are supported and both run on every boot:
-     *
-     *   1. getEventSubscribers() — legacy array API:
-     *        ['EventClass' => callable]  or  ['EventClass' => [callable, $priority]]
-     *
-     *   2. #[ListensTo] attribute — declarative PHP 8.1 attribute on public methods:
-     *        #[ListensTo(SomeEvent::class, priority: 10)]
-     *        public function onSome(SomeEvent $e): void { ... }
-     *
-     * Both paths are additive — using one does not disable the other.
-     *
-     * If the event class named in a #[ListensTo] attribute does not exist at
-     * registration time the listener is silently skipped (graceful degradation).
-     *
-     * @param ServiceProviderInterface $module
-     * @param ServiceContainer $container
-     * @return void
-     */
-    private function registerEventSubscribers(ServiceProviderInterface $module, ServiceContainer $container): void {
-        // Verify the container holds an actual EventDispatcher instance (not just the class name).
-        // Static calls below route to the same instance via EventDispatcher::getInstance().
-        if (!$container->has('events') || !$container->get('events') instanceof EventDispatcher) {
-            return;
-        }
-
-        // ── 1. Legacy array API via getEventSubscribers() ─────────────────
-        $subscribers = $module->getEventSubscribers();
-        foreach ($subscribers as $event => $handler) {
-            if (is_array($handler) && isset($handler[0]) && is_callable($handler[0])) {
-                // [callable, int $priority] tuple — new PSR-14 style
-                EventDispatcher::listen($event, $handler[0], $handler[1] ?? 0);
-            } else {
-                // Legacy: string event name or class-string, plain callable
-                EventDispatcher::listen($event, $handler);
-            }
-        }
-
-        // ── 2. #[ListensTo] attribute scan via Reflection ─────────────────
-        $reflection = new \ReflectionClass($module);
-        foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
-            $attributes = $method->getAttributes(ListensTo::class);
-            if (empty($attributes)) {
-                continue;
-            }
-            foreach ($attributes as $attribute) {
-                /** @var ListensTo $listensTo */
-                $listensTo = $attribute->newInstance();
-
-                // Graceful degradation: skip if the event class is not (yet) loadable.
-                if (!class_exists($listensTo->eventClass)) {
-                    continue;
-                }
-
-                EventDispatcher::listen(
-                    $listensTo->eventClass,
-                    [$module, $method->getName()],
-                    $listensTo->priority,
-                );
-            }
-        }
-    }
-
-    /**
-     * Registers stream middleware declared by a module into the pipeline.
-     *
-     * Only called for modules implementing StreamMiddlewareProviderInterface.
-     *
-     * @param ModuleInterface $module
-     * @param StreamPipeline $pipeline
-     * @return void
-     */
-    private function registerStreamMiddleware(ModuleInterface $module, StreamPipeline $pipeline): void {
-        if (!$module instanceof StreamMiddlewareProviderInterface) {
-            return;
-        }
-        foreach ($module->getStreamMiddleware() as $middleware) {
-            if ($middleware instanceof StreamMiddlewareInterface) {
-                $pipeline->pipe($middleware);
-            }
-        }
-    }
-
-    /**
-     * Registers a PSR-4 autoloader for a single module's namespace (once per path).
-     *
-     * The module's base namespace ({$baseNamespace}, e.g. XcVm\Module\Watch) is
-     * mapped onto its directory ({$modulePath}). The namespace remainder becomes
-     * the sub-path, exactly per PSR-4:
-     *
-     *   XcVm\Module\Watch\WatchModule          → {modulePath}/WatchModule.php
-     *   XcVm\Module\Watch\Service\WatchService → {modulePath}/Service/WatchService.php
-     *
-     * Classes outside the module's namespace (global legacy classes, other
-     * modules, core) fall through to the next autoloader untouched — no short-name
-     * glob, so two modules can declare same-named sub-classes without colliding.
-     * Marketplace slug directories are unaffected: {modulePath} is the real path.
-     *
-     * Encrypted files are require'd as-is and transparently decrypted by the
-     * XC_VM zend_compile_file hook.
-     */
-    private function registerModuleAutoloader(string $modulePath, string $baseNamespace): void {
-        if ($baseNamespace === '' || isset(self::$autoloadedPaths[$modulePath])) {
-            return;
-        }
-        self::$autoloadedPaths[$modulePath] = true;
-
-        $prefix    = $baseNamespace . '\\';
-        $prefixLen = strlen($prefix);
-
-        spl_autoload_register(function (string $class) use ($modulePath, $prefix, $prefixLen): void {
-            // Only resolve classes under this module's namespace; everything else
-            // falls through to the next autoloader (Composer / legacy scanner).
-            if (strncmp($class, $prefix, $prefixLen) !== 0) {
-                return;
-            }
-            $relative = str_replace('\\', '/', substr($class, $prefixLen));
-            $file     = $modulePath . '/' . $relative . '.php';
-            if (is_file($file)) {
-                require_once $file;
-            }
-        });
-    }
-
-    /**
-     * Resolve the effective ModuleState for a module from its overrides entry.
-     *
-     * Reads both the new 'state' key and the legacy 'enabled' bool key so that
-     * existing config/modules.php files continue to work without migration.
-     *
-     * @param string $name Module name or directory name.
-     * @return ModuleState
-     */
-    private function resolveState(string $name): ModuleState {
-        $entry = $this->overrides[$name] ?? null;
-        if ($entry === null) {
-            return ModuleState::Enabled;
-        }
-        // New key takes precedence.
-        if (isset($entry['state'])) {
-            return ModuleState::fromRaw($entry['state']);
-        }
-        // Legacy bool key.
-        if (array_key_exists('enabled', $entry)) {
-            return ModuleState::fromRaw($entry['enabled']);
-        }
-        return ModuleState::Enabled;
-    }
-
-    /**
-     * Returns true if the file starts with the XCVM encrypted-file magic bytes.
-     */
-    private function isFileEncrypted(string $path): bool {
-        $fh = @fopen($path, 'rb');
-        if (!$fh) {
-            return false;
-        }
-        $magic = fread($fh, 4);
-        fclose($fh);
-        return $magic === "\x58\x43\x56\x4D";
-    }
-
-    /**
-     * Resolves the vendor directory path relative to the modules directory.
-     *
-     * The vendor directory is expected to be a sibling of the modules/ directory
-     * (i.e. at MAIN_HOME/vendor/). Returns null when vendor/composer/ does not exist
-     * or Composer has not been run.
-     *
-     * @param string $modulesDir Absolute path to the modules/ directory.
-     * @return string|null Absolute path to vendor/, or null if not found.
-     */
-    private function resolveVendorDir(string $modulesDir): ?string {
-        $vendorDir = dirname($modulesDir) . '/vendor';
-        return is_dir($vendorDir . '/composer') ? $vendorDir : null;
-    }
-
-    /**
-     * Collects module.json paths from Composer-installed xcvm-module packages.
-     *
-     * Reads vendor/composer/installed.json and returns the module.json path for
-     * every package whose "type" is "xcvm-module". Packages may optionally declare
-     * a subdirectory for the module root via:
-     *
-     *   "extra": { "xcvm": { "module-path": "src/" } }
-     *
-     * When absent, module.json is expected at the package root.
-     *
-     * @param string $vendorDir Absolute path to the vendor/ directory.
-     * @return string[] Absolute paths to discovered module.json files.
-     */
-    private function collectComposerModuleManifests(string $vendorDir): array {
-        $installedJson = $vendorDir . '/composer/installed.json';
-        $raw = @file_get_contents($installedJson);
-        if ($raw === false) {
-            return [];
-        }
-
-        $data = json_decode($raw, true);
-        if (!is_array($data)) {
-            return [];
-        }
-
-        // Composer 2.x wraps packages in {"packages": [...], "dev": ...}
-        // Composer 1.x uses a flat array
-        $packages = isset($data['packages']) && is_array($data['packages'])
-            ? $data['packages']
-            : $data;
-
-        $manifests = [];
-        foreach ($packages as $package) {
-            if (!is_array($package) || ($package['type'] ?? '') !== 'xcvm-module') {
-                continue;
-            }
-
-            // install-path is relative to vendor/composer/
-            $installPath = realpath($vendorDir . '/composer/' . ($package['install-path'] ?? ''));
-            if ($installPath === false) {
-                continue;
-            }
-
-            // Optional subdirectory override
-            $subPath     = trim((string) ($package['extra']['xcvm']['module-path'] ?? ''), '/');
-            $moduleDir   = $subPath !== '' ? $installPath . '/' . $subPath : $installPath;
-            $manifestFile = $moduleDir . '/module.json';
-
-            if (file_exists($manifestFile)) {
-                $manifests[] = $manifestFile;
-            }
-        }
-
-        return $manifests;
-    }
+	/**
+	 * Former modules whose functionality now ships in the core codebase.
+	 *
+	 * Released module archives may still declare them in `dependencies`
+	 * (e.g. watch/plex depend on 'tmdb'); such dependencies are considered
+	 * always satisfied and are stripped during manifest normalization.
+	 *
+	 * @var string[]
+	 */
+	public const CORE_PROVIDED_MODULES = ['tmdb'];
+
+	/** @var ModuleInterface[] Loaded module instances, keyed by module name */
+	private array $modules = [];
+
+	/** @var array Module overrides from config/modules.php (enabled/disabled, class names) */
+	private array $overrides = [];
+
+	/** @var array Normalized manifest data from module.json files (name => manifest array) */
+	private array $manifests = [];
+
+	/** @var array<string, true> Module paths that already have an autoloader registered */
+	private static array $autoloadedPaths = [];
+
+	/**
+	 * Loads all discovered modules from modules/ directory.
+	 *
+	 * Performs automatic discovery, dependency validation, load order resolution,
+	 * and environment filtering (main / lb / any). Modules are loaded in topological
+	 * order to satisfy dependencies.
+	 *
+	 * @param string|null $modulesDir Path to modules directory. If null, auto-detected via MAIN_HOME or src/modules.
+	 * @return self Fluent interface for chaining.
+	 * @throws \RuntimeException If a module fails to load, dependency is missing, or manifest is invalid.
+	 */
+	public function loadAll(?string $modulesDir = null): self {
+		if ($modulesDir === null) {
+			$modulesDir = defined('MAIN_HOME')
+				? MAIN_HOME . 'Modules'
+				: dirname(__DIR__, 2) . '/Modules';
+		}
+
+		$this->modules = [];
+		$this->manifests = [];
+
+		$this->loadOverrides();
+
+		$jsonFiles = glob($modulesDir . '/*/module.json') ?: [];
+
+		// Also discover modules installed as Composer packages (type: xcvm-module).
+		// vendor/ is expected to be a sibling of the modules/ directory.
+		$vendorDir = $this->resolveVendorDir($modulesDir);
+		if ($vendorDir !== null) {
+			foreach ($this->collectComposerModuleManifests($vendorDir) as $manifest) {
+				if (!in_array($manifest, $jsonFiles, true)) {
+					$jsonFiles[] = $manifest;
+				}
+			}
+		}
+
+		if (empty($jsonFiles)) {
+			return $this;
+		}
+
+		sort($jsonFiles, SORT_STRING);
+
+		$currentEnvironment = $this->getCurrentEnvironment();
+		$discovered = $this->discoverModules($jsonFiles, $currentEnvironment);
+
+		$loadOrder = $this->resolveLoadOrder($discovered);
+
+		// A single broken module must NOT abort the whole load — that would brick the
+		// panel and CLI (see the philosophy: "removing a module causes no fatal
+		// errors"). Log the failure, mark the module failed, and carry on so healthy
+		// modules still load. loadOrder is topologically sorted, so a failed module's
+		// dependents (which come later) are skipped too — loading a module without its
+		// dependency present could fatal at boot.
+		$failed = [];
+		foreach ($loadOrder as $name) {
+			$deps      = $discovered[$name]['manifest']['dependencies'] ?? [];
+			$blockedBy = array_values(array_intersect($deps, $failed));
+			if ($blockedBy !== []) {
+				error_log("ModuleLoader: skipping module '{$name}' — dependency failed to load: " . implode(', ', $blockedBy));
+				$failed[] = $name;
+				continue;
+			}
+
+			if (!$this->load($name, $discovered[$name]['path'])) {
+				error_log("ModuleLoader: failed to load module '{$name}' — skipping (panel stays up)");
+				$failed[] = $name;
+				continue;
+			}
+
+			$this->manifests[$name] = $discovered[$name]['manifest'];
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Loads a single module by name.
+	 *
+	 * Resolves the class name from module name (or override config), includes the class file,
+	 * and instantiates the module. Verifies that the module implements ModuleInterface.
+	 *
+	 * @param string $name Module name (directory name in modules/).
+	 * @param string|null $modulePath Full path to module directory. If null, auto-detected via getModulePath().
+	 * @return bool True if successfully loaded, false if class not found or doesn't implement ModuleInterface.
+	 */
+	public function load(string $name, ?string $modulePath = null): bool {
+		if (isset($this->modules[$name])) {
+			return true;
+		}
+
+		if ($modulePath === null) {
+			$modulePath = $this->getModulePath($name);
+		}
+
+		// Resolve the class from the module's OWN manifest name, not the passed
+		// $name. Platform installs use the marketplace slug (e.g. "watch-d2bho")
+		// as the directory, but the module's class follows its canonical manifest
+		// name (e.g. "watch" -> XcVm\Module\Watch\WatchModule). This mirrors
+		// discoverModules(), which already keys class resolution on manifest name.
+		$className = $this->resolveClassName($this->manifestName($modulePath, $name));
+
+		// Register a PSR-4 autoloader for this module's namespace before loading,
+		// so multi-file modules (including encrypted ones) can reference their own
+		// classes. The base namespace is the module FQCN minus its short class name
+		// (e.g. XcVm\Module\Watch), mapped onto $modulePath.
+		$baseNamespace = ($nsPos = strrpos($className, '\\')) !== false ? substr($className, 0, $nsPos) : '';
+		$this->registerModuleAutoloader($modulePath, $baseNamespace);
+
+		// NB: class_exists() with autoload=false. The module's main class file is
+		// at the deterministic path modulePath/{ShortName}.php and is require'd
+		// below — we must NOT let class_exists() trigger the global autoloader,
+		// whose miss-path runs a full recursive directory rescan
+		// (Autoloader::warmCache) on EVERY request (workers are short-lived under
+		// pm=ondemand), which pegged php-fpm at high CPU.
+		if (!class_exists($className, false)) {
+			// Strip namespace prefix — the file lives at modulePath/{ShortName}.php.
+			// Guard the no-namespace case (strrpos → false) so the first char isn't dropped.
+			$pos       = strrpos($className, '\\');
+			$shortName = $pos === false ? $className : substr($className, $pos + 1);
+			$classFile = $modulePath . '/' . $shortName . '.php';
+			if (file_exists($classFile)) {
+				if ($this->isFileEncrypted($classFile) && !extension_loaded('xcvm_core')) {
+					error_log("ModuleLoader: module '{$name}' is encrypted but xcvm_core is not loaded");
+					return false;
+				}
+				require_once $classFile;
+			}
+
+			if (!class_exists($className, false)) {
+				error_log("ModuleLoader: class '{$className}' not found for module '{$name}'");
+				return false;
+			}
+		}
+
+		$module = new $className();
+
+		if (!$module instanceof ModuleInterface) {
+			error_log("ModuleLoader: class '{$className}' does not implement ModuleInterface");
+			return false;
+		}
+
+		$this->modules[$name] = $module;
+		return true;
+	}
+
+	/**
+	 * Boots all loaded modules in web context.
+	 *
+	 * Checks each sub-interface via instanceof so modules can implement
+	 * only the contracts they need. Core navbar is registered first.
+	 *
+	 * @param ServiceContainer $container Service container for dependency injection.
+	 * @param Router|null $router Optional router for module route registration.
+	 * @param StreamPipeline|null $pipeline Optional stream pipeline for middleware registration.
+	 * @return void
+	 */
+	public function bootAll(ServiceContainer $container, ?Router $router = null, ?StreamPipeline $pipeline = null): void {
+		$navbarRegistry = new NavbarRegistry();
+		(new CoreNavbarProvider())->registerNavbar($navbarRegistry);
+
+		// Module topbar contributions are merged on top of Topbar's core literal
+		// (see XcVm\Core\Util\Topbar::config). Reset so a re-boot in the same
+		// process (tests/CLI) does not accumulate stale entries.
+		$topbarRegistry = new TopbarRegistry();
+		TopbarRegistry::reset();
+
+		// Module serverSide table handlers (TableController looks them up for
+		// non-core ids). Reset so a re-boot does not accumulate stale handlers.
+		$tableRegistry = new TableRegistry();
+		TableRegistry::reset();
+
+		// Module reseller-permission keys (merged into the group editor catalogue).
+		$permissionRegistry = new PermissionRegistry();
+		PermissionRegistry::reset();
+
+		// Module one-shot Quick Tools actions (button + handler).
+		$quickToolsRegistry = new QuickToolsRegistry();
+		QuickToolsRegistry::reset();
+
+		foreach ($this->modules as $module) {
+			if ($module instanceof ServiceProviderInterface) {
+				$module->boot($container);
+				$this->registerEventSubscribers($module, $container);
+			}
+
+			if ($pipeline !== null) {
+				$this->registerStreamMiddleware($module, $pipeline);
+			}
+
+			if ($module instanceof RouteProviderInterface && $router !== null) {
+				$module->registerRoutes($router);
+			}
+
+			if ($module instanceof NavbarProviderInterface) {
+				$module->registerNavbar($navbarRegistry);
+			}
+
+			if ($module instanceof TopbarProviderInterface) {
+				$module->registerTopbar($topbarRegistry);
+			}
+
+			if ($module instanceof TableProviderInterface) {
+				$module->registerTables($tableRegistry);
+			}
+
+			if ($module instanceof PermissionProviderInterface) {
+				$module->registerPermissions($permissionRegistry);
+			}
+
+			if ($module instanceof QuickToolsProviderInterface) {
+				$module->registerQuickTools($quickToolsRegistry);
+			}
+		}
+	}
+
+	/**
+	 * Registers CLI commands for all loaded modules.
+	 *
+	 * Only calls registerCommands() on modules implementing CommandProviderInterface.
+	 * Used in CLI context (console.php).
+	 *
+	 * @param CommandRegistry $registry Command registry for registering module commands.
+	 * @return void
+	 */
+	public function registerAllCommands(CommandRegistry $registry): void {
+		foreach ($this->modules as $name => $module) {
+			if (!$module instanceof CommandProviderInterface) {
+				continue;
+			}
+			try {
+				$module->registerCommands($registry);
+			} catch (\Throwable $e) {
+				// A module with a missing/broken command class (e.g. a partial
+				// deploy) must not brick EVERY CLI command — skip it, keep the rest.
+				error_log("ModuleLoader: registerCommands failed for module '{$name}': " . $e->getMessage());
+			}
+		}
+	}
+
+	/**
+	 * Collects system crontab entries declared by loaded modules.
+	 *
+	 * Iterates over all loaded modules implementing CronProviderInterface and
+	 * assembles ready-to-write crontab lines. Callers (StartupCommand,
+	 * StatusCommand) append these to the crontab without touching module code.
+	 *
+	 * @return string[] Complete crontab lines, each ending with "# XC_VM".
+	 */
+	public function collectCronEntries(): array {
+		if (!defined('PHP_BIN') || !defined('MAIN_HOME')) {
+			return [];
+		}
+
+		$lines = [];
+		foreach ($this->modules as $module) {
+			if (!$module instanceof CronProviderInterface) {
+				continue;
+			}
+			foreach ($module->getCronEntries() as $expression => $command) {
+				$lines[] = $expression . ' ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php ' . $command . ' # XC_VM';
+			}
+		}
+		return $lines;
+	}
+
+	/**
+	 * Checks whether a module is loaded.
+	 *
+	 * @param string $name Module name to check.
+	 * @return bool True if module is loaded and instantiated, false otherwise.
+	 */
+	public function isLoaded(string $name): bool {
+		return isset($this->modules[$name]);
+	}
+
+	/**
+	 * Retrieves a loaded module instance by name.
+	 *
+	 * @param string $name Module name.
+	 * @return ModuleInterface|null Module instance if loaded, null otherwise.
+	 */
+	public function getModule(string $name): ?ModuleInterface {
+		return $this->modules[$name] ?? null;
+	}
+
+	/**
+	 * Retrieves all loaded module instances.
+	 *
+	 * @return ModuleInterface[] Associative array of loaded modules (name => instance).
+	 */
+	public function getModules(): array {
+		return $this->modules;
+	}
+
+	/**
+	 * Retrieves the normalized manifest for a loaded module.
+	 *
+	 * @param string $name Module name.
+	 * @return array|null Manifest array (name, description, version, requires_core, environment, dependencies, has_navbar, has_settings) if loaded, null otherwise.
+	 */
+	public function getManifest(string $name): ?array {
+		return $this->manifests[$name] ?? null;
+	}
+
+	/**
+	 * Retrieves all manifests for loaded modules.
+	 *
+	 * @return array Associative array of normalized manifests (name => manifest array).
+	 */
+	public function getManifests(): array {
+		return $this->manifests;
+	}
+
+	/**
+	 * Constructs the full path to a module directory.
+	 *
+	 * @param string $name Module name.
+	 * @return string Full path to module directory (modules/{name}).
+	 */
+	public function getModulePath(string $name): string {
+		$base = defined('MAIN_HOME') ? MAIN_HOME : dirname(__DIR__, 2) . '/';
+		return $base . 'Modules/' . $name;
+	}
+
+	/**
+	 * Loads module override configuration from config/modules.php.
+	 *
+	 * Overrides can disable modules, override class names, or provide other module-specific settings.
+	 *
+	 * @return void
+	 */
+	protected function loadOverrides(): void {
+		$overridesPath = defined('CONFIG_PATH')
+			? CONFIG_PATH . 'modules.php'
+			: dirname(__DIR__, 2) . '/config/modules.php';
+
+		if (file_exists($overridesPath)) {
+			$this->overrides = require $overridesPath;
+			if (!is_array($this->overrides)) {
+				$this->overrides = [];
+			}
+		}
+	}
+
+	/**
+	 * Discovers and filters modules based on manifest files and environment.
+	 *
+	 * Reads all module.json manifests, normalizes manifest data, checks override disabling,
+	 * and filters modules to current environment (main/lb). Returns discovered modules
+	 * with their paths and normalized manifest data.
+	 *
+	 * @param array           $jsonFiles          Array of full paths to module.json files.
+	 * @param ServerEnvironment $currentEnvironment Current server environment.
+	 * @return array Associative array of discovered modules: name => [path, manifest].
+	 * @throws \RuntimeException If manifest has invalid environment value or JSON is malformed.
+	 */
+	protected function discoverModules(array $jsonFiles, ServerEnvironment $currentEnvironment): array {
+		$discovered = [];
+
+		foreach ($jsonFiles as $jsonFile) {
+			// Derive a provisional name from directory — used only as fallback in readManifest().
+			$dirName = basename(dirname($jsonFile));
+
+			// Check overrides by directory name before spending I/O on the manifest.
+			if (!$this->resolveState($dirName)->isLoadable()) {
+				continue;
+			}
+
+			$manifest = $this->readManifest($jsonFile, $dirName);
+
+			// Canonical name: always from the manifest (handles module-path subdirs in Composer packages).
+			$name = $manifest['name'];
+
+			// Re-check overrides by canonical name (in case it differs from directory name).
+			if (!$this->resolveState($name)->isLoadable()) {
+				continue;
+			}
+
+			if (!in_array($manifest['environment'], ['main', 'lb', 'any'], true)) {
+				throw new ModuleManifestException("ModuleLoader: invalid environment in module.json for module {$name}");
+			}
+
+			// Filter by environment: skip if module is for different environment (skip lb-only on main, etc)
+			if ($manifest['environment'] !== 'any' && $manifest['environment'] !== $currentEnvironment->value) {
+				continue;
+			}
+
+			$discovered[$name] = [
+				'path'     => dirname($jsonFile),
+				'manifest' => $manifest,
+			];
+		}
+
+		return $discovered;
+	}
+
+	/**
+	 * Resolves the class name for a module from its name.
+	 *
+	 * Checks for override in config first. If not overridden, converts kebab-case name to PascalCase
+	 * and appends 'Module' suffix.
+	 *
+	 * Example: 'watch-manager' -> 'WatchManagerModule'
+	 *
+	 * @param string $name Module name (kebab-case).
+	 * @return string Resolved class name (PascalCase).
+	 */
+	protected function resolveClassName(string $name): string {
+		if (isset($this->overrides[$name]['class'])) {
+			$class = $this->overrides[$name]['class'];
+			// Override must be an FQN. If it's a bare class name, build the FQN using convention.
+			if (!str_contains($class, '\\')) {
+				$pascal = implode('', array_map('ucfirst', explode('-', $name)));
+				return 'XcVm\\Module\\' . $pascal . '\\' . $class;
+			}
+			return $class;
+		}
+
+		// Convert kebab-case to PascalCase: 'my-module' → 'MyModule'
+		$parts  = explode('-', $name);
+		$pascal = implode('', array_map('ucfirst', $parts));
+
+		// Return fully-qualified class name: XcVm\Module\{Pascal}\{Pascal}Module
+		return 'XcVm\\Module\\' . $pascal . '\\' . $pascal . 'Module';
+	}
+
+	/**
+	 * The module's canonical name as declared in its module.json ("name"), used
+	 * for class resolution. Falls back to $fallback (the directory/slug) when the
+	 * manifest is missing or has no usable name. This lets a module installed
+	 * under a marketplace slug still resolve to the class the developer authored.
+	 *
+	 * @param string|null $modulePath Module directory (contains module.json).
+	 * @param string      $fallback   Name to use when the manifest has none.
+	 * @return string Canonical module name (kebab-case).
+	 */
+	private function manifestName(?string $modulePath, string $fallback): string {
+		if ($modulePath === null) {
+			return $fallback;
+		}
+		$jsonFile = $modulePath . '/module.json';
+		if (is_file($jsonFile)) {
+			$meta = json_decode((string) @file_get_contents($jsonFile), true);
+			if (is_array($meta) && isset($meta['name']) && is_string($meta['name']) && $meta['name'] !== '') {
+				return $meta['name'];
+			}
+		}
+		return $fallback;
+	}
+
+	/**
+	 * Detects the current environment (main or load-balancer).
+	 *
+	 * Checks SERVER_TYPE constant. Returns LoadBalancer if set to 'lb' (case-insensitive), else Main.
+	 */
+	protected function getCurrentEnvironment(): ServerEnvironment {
+		if (defined('SERVER_TYPE') && strtolower((string) constant('SERVER_TYPE')) === 'lb') {
+			return ServerEnvironment::LoadBalancer;
+		}
+		return ServerEnvironment::Main;
+	}
+
+	/**
+	 * Reads and normalizes a module manifest from JSON file.
+	 *
+	 * Parses module.json, validates all fields, normalizes dependency arrays (trim, dedup, sort),
+	 * and fills in default values. Performs strict type checking to catch configuration errors early.
+	 *
+	 * Supported fields:
+	 *   dependencies          — required; missing dep causes load failure
+	 *   optional_dependencies — optional; missing dep is silently skipped
+	 *   priority              — load order weight (higher = earlier, default 0)
+	 *
+	 * @param string $jsonFile Full path to module.json file.
+	 * @param string $name Module name (used for error messages).
+	 * @return array Normalized manifest.
+	 * @throws \RuntimeException If JSON is invalid, dependencies not array, or dependency names not strings.
+	 */
+	protected function readManifest(string $jsonFile, string $name): array {
+		$raw = @file_get_contents($jsonFile);
+		$manifest = json_decode((string) $raw, true);
+
+		if (!is_array($manifest)) {
+			throw new ModuleManifestException("ModuleLoader: invalid JSON in module manifest for module {$name}");
+		}
+
+		$normalizeDepArray = function (mixed $raw, string $field) use ($name): array {
+			if (!is_array($raw)) {
+				throw new ModuleManifestException("ModuleLoader: {$field} must be array for module {$name}");
+			}
+			$result = [];
+			foreach ($raw as $dep) {
+				if (!is_string($dep) || trim($dep) === '') {
+					throw new ModuleManifestException("ModuleLoader: {$field} names must be non-empty strings for module {$name}");
+				}
+				$result[] = trim($dep);
+			}
+			sort($result, SORT_STRING);
+			return array_values(array_unique($result));
+		};
+
+		return [
+			'name'                  => $manifest['name'] ?? $name,
+			'hash_id'               => (string) ($manifest['hash_id'] ?? ''),
+			'description'           => $manifest['description'] ?? '',
+			'version'               => $manifest['version'] ?? '',
+			'requires_core'         => $manifest['requires_core'] ?? '',
+			'environment'           => strtolower((string) ($manifest['environment'] ?? 'main')),
+			'dependencies'          => self::filterCoreProvidedDependencies($normalizeDepArray($manifest['dependencies'] ?? [], 'dependencies')),
+			'optional_dependencies' => self::filterCoreProvidedDependencies($normalizeDepArray($manifest['optional_dependencies'] ?? [], 'optional_dependencies')),
+			'has_navbar'            => (bool) ($manifest['has_navbar'] ?? false),
+			'has_settings'          => (bool) ($manifest['has_settings'] ?? false),
+			'priority'              => (int) ($manifest['priority'] ?? 0),
+			'update'                => self::normalizeUpdateBlock($manifest, $manifest['name'] ?? $name),
+		];
+	}
+
+	/**
+	 * Strip dependencies that are provided by the core codebase.
+	 *
+	 * @param string[] $dependencies Normalized dependency names.
+	 * @return string[] Dependencies that still refer to real modules.
+	 */
+	public static function filterCoreProvidedDependencies(array $dependencies): array {
+		return array_values(array_diff($dependencies, self::CORE_PROVIDED_MODULES));
+	}
+
+	/**
+	 * Normalize the optional `update` manifest block — where the module gets its
+	 * updates from. Part of the module-update-source plan (P2).
+	 *
+	 * Shape:
+	 *   "update": {
+	 *     "source": "bundled | platform | git | url",
+	 *     "repository": "https://…",   // git
+	 *     "channel": "stable | beta",
+	 *     "slug": "…",                  // platform (defaults to name)
+	 *     "url": "https://…"            // url
+	 *   }
+	 *
+	 * Absent or unknown source → `bundled` (files ship with the panel), so every
+	 * existing module keeps working unchanged. NO network is done here — this only
+	 * shapes the declared source for the later fetch/apply phases.
+	 *
+	 * @param array  $manifest Raw module.json.
+	 * @param string $name     Module name (fallback for slug).
+	 * @return array{source:string,repository:string,channel:string,slug:string,url:string}
+	 */
+	public static function normalizeUpdateBlock(array $manifest, string $name): array {
+		$raw    = is_array($manifest['update'] ?? null) ? $manifest['update'] : [];
+		$source = strtolower(trim((string) ($raw['source'] ?? 'bundled')));
+		if (!in_array($source, ['bundled', 'platform', 'git', 'url'], true)) {
+			$source = 'bundled';
+		}
+
+		return [
+			'source'     => $source,
+			'repository' => trim((string) ($raw['repository'] ?? '')),
+			'channel'    => strtolower(trim((string) ($raw['channel'] ?? 'stable'))) ?: 'stable',
+			'slug'       => trim((string) ($raw['slug'] ?? '')) ?: $name,
+			'url'        => trim((string) ($raw['url'] ?? '')),
+		];
+	}
+
+	/**
+	 * Resolves deterministic load order of modules based on dependencies.
+	 *
+	 * Uses depth-first search (DFS) with topological sort to order modules such that
+	 * dependencies are loaded before their dependents. Modules are visited in alphabetical order
+	 * for determinism. Detects cyclic dependencies and throws exception.
+	 *
+	 * @param array $discovered Discovered modules (name => [path, manifest]).
+	 * @return array Ordered module names: modules are in dependency-order (dependencies first).
+	 * @throws \RuntimeException If a cyclic dependency is detected.
+	 */
+	protected function resolveLoadOrder(array $discovered): array {
+		$order = [];
+		$state = [];  // 1 = visiting, 2 = visited
+
+		// Drop modules whose required dependencies are unavailable (missing on
+		// disk, disabled/uninstalled via config/modules.php, or filtered out by
+		// environment) before sorting. A single unsatisfiable module must not
+		// abort the whole load: we skip it — and, transitively, anything that
+		// requires it — with a warning, so the rest of the panel and the CLI keep
+		// working. Without this, e.g. disabling 'watch' while 'plex' (which
+		// requires it) stays enabled would throw ModuleNotFoundException out of
+		// loadAll() and brick both the admin panel and console.php.
+		$discovered = $this->pruneUnsatisfiableModules($discovered);
+
+		$names = array_keys($discovered);
+
+		// Sort by priority desc, then alphabetically for determinism within same priority
+		usort($names, function (string $a, string $b) use ($discovered): int {
+			$pa = $discovered[$a]['manifest']['priority'] ?? 0;
+			$pb = $discovered[$b]['manifest']['priority'] ?? 0;
+			if ($pa !== $pb) {
+				return $pb <=> $pa; // higher priority first
+			}
+			return strcmp($a, $b);
+		});
+
+		foreach ($names as $name) {
+			$this->visitDependencyNode($name, $discovered, $state, $order, []);
+		}
+
+		return $order;
+	}
+
+	/**
+	 * Removes modules whose required dependencies are not present in the
+	 * discovered set, cascading transitively.
+	 *
+	 * Discovery may legitimately exclude a module (disabled/uninstalled via
+	 * config/modules.php, or filtered out for the current environment). When that
+	 * module is a *required* dependency of another, the dependent cannot load —
+	 * but that is not a fatal condition for the whole panel: we drop the dependent
+	 * (and anything depending on it, in turn) and log a warning, leaving every
+	 * still-satisfiable module loadable. This keeps the admin panel and CLI alive
+	 * instead of throwing ModuleNotFoundException out of loadAll().
+	 *
+	 * Optional dependencies are ignored here — they are allowed to be absent.
+	 *
+	 * @param array $discovered Discovered modules (name => [path, manifest]).
+	 * @return array Pruned discovered set containing only satisfiable modules.
+	 */
+	protected function pruneUnsatisfiableModules(array $discovered): array {
+		do {
+			$removed = false;
+			foreach ($discovered as $name => $info) {
+				foreach ($info['manifest']['dependencies'] as $dependency) {
+					if (!isset($discovered[$dependency])) {
+						error_log(
+							"ModuleLoader: skipping module '{$name}' — required dependency "
+							. "'{$dependency}' is not available (missing, disabled, or wrong environment)"
+						);
+						unset($discovered[$name]);
+						$removed = true;
+						break;
+					}
+				}
+			}
+		} while ($removed);
+
+		return $discovered;
+	}
+
+	/**
+	 * DFS traversal to visit a module and its dependencies in dependency order.
+	 *
+	 * Part of topological sort algorithm. Maintains state machine:
+	 * - 1 = currently visiting (used to detect cycles)
+	 * - 2 = finished visiting
+	 *
+	 * Recursively visits all dependencies before adding module to load order.
+	 *
+	 * @param string $name Module name to visit.
+	 * @param array $discovered Discovered modules (name => [path, manifest]).
+	 * @param array &$state Visit state for each module (1=visiting, 2=visited).
+	 * @param array &$order Load order being built (appends module names).
+	 * @param array $stack Call stack trace (used for cycle error message).
+	 * @return void
+	 * @throws \RuntimeException If cyclic dependency detected or dependency not found in discovered modules.
+	 */
+	protected function visitDependencyNode(
+		string $name,
+		array $discovered,
+		array &$state,
+		array &$order,
+		array $stack
+	): void {
+		if (isset($state[$name])) {
+			if ($state[$name] === 2) {
+				// Already fully visited, skip
+				return;
+			}
+			if ($state[$name] === 1) {
+				// Currently visiting = cycle detected
+				$cycle = array_slice($stack, array_search($name, $stack, true) ?: 0);
+				$cycle[] = $name;
+				throw new ModuleCycleException('ModuleLoader: cyclic module dependency detected: ' . implode(' -> ', $cycle));
+			}
+		}
+
+		if (!isset($discovered[$name])) {
+			throw new ModuleLoadException("ModuleLoader: unknown module in dependency graph: {$name}");
+		}
+
+		// Mark as currently visiting
+		$state[$name] = 1;
+		$stack[] = $name;
+
+		// Required dependencies — throw if missing
+		foreach ($discovered[$name]['manifest']['dependencies'] as $dependency) {
+			if (!isset($discovered[$dependency])) {
+				throw new ModuleNotFoundException("ModuleLoader: module {$name} requires missing dependency {$dependency}");
+			}
+			$this->visitDependencyNode($dependency, $discovered, $state, $order, $stack);
+		}
+
+		// Optional dependencies — visit only when present, skip silently otherwise
+		foreach ($discovered[$name]['manifest']['optional_dependencies'] ?? [] as $dependency) {
+			if (isset($discovered[$dependency])) {
+				$this->visitDependencyNode($dependency, $discovered, $state, $order, $stack);
+			}
+		}
+
+		// Mark as fully visited and add to load order
+		$state[$name] = 2;
+		$order[] = $name;
+	}
+
+	/**
+	 * Registers event subscribers declared by a module.
+	 *
+	 * Two complementary mechanisms are supported and both run on every boot:
+	 *
+	 *   1. getEventSubscribers() — legacy array API:
+	 *        ['EventClass' => callable]  or  ['EventClass' => [callable, $priority]]
+	 *
+	 *   2. #[ListensTo] attribute — declarative PHP 8.1 attribute on public methods:
+	 *        #[ListensTo(SomeEvent::class, priority: 10)]
+	 *        public function onSome(SomeEvent $e): void { ... }
+	 *
+	 * Both paths are additive — using one does not disable the other.
+	 *
+	 * If the event class named in a #[ListensTo] attribute does not exist at
+	 * registration time the listener is silently skipped (graceful degradation).
+	 *
+	 * @return void
+	 */
+	private function registerEventSubscribers(ServiceProviderInterface $module, ServiceContainer $container): void {
+		// Verify the container holds an actual EventDispatcher instance (not just the class name).
+		// Static calls below route to the same instance via EventDispatcher::getInstance().
+		if (!$container->has('events') || !$container->get('events') instanceof EventDispatcher) {
+			return;
+		}
+
+		// ── 1. Legacy array API via getEventSubscribers() ─────────────────
+		$subscribers = $module->getEventSubscribers();
+		foreach ($subscribers as $event => $handler) {
+			if (is_array($handler) && isset($handler[0]) && is_callable($handler[0])) {
+				// [callable, int $priority] tuple — new PSR-14 style
+				EventDispatcher::listen($event, $handler[0], $handler[1] ?? 0);
+			} else {
+				// Legacy: string event name or class-string, plain callable
+				EventDispatcher::listen($event, $handler);
+			}
+		}
+
+		// ── 2. #[ListensTo] attribute scan via Reflection ─────────────────
+		$reflection = new \ReflectionClass($module);
+		foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+			$attributes = $method->getAttributes(ListensTo::class);
+			if (empty($attributes)) {
+				continue;
+			}
+			foreach ($attributes as $attribute) {
+				/** @var ListensTo $listensTo */
+				$listensTo = $attribute->newInstance();
+
+				// Graceful degradation: skip if the event class is not (yet) loadable.
+				if (!class_exists($listensTo->eventClass)) {
+					continue;
+				}
+
+				EventDispatcher::listen(
+					$listensTo->eventClass,
+					[$module, $method->getName()],
+					$listensTo->priority,
+				);
+			}
+		}
+	}
+
+	/**
+	 * Registers stream middleware declared by a module into the pipeline.
+	 *
+	 * Only called for modules implementing StreamMiddlewareProviderInterface.
+	 *
+	 * @return void
+	 */
+	private function registerStreamMiddleware(ModuleInterface $module, StreamPipeline $pipeline): void {
+		if (!$module instanceof StreamMiddlewareProviderInterface) {
+			return;
+		}
+		foreach ($module->getStreamMiddleware() as $middleware) {
+			if ($middleware instanceof StreamMiddlewareInterface) {
+				$pipeline->pipe($middleware);
+			}
+		}
+	}
+
+	/**
+	 * Registers a PSR-4 autoloader for a single module's namespace (once per path).
+	 *
+	 * The module's base namespace ({$baseNamespace}, e.g. XcVm\Module\Watch) is
+	 * mapped onto its directory ({$modulePath}). The namespace remainder becomes
+	 * the sub-path, exactly per PSR-4:
+	 *
+	 *   XcVm\Module\Watch\WatchModule          → {modulePath}/WatchModule.php
+	 *   XcVm\Module\Watch\Service\WatchService → {modulePath}/Service/WatchService.php
+	 *
+	 * Classes outside the module's namespace (global legacy classes, other
+	 * modules, core) fall through to the next autoloader untouched — no short-name
+	 * glob, so two modules can declare same-named sub-classes without colliding.
+	 * Marketplace slug directories are unaffected: {modulePath} is the real path.
+	 *
+	 * Encrypted files are require'd as-is and transparently decrypted by the
+	 * XC_VM zend_compile_file hook.
+	 */
+	private function registerModuleAutoloader(string $modulePath, string $baseNamespace): void {
+		if ($baseNamespace === '' || isset(self::$autoloadedPaths[$modulePath])) {
+			return;
+		}
+		self::$autoloadedPaths[$modulePath] = true;
+
+		$prefix    = $baseNamespace . '\\';
+		$prefixLen = strlen($prefix);
+
+		spl_autoload_register(function (string $class) use ($modulePath, $prefix, $prefixLen): void {
+			// Only resolve classes under this module's namespace; everything else
+			// falls through to the next autoloader (Composer / legacy scanner).
+			if (strncmp($class, $prefix, $prefixLen) !== 0) {
+				return;
+			}
+			$relative = str_replace('\\', '/', substr($class, $prefixLen));
+			$file     = $modulePath . '/' . $relative . '.php';
+			if (is_file($file)) {
+				require_once $file;
+			}
+		});
+	}
+
+	/**
+	 * Resolve the effective ModuleState for a module from its overrides entry.
+	 *
+	 * Reads both the new 'state' key and the legacy 'enabled' bool key so that
+	 * existing config/modules.php files continue to work without migration.
+	 *
+	 * @param string $name Module name or directory name.
+	 * @return ModuleState
+	 */
+	private function resolveState(string $name): ModuleState {
+		$entry = $this->overrides[$name] ?? null;
+		if ($entry === null) {
+			return ModuleState::Enabled;
+		}
+		// New key takes precedence.
+		if (isset($entry['state'])) {
+			return ModuleState::fromRaw($entry['state']);
+		}
+		// Legacy bool key.
+		if (array_key_exists('enabled', $entry)) {
+			return ModuleState::fromRaw($entry['enabled']);
+		}
+		return ModuleState::Enabled;
+	}
+
+	/**
+	 * Returns true if the file starts with the XCVM encrypted-file magic bytes.
+	 */
+	private function isFileEncrypted(string $path): bool {
+		$fh = @fopen($path, 'rb');
+		if (!$fh) {
+			return false;
+		}
+		$magic = fread($fh, 4);
+		fclose($fh);
+		return $magic === "\x58\x43\x56\x4D";
+	}
+
+	/**
+	 * Resolves the vendor directory path relative to the modules directory.
+	 *
+	 * The vendor directory is expected to be a sibling of the modules/ directory
+	 * (i.e. at MAIN_HOME/vendor/). Returns null when vendor/composer/ does not exist
+	 * or Composer has not been run.
+	 *
+	 * @param string $modulesDir Absolute path to the modules/ directory.
+	 * @return string|null Absolute path to vendor/, or null if not found.
+	 */
+	private function resolveVendorDir(string $modulesDir): ?string {
+		$vendorDir = dirname($modulesDir) . '/vendor';
+		return is_dir($vendorDir . '/composer') ? $vendorDir : null;
+	}
+
+	/**
+	 * Collects module.json paths from Composer-installed xcvm-module packages.
+	 *
+	 * Reads vendor/composer/installed.json and returns the module.json path for
+	 * every package whose "type" is "xcvm-module". Packages may optionally declare
+	 * a subdirectory for the module root via:
+	 *
+	 *   "extra": { "xcvm": { "module-path": "src/" } }
+	 *
+	 * When absent, module.json is expected at the package root.
+	 *
+	 * @param string $vendorDir Absolute path to the vendor/ directory.
+	 * @return string[] Absolute paths to discovered module.json files.
+	 */
+	private function collectComposerModuleManifests(string $vendorDir): array {
+		$installedJson = $vendorDir . '/composer/installed.json';
+		$raw = @file_get_contents($installedJson);
+		if ($raw === false) {
+			return [];
+		}
+
+		$data = json_decode($raw, true);
+		if (!is_array($data)) {
+			return [];
+		}
+
+		// Composer 2.x wraps packages in {"packages": [...], "dev": ...}
+		// Composer 1.x uses a flat array
+		$packages = isset($data['packages']) && is_array($data['packages'])
+			? $data['packages']
+			: $data;
+
+		$manifests = [];
+		foreach ($packages as $package) {
+			if (!is_array($package) || ($package['type'] ?? '') !== 'xcvm-module') {
+				continue;
+			}
+
+			// install-path is relative to vendor/composer/
+			$installPath = realpath($vendorDir . '/composer/' . ($package['install-path'] ?? ''));
+			if ($installPath === false) {
+				continue;
+			}
+
+			// Optional subdirectory override
+			$subPath     = trim((string) ($package['extra']['xcvm']['module-path'] ?? ''), '/');
+			$moduleDir   = $subPath !== '' ? $installPath . '/' . $subPath : $installPath;
+			$manifestFile = $moduleDir . '/module.json';
+
+			if (file_exists($manifestFile)) {
+				$manifests[] = $manifestFile;
+			}
+		}
+
+		return $manifests;
+	}
 }
diff --git a/src/Core/Module/ModuleManager.php b/src/Core/Module/ModuleManager.php
index 42e8c983..e8f2caa6 100644
--- a/src/Core/Module/ModuleManager.php
+++ b/src/Core/Module/ModuleManager.php
@@ -31,2213 +31,2217 @@ use XcVm\Infrastructure\Database\DatabaseFactory;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ModuleManager {
-    private string $modulesPath;
-    private string $overridesPath;
-    private string $archivesPath;
-    private ?ServiceContainer $container;
-
-    /**
-     * Initialize the module manager.
-     *
-     * @param string|null $modulesPath   Path to the modules directory.
-     * @param string|null $overridesPath Path to the config/modules.php overrides file.
-     * @param ServiceContainer|null $container Service container for DB access and DI.
-     */
-    public function __construct(
-        ?string $modulesPath = null,
-        ?string $overridesPath = null,
-        ?ServiceContainer $container = null
-    ) {
-        $this->modulesPath   = $modulesPath   ?: (defined('MAIN_HOME')   ? MAIN_HOME   . 'Modules'      : dirname(__DIR__, 2) . '/Modules');
-        $this->overridesPath = $overridesPath ?: (defined('CONFIG_PATH') ? CONFIG_PATH . 'modules.php'  : dirname(__DIR__, 2) . '/config/modules.php');
-        $this->archivesPath  = defined('MAIN_HOME') ? MAIN_HOME . 'modules_archives' : dirname(__DIR__, 2) . '/modules_archives';
-        $this->container     = $container;
-    }
-
-    /**
-     * Absolute path of the stored archive for a custom (non-store) module.
-     *
-     * MAIN keeps a copy of every uploaded module archive named
-     * {name}_{version}.zip so LB servers can pull it back over the internal
-     * system API (action=getFile). Because every server shares the same
-     * MAIN_HOME layout, the LB can reconstruct this exact path from the name +
-     * version carried in the install_module signal.
-     */
-    public function archivePathFor(string $name, string $version): string {
-        $name    = $this->sanitizeModuleName($name);
-        $version = preg_replace('/[^0-9A-Za-z._\-]/', '', (string) $version);
-        return $this->archivesPath . '/' . $name . '_' . $version . '.zip';
-    }
-
-    /** @return object|null Database instance from the container, or null if unavailable. */
-    private function getDb(): ?object {
-        if ($this->container !== null && $this->container->has('db')) {
-            return $this->container->get('db');
-        }
-        return null;
-    }
-
-    /**
-     * Absolute path of a module's directory on disk, resolving the
-     * `{name}_{hash5}` directory convention.
-     *
-     * A module's logical name (config key, class namespace) never carries the hash
-     * — sanitizeModuleName() forbids `_`. The directory does: `{name}_{hash5}` (5
-     * hex chars of hash_id), so two modules that share a name don't clash on disk.
-     * Resolution order: exact `{name}` (legacy / back-compat) → the first
-     * `{name}_*` directory that has a module.json → fall back to exact.
-     */
-    private function modulePathFor(string $name): string {
-        $name  = $this->sanitizeModuleName($name);
-        $exact = $this->modulesPath . '/' . $name;
-        if (is_dir($exact)) {
-            return $exact;
-        }
-        foreach (glob($this->modulesPath . '/' . $name . '_*', GLOB_ONLYDIR) ?: [] as $dir) {
-            if (is_file($dir . '/module.json')) {
-                return $dir;
-            }
-        }
-        return $exact;
-    }
-
-    /**
-     * Directory name for a module: `{name}_{hash5}` where hash5 is the first 5 hex
-     * chars of its permanent hash_id. The name itself never contains `_`.
-     *
-     * A hash_id is mandatory — callers must run the manifest through ensureHashId()
-     * first so no module is ever placed in a hash-less directory. Passing an empty
-     * hash_id is a programming error and throws.
-     */
-    private function moduleDirName(string $name, string $hashId): string {
-        $name   = $this->sanitizeModuleName($name);
-        $hashId = strtolower(preg_replace('/[^a-f0-9]/i', '', $hashId) ?? '');
-        if ($hashId === '') {
-            throw new \RuntimeException("module '{$name}' has no hash_id — cannot build directory name");
-        }
-        return $name . '_' . substr($hashId, 0, 5);
-    }
-
-    /**
-     * Ensure the module at $moduleDir has a permanent hash_id, generating and
-     * persisting one into its module.json when absent. Returns the 32-hex value.
-     *
-     * Every module must carry a hash_id: it forms the `{name}_{hash5}` directory
-     * suffix and is the module's stable identity. Uploaded or legacy modules that
-     * ship without one get a fresh random id written here (once, mirroring
-     * tools/gen-module-hashes.php); a valid existing id is immutable and left as-is.
-     */
-    private function ensureHashId(string $moduleDir): string {
-        $file = $moduleDir . '/module.json';
-        $meta = json_decode((string) @file_get_contents($file), true);
-        if (!is_array($meta)) {
-            $meta = [];
-        }
-        $hash = strtolower(preg_replace('/[^a-f0-9]/i', '', (string) ($meta['hash_id'] ?? '')) ?? '');
-
-        if (strlen($hash) < 32) {
-            $hash = bin2hex(random_bytes(16));
-            $meta = $this->withHashIdAfterName($meta, $hash);
-            @file_put_contents(
-                $file,
-                json_encode($meta, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE) . "\n"
-            );
-        }
-        return $hash;
-    }
-
-    /**
-     * Return $meta with hash_id set immediately after the `name` key (or first when
-     * there is no name), dropping any pre-existing empty hash_id entry.
-     *
-     * @param array<string, mixed> $meta
-     * @return array<string, mixed>
-     */
-    private function withHashIdAfterName(array $meta, string $hash): array {
-        $out = [];
-        foreach ($meta as $k => $v) {
-            if ($k === 'hash_id') {
-                continue;
-            }
-            $out[$k] = $v;
-            if ($k === 'name') {
-                $out['hash_id'] = $hash;
-            }
-        }
-        if (!isset($out['hash_id'])) {
-            $out = ['hash_id' => $hash] + $out;
-        }
-        return $out;
-    }
-
-    /**
-     * Copy an extracted module directory into modulesPath as `{name}_{hash5}`,
-     * replacing any existing install of the same module (one per name is active).
-     *
-     * @param string $moduleDir Extracted directory containing module.json.
-     * @return string Canonical module name that was placed.
-     */
-    private function placeModuleFiles(string $moduleDir): string {
-        $name = $this->sanitizeModuleName($this->manifestNameFromDir($moduleDir));
-        // Guarantee a hash_id (generating + persisting one when the upload lacks it)
-        // so the module is always placed in a `{name}_{hash5}` directory, never bare.
-        $hash = $this->ensureHashId($moduleDir);
-
-        // Remove any current install of the same module (may live under a different
-        // {name}_{hash5} or a legacy {name} directory).
-        $existing = $this->modulePathFor($name);
-        if (is_dir($existing)) {
-            $this->deleteDirectory($existing);
-        }
-
-        $targetDir = $this->modulesPath . '/' . $this->moduleDirName($name, $hash);
-        if (is_dir($targetDir)) {
-            $this->deleteDirectory($targetDir);
-        }
-        $this->copyDirectory($moduleDir, $targetDir);
-
-        return $name;
-    }
-
-    /**
-     * Retire legacy hash-less module directories: rename every bare `{name}`
-     * directory to the canonical `{name}_{hash5}`, generating a hash_id when the
-     * manifest lacks one.
-     *
-     * Older deployments (and modules placed before the hash convention) live in a
-     * bare `{name}` directory. This one-shot, idempotent migration — run on every
-     * `status` pass before anything scans the modules folder — brings them onto the
-     * `{name}_{hash5}` scheme so the legacy layout can be dropped. Already-hashed
-     * directories and non-module directories are skipped. When both a bare and a
-     * hashed copy of the same module exist, the stale bare copy is removed.
-     *
-     * @return string[] Canonical names of modules migrated this pass.
-     */
-    public function migrateLegacyModuleDirs(): array {
-        $migrated = [];
-        foreach (glob($this->modulesPath . '/*', GLOB_ONLYDIR) ?: [] as $dir) {
-            if (!is_file($dir . '/module.json')) {
-                continue;
-            }
-            $name = $this->sanitizeModuleName($this->manifestNameFromDir($dir));
-            if ($name === '') {
-                continue;
-            }
-            // A canonical `{name}_{hash5}` directory has a basename different from the
-            // logical name; only a bare `{name}` directory is legacy.
-            if (basename($dir) !== $name) {
-                continue;
-            }
-
-            $hash   = $this->ensureHashId($dir);
-            $target = $this->modulesPath . '/' . $this->moduleDirName($name, $hash);
-            if ($target === $dir) {
-                continue;
-            }
-            if (is_dir($target)) {
-                // A hashed copy already exists — the bare directory is a stale dup.
-                $this->deleteDirectory($dir);
-            } else {
-                @rename($dir, $target);
-            }
-            $migrated[] = $name;
-        }
-        return $migrated;
-    }
-
-    /**
-     * Remove on-disk copies and recorded state of modules that are now part of
-     * the core codebase (ModuleLoader::CORE_PROVIDED_MODULES).
-     *
-     * Upgraded panels may still carry the old module directory (any hash
-     * suffix); left in place it would boot alongside the core implementation
-     * and its commands/routes would collide.
-     *
-     * @return string[] Names that were purged.
-     */
-    public function purgeCoreProvidedModules(): array {
-        $purged = [];
-        foreach (ModuleLoader::CORE_PROVIDED_MODULES as $name) {
-            $dir = $this->modulePathFor($name);
-            if (is_dir($dir) && is_file($dir . '/module.json')) {
-                $this->deleteDirectory($dir);
-                error_log("purgeCoreProvidedModules: removed stale module directory '" . basename($dir) . "' — '{$name}' now ships in core.");
-                $purged[] = $name;
-            }
-
-            $overrides = $this->readOverrides();
-            if (isset($overrides[$name])) {
-                unset($overrides[$name]);
-                $this->writeOverrides($overrides);
-                if (!in_array($name, $purged, true)) {
-                    $purged[] = $name;
-                }
-            }
-        }
-        return $purged;
-    }
-
-    /**
-     * Names of currently-installed modules that declare $name as a dependency.
-     *
-     * @return string[]
-     */
-    private function installedDependentsOf(string $name): array {
-        $out = [];
-        foreach ($this->listModules() as $module) {
-            if (($module['installed_version'] ?? '') === '') {
-                continue; // not installed — its requirements don't apply
-            }
-            if (in_array($name, $module['dependencies'] ?? [], true)) {
-                $out[] = $module['name'];
-            }
-        }
-        return $out;
-    }
-
-    /**
-     * Names of currently-loadable (enabled) installed modules that declare $name
-     * as a required dependency.
-     *
-     * Used to guard disabling: a dependent that is itself disabled won't be loaded
-     * either, so disabling $name under it is harmless and must not be blocked.
-     * Only enabled dependents would be broken (ModuleLoader skips them on the next
-     * boot), so only those count.
-     *
-     * @return string[]
-     */
-    private function enabledDependentsOf(string $name): array {
-        $out = [];
-        foreach ($this->listModules() as $module) {
-            if (($module['installed_version'] ?? '') === '') {
-                continue; // not installed — its requirements don't apply
-            }
-            $state = $module['state'] ?? null;
-            if (!($state instanceof ModuleState) || !$state->isLoadable()) {
-                continue; // already disabled/failed — disabling its dep won't break it
-            }
-            if (in_array($name, $module['dependencies'] ?? [], true)) {
-                $out[] = $module['name'];
-            }
-        }
-        return $out;
-    }
-
-    /**
-     * Install any on-disk module that has never been installed.
-     *
-     * Bundled modules (e.g. ministra) are booted on every request but only get
-     * their install() / migrations run when explicitly installed. On a fresh
-     * panel nothing would create their tables, so this runs once during the
-     * migrate step (see StatusCommand) to provision them. It is idempotent:
-     * already-installed modules are skipped, and a module's up-migrations use
-     * CREATE TABLE IF NOT EXISTS so re-provisioning an existing panel is safe.
-     *
-     * Modules are installed in dependency order. Only admin-disabled modules are
-     * left untouched — a module whose previous install FAILED (or crashed mid-way,
-     * leaving it Installing) is retried here, so re-running `console.php status`
-     * self-heals once the root cause is fixed. Retrying is safe: the master schema
-     * uses CREATE TABLE IF NOT EXISTS.
-     *
-     * @return string[] Names of modules that were installed this pass.
-     */
-    public function syncBundledModules(): array {
-        // Retire any legacy hash-less {name} directory before anything scans the
-        // modules folder, so every module ends up on the {name}_{hash5} scheme.
-        $this->migrateLegacyModuleDirs();
-
-        // Drop leftovers of modules whose functionality moved into the core
-        // (e.g. tmdb): a stale on-disk copy would still boot and its commands
-        // would collide with the core-registered ones.
-        $this->purgeCoreProvidedModules();
-
-        // Fetch any standard-set module that lives in a remote source (git/url/
-        // platform) and isn't on disk yet — a no-op while every standard module is
-        // bundled on-disk. Fetched modules are installed by provisionStandardSet(),
-        // so the on-disk pass below simply skips them.
-        $provisioned = $this->provisionStandardSet();
-
-        $modules   = $this->listModules();
-        $installed = [];
-        foreach ($modules as $module) {
-            if (($module['installed_version'] ?? '') !== '') {
-                $installed[$module['name']] = true;
-            }
-        }
-
-        // Candidates: present on disk, not yet installed, not admin-disabled.
-        // Failed/Installing (a never-completed install) are retried, not skipped.
-        $pending = [];
-        foreach ($modules as $module) {
-            $name = $module['name'];
-            if (isset($installed[$name])) {
-                continue;
-            }
-            if (($module['state'] ?? null) === ModuleState::Disabled) {
-                continue;
-            }
-            $pending[$name] = $module;
-        }
-
-        // Install in dependency order: a module installs once all its declared
-        // dependencies are themselves installed.
-        $done  = [];
-        $guard = 0;
-        while (!empty($pending) && $guard++ < 1000) {
-            $progressed = false;
-            foreach (array_keys($pending) as $name) {
-                $ready = true;
-                foreach ($pending[$name]['dependencies'] ?? [] as $dep) {
-                    if (!isset($installed[$dep])) {
-                        $ready = false;
-                        break;
-                    }
-                }
-                if (!$ready) {
-                    continue;
-                }
-                try {
-                    $this->installModule($name);
-                    $installed[$name] = true;
-                    $done[] = $name;
-                } catch (\Throwable $e) {
-                    error_log("syncBundledModules: install '{$name}' failed: " . $e->getMessage());
-                }
-                unset($pending[$name]);
-                $progressed = true;
-            }
-            if (!$progressed) {
-                break; // unmet or circular dependencies — stop
-            }
-        }
-
-        return array_values(array_unique(array_merge($provisioned, $done)));
-    }
-
-    /**
-     * The standard module set the panel provisions by default (config/bundled_modules.php).
-     *
-     * Foundation for modules-in-separate-repos: each entry is keyed by the module's
-     * permanent `hash_id`. When the config file is absent, falls back to whatever
-     * is on disk (treated as `bundled`).
-     *
-     * @return array<int, array{hash_id?:string,name?:string,source?:string,repository?:string,channel?:string,slug?:string,url?:string}>
-     */
-    public function getStandardSet(): array {
-        $path = defined('CONFIG_PATH')
-            ? CONFIG_PATH . 'bundled_modules.php'
-            : dirname(__DIR__, 2) . '/config/bundled_modules.php';
-
-        if (is_file($path)) {
-            $data = require $path;
-            if (is_array($data)) {
-                return array_values(array_filter($data, 'is_array'));
-            }
-        }
-
-        // Fallback: derive from on-disk modules (all treated as bundled).
-        $out = [];
-        foreach ($this->listModules() as $m) {
-            $out[] = ['hash_id' => (string) ($m['hash_id'] ?? ''), 'name' => $m['name'], 'source' => 'bundled'];
-        }
-        return $out;
-    }
-
-    /**
-     * Resolve the on-disk module name that carries a given permanent `hash_id`.
-     *
-     * The stable identity lookup: lets the panel recognise "the same module" across
-     * a rename or a repo move, where `name` alone is unreliable.
-     *
-     * @param string $hashId Permanent module hash_id.
-     * @return string|null Module name, or null if no on-disk module has that hash_id.
-     */
-    public function findModuleByHashId(string $hashId): ?string {
-        $hashId = trim($hashId);
-        if ($hashId === '') {
-            return null;
-        }
-        foreach ($this->listModules() as $m) {
-            if (($m['hash_id'] ?? '') === $hashId) {
-                return $m['name'];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Provision the standard set: fetch+install any standard-set module that lives
-     * in a remote source (git/url/platform) and is not on disk yet.
-     *
-     * `bundled` entries and modules already present (matched by `hash_id`) are left
-     * to syncBundledModules()'s on-disk install. Per-entry failures are logged, not
-     * fatal. No-op today (every standard module is bundled on-disk).
-     *
-     * @return string[] Names/hash_ids of modules fetched this pass.
-     */
-    public function provisionStandardSet(): array {
-        $done = [];
-        foreach ($this->getStandardSet() as $entry) {
-            $hash = (string) ($entry['hash_id'] ?? '');
-            $name = (string) ($entry['name'] ?? '');
-
-            // Already on disk (bundled or previously fetched)? Nothing to fetch.
-            // A same-name directory whose identity does NOT match the pinned
-            // hash_id is a stale pre-pin copy (e.g. a legacy-migrated bundled
-            // module from an older release) — it must be replaced, not kept:
-            // otherwise the panel runs outdated module code forever.
-            $onDisk   = $hash !== '' ? $this->findModuleByHashId($hash) : null;
-            $staleDir = null;
-            if ($onDisk === null && $name !== '') {
-                $dir = $this->modulePathFor($name);
-                if (is_dir($dir) && is_file($dir . '/module.json')) {
-                    if ($hash === '') {
-                        $onDisk = $name; // no pin — any same-name copy counts
-                    } else {
-                        $staleDir = $dir;
-                    }
-                }
-            }
-            if ($onDisk !== null) {
-                continue;
-            }
-
-            $source = (string) ($entry['source'] ?? 'bundled');
-            if ($source === 'bundled') {
-                error_log("provisionStandardSet: '{$name}' is declared bundled but missing on disk — skipped.");
-                continue;
-            }
-
-            try {
-                if ($staleDir !== null) {
-                    error_log("provisionStandardSet: '{$name}' on disk (" . basename($staleDir) . ") does not match the pinned hash_id — replacing with the pinned release.");
-                    $this->deleteDirectory($staleDir);
-                }
-                $this->installModuleFromSource($entry);
-                $done[] = $name !== '' ? $name : $hash;
-            } catch (\Throwable $e) {
-                error_log("provisionStandardSet: fetch of '" . ($name !== '' ? $name : $hash) . "' failed: " . $e->getMessage());
-            }
-        }
-        return $done;
-    }
-
-    /**
-     * Fetch a NOT-yet-present module from a standard-set entry's source and install it.
-     *
-     * Mirrors updateModuleFromSource() but for a first install (no local module.json
-     * to read the source from — it comes from the entry). Verifies the fetched
-     * `hash_id` against the entry so a repo/URL cannot supply a different module.
-     *
-     * @param array $entry A getStandardSet() entry (source/repository/…, hash_id).
-     * @return void
-     * @throws \RuntimeException on download/verify/install failure.
-     */
-    private function installModuleFromSource(array $entry): void {
-        $update = [
-            'source'     => (string) ($entry['source'] ?? 'bundled'),
-            'repository' => (string) ($entry['repository'] ?? ''),
-            'channel'    => (string) ($entry['channel'] ?? 'stable'),
-            'slug'       => (string) ($entry['slug'] ?? ($entry['name'] ?? '')),
-            'url'        => (string) ($entry['url'] ?? ''),
-        ];
-        $expectedHash = (string) ($entry['hash_id'] ?? '');
-
-        // platform — the store install flow handles download/decrypt/license/LB.
-        if ($update['source'] === 'platform') {
-            $apiKey = (string) (SettingsManager::get('platform_api_key') ?? '');
-            $slug   = $update['slug'] !== '' ? $update['slug'] : (string) ($entry['name'] ?? '');
-            $this->downloadFromPlatform($slug, '', $apiKey);
-            return;
-        }
-
-        $version = (new ModuleUpdateChecker())->latestAvailable([
-            'update'            => $update,
-            'version'           => '',
-            'installed_version' => '',
-        ]);
-        if ($version === null) {
-            throw new \RuntimeException('No installable version resolved from source.');
-        }
-
-        [$url, $md5] = $this->resolveSourceDownload($update, $version);
-        if ($url === '') {
-            throw new \RuntimeException('No download URL resolved from source.');
-        }
-
-        $archive  = (string) @tempnam(sys_get_temp_dir(), 'xc_modinst_');
-        $tempBase = rtrim(sys_get_temp_dir(), '/') . '/xc_modinst_' . bin2hex(random_bytes(8));
-        try {
-            $this->downloadToFile($url, $archive);
-            if ($md5 !== '' && !hash_equals(strtolower($md5), (string) md5_file($archive))) {
-                throw new \RuntimeException('Checksum mismatch on the downloaded module archive.');
-            }
-
-            $this->extractArchive($archive, $tempBase);
-            $moduleDir = $this->resolveExtractedModuleDir($tempBase);
-
-            $meta    = json_decode((string) @file_get_contents($moduleDir . '/module.json'), true);
-            $gotHash = is_array($meta) ? (string) ($meta['hash_id'] ?? '') : '';
-            if ($expectedHash !== '' && $gotHash !== '' && !hash_equals($expectedHash, $gotHash)) {
-                throw new \RuntimeException('hash_id mismatch — fetched module is not the expected one.');
-            }
-
-            $name     = $this->placeModuleFiles($moduleDir);
-            $manifest = $this->readModuleManifest($name);
-            $ver      = (string) ($manifest['version'] ?? $version);
-
-            $this->storeModuleArchive($archive, $name, $ver);
-            if ((string) ($this->readOverrides()[$name]['installed_version'] ?? '') !== '') {
-                // Files were re-provisioned for an already-installed module (a
-                // stale copy was replaced) — catch the schema up incrementally
-                // instead of re-running the initial install migrations.
-                $this->updateModule($name);
-            } else {
-                $this->installModule($name, $ver);
-            }
-            $this->recordModuleSource($name, 'local');
-            $this->distributeToLoadBalancers($name, $manifest, 'local', $ver);
-        } finally {
-            @unlink($archive);
-            $this->deleteDirectory($tempBase);
-        }
-    }
-
-    /**
-     * List all installed modules with their metadata and status.
-     *
-     * Scans the modules directory for module.json files, merges with
-     * config/modules.php overrides, and returns sorted results.
-     *
-     * @return array<int, array{name: string, description: string, version: string, requires_core: string, environment: string, priority: int, dependencies: array, optional_dependencies: array, has_navbar: bool, has_settings: bool, enabled: bool, state: ModuleState, path: string, installed_version: string, source: string, previous_version: string, dependency_warnings: string[]}> Module list.
-     */
-    public function listModules(): array {
-        $overrides = $this->readOverrides();
-        $items = [];
-
-        $jsonFiles = glob($this->modulesPath . '/*/module.json') ?: [];
-
-        // Pre-resolve each module's state by name so the dependency diagnostics
-        // below can see the full set while building items.
-        $stateByName = [];
-        foreach ($jsonFiles as $jsonFile) {
-            $meta    = json_decode((string) @file_get_contents($jsonFile), true) ?: [];
-            // Key by the CANONICAL manifest name, not the `{name}_{hash5}` directory —
-            // config/modules.php and `dependencies` both reference the logical name.
-            $depName = (string) ($meta['name'] ?? basename(dirname($jsonFile)));
-            $stateByName[$depName] = ModuleState::fromRaw(
-                $overrides[$depName]['state'] ?? ($overrides[$depName]['enabled'] ?? null)
-            );
-        }
-
-        foreach ($jsonFiles as $jsonFile) {
-            $meta  = json_decode((string) @file_get_contents($jsonFile), true) ?: [];
-            $name  = (string) ($meta['name'] ?? basename(dirname($jsonFile))); // canonical name
-            $state = $stateByName[$name] ?? ModuleState::fromRaw(null);
-
-            $dependencies = ModuleLoader::filterCoreProvidedDependencies(
-                is_array($meta['dependencies'] ?? null) ? $meta['dependencies'] : []
-            );
-
-            // Flag a module that is nominally Enabled but won't actually load:
-            // ModuleLoader skips it when a required dependency is missing or not
-            // loadable (e.g. plex is Enabled but watch is Failed/Disabled). Mirrors
-            // ModuleLoader::pruneUnsatisfiableModules().
-            $dependencyWarnings = [];
-            foreach ($dependencies as $dep) {
-                if (!isset($stateByName[$dep])) {
-                    $dependencyWarnings[] = "Required dependency '{$dep}' is missing.";
-                } elseif (!$stateByName[$dep]->isLoadable()) {
-                    $dependencyWarnings[] = "Required dependency '{$dep}' is not enabled ("
-                        . $stateByName[$dep]->value . ').';
-                }
-            }
-
-            $items[] = [
-                'name'                  => $name,
-                'hash_id'               => (string) ($meta['hash_id'] ?? ''),
-                'update'                => ModuleLoader::normalizeUpdateBlock($meta, $name),
-                'description'           => $meta['description'] ?? '',
-                'version'               => $meta['version'] ?? '',
-                'requires_core'         => $meta['requires_core'] ?? '',
-                'environment'           => $meta['environment'] ?? 'main',
-                'priority'              => (int) ($meta['priority'] ?? 0),
-                'dependencies'          => $dependencies,
-                'optional_dependencies' => is_array($meta['optional_dependencies'] ?? null) ? $meta['optional_dependencies'] : [],
-                'has_navbar'            => (bool) ($meta['has_navbar'] ?? false),
-                'has_settings'          => (bool) ($meta['has_settings'] ?? false),
-                'enabled'               => $state->isLoadable(),
-                'state'                 => $state,
-                'path'                  => dirname($jsonFile),
-                'installed_version'     => $overrides[$name]['installed_version'] ?? '',
-                'available_version'     => $overrides[$name]['available_version'] ?? '',
-                'source'                => $overrides[$name]['source'] ?? '',
-                'previous_version'      => $overrides[$name]['previous_version'] ?? '',
-                'dependency_warnings'   => $dependencyWarnings,
-            ];
-        }
-
-        usort($items, function ($a, $b) {
-            return strcmp($a['name'], $b['name']);
-        });
-
-        return $items;
-    }
-
-    /**
-     * Install a module by name.
-     *
-     * Loads the module instance, runs install(), and enables it.
-     *
-     * @param string $name Module name (lowercase, alphanumeric + hyphens).
-     * @return void
-     * @throws \RuntimeException If the module cannot be loaded.
-     */
-    public function installModule(string $name, ?string $version = null): void {
-        $name = $this->sanitizeModuleName($name);
-        $module = $this->loadModuleInstance($name);
-
-        // Version priority: explicit $version (platform installs pass the
-        // authoritative SaaS release version) → module.json manifest → the
-        // module's hardcoded getVersion() (which can drift from the manifest).
-        $targetVersion = $version ?? $this->manifestVersion($name) ?? $module->getVersion();
-        $modulePath = $this->modulePathFor($name);
-
-        $this->setState($name, ModuleState::Installing);
-
-        try {
-            $db = $this->getDb() ?? DatabaseFactory::get();
-            // Apply the module's master schema, then its own install() hook for any
-            // non-SQL setup. NB: schema files are DDL (CREATE/ALTER), which
-            // MySQL/MariaDB implicitly commit — a wrapping transaction gives no
-            // rollback safety, and its rollback() on error throws "no active
-            // transaction", masking the real SQL error. So run directly and let the
-            // genuine failure propagate to the catch below (and into the logs).
-            if ($db !== null) {
-                // Fresh install applies the module's master schema (database.sql).
-                ModuleMigrator::install($modulePath, $db, (string) $targetVersion);
-            }
-            $module->install();
-        } catch (\Throwable $e) {
-            $this->setState($name, ModuleState::Failed);
-            throw $e;
-        }
-
-        $this->setState($name, ModuleState::Enabled);
-        $this->recordInstalledVersion($name, $targetVersion);
-    }
-
-    /**
-     * Uninstall a module by name.
-     *
-     * Runs uninstall() and disables the module.
-     *
-     * @param string $name Module name.
-     * @return void
-     * @throws \RuntimeException If the module cannot be loaded.
-     */
-    public function uninstallModule(string $name): void {
-        $name = $this->sanitizeModuleName($name);
-
-        // Refuse to remove a module that still-installed dependents rely on
-        // (e.g. plex depends on watch — watch cannot be removed under it).
-        $dependents = $this->installedDependentsOf($name);
-        if (!empty($dependents)) {
-            throw new \RuntimeException(
-                "Cannot uninstall '{$name}': still required by " . implode(', ', $dependents)
-                . '. Uninstall ' . (count($dependents) === 1 ? 'it' : 'them') . ' first.'
-            );
-        }
-
-        $module = $this->loadModuleInstance($name);
-
-        // The module's own uninstall() hook runs first (it clears the data/rows
-        // it created), then the module's schema is torn down via its single
-        // teardown file (database_drop.sql).
-        $module->uninstall();
-        $db = $this->getDb() ?? DatabaseFactory::get();
-        if ($db !== null) {
-            ModuleMigrator::uninstall($this->modulePathFor($name), $db);
-        }
-
-        $this->clearInstalledVersion($name);
-        $this->setState($name, ModuleState::Disabled);
-    }
-
-    /**
-     * Fully delete a module: uninstall it, then remove its directory from disk and
-     * its override entry from config/modules.php.
-     *
-     * Unlike uninstallModule() — which drops the tables and disables the module but
-     * leaves its files on disk so it stays listed and re-installable — this removes
-     * the module entirely. For a BUNDLED module (shipped in the deploy) the files
-     * come back on the next panel update; deletion is still honoured until then.
-     *
-     * Order matters: uninstall runs FIRST (drop tables + uninstall() hook) while the
-     * files are still on disk (the teardown SQL and the module class live there);
-     * only after a clean uninstall are the files removed, so no orphaned tables are
-     * left behind. A failing uninstall aborts the delete. The dependents guard is
-     * enforced up front.
-     *
-     * @param string $name Module name.
-     * @return void
-     * @throws \RuntimeException If an installed dependent still requires the module.
-     */
-    public function deleteModule(string $name): void {
-        $name = $this->sanitizeModuleName($name);
-
-        // Same guard as uninstall: refuse while an installed dependent needs it.
-        $dependents = $this->installedDependentsOf($name);
-        if (!empty($dependents)) {
-            throw new \RuntimeException(
-                "Cannot delete '{$name}': still required by " . implode(', ', $dependents)
-                . '. Delete ' . (count($dependents) === 1 ? 'it' : 'them') . ' first.'
-            );
-        }
-
-        // Read the manifest (for LB propagation) BEFORE the files are removed.
-        $manifest = [];
-        try {
-            $manifest = $this->readModuleManifest($name);
-        } catch (\Throwable $e) {
-            // No readable manifest — LB propagation just skips below.
-        }
-
-        // Step 1 — uninstall FIRST, while the module's files are still on disk:
-        // run its uninstall() hook and drop its tables (teardown SQL + module class
-        // both live in the directory). A failure aborts the delete and propagates,
-        // so the files are never removed with orphaned tables left behind.
-        $this->uninstallModule($name);
-
-        // Step 2 — remove the files, stored archives and the config override.
-        $this->deleteModuleFilesOnly($name);
-
-        // Step 3 — propagate the deletion to every LB node that received this module.
-        $this->distributeDeletionToLoadBalancers($name, $manifest);
-    }
-
-    /**
-     * Remove a module's files WITHOUT touching the database.
-     *
-     * Used on LB nodes (which share MAIN's database — dropping tables there would
-     * delete MAIN's data) and as the file-removal step of deleteModule(). Removes
-     * the module directory, its stored archives, and its config/modules.php entry.
-     *
-     * @param string $name Module name.
-     * @return void
-     */
-    public function deleteModuleFilesOnly(string $name): void {
-        $name = $this->sanitizeModuleName($name);
-
-        $modulePath = $this->modulePathFor($name);
-        if (is_dir($modulePath)) {
-            $this->deleteDirectory($modulePath);
-        }
-
-        // Remove any stored marketplace archives (name_<version>.zip).
-        foreach (glob($this->archivesPath . '/' . $name . '_*.zip') ?: [] as $rArchive) {
-            @unlink($rArchive);
-        }
-
-        // Drop the config/modules.php override entry entirely.
-        $overrides = $this->readOverrides();
-        if (isset($overrides[$name])) {
-            unset($overrides[$name]);
-            $this->writeOverrides($overrides);
-        }
-    }
-
-    /**
-     * Tell every load balancer that received this module to delete it too.
-     *
-     * Mirrors distributeToLoadBalancers(): only MAIN dispatches, and only for
-     * modules that were distributed (environment lb/any). LB nodes act on the
-     * `delete_module` signal via RootSignalsCronJob → `console.php module:delete`
-     * (files-only — never a DB drop on the shared MAIN database).
-     *
-     * @param string $name     Module name.
-     * @param array  $manifest The module's manifest (read before deletion).
-     * @return void
-     */
-    private function distributeDeletionToLoadBalancers(string $name, array $manifest): void {
-        // Cheap manifest check first — a MAIN-only module was never on any LB, so
-        // return before touching config (isLoadBalancer() reads via the extension).
-        $environment = strtolower((string) ($manifest['environment'] ?? 'main'));
-        if (!in_array($environment, ['lb', 'any'], true)) {
-            return; // MAIN-only — LB never had it
-        }
-        if ($this->isLoadBalancer()) {
-            return;
-        }
-        $db = $this->getDb();
-        if ($db === null) {
-            return;
-        }
-
-        $payload = json_encode(['action' => 'delete_module', 'name' => $name]);
-
-        $db->query('SELECT `id` FROM `servers` WHERE `server_type` = 0 AND `is_main` = 0 AND `enabled` = 1;');
-        $rServerIDs = array();
-        foreach ($db->get_rows() as $rRow) {
-            $rServerIDs[] = intval($rRow['id']);
-        }
-        foreach ($rServerIDs as $rServerID) {
-            $db->query(
-                'INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);',
-                $rServerID,
-                time(),
-                $payload
-            );
-        }
-    }
-
-    /**
-     * Update a module, running only the incremental migrations needed.
-     *
-     * Reads the recorded installed_version from config/modules.php.
-     * If no version is recorded (legacy install), falls back to full installModule().
-     * If already at the current version, does nothing.
-     * Otherwise runs all getMigrations() entries with version > installedVersion
-     * and version <= module->getVersion(), in ascending semver order.
-     *
-     * @param string $name Module name.
-     * @return void
-     */
-    public function updateModule(string $name): void {
-        $name        = $this->sanitizeModuleName($name);
-        $overrides   = $this->readOverrides();
-        $fromVersion = $overrides[$name]['installed_version'] ?? null;
-
-        if ($fromVersion === null) {
-            $this->installModule($name);
-            return;
-        }
-
-        $module    = $this->loadModuleInstance($name);
-        $toVersion = $this->manifestVersion($name) ?? $module->getVersion();
-
-        if (version_compare($fromVersion, $toVersion, '>=')) {
-            return;
-        }
-
-        // File-based schema migrations: every up file in (fromVersion, toVersion].
-        $db = $this->getDb() ?? DatabaseFactory::get();
-        if ($db !== null) {
-            ModuleMigrator::up($this->modulePathFor($name), $db, $fromVersion, (string) $toVersion);
-        }
-
-        // Programmatic migrations (callables) — coexist with the file-based ones.
-        if ($module instanceof MigratableInterface) {
-            $this->runPendingMigrations($module->getMigrations(), $fromVersion, $toVersion);
-        }
-
-        $this->recordInstalledVersion($name, $toVersion);
-    }
-
-    /**
-     * Update a module by fetching new files from its declared source, then running
-     * migrations. This is what the panel's "Update" button triggers (P4).
-     *
-     *  - bundled  : files already ship with the panel → migrations only (updateModule()).
-     *  - platform : delegated to the store flow (downloadFromPlatform — backup/restore/LB inside).
-     *  - git/url  : download archive → verify `hash_id` → backup → replace files → migrate →
-     *               restore on failure → distribute to LB.
-     *
-     * Identity pinning: for git/url the fetched module.json `hash_id` must equal the
-     * installed one — a repo/URL cannot impersonate another module or hijack a rename.
-     *
-     * @param string $name Module name.
-     * @return string|null Version now on disk after the update, or null when the
-     *                     source had nothing newer (stale available_version cleared).
-     * @throws \RuntimeException on download/verify/apply failure (files rolled back).
-     */
-    public function updateModuleFromSource(string $name): ?string {
-        $name      = $this->sanitizeModuleName($name);
-        $manifest  = $this->readModuleManifest($name);
-        $overrides = $this->readOverrides();
-
-        $update    = ModuleLoader::normalizeUpdateBlock($manifest, $name);
-        $installed = (string) ($overrides[$name]['installed_version'] ?? '');
-        $source    = $update['source'];
-
-        // bundled — the panel already replaced the files; just catch the schema up.
-        if ($source === 'bundled') {
-            $this->updateModule($name);
-            $this->recordAvailableVersion($name, null);
-            return $this->manifestVersion($name);
-        }
-
-        // platform — reuse the full store flow (self-contained rollback + LB fan-out).
-        if ($source === 'platform') {
-            $apiKey = (string) (SettingsManager::get('platform_api_key') ?? '');
-            $this->downloadFromPlatform(($update['slug'] !== '' ? $update['slug'] : $name), '', $apiKey);
-            $this->recordAvailableVersion($name, null);
-            return $this->manifestVersion($name);
-        }
-
-        // git / url — fetch, verify, apply.
-        $checker = new ModuleUpdateChecker();
-        $version = $checker->latestAvailable([
-            'update'            => $update,
-            'version'           => (string) ($manifest['version'] ?? ''),
-            'installed_version' => $installed,
-        ]);
-        if ($version === null && $checker->lastError() !== null) {
-            // Source unreachable (e.g. GitHub API rate limit) — fail loudly instead
-            // of silently doing nothing while the caller reports "updated".
-            throw new \RuntimeException(
-                "Cannot resolve the latest version of '{$name}' from its {$source} source: " . $checker->lastError()
-            );
-        }
-        if ($version === null || ($installed !== '' && version_compare($version, $installed, '<='))) {
-            // Nothing newer at the source — the recorded available_version is stale
-            // (already updated, or the release was pulled). Clear it so the Update
-            // button disappears instead of reappearing forever.
-            $this->recordAvailableVersion($name, null);
-            return null;
-        }
-
-        [$downloadUrl, $expectedMd5] = $this->resolveSourceDownload($update, $version);
-        if ($downloadUrl === '') {
-            throw new \RuntimeException("No download URL resolved for module '{$name}' (source '{$source}').");
-        }
-
-        $archive = (string) @tempnam(sys_get_temp_dir(), 'xc_modupd_');
-        if ($archive === '') {
-            throw new \RuntimeException('Unable to create a temp file for the module download.');
-        }
-        $tempBase = rtrim(sys_get_temp_dir(), '/') . '/xc_modupd_' . bin2hex(random_bytes(8));
-
-        try {
-            $this->downloadToFile($downloadUrl, $archive);
-            if ($expectedMd5 !== '' && !hash_equals(strtolower($expectedMd5), (string) md5_file($archive))) {
-                throw new \RuntimeException('Checksum mismatch on the downloaded module archive.');
-            }
-
-            $this->extractArchive($archive, $tempBase);
-            $moduleDir = $this->resolveExtractedModuleDir($tempBase);
-
-            // Identity pinning — the fetched module must be the SAME module.
-            $newMeta = json_decode((string) @file_get_contents($moduleDir . '/module.json'), true);
-            $newHash = is_array($newMeta) ? (string) ($newMeta['hash_id'] ?? '') : '';
-            $ownHash = (string) ($manifest['hash_id'] ?? '');
-            if ($ownHash !== '' && $newHash !== '' && !hash_equals($ownHash, $newHash)) {
-                throw new \RuntimeException("hash_id mismatch — refusing to overwrite '{$name}' with a different module.");
-            }
-
-            $targetDir = $this->modulePathFor($name);
-            $backupDir = $this->backupModuleDir($name, $targetDir);
-            try {
-                $this->copyDirectory($moduleDir, $targetDir);
-                $this->updateModule($name); // incremental migrations to the new manifest version
-
-                $fresh          = $this->readModuleManifest($name);
-                $resolvedVer    = (string) ($fresh['version'] ?? $version);
-                $this->recordAvailableVersion($name, null);
-
-                // Keep a local archive so LB nodes can pull it (getFile), then fan out.
-                $this->storeModuleArchive($archive, $name, $resolvedVer);
-                $this->distributeToLoadBalancers($name, $fresh, 'local', $resolvedVer);
-
-                if ($backupDir !== null) {
-                    $this->deleteDirectory($backupDir);
-                }
-
-                return $resolvedVer;
-            } catch (\Throwable $e) {
-                $this->restoreModuleBackup($name, $targetDir, $backupDir, $installed !== '' ? $installed : null);
-                throw new \RuntimeException("Update of '{$name}' failed — rolled back: " . $e->getMessage(), 0, $e);
-            }
-        } finally {
-            @unlink($archive);
-            $this->deleteDirectory($tempBase);
-        }
-    }
-
-    /**
-     * Resolve the download URL (+ optional expected md5) for a git/url source.
-     *
-     * git : release asset `module.tar.gz` at the tag == $version; md5 (if any)
-     *       comes from the release's `hashes.md5` via GitHubReleases::getAssetHash().
-     * url : re-fetch the `version.json` for its `download` (https) and optional `md5`.
-     *
-     * @return array{0:string,1:string} [downloadUrl, expectedMd5] — url '' if unresolved.
-     */
-    private function resolveSourceDownload(array $update, string $version): array {
-        if (($update['source'] ?? '') === 'git') {
-            if (!preg_match('~github\.com[:/]+([^/]+)/([^/]+?)(?:\.git)?/?$~i', (string) ($update['repository'] ?? ''), $m)) {
-                return ['', ''];
-            }
-            $asset = 'module.tar.gz'; // convention: module repo release ships this asset
-            $url   = "https://github.com/{$m[1]}/{$m[2]}/releases/download/{$version}/{$asset}";
-            $md5   = '';
-            try {
-                $channel = in_array((string) ($update['channel'] ?? 'stable'), ['beta', 'unstable'], true) ? 'beta' : 'stable';
-                $md5 = (string) ((new GitHubReleases($m[1], $m[2], $channel))->getAssetHash($version, $asset) ?? '');
-            } catch (\Throwable $e) {
-                // no hash available → download proceeds unverified
-            }
-            return [$url, $md5];
-        }
-
-        if (($update['source'] ?? '') === 'url') {
-            $data = json_decode($this->httpGetString((string) ($update['url'] ?? '')), true);
-            $dl   = is_array($data) ? trim((string) ($data['download'] ?? '')) : '';
-            $md5  = is_array($data) ? trim((string) ($data['md5'] ?? '')) : '';
-            if (stripos($dl, 'https://') !== 0) {
-                $dl = '';
-            }
-            return [$dl, $md5];
-        }
-
-        return ['', ''];
-    }
-
-    /** cURL GET a small https resource to a string ('' on failure/non-https). */
-    private function httpGetString(string $url): string {
-        if (stripos($url, 'https://') !== 0) {
-            return '';
-        }
-        $ch = curl_init($url);
-        curl_setopt_array($ch, [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_CONNECTTIMEOUT => 15,
-            CURLOPT_TIMEOUT        => 30,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_USERAGENT      => 'XC_VM-ModuleManager',
-        ]);
-        $body = curl_exec($ch);
-        curl_close($ch);
-        return is_string($body) ? $body : '';
-    }
-
-    /** Download an https URL straight to $dest; throws on non-https / HTTP error. */
-    private function downloadToFile(string $url, string $dest): void {
-        // Shared streaming primitive (see CurlClient::downloadToFile); kept as a
-        // thin wrapper so existing call sites and error text stay stable.
-        CurlClient::downloadToFile($url, $dest);
-    }
-
-    /**
-     * Set the lifecycle state of a module in config/modules.php.
-     *
-     * When state is Enabled the 'state' key is removed entirely (clean default).
-     * When state is anything else the string value is persisted as 'state'.
-     *
-     * @param string      $name  Module name.
-     * @param ModuleState $state Target lifecycle state.
-     * @return void
-     */
-    public function setState(string $name, ModuleState $state): void {
-        $name      = $this->sanitizeModuleName($name);
-
-        // Refuse to disable a module that still-enabled dependents rely on
-        // (e.g. plex requires watch — watch cannot be disabled under it, or
-        // ModuleLoader would skip plex on the next boot). Mirrors the guard in
-        // uninstallModule(). Scoped strictly to a deliberate Disabled transition:
-        // the internal lifecycle states (Installing, Failed) are also non-loadable
-        // but are set by installModule() itself and must never be blocked.
-        if ($state === ModuleState::Disabled) {
-            $dependents = $this->enabledDependentsOf($name);
-            if (!empty($dependents)) {
-                throw new \RuntimeException(
-                    "Cannot disable '{$name}': still required by " . implode(', ', $dependents)
-                    . '. Disable ' . (count($dependents) === 1 ? 'it' : 'them') . ' first.'
-                );
-            }
-        }
-
-        $overrides = $this->readOverrides();
-
-        if (!isset($overrides[$name]) || !is_array($overrides[$name])) {
-            $overrides[$name] = [];
-        }
-
-        // Remove any legacy bool 'enabled' key — we use 'state' now.
-        unset($overrides[$name]['enabled']);
-
-        if ($state === ModuleState::Enabled) {
-            // Enabled is the default: clean up the key so the file stays minimal.
-            unset($overrides[$name]['state']);
-            if (empty($overrides[$name])) {
-                unset($overrides[$name]);
-            }
-        } else {
-            $overrides[$name]['state'] = $state->value;
-        }
-
-        $this->writeOverrides($overrides);
-    }
-
-    /**
-     * Enable or disable a module in config/modules.php.
-     *
-     * @deprecated Use setState(name, ModuleState::Enabled / ModuleState::Disabled) instead.
-     *
-     * @param string $name    Module name.
-     * @param bool   $enabled True to enable, false to disable.
-     * @return void
-     */
-    public function setEnabled(string $name, bool $enabled): void {
-        $this->setState($name, $enabled ? ModuleState::Enabled : ModuleState::Disabled);
-    }
-
-    /**
-     * Upload a zip archive and install the module from it.
-     *
-     * Extracts the archive to a temp directory, validates structure,
-     * copies to the modules path, and runs installModule().
-     *
-     * @param string $zipFilePath Path to the uploaded zip file.
-     * @return string Installed module name.
-     * @throws \RuntimeException If extraction or installation fails.
-     * @throws \InvalidArgumentException If the zip file is not found.
-     */
-    public function uploadAndInstall(string $zipFilePath): string {
-        if (!is_file($zipFilePath)) {
-            throw new \InvalidArgumentException('Uploaded zip file not found.');
-        }
-
-        $tempBase = rtrim(sys_get_temp_dir(), '/') . '/xc_module_' . bin2hex(random_bytes(8));
-        if (!@mkdir($tempBase, 0755, true) && !is_dir($tempBase)) {
-            throw new \RuntimeException('Unable to create temporary directory.');
-        }
-
-        try {
-            $this->extractArchive($zipFilePath, $tempBase);
-
-            $moduleDir  = $this->resolveExtractedModuleDir($tempBase);
-            $moduleName = $this->placeModuleFiles($moduleDir);
-
-            $this->installModule($moduleName);
-
-            // Keep a copy of the uploaded archive so it can be redistributed to
-            // LB servers (which have no access to the store for custom modules).
-            $manifest = $this->readModuleManifest($moduleName);
-            $version  = (string) ($manifest['version'] ?? '0.0.0');
-            $this->storeModuleArchive($zipFilePath, $moduleName, $version);
-
-            // Custom (non-store) module — no store rollback available.
-            $this->recordModuleSource($moduleName, 'local');
-
-            // If the manifest targets load balancers, push the archive to every LB.
-            $this->distributeToLoadBalancers($moduleName, $manifest, 'local', $version);
-
-            return $moduleName;
-        } finally {
-            $this->deleteDirectory($tempBase);
-        }
-    }
-
-    /**
-     * LB-side: install a custom (non-store) module from a local archive,
-     * deploying its FILES ONLY — no DB migrations (the shared DB was already
-     * migrated by MAIN).
-     *
-     * @param string $zipFilePath Path to the .zip archive fetched from MAIN.
-     * @return string Installed module name.
-     */
-    public function deployFromArchiveFilesOnly(string $zipFilePath): string {
-        if (!is_file($zipFilePath)) {
-            throw new \InvalidArgumentException('Module archive not found.');
-        }
-
-        $tempBase = rtrim(sys_get_temp_dir(), '/') . '/xc_module_' . bin2hex(random_bytes(8));
-        if (!@mkdir($tempBase, 0755, true) && !is_dir($tempBase)) {
-            throw new \RuntimeException('Unable to create temporary directory.');
-        }
-
-        try {
-            $this->extractArchive($zipFilePath, $tempBase);
-
-            $moduleDir  = $this->resolveExtractedModuleDir($tempBase);
-            $moduleName = $this->placeModuleFiles($moduleDir);
-            $targetDir  = $this->modulePathFor($moduleName);
-
-            // Keep the archive locally too, so this LB can re-seed if needed.
-            $manifest = $this->readModuleManifest($moduleName);
-            $version  = (string) ($manifest['version'] ?? '0.0.0');
-            $this->storeModuleArchive($zipFilePath, $moduleName, $version);
-
-            $this->recordInstalledVersion($moduleName, $version);
-            $this->setState($moduleName, ModuleState::Enabled);
-            $this->hotReloadSafe($moduleName, $targetDir);
-
-            return $moduleName;
-        } finally {
-            $this->deleteDirectory($tempBase);
-        }
-    }
-
-    /**
-     * Copy a module archive into the local archives directory as
-     * {name}_{version}.zip (idempotent — overwrites any previous copy).
-     */
-    private function storeModuleArchive(string $sourceZip, string $name, string $version): void {
-        $dest = $this->archivePathFor($name, $version);
-        $dir  = dirname($dest);
-        if (!is_dir($dir) && !@mkdir($dir, 0755, true) && !is_dir($dir)) {
-            throw new \RuntimeException('Unable to create modules archive directory.');
-        }
-        if (realpath($sourceZip) !== realpath($dest) && !@copy($sourceZip, $dest)) {
-            throw new \RuntimeException('Unable to store module archive.');
-        }
-        @chmod($dest, 0644);
-    }
-
-    /**
-     * Read a module's manifest (module.json) from the modules directory.
-     *
-     * @return array Decoded manifest, or [] if missing/invalid.
-     */
-    private function readModuleManifest(string $name): array {
-        $name = $this->sanitizeModuleName($name);
-        // Resolve the real {name}_{hash5} (or legacy bare) directory — reading the
-        // bare path would miss the manifest for a hash-suffixed module.
-        $file = $this->modulePathFor($name) . '/module.json';
-        if (!is_file($file)) {
-            return [];
-        }
-        $data = json_decode((string) @file_get_contents($file), true);
-        return is_array($data) ? $data : [];
-    }
-
-    /**
-     * The module's version as declared in its module.json, or null if absent.
-     * Authoritative source for the installed version (the module's getVersion()
-     * is hardcoded and may drift from the shipped manifest).
-     *
-     * @param string $name Module name / directory.
-     * @return string|null
-     */
-    private function manifestVersion(string $name): ?string {
-        $v = $this->readModuleManifest($name)['version'] ?? null;
-        return (is_string($v) && $v !== '') ? $v : null;
-    }
-
-    /**
-     * Tell every enabled load balancer to install a module, if the manifest
-     * targets the LB environment. Runs only on MAIN.
-     *
-     * Inserts one `signals` row per LB with custom_data:
-     *   {"action":"install_module","source":"platform|local","name":"…","version":"…"}
-     * The LB's root signals daemon picks it up and runs `console.php module:install`.
-     *
-     * @param string $name     Module name / slug.
-     * @param array  $manifest Decoded module.json.
-     * @param string $source   'platform' (pull from store) or 'local' (pull archive from MAIN).
-     * @param string $version  Module version.
-     */
-    private function distributeToLoadBalancers(string $name, array $manifest, string $source, string $version): void {
-        // Only MAIN distributes. LB installs are file-only and never re-dispatch.
-        if ($this->isLoadBalancer()) {
-            return;
-        }
-
-        $environment = strtolower((string) ($manifest['environment'] ?? 'main'));
-        if (!in_array($environment, ['lb', 'any'], true)) {
-            return; // module is MAIN-only — nothing to distribute
-        }
-
-        $db = $this->getDb();
-        if ($db === null) {
-            return;
-        }
-
-        $payload = json_encode([
-            'action'  => 'install_module',
-            'source'  => $source === 'platform' ? 'platform' : 'local',
-            'name'    => $name,
-            'version' => $version,
-        ]);
-
-        // LB servers are streaming servers (server_type = 0) that are not the
-        // main panel and are enabled. Collect ids first so the INSERT loop does
-        // not clobber the active result set.
-        $db->query('SELECT `id` FROM `servers` WHERE `server_type` = 0 AND `is_main` = 0 AND `enabled` = 1;');
-        $rServerIDs = array();
-        foreach ($db->get_rows() as $rRow) {
-            $rServerIDs[] = intval($rRow['id']);
-        }
-
-        foreach ($rServerIDs as $rServerID) {
-            $db->query(
-                'INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);',
-                $rServerID,
-                time(),
-                $payload
-            );
-        }
-    }
-
-    /**
-     * @return bool True when running on a load balancer (is_lb = 1 in config).
-     */
-    private function isLoadBalancer(): bool {
-        if (class_exists(ConfigReader::class)) {
-            return (bool) ConfigReader::get('is_lb');
-        }
-        if (defined('SERVER_TYPE')) {
-            // SERVER_TYPE is an external runtime constant (not define()d in-tree);
-            // use constant() so static analysis doesn't flag an undefined constant.
-            // Mirrors ModuleLoader::detectEnvironment().
-            return constant('SERVER_TYPE') === 'lb';
-        }
-        return false;
-    }
-
-    /**
-     * Download a module from the SaaS platform and install it.
-     *
-     * Delegates the full download → key-unwrap → extract flow to the
-     * XC_VM C extension, then runs installModule() to register it.
-     * Fires PackageInstalledEvent and hot-reloads the module into the
-     * current ServiceContainer without requiring a PHP-FPM restart.
-     *
-     * @param string      $slug    Module slug as listed on the platform.
-     * @param string      $version Exact version string (e.g. "1.2.0"), or '' for the latest.
-     * @param string|null $apiKey  API key for the SaaS platform.
-     * @return void
-     * @throws \RuntimeException If the C extension is missing, download fails, or install fails.
-     */
-    public function downloadFromPlatform(string $slug, string $version = '', ?string $apiKey = null): void {
-        $slug      = $this->sanitizeModuleName($slug);
-        $targetDir = $this->modulesPath . '/' . $slug;
-
-        // Snapshot current state so a failed (re)install rolls back cleanly. We
-        // MOVE the existing module aside (outside modulesPath so the loader never
-        // scans it) — this both gives a clean dir for the new extract and a
-        // restore point. installed_version is captured for the version record.
-        $prevVersion = $this->readOverrides()[$slug]['installed_version'] ?? null;
-        $backupDir   = $this->backupModuleDir($slug, $targetDir);
-
-        try {
-            $result          = $this->pullFilesFromPlatform($slug, $version, $apiKey);
-            $modulePath      = $result['path'];
-            $resolvedVersion = (string) ($result['version'] ?: $version);
-
-            // Acquire the per-machine ionCube license BEFORE installModule(): if the
-            // platform encoded the module with --with-license, the loader rejects the
-            // encoded files at require-time unless a valid .lic is already present.
-            // No-op when the platform has licensing disabled.
-            $this->acquireModuleLicense($slug, $apiKey);
-
-            // Record the version the PLATFORM served (authoritative for store
-            // installs); the module's module.json/getVersion() may lag behind.
-            $this->installModule($slug, $resolvedVersion);
-
-            EventDispatcher::dispatch(new PackageInstalledEvent(
-                slug:        $result['module'],
-                version:     $resolvedVersion,
-                path:        $modulePath,
-                installedAt: time(),
-            ));
-
-            $this->hotReload($slug, $modulePath);
-
-            // Mark as store-installed and remember the version the Rollback
-            // button should target. The previous version is authoritative from
-            // the PLATFORM (it holds release history); it may be null when the
-            // platform has no prior approved version. (NB: $prevVersion below is
-            // the LOCAL pre-install version, used only for failure rollback.)
-            $this->recordPlatformSource($slug, $result['previous_version'] ?? null);
-
-            // If the manifest targets load balancers, tell every LB to pull the
-            // same module from the platform with its own install_id (MAIN-only).
-            $this->distributeToLoadBalancers($slug, $this->readModuleManifest($slug), 'platform', $resolvedVersion);
-
-            // Success — drop the rollback snapshot.
-            if ($backupDir !== null) {
-                $this->deleteDirectory($backupDir);
-            }
-        } catch (\Throwable $e) {
-            $restored = $this->restoreModuleBackup($slug, $targetDir, $backupDir, $prevVersion);
-            throw new \RuntimeException(
-                "Platform install of '{$slug}' failed"
-                . ($restored
-                    ? ' — rolled back to previous version' . ($prevVersion ? " {$prevVersion}" : '')
-                    : '')
-                . ': ' . $e->getMessage(),
-                0,
-                $e
-            );
-        }
-    }
-
-    /**
-     * Roll a store-installed module back to its previously installed version.
-     *
-     * Uses the `previous_version` recorded at the last store install (still
-     * available on the platform within its retention window). Re-installs that
-     * exact version, then clears `previous_version` (one-shot rollback). LBs are
-     * re-synced to the rolled-back version via the normal distribution path.
-     *
-     * @param string      $slug   Module slug.
-     * @param string|null $apiKey Platform API key.
-     * @throws \RuntimeException If the module was not installed from the store or
-     *                          has no recorded previous version.
-     */
-    public function rollbackFromPlatform(string $slug, ?string $apiKey = null): void {
-        $slug      = $this->sanitizeModuleName($slug);
-        $overrides = $this->readOverrides();
-        $entry     = $overrides[$slug] ?? [];
-
-        if (($entry['source'] ?? '') !== 'platform') {
-            throw new \RuntimeException("Module '{$slug}' was not installed from the store; cannot roll back.");
-        }
-        $previous = $entry['previous_version'] ?? '';
-        if ($previous === '') {
-            throw new \RuntimeException("No previous version recorded for '{$slug}'.");
-        }
-
-        // Re-installs the previous version (explicit, not "latest").
-        $this->downloadFromPlatform($slug, $previous, $apiKey);
-
-        // One-shot: drop the previous-version marker so the rollback button hides
-        // until the next successful update creates a new restore point.
-        $this->clearPreviousVersion($slug);
-    }
-
-    /** Mark a module as store-installed and (optionally) record the replaced version. */
-    private function recordPlatformSource(string $name, ?string $previousVersion): void {
-        $overrides = $this->readOverrides();
-        if (!isset($overrides[$name]) || !is_array($overrides[$name])) {
-            $overrides[$name] = [];
-        }
-        $overrides[$name]['source'] = 'platform';
-        if ($previousVersion !== null && $previousVersion !== '') {
-            $overrides[$name]['previous_version'] = $previousVersion;
-        }
-        $this->writeOverrides($overrides);
-    }
-
-    /** Record the install source for a module (e.g. 'platform' or 'local'). */
-    private function recordModuleSource(string $name, string $source): void {
-        $overrides = $this->readOverrides();
-        if (!isset($overrides[$name]) || !is_array($overrides[$name])) {
-            $overrides[$name] = [];
-        }
-        $overrides[$name]['source'] = $source;
-        $this->writeOverrides($overrides);
-    }
-
-    /**
-     * Fetch and install the per-machine ionCube license for a module.
-     *
-     * Generates this machine's ionCube server-data, asks the platform to mint a
-     * hardware-bound + expiring .lic (XC_VM::module_license) and writes it next to
-     * the encoded files (the name the encoder's --with-license expects).
-     *
-     * Best-effort: when the platform has licensing disabled, the module is not
-     * entitled, or the loader/extension lacks the needed functions, it silently
-     * writes nothing — so unlicensed-encoded modules still install normally.
-     *
-     * @return bool True if a .lic was written.
-     */
-    private function acquireModuleLicense(string $slug, ?string $apiKey): bool {
-        if (!class_exists('XC_VM') || !function_exists('ioncube_server_data')) {
-            return false;
-        }
-
-        $serverData = @ioncube_server_data();
-        if (!is_string($serverData) || $serverData === '') {
-            error_log("ModuleManager: license skipped for '{$slug}': ioncube_server_data() empty");
-            return false;
-        }
-
-        try {
-            $res = \XC_VM::module_license($slug, base64_encode($serverData), $apiKey ?? '');
-        } catch (\Throwable $e) {
-            error_log("ModuleManager: license request failed for '{$slug}': " . $e->getMessage());
-            return false;
-        }
-
-        if (!is_array($res) || empty($res['ok'])) {
-            $reason = is_array($res) ? ($res['reason'] ?? 'unknown') : 'no_response';
-            error_log("ModuleManager: license NOT issued for '{$slug}': {$reason}"
-                . (($apiKey ?? '') === '' ? ' (api_key пуст — для лицензии он обязателен)' : ''));
-            return false;
-        }
-
-        $licName  = basename((string) ($res['license_name'] ?? 'module.lic'));
-        $licBytes = base64_decode((string) ($res['license'] ?? ''), true);
-        if ($licName === '' || $licBytes === false || $licBytes === '') {
-            error_log("ModuleManager: license for '{$slug}' empty/undecodable in response");
-            return false;
-        }
-
-        $dir = $this->modulesPath . '/' . $slug;
-        if (!is_dir($dir)) {
-            error_log("ModuleManager: module dir missing for '{$slug}': {$dir}");
-            return false;
-        }
-
-        if (@file_put_contents($dir . '/' . $licName, $licBytes) === false) {
-            error_log("ModuleManager: failed to write license {$dir}/{$licName} (права?)");
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Re-issue the per-machine license for an installed platform module — call
-     * before expiry, or after a "license expired/invalid" load failure. The SaaS
-     * refusing to mint (lapsed subscription / revoked) is the effective kill.
-     *
-     * @return bool True if a fresh .lic was written.
-     */
-    public function renewModuleLicense(string $slug, ?string $apiKey = null): bool {
-        return $this->acquireModuleLicense($this->sanitizeModuleName($slug), $apiKey);
-    }
-
-    /** Remove the recorded previous version for a module. */
-    private function clearPreviousVersion(string $name): void {
-        $overrides = $this->readOverrides();
-        if (isset($overrides[$name]['previous_version'])) {
-            unset($overrides[$name]['previous_version']);
-            $this->writeOverrides($overrides);
-        }
-    }
-
-    /**
-     * Move an installed module directory to a backup location outside the
-     * modules path (so ModuleLoader never scans it). Returns the backup path,
-     * or null if the module was not installed. Falls back to copy+delete if the
-     * move (rename) fails.
-     */
-    private function backupModuleDir(string $slug, string $targetDir): ?string {
-        if (!is_dir($targetDir)) {
-            return null;
-        }
-        $base = dirname($this->modulesPath) . '/.module_backups';
-        if (!is_dir($base) && !@mkdir($base, 0755, true) && !is_dir($base)) {
-            // Cannot create a backup area — copy in place as a last resort is not
-            // possible; proceed without rollback rather than block the install.
-            return null;
-        }
-        $backupDir = $base . '/' . $slug . '_' . bin2hex(random_bytes(4));
-        if (@rename($targetDir, $backupDir)) {
-            return $backupDir;
-        }
-        // rename failed (e.g. cross-device) — copy then remove the original.
-        $this->copyDirectory($targetDir, $backupDir);
-        $this->deleteDirectory($targetDir);
-        return $backupDir;
-    }
-
-    /**
-     * Restore a module backup created by backupModuleDir() after a failed
-     * install, re-recording the previous installed version. Returns true if a
-     * backup was restored.
-     */
-    private function restoreModuleBackup(string $slug, string $targetDir, ?string $backupDir, ?string $prevVersion): bool {
-        // Remove the (possibly partial) failed install first.
-        $realModules = realpath($this->modulesPath);
-        $realTarget  = realpath($targetDir) ?: $targetDir;
-        if ($realModules && str_starts_with($realTarget, $realModules . '/')) {
-            $this->deleteDirectory($targetDir);
-        }
-
-        if ($backupDir === null || !is_dir($backupDir)) {
-            return false;
-        }
-
-        if (!@rename($backupDir, $targetDir)) {
-            $this->copyDirectory($backupDir, $targetDir);
-            $this->deleteDirectory($backupDir);
-        }
-
-        if ($prevVersion !== null) {
-            $this->recordInstalledVersion($slug, $prevVersion);
-        }
-        $this->setState($slug, ModuleState::Enabled);
-        return true;
-    }
-
-    /**
-     * LB-side: download a store module from the platform and deploy its FILES
-     * ONLY — no DB migrations.
-     *
-     * LB servers share MAIN's database, so the module's schema migrations have
-     * already been applied by MAIN. Here we only need the decrypted code on the
-     * LB so it loads under environment=lb/any. Each LB registers and downloads
-     * with its OWN install_id.
-     *
-     * @param string      $slug    Module slug on the platform.
-     * @param string      $version Exact version string.
-     * @param string|null $apiKey  Shared platform API key (from settings).
-     * @return void
-     */
-    public function deployFromPlatformFilesOnly(string $slug, string $version, ?string $apiKey = null): void {
-        $result = $this->pullFilesFromPlatform($slug, $version, $apiKey);
-
-        EventDispatcher::dispatch(new PackageInstalledEvent(
-            slug:        $result['module'],
-            version:     $result['version'],
-            path:        $result['path'],
-            installedAt: time(),
-        ));
-
-        $this->recordInstalledVersion($slug, (string) ($result['version'] ?: $version));
-        $this->setState($slug, ModuleState::Enabled);
-        $this->hotReloadSafe($slug, $result['path']);
-    }
-
-    /**
-     * Register the panel and pull (download + decrypt + extract) a module's
-     * files from the platform via the C extension. Does NOT run installModule().
-     *
-     * @return array{ok: bool, module: string, version: string, path: string}
-     * @throws \RuntimeException On a missing extension, registration or download failure.
-     */
-    private function pullFilesFromPlatform(string $slug, string $version, ?string $apiKey): array {
-        if (!class_exists('XC_VM')) {
-            throw new \RuntimeException('XC_VM extension is not loaded. Install xcvm_core.so and enable it in php.ini.');
-        }
-
-        // Ensure this panel is registered with the platform before installing.
-        // module_install() asks the SaaS to wrap the module key in an X25519
-        // SealedBox for *this* panel's public key; if the panel was never
-        // registered the /plugins/key endpoint answers "panel_not_registered"
-        // and the install fails. Registration is an idempotent upsert keyed by
-        // install_id, so running it before every install also guarantees the
-        // server holds the public key matching our current local secret key.
-        $reg = \XC_VM::panel_register($apiKey ?? '');
-        if (!is_array($reg) || empty($reg['ok'])) {
-            $regReason = $reg['message'] ?? ($reg['reason'] ?? 'unknown');
-            throw new \RuntimeException("Panel registration with platform failed for module '{$slug}': {$regReason}");
-        }
-
-        $result = \XC_VM::module_install($slug, $version, $apiKey ?? '');
-
-        if (!is_array($result) || empty($result['ok'])) {
-            $reason = $result['error'] ?? 'unknown';
-            throw new \RuntimeException("Platform download failed for module '{$slug}': {$reason}");
-        }
-
-        return [
-            'ok'               => true,
-            'module'           => $result['module']  ?? $slug,
-            'version'          => $result['version'] ?? $version,
-            'path'             => $result['path']    ?? ($this->modulesPath . '/' . $slug),
-            // Previous approved version reported by the platform (for the
-            // Rollback button). May be absent/null when there is no prior version.
-            'previous_version' => $result['previous_version'] ?? null,
-        ];
-    }
-
-    /**
-     * Hot-reload a newly installed module into the running ServiceContainer.
-     *
-     * Loads and boots the module within the current request so it becomes
-     * immediately usable without a PHP-FPM restart.
-     *
-     * @param string $slug       Module name.
-     * @param string $modulePath Absolute path to the module directory.
-     */
-    /**
-     * Hot-reload only when serving a web request, never crash the caller.
-     *
-     * On an LB the install runs from a root CLI cron where there is no live
-     * request to keep warm and no router/container wired — the module simply
-     * loads from disk on the next request. So skip hot-reload under CLI and
-     * swallow any error.
-     */
-    private function hotReloadSafe(string $slug, string $modulePath): void {
-        if (PHP_SAPI === 'cli') {
-            return;
-        }
-        try {
-            $this->hotReload($slug, $modulePath);
-        } catch (\Throwable $e) {
-            error_log("ModuleManager: hot-reload skipped for '{$slug}': " . $e->getMessage());
-        }
-    }
-
-    /**
-     * Hot-reload a freshly installed module without restarting PHP-FPM.
-     *
-     * Loads the module, boots it and registers its routes against the live
-     * container so it becomes usable within the current request lifecycle.
-     *
-     * @param string $slug       Module slug.
-     * @param string $modulePath Filesystem path to the module.
-     * @return void
-     */
-    private function hotReload(string $slug, string $modulePath): void {
-        $container = ServiceContainer::getInstance();
-
-        $loader = new ModuleLoader();
-        if (!$loader->load($slug, $modulePath)) {
-            return;
-        }
-
-        $router = $container->getOrDefault('router');
-        $loader->bootAll($container, $router instanceof Router ? $router : null);
-    }
-
-    /**
-     * Run migrations whose target version falls in (fromVersion, toVersion].
-     *
-     * @param array<string, callable> $migrations
-     * @param string $fromVersion Currently installed version (exclusive lower bound).
-     * @param string $toVersion   New version (inclusive upper bound).
-     */
-    private function runPendingMigrations(array $migrations, string $fromVersion, string $toVersion): void {
-        $pending = [];
-        foreach ($migrations as $version => $callable) {
-            if (
-                version_compare($version, $fromVersion, '>') &&
-                version_compare($version, $toVersion, '<=')
-            ) {
-                $pending[$version] = $callable;
-            }
-        }
-
-        uksort($pending, 'version_compare');
-
-        $db = $this->getDb();
-        foreach ($pending as $callable) {
-            if ($db !== null && method_exists($db, 'transactional')) {
-                $db->transactional(fn() => $callable($this->container));
-            } else {
-                $callable($this->container);
-            }
-        }
-    }
-
-    /**
-     * Persist the installed version for a module in config/modules.php.
-     *
-     * @param string $name    Module name.
-     * @param string $version Installed version string.
-     */
-    private function recordInstalledVersion(string $name, string $version): void {
-        $overrides = $this->readOverrides();
-        if (!isset($overrides[$name]) || !is_array($overrides[$name])) {
-            $overrides[$name] = [];
-        }
-        $overrides[$name]['installed_version'] = $version;
-        $this->writeOverrides($overrides);
-    }
-
-    /**
-     * Remove the recorded installed version for a module from config/modules.php.
-     *
-     * @param string $name Module name.
-     */
-    private function clearInstalledVersion(string $name): void {
-        $overrides = $this->readOverrides();
-        if (!isset($overrides[$name]['installed_version'])) {
-            return;
-        }
-        unset($overrides[$name]['installed_version']);
-        if (empty($overrides[$name])) {
-            unset($overrides[$name]);
-        }
-        $this->writeOverrides($overrides);
-    }
-
-    /**
-     * Record (or clear) the latest available version for a module in
-     * config/modules.php — written by the update-availability check
-     * (ModuleUpdatesCronJob) and read back by listModules()/the UI to show the
-     * Update button only when a newer version actually exists at the source.
-     *
-     * A null/empty version clears the flag (nothing newer, or not checkable).
-     *
-     * @param string      $name    Module name.
-     * @param string|null $version Latest available version, or null to clear.
-     * @return void
-     */
-    public function recordAvailableVersion(string $name, ?string $version): void {
-        $name    = $this->sanitizeModuleName($name);
-        $version = $version !== null ? trim($version) : '';
-
-        $overrides = $this->readOverrides();
-        $current   = (string) ($overrides[$name]['available_version'] ?? '');
-        if ($current === $version) {
-            return; // no change — avoid a needless config rewrite
-        }
-
-        if ($version === '') {
-            unset($overrides[$name]['available_version']);
-            if (isset($overrides[$name]) && empty($overrides[$name])) {
-                unset($overrides[$name]);
-            }
-        } else {
-            $overrides[$name]['available_version'] = $version;
-        }
-        $this->writeOverrides($overrides);
-    }
-
-    /**
-     * Load and return a module instance by name.
-     *
-     * @param string $name Module name.
-     * @return object Module instance implementing ModuleInterface.
-     * @throws \RuntimeException If the module cannot be loaded or instantiated.
-     */
-    private function loadModuleInstance(string $name) {
-        $name = $this->sanitizeModuleName($name);
-        $loader = new ModuleLoader();
-        // Resolve the real directory ({name}_{hash5}, or a legacy bare {name}) — the
-        // module rarely lives at the bare path, so passing that would fail to find
-        // the class file for a freshly-uploaded module and abort its install.
-        $ok = $loader->load($name, $this->modulePathFor($name));
-        if (!$ok) {
-            throw new ModuleNotFoundException('Cannot load module: ' . $name);
-        }
-
-        $module = $loader->getModule($name);
-        if (!$module) {
-            throw new ModuleNotFoundException('Module instance is not available: ' . $name);
-        }
-
-        return $module;
-    }
-
-    /**
-     * Validate and sanitize a module name.
-     *
-     * @param string $name Raw module name.
-     * @return string Sanitized module name.
-     * @throws \InvalidArgumentException If the name is invalid.
-     */
-    private function sanitizeModuleName(string $name): string {
-        $name = trim((string) $name);
-        if (!preg_match('/^[a-z0-9][a-z0-9\-]*$/', $name)) {
-            throw new ModuleException('Invalid module name.');
-        }
-        return $name;
-    }
-
-    /**
-     * Read module overrides from config/modules.php.
-     *
-     * @return array<string, array> Module overrides keyed by module name.
-     */
-    private function readOverrides(): array {
-        if (!file_exists($this->overridesPath)) {
-            return [];
-        }
-
-        $data = require $this->overridesPath;
-        return is_array($data) ? $data : [];
-    }
-
-    /**
-     * Write module overrides to config/modules.php atomically.
-     *
-     * Writes to a sibling temp file then renames into place, so concurrent
-     * requests can never read a partially-written file.
-     *
-     * @param array $overrides Module overrides to persist.
-     * @return void
-     * @throws \RuntimeException If the file cannot be written or renamed.
-     */
-    private function writeOverrides(array $overrides): void {
-        ksort($overrides);
-
-        $content = "<?php\n\nreturn " . var_export($overrides, true) . ";\n";
-
-        $dir  = dirname($this->overridesPath);
-        $tmp  = @tempnam($dir, '.modules_tmp_');
-        if ($tmp === false) {
-            throw new \RuntimeException('Unable to create temporary file for config/modules.php');
-        }
-
-        try {
-            if (@file_put_contents($tmp, $content, LOCK_EX) === false) {
-                throw new \RuntimeException('Unable to write config/modules.php (temp stage)');
-            }
-
-            @chmod($tmp, 0644);
-
-            if (!@rename($tmp, $this->overridesPath)) {
-                throw new \RuntimeException('Unable to atomically replace config/modules.php');
-            }
-
-            // config/modules.php is read back via require(), which OPcache caches
-            // (validate_timestamps + revalidate_freq). Install does several
-            // read-modify-write cycles in one request (setState → recordInstalled
-            // → recordSource); without invalidation the later reads see a STALE
-            // array and the final write clobbers the module's state, leaving it
-            // not-Enabled until a manual disable/enable. Drop the cached entry so
-            // every readOverrides() in this request sees what we just wrote.
-            if (function_exists('opcache_invalidate')) {
-                opcache_invalidate($this->overridesPath, true);
-            }
-        } catch (\Throwable $e) {
-            @unlink($tmp);
-            throw $e;
-        }
-    }
-
-    /**
-     * Extract a module archive (.zip or .tar.gz/.tgz/.tar) into $destination.
-     *
-     * The type is detected by magic bytes (uploads arrive as an extension-less tmp
-     * file), then routed:
-     *   - tar.gz : PharData (bundled with PHP, no extension) → fallback to `tar` CLI
-     *   - zip    : ZipArchive (validated) → fallback to the `unzip` CLI
-     *
-     * $destination is always an isolated temp dir created by the caller, and the
-     * CLI tools refuse to write outside it (they strip `../`/absolute members), so
-     * extraction stays contained even without the per-entry PHP validation.
-     *
-     * @throws \RuntimeException If the archive cannot be extracted in this environment.
-     */
-    private function extractArchive(string $archivePath, string $destination): void {
-        if (!is_dir($destination) && !@mkdir($destination, 0755, true) && !is_dir($destination)) {
-            throw new \RuntimeException('Unable to create extraction directory.');
-        }
-
-        if ($this->looksLikeTar($archivePath)) {
-            $this->extractTarArchive($archivePath, $destination);
-            return;
-        }
-
-        // ZIP: prefer the validated PHP extension, else the `unzip` CLI.
-        if (class_exists('ZipArchive')) {
-            $this->extractZipViaZipArchive($archivePath, $destination);
-            return;
-        }
-        if ($this->hasBinary('unzip')) {
-            // unzip exit 1 = success with warnings (e.g. skipped unsafe paths).
-            $this->runExtractor('unzip -oqq ' . escapeshellarg($archivePath) . ' -d ' . escapeshellarg($destination), 1);
-            return;
-        }
-        throw new \RuntimeException('Cannot extract .zip: install the PHP zip extension or the `unzip` command (or upload a .tar.gz).');
-    }
-
-    /** Detect a tar/tar.gz archive by extension, or gzip magic bytes for tmp uploads. */
-    private function looksLikeTar(string $path): bool {
-        $lower = strtolower($path);
-        if (str_ends_with($lower, '.tar.gz') || str_ends_with($lower, '.tgz') || str_ends_with($lower, '.tar')) {
-            return true;
-        }
-        if (str_ends_with($lower, '.zip')) {
-            return false;
-        }
-        // Extension-less (uploaded tmp file): sniff magic. gzip = 1f 8b.
-        $fh = @fopen($path, 'rb');
-        if ($fh === false) {
-            return false;
-        }
-        $magic = fread($fh, 3);
-        fclose($fh);
-        return strlen($magic) >= 2 && ord($magic[0]) === 0x1f && ord($magic[1]) === 0x8b;
-    }
-
-    /** Extract .tar/.tar.gz via PharData (no PHP extension needed) or the `tar` CLI. */
-    private function extractTarArchive(string $archivePath, string $destination): void {
-        if (class_exists('PharData')) {
-            try {
-                (new \PharData($archivePath))->extractTo($destination, null, true);
-                return;
-            } catch (\Throwable $e) {
-                // fall through to the CLI
-            }
-        }
-        if ($this->hasBinary('tar')) {
-            // GNU tar auto-detects gzip and strips unsafe (../, absolute) members.
-            $this->runExtractor('tar -xf ' . escapeshellarg($archivePath) . ' -C ' . escapeshellarg($destination), 0);
-            return;
-        }
-        throw new \RuntimeException('Cannot extract .tar.gz: PharData is unavailable and the `tar` command is missing.');
-    }
-
-    /** True if $bin resolves on PATH. */
-    private function hasBinary(string $bin): bool {
-        $out = @shell_exec('command -v ' . escapeshellarg($bin) . ' 2>/dev/null');
-        return is_string($out) && trim($out) !== '';
-    }
-
-    /** Run a CLI extractor; treat exit codes above $maxOkCode as failures. */
-    private function runExtractor(string $cmd, int $maxOkCode): void {
-        $out  = [];
-        $code = 0;
-        @exec($cmd . ' 2>&1', $out, $code);
-        if ($code > $maxOkCode) {
-            throw new \RuntimeException('Archive extraction failed (exit ' . $code . '): ' . implode(' ', array_slice($out, -3)));
-        }
-    }
-
-    /**
-     * Safely extract a ZIP archive via the PHP zip extension.
-     *
-     * Validates each entry for path traversal attacks before extracting.
-     *
-     * @param string $zipFilePath  Path to the zip file.
-     * @param string $destination  Extraction target directory.
-     * @return void
-     * @throws \RuntimeException If extraction fails or unsafe entries are detected.
-     */
-    private function extractZipViaZipArchive(string $zipFilePath, string $destination): void {
-        $zip = new \ZipArchive();
-        if ($zip->open($zipFilePath) !== true) {
-            throw new \RuntimeException('Unable to open zip archive.');
-        }
-
-        try {
-            for ($i = 0; $i < $zip->numFiles; $i++) {
-                $entry = $zip->getNameIndex($i);
-                if ($entry === false || $entry === '') {
-                    continue;
-                }
-
-                $entry = str_replace('\\', '/', $entry);
-                if (strpos($entry, '../') !== false || strpos($entry, '..\\') !== false || strpos($entry, ':') !== false) {
-                    throw new \RuntimeException('Unsafe zip entry detected.');
-                }
-
-                $targetPath = rtrim($destination, '/') . '/' . ltrim($entry, '/');
-
-                if (substr($entry, -1) === '/') {
-                    if (!is_dir($targetPath) && !@mkdir($targetPath, 0755, true)) {
-                        throw new \RuntimeException('Unable to create directory while extracting zip.');
-                    }
-                    continue;
-                }
-
-                $dir = dirname($targetPath);
-                if (!is_dir($dir) && !@mkdir($dir, 0755, true)) {
-                    throw new \RuntimeException('Unable to create directory while extracting zip.');
-                }
-
-                $in = $zip->getStream($entry);
-                if (!$in) {
-                    throw new \RuntimeException('Unable to read zip entry stream.');
-                }
-
-                $out = @fopen($targetPath, 'wb');
-                if (!$out) {
-                    fclose($in);
-                    throw new \RuntimeException('Unable to write extracted file.');
-                }
-
-                while (!feof($in)) {
-                    $chunk = fread($in, 8192);
-                    if ($chunk === false) {
-                        break;
-                    }
-                    fwrite($out, $chunk);
-                }
-
-                fclose($in);
-                fclose($out);
-            }
-        } finally {
-            $zip->close();
-        }
-    }
-
-    /**
-     * Resolve the module root directory from the extracted temp path.
-     *
-     * Handles both flat and nested zip layouts.
-     *
-     * @param string $tempBase Temporary extraction directory.
-     * @return string Path to the directory containing module.json.
-     * @throws \RuntimeException If module.json is not found or ambiguous.
-     */
-    private function resolveExtractedModuleDir(string $tempBase): string {
-        $rootJson = $tempBase . '/module.json';
-        if (is_file($rootJson)) {
-            return $tempBase;
-        }
-
-        $jsonFiles = glob($tempBase . '/*/module.json') ?: [];
-        if (count($jsonFiles) !== 1) {
-            throw new \RuntimeException('Archive must contain exactly one module with module.json.');
-        }
-
-        return dirname($jsonFiles[0]);
-    }
-
-    /**
-     * The module's canonical name from its module.json ("name"), falling back to
-     * the directory basename. The manifest is authoritative: extracting a flat
-     * archive (module.json at the root) or a differently-named wrapper dir would
-     * otherwise yield the random temp-dir name (e.g. "xc_module_ab12"), which fails
-     * sanitizeModuleName() with "Invalid module name."
-     */
-    private function manifestNameFromDir(string $moduleDir): string {
-        $meta = json_decode((string) @file_get_contents($moduleDir . '/module.json'), true);
-        $name = is_array($meta) ? trim((string) ($meta['name'] ?? '')) : '';
-        return $name !== '' ? $name : basename($moduleDir);
-    }
-
-    /**
-     * Recursively delete a directory and its contents.
-     *
-     * @param string $path Path to delete.
-     * @return void
-     */
-    private function deleteDirectory(string $path): void {
-        if (!file_exists($path)) {
-            return;
-        }
-
-        if (is_file($path) || is_link($path)) {
-            @unlink($path);
-            return;
-        }
-
-        $items = scandir($path);
-        if (!$items) {
-            @rmdir($path);
-            return;
-        }
-
-        foreach ($items as $item) {
-            if ($item === '.' || $item === '..') {
-                continue;
-            }
-            $this->deleteDirectory($path . '/' . $item);
-        }
-
-        @rmdir($path);
-    }
-
-    /**
-     * Recursively copy a directory.
-     *
-     * @param string $source      Source directory path.
-     * @param string $destination Destination directory path.
-     * @return void
-     * @throws \RuntimeException If copying fails.
-     */
-    private function copyDirectory(string $source, string $destination): void {
-        if (!is_dir($source)) {
-            throw new \RuntimeException('Source directory not found: ' . $source);
-        }
-
-        if (!is_dir($destination) && !@mkdir($destination, 0755, true)) {
-            throw new \RuntimeException('Unable to create module directory.');
-        }
-
-        $items = scandir($source);
-        if (!$items) {
-            return;
-        }
-
-        foreach ($items as $item) {
-            if ($item === '.' || $item === '..') {
-                continue;
-            }
-
-            $src = $source . '/' . $item;
-            $dst = $destination . '/' . $item;
-
-            if (is_dir($src)) {
-                $this->copyDirectory($src, $dst);
-            } else {
-                if (!@copy($src, $dst)) {
-                    throw new \RuntimeException('Unable to copy file: ' . $item);
-                }
-            }
-        }
-    }
+	private string $modulesPath;
+
+	private string $overridesPath;
+
+	private string $archivesPath;
+
+	private ?ServiceContainer $container;
+
+	/**
+	 * Initialize the module manager.
+	 *
+	 * @param string|null $modulesPath   Path to the modules directory.
+	 * @param string|null $overridesPath Path to the config/modules.php overrides file.
+	 * @param ServiceContainer|null $container Service container for DB access and DI.
+	 */
+	public function __construct(
+		?string $modulesPath = null,
+		?string $overridesPath = null,
+		?ServiceContainer $container = null
+	) {
+		$this->modulesPath   = $modulesPath ?: (defined('MAIN_HOME') ? MAIN_HOME . 'Modules' : dirname(__DIR__, 2) . '/Modules');
+		$this->overridesPath = $overridesPath ?: (defined('CONFIG_PATH') ? CONFIG_PATH . 'modules.php' : dirname(__DIR__, 2) . '/config/modules.php');
+		$this->archivesPath  = defined('MAIN_HOME') ? MAIN_HOME . 'modules_archives' : dirname(__DIR__, 2) . '/modules_archives';
+		$this->container     = $container;
+	}
+
+	/**
+	 * Absolute path of the stored archive for a custom (non-store) module.
+	 *
+	 * MAIN keeps a copy of every uploaded module archive named
+	 * {name}_{version}.zip so LB servers can pull it back over the internal
+	 * system API (action=getFile). Because every server shares the same
+	 * MAIN_HOME layout, the LB can reconstruct this exact path from the name +
+	 * version carried in the install_module signal.
+	 */
+	public function archivePathFor(string $name, string $version): string {
+		$name    = $this->sanitizeModuleName($name);
+		$version = preg_replace('/[^0-9A-Za-z._\-]/', '', (string) $version);
+		return $this->archivesPath . '/' . $name . '_' . $version . '.zip';
+	}
+
+	/** @return object|null Database instance from the container, or null if unavailable. */
+	private function getDb(): ?object {
+		if ($this->container !== null && $this->container->has('db')) {
+			return $this->container->get('db');
+		}
+		return null;
+	}
+
+	/**
+	 * Absolute path of a module's directory on disk, resolving the
+	 * `{name}_{hash5}` directory convention.
+	 *
+	 * A module's logical name (config key, class namespace) never carries the hash
+	 * — sanitizeModuleName() forbids `_`. The directory does: `{name}_{hash5}` (5
+	 * hex chars of hash_id), so two modules that share a name don't clash on disk.
+	 * Resolution order: exact `{name}` (legacy / back-compat) → the first
+	 * `{name}_*` directory that has a module.json → fall back to exact.
+	 */
+	private function modulePathFor(string $name): string {
+		$name  = $this->sanitizeModuleName($name);
+		$exact = $this->modulesPath . '/' . $name;
+		if (is_dir($exact)) {
+			return $exact;
+		}
+		foreach (glob($this->modulesPath . '/' . $name . '_*', GLOB_ONLYDIR) ?: [] as $dir) {
+			if (is_file($dir . '/module.json')) {
+				return $dir;
+			}
+		}
+		return $exact;
+	}
+
+	/**
+	 * Directory name for a module: `{name}_{hash5}` where hash5 is the first 5 hex
+	 * chars of its permanent hash_id. The name itself never contains `_`.
+	 *
+	 * A hash_id is mandatory — callers must run the manifest through ensureHashId()
+	 * first so no module is ever placed in a hash-less directory. Passing an empty
+	 * hash_id is a programming error and throws.
+	 */
+	private function moduleDirName(string $name, string $hashId): string {
+		$name   = $this->sanitizeModuleName($name);
+		$hashId = strtolower(preg_replace('/[^a-f0-9]/i', '', $hashId) ?? '');
+		if ($hashId === '') {
+			throw new \RuntimeException("module '{$name}' has no hash_id — cannot build directory name");
+		}
+		return $name . '_' . substr($hashId, 0, 5);
+	}
+
+	/**
+	 * Ensure the module at $moduleDir has a permanent hash_id, generating and
+	 * persisting one into its module.json when absent. Returns the 32-hex value.
+	 *
+	 * Every module must carry a hash_id: it forms the `{name}_{hash5}` directory
+	 * suffix and is the module's stable identity. Uploaded or legacy modules that
+	 * ship without one get a fresh random id written here (once, mirroring
+	 * tools/gen-module-hashes.php); a valid existing id is immutable and left as-is.
+	 */
+	private function ensureHashId(string $moduleDir): string {
+		$file = $moduleDir . '/module.json';
+		$meta = json_decode((string) @file_get_contents($file), true);
+		if (!is_array($meta)) {
+			$meta = [];
+		}
+		$hash = strtolower(preg_replace('/[^a-f0-9]/i', '', (string) ($meta['hash_id'] ?? '')) ?? '');
+
+		if (strlen($hash) < 32) {
+			$hash = bin2hex(random_bytes(16));
+			$meta = $this->withHashIdAfterName($meta, $hash);
+			@file_put_contents(
+				$file,
+				json_encode($meta, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE) . "\n"
+			);
+		}
+		return $hash;
+	}
+
+	/**
+	 * Return $meta with hash_id set immediately after the `name` key (or first when
+	 * there is no name), dropping any pre-existing empty hash_id entry.
+	 *
+	 * @param array<string, mixed> $meta
+	 * @return array<string, mixed>
+	 */
+	private function withHashIdAfterName(array $meta, string $hash): array {
+		$out = [];
+		foreach ($meta as $k => $v) {
+			if ($k === 'hash_id') {
+				continue;
+			}
+			$out[$k] = $v;
+			if ($k === 'name') {
+				$out['hash_id'] = $hash;
+			}
+		}
+		if (!isset($out['hash_id'])) {
+			$out = ['hash_id' => $hash] + $out;
+		}
+		return $out;
+	}
+
+	/**
+	 * Copy an extracted module directory into modulesPath as `{name}_{hash5}`,
+	 * replacing any existing install of the same module (one per name is active).
+	 *
+	 * @param string $moduleDir Extracted directory containing module.json.
+	 * @return string Canonical module name that was placed.
+	 */
+	private function placeModuleFiles(string $moduleDir): string {
+		$name = $this->sanitizeModuleName($this->manifestNameFromDir($moduleDir));
+		// Guarantee a hash_id (generating + persisting one when the upload lacks it)
+		// so the module is always placed in a `{name}_{hash5}` directory, never bare.
+		$hash = $this->ensureHashId($moduleDir);
+
+		// Remove any current install of the same module (may live under a different
+		// {name}_{hash5} or a legacy {name} directory).
+		$existing = $this->modulePathFor($name);
+		if (is_dir($existing)) {
+			$this->deleteDirectory($existing);
+		}
+
+		$targetDir = $this->modulesPath . '/' . $this->moduleDirName($name, $hash);
+		if (is_dir($targetDir)) {
+			$this->deleteDirectory($targetDir);
+		}
+		$this->copyDirectory($moduleDir, $targetDir);
+
+		return $name;
+	}
+
+	/**
+	 * Retire legacy hash-less module directories: rename every bare `{name}`
+	 * directory to the canonical `{name}_{hash5}`, generating a hash_id when the
+	 * manifest lacks one.
+	 *
+	 * Older deployments (and modules placed before the hash convention) live in a
+	 * bare `{name}` directory. This one-shot, idempotent migration — run on every
+	 * `status` pass before anything scans the modules folder — brings them onto the
+	 * `{name}_{hash5}` scheme so the legacy layout can be dropped. Already-hashed
+	 * directories and non-module directories are skipped. When both a bare and a
+	 * hashed copy of the same module exist, the stale bare copy is removed.
+	 *
+	 * @return string[] Canonical names of modules migrated this pass.
+	 */
+	public function migrateLegacyModuleDirs(): array {
+		$migrated = [];
+		foreach (glob($this->modulesPath . '/*', GLOB_ONLYDIR) ?: [] as $dir) {
+			if (!is_file($dir . '/module.json')) {
+				continue;
+			}
+			$name = $this->sanitizeModuleName($this->manifestNameFromDir($dir));
+			if ($name === '') {
+				continue;
+			}
+			// A canonical `{name}_{hash5}` directory has a basename different from the
+			// logical name; only a bare `{name}` directory is legacy.
+			if (basename($dir) !== $name) {
+				continue;
+			}
+
+			$hash   = $this->ensureHashId($dir);
+			$target = $this->modulesPath . '/' . $this->moduleDirName($name, $hash);
+			if ($target === $dir) {
+				continue;
+			}
+			if (is_dir($target)) {
+				// A hashed copy already exists — the bare directory is a stale dup.
+				$this->deleteDirectory($dir);
+			} else {
+				@rename($dir, $target);
+			}
+			$migrated[] = $name;
+		}
+		return $migrated;
+	}
+
+	/**
+	 * Remove on-disk copies and recorded state of modules that are now part of
+	 * the core codebase (ModuleLoader::CORE_PROVIDED_MODULES).
+	 *
+	 * Upgraded panels may still carry the old module directory (any hash
+	 * suffix); left in place it would boot alongside the core implementation
+	 * and its commands/routes would collide.
+	 *
+	 * @return string[] Names that were purged.
+	 */
+	public function purgeCoreProvidedModules(): array {
+		$purged = [];
+		foreach (ModuleLoader::CORE_PROVIDED_MODULES as $name) {
+			$dir = $this->modulePathFor($name);
+			if (is_dir($dir) && is_file($dir . '/module.json')) {
+				$this->deleteDirectory($dir);
+				error_log("purgeCoreProvidedModules: removed stale module directory '" . basename($dir) . "' — '{$name}' now ships in core.");
+				$purged[] = $name;
+			}
+
+			$overrides = $this->readOverrides();
+			if (isset($overrides[$name])) {
+				unset($overrides[$name]);
+				$this->writeOverrides($overrides);
+				if (!in_array($name, $purged, true)) {
+					$purged[] = $name;
+				}
+			}
+		}
+		return $purged;
+	}
+
+	/**
+	 * Names of currently-installed modules that declare $name as a dependency.
+	 *
+	 * @return string[]
+	 */
+	private function installedDependentsOf(string $name): array {
+		$out = [];
+		foreach ($this->listModules() as $module) {
+			if (($module['installed_version'] ?? '') === '') {
+				continue; // not installed — its requirements don't apply
+			}
+			if (in_array($name, $module['dependencies'] ?? [], true)) {
+				$out[] = $module['name'];
+			}
+		}
+		return $out;
+	}
+
+	/**
+	 * Names of currently-loadable (enabled) installed modules that declare $name
+	 * as a required dependency.
+	 *
+	 * Used to guard disabling: a dependent that is itself disabled won't be loaded
+	 * either, so disabling $name under it is harmless and must not be blocked.
+	 * Only enabled dependents would be broken (ModuleLoader skips them on the next
+	 * boot), so only those count.
+	 *
+	 * @return string[]
+	 */
+	private function enabledDependentsOf(string $name): array {
+		$out = [];
+		foreach ($this->listModules() as $module) {
+			if (($module['installed_version'] ?? '') === '') {
+				continue; // not installed — its requirements don't apply
+			}
+			$state = $module['state'] ?? null;
+			if (!($state instanceof ModuleState) || !$state->isLoadable()) {
+				continue; // already disabled/failed — disabling its dep won't break it
+			}
+			if (in_array($name, $module['dependencies'] ?? [], true)) {
+				$out[] = $module['name'];
+			}
+		}
+		return $out;
+	}
+
+	/**
+	 * Install any on-disk module that has never been installed.
+	 *
+	 * Bundled modules (e.g. ministra) are booted on every request but only get
+	 * their install() / migrations run when explicitly installed. On a fresh
+	 * panel nothing would create their tables, so this runs once during the
+	 * migrate step (see StatusCommand) to provision them. It is idempotent:
+	 * already-installed modules are skipped, and a module's up-migrations use
+	 * CREATE TABLE IF NOT EXISTS so re-provisioning an existing panel is safe.
+	 *
+	 * Modules are installed in dependency order. Only admin-disabled modules are
+	 * left untouched — a module whose previous install FAILED (or crashed mid-way,
+	 * leaving it Installing) is retried here, so re-running `console.php status`
+	 * self-heals once the root cause is fixed. Retrying is safe: the master schema
+	 * uses CREATE TABLE IF NOT EXISTS.
+	 *
+	 * @return string[] Names of modules that were installed this pass.
+	 */
+	public function syncBundledModules(): array {
+		// Retire any legacy hash-less {name} directory before anything scans the
+		// modules folder, so every module ends up on the {name}_{hash5} scheme.
+		$this->migrateLegacyModuleDirs();
+
+		// Drop leftovers of modules whose functionality moved into the core
+		// (e.g. tmdb): a stale on-disk copy would still boot and its commands
+		// would collide with the core-registered ones.
+		$this->purgeCoreProvidedModules();
+
+		// Fetch any standard-set module that lives in a remote source (git/url/
+		// platform) and isn't on disk yet — a no-op while every standard module is
+		// bundled on-disk. Fetched modules are installed by provisionStandardSet(),
+		// so the on-disk pass below simply skips them.
+		$provisioned = $this->provisionStandardSet();
+
+		$modules   = $this->listModules();
+		$installed = [];
+		foreach ($modules as $module) {
+			if (($module['installed_version'] ?? '') !== '') {
+				$installed[$module['name']] = true;
+			}
+		}
+
+		// Candidates: present on disk, not yet installed, not admin-disabled.
+		// Failed/Installing (a never-completed install) are retried, not skipped.
+		$pending = [];
+		foreach ($modules as $module) {
+			$name = $module['name'];
+			if (isset($installed[$name])) {
+				continue;
+			}
+			if (($module['state'] ?? null) === ModuleState::Disabled) {
+				continue;
+			}
+			$pending[$name] = $module;
+		}
+
+		// Install in dependency order: a module installs once all its declared
+		// dependencies are themselves installed.
+		$done  = [];
+		$guard = 0;
+		while (!empty($pending) && $guard++ < 1000) {
+			$progressed = false;
+			foreach (array_keys($pending) as $name) {
+				$ready = true;
+				foreach ($pending[$name]['dependencies'] ?? [] as $dep) {
+					if (!isset($installed[$dep])) {
+						$ready = false;
+						break;
+					}
+				}
+				if (!$ready) {
+					continue;
+				}
+				try {
+					$this->installModule($name);
+					$installed[$name] = true;
+					$done[] = $name;
+				} catch (\Throwable $e) {
+					error_log("syncBundledModules: install '{$name}' failed: " . $e->getMessage());
+				}
+				unset($pending[$name]);
+				$progressed = true;
+			}
+			if (!$progressed) {
+				break; // unmet or circular dependencies — stop
+			}
+		}
+
+		return array_values(array_unique(array_merge($provisioned, $done)));
+	}
+
+	/**
+	 * The standard module set the panel provisions by default (config/bundled_modules.php).
+	 *
+	 * Foundation for modules-in-separate-repos: each entry is keyed by the module's
+	 * permanent `hash_id`. When the config file is absent, falls back to whatever
+	 * is on disk (treated as `bundled`).
+	 *
+	 * @return array<int, array{hash_id?:string,name?:string,source?:string,repository?:string,channel?:string,slug?:string,url?:string}>
+	 */
+	public function getStandardSet(): array {
+		$path = defined('CONFIG_PATH')
+			? CONFIG_PATH . 'bundled_modules.php'
+			: dirname(__DIR__, 2) . '/config/bundled_modules.php';
+
+		if (is_file($path)) {
+			$data = require $path;
+			if (is_array($data)) {
+				return array_values(array_filter($data, 'is_array'));
+			}
+		}
+
+		// Fallback: derive from on-disk modules (all treated as bundled).
+		$out = [];
+		foreach ($this->listModules() as $m) {
+			$out[] = ['hash_id' => (string) ($m['hash_id'] ?? ''), 'name' => $m['name'], 'source' => 'bundled'];
+		}
+		return $out;
+	}
+
+	/**
+	 * Resolve the on-disk module name that carries a given permanent `hash_id`.
+	 *
+	 * The stable identity lookup: lets the panel recognise "the same module" across
+	 * a rename or a repo move, where `name` alone is unreliable.
+	 *
+	 * @param string $hashId Permanent module hash_id.
+	 * @return string|null Module name, or null if no on-disk module has that hash_id.
+	 */
+	public function findModuleByHashId(string $hashId): ?string {
+		$hashId = trim($hashId);
+		if ($hashId === '') {
+			return null;
+		}
+		foreach ($this->listModules() as $m) {
+			if (($m['hash_id'] ?? '') === $hashId) {
+				return $m['name'];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Provision the standard set: fetch+install any standard-set module that lives
+	 * in a remote source (git/url/platform) and is not on disk yet.
+	 *
+	 * `bundled` entries and modules already present (matched by `hash_id`) are left
+	 * to syncBundledModules()'s on-disk install. Per-entry failures are logged, not
+	 * fatal. No-op today (every standard module is bundled on-disk).
+	 *
+	 * @return string[] Names/hash_ids of modules fetched this pass.
+	 */
+	public function provisionStandardSet(): array {
+		$done = [];
+		foreach ($this->getStandardSet() as $entry) {
+			$hash = (string) ($entry['hash_id'] ?? '');
+			$name = (string) ($entry['name'] ?? '');
+
+			// Already on disk (bundled or previously fetched)? Nothing to fetch.
+			// A same-name directory whose identity does NOT match the pinned
+			// hash_id is a stale pre-pin copy (e.g. a legacy-migrated bundled
+			// module from an older release) — it must be replaced, not kept:
+			// otherwise the panel runs outdated module code forever.
+			$onDisk   = $hash !== '' ? $this->findModuleByHashId($hash) : null;
+			$staleDir = null;
+			if ($onDisk === null && $name !== '') {
+				$dir = $this->modulePathFor($name);
+				if (is_dir($dir) && is_file($dir . '/module.json')) {
+					if ($hash === '') {
+						$onDisk = $name; // no pin — any same-name copy counts
+					} else {
+						$staleDir = $dir;
+					}
+				}
+			}
+			if ($onDisk !== null) {
+				continue;
+			}
+
+			$source = (string) ($entry['source'] ?? 'bundled');
+			if ($source === 'bundled') {
+				error_log("provisionStandardSet: '{$name}' is declared bundled but missing on disk — skipped.");
+				continue;
+			}
+
+			try {
+				if ($staleDir !== null) {
+					error_log("provisionStandardSet: '{$name}' on disk (" . basename($staleDir) . ") does not match the pinned hash_id — replacing with the pinned release.");
+					$this->deleteDirectory($staleDir);
+				}
+				$this->installModuleFromSource($entry);
+				$done[] = $name !== '' ? $name : $hash;
+			} catch (\Throwable $e) {
+				error_log("provisionStandardSet: fetch of '" . ($name !== '' ? $name : $hash) . "' failed: " . $e->getMessage());
+			}
+		}
+		return $done;
+	}
+
+	/**
+	 * Fetch a NOT-yet-present module from a standard-set entry's source and install it.
+	 *
+	 * Mirrors updateModuleFromSource() but for a first install (no local module.json
+	 * to read the source from — it comes from the entry). Verifies the fetched
+	 * `hash_id` against the entry so a repo/URL cannot supply a different module.
+	 *
+	 * @param array $entry A getStandardSet() entry (source/repository/…, hash_id).
+	 * @return void
+	 * @throws \RuntimeException on download/verify/install failure.
+	 */
+	private function installModuleFromSource(array $entry): void {
+		$update = [
+			'source'     => (string) ($entry['source'] ?? 'bundled'),
+			'repository' => (string) ($entry['repository'] ?? ''),
+			'channel'    => (string) ($entry['channel'] ?? 'stable'),
+			'slug'       => (string) ($entry['slug'] ?? ($entry['name'] ?? '')),
+			'url'        => (string) ($entry['url'] ?? ''),
+		];
+		$expectedHash = (string) ($entry['hash_id'] ?? '');
+
+		// platform — the store install flow handles download/decrypt/license/LB.
+		if ($update['source'] === 'platform') {
+			$apiKey = (string) (SettingsManager::get('platform_api_key') ?? '');
+			$slug   = $update['slug'] !== '' ? $update['slug'] : (string) ($entry['name'] ?? '');
+			$this->downloadFromPlatform($slug, '', $apiKey);
+			return;
+		}
+
+		$version = (new ModuleUpdateChecker())->latestAvailable([
+			'update'            => $update,
+			'version'           => '',
+			'installed_version' => '',
+		]);
+		if ($version === null) {
+			throw new \RuntimeException('No installable version resolved from source.');
+		}
+
+		[$url, $md5] = $this->resolveSourceDownload($update, $version);
+		if ($url === '') {
+			throw new \RuntimeException('No download URL resolved from source.');
+		}
+
+		$archive  = (string) @tempnam(sys_get_temp_dir(), 'xc_modinst_');
+		$tempBase = rtrim(sys_get_temp_dir(), '/') . '/xc_modinst_' . bin2hex(random_bytes(8));
+		try {
+			$this->downloadToFile($url, $archive);
+			if ($md5 !== '' && !hash_equals(strtolower($md5), (string) md5_file($archive))) {
+				throw new \RuntimeException('Checksum mismatch on the downloaded module archive.');
+			}
+
+			$this->extractArchive($archive, $tempBase);
+			$moduleDir = $this->resolveExtractedModuleDir($tempBase);
+
+			$meta    = json_decode((string) @file_get_contents($moduleDir . '/module.json'), true);
+			$gotHash = is_array($meta) ? (string) ($meta['hash_id'] ?? '') : '';
+			if ($expectedHash !== '' && $gotHash !== '' && !hash_equals($expectedHash, $gotHash)) {
+				throw new \RuntimeException('hash_id mismatch — fetched module is not the expected one.');
+			}
+
+			$name     = $this->placeModuleFiles($moduleDir);
+			$manifest = $this->readModuleManifest($name);
+			$ver      = (string) ($manifest['version'] ?? $version);
+
+			$this->storeModuleArchive($archive, $name, $ver);
+			if ((string) ($this->readOverrides()[$name]['installed_version'] ?? '') !== '') {
+				// Files were re-provisioned for an already-installed module (a
+				// stale copy was replaced) — catch the schema up incrementally
+				// instead of re-running the initial install migrations.
+				$this->updateModule($name);
+			} else {
+				$this->installModule($name, $ver);
+			}
+			$this->recordModuleSource($name, 'local');
+			$this->distributeToLoadBalancers($name, $manifest, 'local', $ver);
+		} finally {
+			@unlink($archive);
+			$this->deleteDirectory($tempBase);
+		}
+	}
+
+	/**
+	 * List all installed modules with their metadata and status.
+	 *
+	 * Scans the modules directory for module.json files, merges with
+	 * config/modules.php overrides, and returns sorted results.
+	 *
+	 * @return array<int, array{name: string, description: string, version: string, requires_core: string, environment: string, priority: int, dependencies: array, optional_dependencies: array, has_navbar: bool, has_settings: bool, enabled: bool, state: ModuleState, path: string, installed_version: string, source: string, previous_version: string, dependency_warnings: string[]}> Module list.
+	 */
+	public function listModules(): array {
+		$overrides = $this->readOverrides();
+		$items = [];
+
+		$jsonFiles = glob($this->modulesPath . '/*/module.json') ?: [];
+
+		// Pre-resolve each module's state by name so the dependency diagnostics
+		// below can see the full set while building items.
+		$stateByName = [];
+		foreach ($jsonFiles as $jsonFile) {
+			$meta    = json_decode((string) @file_get_contents($jsonFile), true) ?: [];
+			// Key by the CANONICAL manifest name, not the `{name}_{hash5}` directory —
+			// config/modules.php and `dependencies` both reference the logical name.
+			$depName = (string) ($meta['name'] ?? basename(dirname($jsonFile)));
+			$stateByName[$depName] = ModuleState::fromRaw(
+				$overrides[$depName]['state'] ?? ($overrides[$depName]['enabled'] ?? null)
+			);
+		}
+
+		foreach ($jsonFiles as $jsonFile) {
+			$meta  = json_decode((string) @file_get_contents($jsonFile), true) ?: [];
+			$name  = (string) ($meta['name'] ?? basename(dirname($jsonFile))); // canonical name
+			$state = $stateByName[$name] ?? ModuleState::fromRaw(null);
+
+			$dependencies = ModuleLoader::filterCoreProvidedDependencies(
+				is_array($meta['dependencies'] ?? null) ? $meta['dependencies'] : []
+			);
+
+			// Flag a module that is nominally Enabled but won't actually load:
+			// ModuleLoader skips it when a required dependency is missing or not
+			// loadable (e.g. plex is Enabled but watch is Failed/Disabled). Mirrors
+			// ModuleLoader::pruneUnsatisfiableModules().
+			$dependencyWarnings = [];
+			foreach ($dependencies as $dep) {
+				if (!isset($stateByName[$dep])) {
+					$dependencyWarnings[] = "Required dependency '{$dep}' is missing.";
+				} elseif (!$stateByName[$dep]->isLoadable()) {
+					$dependencyWarnings[] = "Required dependency '{$dep}' is not enabled ("
+						. $stateByName[$dep]->value . ').';
+				}
+			}
+
+			$items[] = [
+				'name'                  => $name,
+				'hash_id'               => (string) ($meta['hash_id'] ?? ''),
+				'update'                => ModuleLoader::normalizeUpdateBlock($meta, $name),
+				'description'           => $meta['description'] ?? '',
+				'version'               => $meta['version'] ?? '',
+				'requires_core'         => $meta['requires_core'] ?? '',
+				'environment'           => $meta['environment'] ?? 'main',
+				'priority'              => (int) ($meta['priority'] ?? 0),
+				'dependencies'          => $dependencies,
+				'optional_dependencies' => is_array($meta['optional_dependencies'] ?? null) ? $meta['optional_dependencies'] : [],
+				'has_navbar'            => (bool) ($meta['has_navbar'] ?? false),
+				'has_settings'          => (bool) ($meta['has_settings'] ?? false),
+				'enabled'               => $state->isLoadable(),
+				'state'                 => $state,
+				'path'                  => dirname($jsonFile),
+				'installed_version'     => $overrides[$name]['installed_version'] ?? '',
+				'available_version'     => $overrides[$name]['available_version'] ?? '',
+				'source'                => $overrides[$name]['source'] ?? '',
+				'previous_version'      => $overrides[$name]['previous_version'] ?? '',
+				'dependency_warnings'   => $dependencyWarnings,
+			];
+		}
+
+		usort($items, function ($a, $b) {
+			return strcmp($a['name'], $b['name']);
+		});
+
+		return $items;
+	}
+
+	/**
+	 * Install a module by name.
+	 *
+	 * Loads the module instance, runs install(), and enables it.
+	 *
+	 * @param string $name Module name (lowercase, alphanumeric + hyphens).
+	 * @return void
+	 * @throws \RuntimeException If the module cannot be loaded.
+	 */
+	public function installModule(string $name, ?string $version = null): void {
+		$name = $this->sanitizeModuleName($name);
+		$module = $this->loadModuleInstance($name);
+
+		// Version priority: explicit $version (platform installs pass the
+		// authoritative SaaS release version) → module.json manifest → the
+		// module's hardcoded getVersion() (which can drift from the manifest).
+		$targetVersion = $version ?? $this->manifestVersion($name) ?? $module->getVersion();
+		$modulePath = $this->modulePathFor($name);
+
+		$this->setState($name, ModuleState::Installing);
+
+		try {
+			$db = $this->getDb() ?? DatabaseFactory::get();
+			// Apply the module's master schema, then its own install() hook for any
+			// non-SQL setup. NB: schema files are DDL (CREATE/ALTER), which
+			// MySQL/MariaDB implicitly commit — a wrapping transaction gives no
+			// rollback safety, and its rollback() on error throws "no active
+			// transaction", masking the real SQL error. So run directly and let the
+			// genuine failure propagate to the catch below (and into the logs).
+			if ($db !== null) {
+				// Fresh install applies the module's master schema (database.sql).
+				ModuleMigrator::install($modulePath, $db, (string) $targetVersion);
+			}
+			$module->install();
+		} catch (\Throwable $e) {
+			$this->setState($name, ModuleState::Failed);
+			throw $e;
+		}
+
+		$this->setState($name, ModuleState::Enabled);
+		$this->recordInstalledVersion($name, $targetVersion);
+	}
+
+	/**
+	 * Uninstall a module by name.
+	 *
+	 * Runs uninstall() and disables the module.
+	 *
+	 * @param string $name Module name.
+	 * @return void
+	 * @throws \RuntimeException If the module cannot be loaded.
+	 */
+	public function uninstallModule(string $name): void {
+		$name = $this->sanitizeModuleName($name);
+
+		// Refuse to remove a module that still-installed dependents rely on
+		// (e.g. plex depends on watch — watch cannot be removed under it).
+		$dependents = $this->installedDependentsOf($name);
+		if (!empty($dependents)) {
+			throw new \RuntimeException(
+				"Cannot uninstall '{$name}': still required by " . implode(', ', $dependents)
+				. '. Uninstall ' . (count($dependents) === 1 ? 'it' : 'them') . ' first.'
+			);
+		}
+
+		$module = $this->loadModuleInstance($name);
+
+		// The module's own uninstall() hook runs first (it clears the data/rows
+		// it created), then the module's schema is torn down via its single
+		// teardown file (database_drop.sql).
+		$module->uninstall();
+		$db = $this->getDb() ?? DatabaseFactory::get();
+		if ($db !== null) {
+			ModuleMigrator::uninstall($this->modulePathFor($name), $db);
+		}
+
+		$this->clearInstalledVersion($name);
+		$this->setState($name, ModuleState::Disabled);
+	}
+
+	/**
+	 * Fully delete a module: uninstall it, then remove its directory from disk and
+	 * its override entry from config/modules.php.
+	 *
+	 * Unlike uninstallModule() — which drops the tables and disables the module but
+	 * leaves its files on disk so it stays listed and re-installable — this removes
+	 * the module entirely. For a BUNDLED module (shipped in the deploy) the files
+	 * come back on the next panel update; deletion is still honoured until then.
+	 *
+	 * Order matters: uninstall runs FIRST (drop tables + uninstall() hook) while the
+	 * files are still on disk (the teardown SQL and the module class live there);
+	 * only after a clean uninstall are the files removed, so no orphaned tables are
+	 * left behind. A failing uninstall aborts the delete. The dependents guard is
+	 * enforced up front.
+	 *
+	 * @param string $name Module name.
+	 * @return void
+	 * @throws \RuntimeException If an installed dependent still requires the module.
+	 */
+	public function deleteModule(string $name): void {
+		$name = $this->sanitizeModuleName($name);
+
+		// Same guard as uninstall: refuse while an installed dependent needs it.
+		$dependents = $this->installedDependentsOf($name);
+		if (!empty($dependents)) {
+			throw new \RuntimeException(
+				"Cannot delete '{$name}': still required by " . implode(', ', $dependents)
+				. '. Delete ' . (count($dependents) === 1 ? 'it' : 'them') . ' first.'
+			);
+		}
+
+		// Read the manifest (for LB propagation) BEFORE the files are removed.
+		$manifest = [];
+		try {
+			$manifest = $this->readModuleManifest($name);
+		} catch (\Throwable $e) {
+			// No readable manifest — LB propagation just skips below.
+		}
+
+		// Step 1 — uninstall FIRST, while the module's files are still on disk:
+		// run its uninstall() hook and drop its tables (teardown SQL + module class
+		// both live in the directory). A failure aborts the delete and propagates,
+		// so the files are never removed with orphaned tables left behind.
+		$this->uninstallModule($name);
+
+		// Step 2 — remove the files, stored archives and the config override.
+		$this->deleteModuleFilesOnly($name);
+
+		// Step 3 — propagate the deletion to every LB node that received this module.
+		$this->distributeDeletionToLoadBalancers($name, $manifest);
+	}
+
+	/**
+	 * Remove a module's files WITHOUT touching the database.
+	 *
+	 * Used on LB nodes (which share MAIN's database — dropping tables there would
+	 * delete MAIN's data) and as the file-removal step of deleteModule(). Removes
+	 * the module directory, its stored archives, and its config/modules.php entry.
+	 *
+	 * @param string $name Module name.
+	 * @return void
+	 */
+	public function deleteModuleFilesOnly(string $name): void {
+		$name = $this->sanitizeModuleName($name);
+
+		$modulePath = $this->modulePathFor($name);
+		if (is_dir($modulePath)) {
+			$this->deleteDirectory($modulePath);
+		}
+
+		// Remove any stored marketplace archives (name_<version>.zip).
+		foreach (glob($this->archivesPath . '/' . $name . '_*.zip') ?: [] as $rArchive) {
+			@unlink($rArchive);
+		}
+
+		// Drop the config/modules.php override entry entirely.
+		$overrides = $this->readOverrides();
+		if (isset($overrides[$name])) {
+			unset($overrides[$name]);
+			$this->writeOverrides($overrides);
+		}
+	}
+
+	/**
+	 * Tell every load balancer that received this module to delete it too.
+	 *
+	 * Mirrors distributeToLoadBalancers(): only MAIN dispatches, and only for
+	 * modules that were distributed (environment lb/any). LB nodes act on the
+	 * `delete_module` signal via RootSignalsCronJob → `console.php module:delete`
+	 * (files-only — never a DB drop on the shared MAIN database).
+	 *
+	 * @param string $name     Module name.
+	 * @param array  $manifest The module's manifest (read before deletion).
+	 * @return void
+	 */
+	private function distributeDeletionToLoadBalancers(string $name, array $manifest): void {
+		// Cheap manifest check first — a MAIN-only module was never on any LB, so
+		// return before touching config (isLoadBalancer() reads via the extension).
+		$environment = strtolower((string) ($manifest['environment'] ?? 'main'));
+		if (!in_array($environment, ['lb', 'any'], true)) {
+			return; // MAIN-only — LB never had it
+		}
+		if ($this->isLoadBalancer()) {
+			return;
+		}
+		$db = $this->getDb();
+		if ($db === null) {
+			return;
+		}
+
+		$payload = json_encode(['action' => 'delete_module', 'name' => $name]);
+
+		$db->query('SELECT `id` FROM `servers` WHERE `server_type` = 0 AND `is_main` = 0 AND `enabled` = 1;');
+		$rServerIDs = [];
+		foreach ($db->get_rows() as $rRow) {
+			$rServerIDs[] = intval($rRow['id']);
+		}
+		foreach ($rServerIDs as $rServerID) {
+			$db->query(
+				'INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);',
+				$rServerID,
+				time(),
+				$payload
+			);
+		}
+	}
+
+	/**
+	 * Update a module, running only the incremental migrations needed.
+	 *
+	 * Reads the recorded installed_version from config/modules.php.
+	 * If no version is recorded (legacy install), falls back to full installModule().
+	 * If already at the current version, does nothing.
+	 * Otherwise runs all getMigrations() entries with version > installedVersion
+	 * and version <= module->getVersion(), in ascending semver order.
+	 *
+	 * @param string $name Module name.
+	 * @return void
+	 */
+	public function updateModule(string $name): void {
+		$name        = $this->sanitizeModuleName($name);
+		$overrides   = $this->readOverrides();
+		$fromVersion = $overrides[$name]['installed_version'] ?? null;
+
+		if ($fromVersion === null) {
+			$this->installModule($name);
+			return;
+		}
+
+		$module    = $this->loadModuleInstance($name);
+		$toVersion = $this->manifestVersion($name) ?? $module->getVersion();
+
+		if (version_compare($fromVersion, $toVersion, '>=')) {
+			return;
+		}
+
+		// File-based schema migrations: every up file in (fromVersion, toVersion].
+		$db = $this->getDb() ?? DatabaseFactory::get();
+		if ($db !== null) {
+			ModuleMigrator::up($this->modulePathFor($name), $db, $fromVersion, (string) $toVersion);
+		}
+
+		// Programmatic migrations (callables) — coexist with the file-based ones.
+		if ($module instanceof MigratableInterface) {
+			$this->runPendingMigrations($module->getMigrations(), $fromVersion, $toVersion);
+		}
+
+		$this->recordInstalledVersion($name, $toVersion);
+	}
+
+	/**
+	 * Update a module by fetching new files from its declared source, then running
+	 * migrations. This is what the panel's "Update" button triggers (P4).
+	 *
+	 *  - bundled  : files already ship with the panel → migrations only (updateModule()).
+	 *  - platform : delegated to the store flow (downloadFromPlatform — backup/restore/LB inside).
+	 *  - git/url  : download archive → verify `hash_id` → backup → replace files → migrate →
+	 *               restore on failure → distribute to LB.
+	 *
+	 * Identity pinning: for git/url the fetched module.json `hash_id` must equal the
+	 * installed one — a repo/URL cannot impersonate another module or hijack a rename.
+	 *
+	 * @param string $name Module name.
+	 * @return string|null Version now on disk after the update, or null when the
+	 *                     source had nothing newer (stale available_version cleared).
+	 * @throws \RuntimeException on download/verify/apply failure (files rolled back).
+	 */
+	public function updateModuleFromSource(string $name): ?string {
+		$name      = $this->sanitizeModuleName($name);
+		$manifest  = $this->readModuleManifest($name);
+		$overrides = $this->readOverrides();
+
+		$update    = ModuleLoader::normalizeUpdateBlock($manifest, $name);
+		$installed = (string) ($overrides[$name]['installed_version'] ?? '');
+		$source    = $update['source'];
+
+		// bundled — the panel already replaced the files; just catch the schema up.
+		if ($source === 'bundled') {
+			$this->updateModule($name);
+			$this->recordAvailableVersion($name, null);
+			return $this->manifestVersion($name);
+		}
+
+		// platform — reuse the full store flow (self-contained rollback + LB fan-out).
+		if ($source === 'platform') {
+			$apiKey = (string) (SettingsManager::get('platform_api_key') ?? '');
+			$this->downloadFromPlatform(($update['slug'] !== '' ? $update['slug'] : $name), '', $apiKey);
+			$this->recordAvailableVersion($name, null);
+			return $this->manifestVersion($name);
+		}
+
+		// git / url — fetch, verify, apply.
+		$checker = new ModuleUpdateChecker();
+		$version = $checker->latestAvailable([
+			'update'            => $update,
+			'version'           => (string) ($manifest['version'] ?? ''),
+			'installed_version' => $installed,
+		]);
+		if ($version === null && $checker->lastError() !== null) {
+			// Source unreachable (e.g. GitHub API rate limit) — fail loudly instead
+			// of silently doing nothing while the caller reports "updated".
+			throw new \RuntimeException(
+				"Cannot resolve the latest version of '{$name}' from its {$source} source: " . $checker->lastError()
+			);
+		}
+		if ($version === null || ($installed !== '' && version_compare($version, $installed, '<='))) {
+			// Nothing newer at the source — the recorded available_version is stale
+			// (already updated, or the release was pulled). Clear it so the Update
+			// button disappears instead of reappearing forever.
+			$this->recordAvailableVersion($name, null);
+			return null;
+		}
+
+		[$downloadUrl, $expectedMd5] = $this->resolveSourceDownload($update, $version);
+		if ($downloadUrl === '') {
+			throw new \RuntimeException("No download URL resolved for module '{$name}' (source '{$source}').");
+		}
+
+		$archive = (string) @tempnam(sys_get_temp_dir(), 'xc_modupd_');
+		if ($archive === '') {
+			throw new \RuntimeException('Unable to create a temp file for the module download.');
+		}
+		$tempBase = rtrim(sys_get_temp_dir(), '/') . '/xc_modupd_' . bin2hex(random_bytes(8));
+
+		try {
+			$this->downloadToFile($downloadUrl, $archive);
+			if ($expectedMd5 !== '' && !hash_equals(strtolower($expectedMd5), (string) md5_file($archive))) {
+				throw new \RuntimeException('Checksum mismatch on the downloaded module archive.');
+			}
+
+			$this->extractArchive($archive, $tempBase);
+			$moduleDir = $this->resolveExtractedModuleDir($tempBase);
+
+			// Identity pinning — the fetched module must be the SAME module.
+			$newMeta = json_decode((string) @file_get_contents($moduleDir . '/module.json'), true);
+			$newHash = is_array($newMeta) ? (string) ($newMeta['hash_id'] ?? '') : '';
+			$ownHash = (string) ($manifest['hash_id'] ?? '');
+			if ($ownHash !== '' && $newHash !== '' && !hash_equals($ownHash, $newHash)) {
+				throw new \RuntimeException("hash_id mismatch — refusing to overwrite '{$name}' with a different module.");
+			}
+
+			$targetDir = $this->modulePathFor($name);
+			$backupDir = $this->backupModuleDir($name, $targetDir);
+			try {
+				$this->copyDirectory($moduleDir, $targetDir);
+				$this->updateModule($name); // incremental migrations to the new manifest version
+
+				$fresh          = $this->readModuleManifest($name);
+				$resolvedVer    = (string) ($fresh['version'] ?? $version);
+				$this->recordAvailableVersion($name, null);
+
+				// Keep a local archive so LB nodes can pull it (getFile), then fan out.
+				$this->storeModuleArchive($archive, $name, $resolvedVer);
+				$this->distributeToLoadBalancers($name, $fresh, 'local', $resolvedVer);
+
+				if ($backupDir !== null) {
+					$this->deleteDirectory($backupDir);
+				}
+
+				return $resolvedVer;
+			} catch (\Throwable $e) {
+				$this->restoreModuleBackup($name, $targetDir, $backupDir, $installed !== '' ? $installed : null);
+				throw new \RuntimeException("Update of '{$name}' failed — rolled back: " . $e->getMessage(), 0, $e);
+			}
+		} finally {
+			@unlink($archive);
+			$this->deleteDirectory($tempBase);
+		}
+	}
+
+	/**
+	 * Resolve the download URL (+ optional expected md5) for a git/url source.
+	 *
+	 * git : release asset `module.tar.gz` at the tag == $version; md5 (if any)
+	 *       comes from the release's `hashes.md5` via GitHubReleases::getAssetHash().
+	 * url : re-fetch the `version.json` for its `download` (https) and optional `md5`.
+	 *
+	 * @return array{0:string,1:string} [downloadUrl, expectedMd5] — url '' if unresolved.
+	 */
+	private function resolveSourceDownload(array $update, string $version): array {
+		if (($update['source'] ?? '') === 'git') {
+			if (!preg_match('~github\.com[:/]+([^/]+)/([^/]+?)(?:\.git)?/?$~i', (string) ($update['repository'] ?? ''), $m)) {
+				return ['', ''];
+			}
+			$asset = 'module.tar.gz'; // convention: module repo release ships this asset
+			$url   = "https://github.com/{$m[1]}/{$m[2]}/releases/download/{$version}/{$asset}";
+			$md5   = '';
+			try {
+				$channel = in_array((string) ($update['channel'] ?? 'stable'), ['beta', 'unstable'], true) ? 'beta' : 'stable';
+				$md5 = (string) ((new GitHubReleases($m[1], $m[2], $channel))->getAssetHash($version, $asset) ?? '');
+			} catch (\Throwable $e) {
+				// no hash available → download proceeds unverified
+			}
+			return [$url, $md5];
+		}
+
+		if (($update['source'] ?? '') === 'url') {
+			$data = json_decode($this->httpGetString((string) ($update['url'] ?? '')), true);
+			$dl   = is_array($data) ? trim((string) ($data['download'] ?? '')) : '';
+			$md5  = is_array($data) ? trim((string) ($data['md5'] ?? '')) : '';
+			if (stripos($dl, 'https://') !== 0) {
+				$dl = '';
+			}
+			return [$dl, $md5];
+		}
+
+		return ['', ''];
+	}
+
+	/** cURL GET a small https resource to a string ('' on failure/non-https). */
+	private function httpGetString(string $url): string {
+		if (stripos($url, 'https://') !== 0) {
+			return '';
+		}
+		$ch = curl_init($url);
+		curl_setopt_array($ch, [
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_CONNECTTIMEOUT => 15,
+			CURLOPT_TIMEOUT        => 30,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_USERAGENT      => 'XC_VM-ModuleManager',
+		]);
+		$body = curl_exec($ch);
+		curl_close($ch);
+		return is_string($body) ? $body : '';
+	}
+
+	/** Download an https URL straight to $dest; throws on non-https / HTTP error. */
+	private function downloadToFile(string $url, string $dest): void {
+		// Shared streaming primitive (see CurlClient::downloadToFile); kept as a
+		// thin wrapper so existing call sites and error text stay stable.
+		CurlClient::downloadToFile($url, $dest);
+	}
+
+	/**
+	 * Set the lifecycle state of a module in config/modules.php.
+	 *
+	 * When state is Enabled the 'state' key is removed entirely (clean default).
+	 * When state is anything else the string value is persisted as 'state'.
+	 *
+	 * @param string      $name  Module name.
+	 * @param ModuleState $state Target lifecycle state.
+	 * @return void
+	 */
+	public function setState(string $name, ModuleState $state): void {
+		$name      = $this->sanitizeModuleName($name);
+
+		// Refuse to disable a module that still-enabled dependents rely on
+		// (e.g. plex requires watch — watch cannot be disabled under it, or
+		// ModuleLoader would skip plex on the next boot). Mirrors the guard in
+		// uninstallModule(). Scoped strictly to a deliberate Disabled transition:
+		// the internal lifecycle states (Installing, Failed) are also non-loadable
+		// but are set by installModule() itself and must never be blocked.
+		if ($state === ModuleState::Disabled) {
+			$dependents = $this->enabledDependentsOf($name);
+			if (!empty($dependents)) {
+				throw new \RuntimeException(
+					"Cannot disable '{$name}': still required by " . implode(', ', $dependents)
+					. '. Disable ' . (count($dependents) === 1 ? 'it' : 'them') . ' first.'
+				);
+			}
+		}
+
+		$overrides = $this->readOverrides();
+
+		if (!isset($overrides[$name]) || !is_array($overrides[$name])) {
+			$overrides[$name] = [];
+		}
+
+		// Remove any legacy bool 'enabled' key — we use 'state' now.
+		unset($overrides[$name]['enabled']);
+
+		if ($state === ModuleState::Enabled) {
+			// Enabled is the default: clean up the key so the file stays minimal.
+			unset($overrides[$name]['state']);
+			if (empty($overrides[$name])) {
+				unset($overrides[$name]);
+			}
+		} else {
+			$overrides[$name]['state'] = $state->value;
+		}
+
+		$this->writeOverrides($overrides);
+	}
+
+	/**
+	 * Enable or disable a module in config/modules.php.
+	 *
+	 * @deprecated Use setState(name, ModuleState::Enabled / ModuleState::Disabled) instead.
+	 *
+	 * @param string $name    Module name.
+	 * @param bool   $enabled True to enable, false to disable.
+	 * @return void
+	 */
+	public function setEnabled(string $name, bool $enabled): void {
+		$this->setState($name, $enabled ? ModuleState::Enabled : ModuleState::Disabled);
+	}
+
+	/**
+	 * Upload a zip archive and install the module from it.
+	 *
+	 * Extracts the archive to a temp directory, validates structure,
+	 * copies to the modules path, and runs installModule().
+	 *
+	 * @param string $zipFilePath Path to the uploaded zip file.
+	 * @return string Installed module name.
+	 * @throws \RuntimeException If extraction or installation fails.
+	 * @throws \InvalidArgumentException If the zip file is not found.
+	 */
+	public function uploadAndInstall(string $zipFilePath): string {
+		if (!is_file($zipFilePath)) {
+			throw new \InvalidArgumentException('Uploaded zip file not found.');
+		}
+
+		$tempBase = rtrim(sys_get_temp_dir(), '/') . '/xc_module_' . bin2hex(random_bytes(8));
+		if (!@mkdir($tempBase, 0755, true) && !is_dir($tempBase)) {
+			throw new \RuntimeException('Unable to create temporary directory.');
+		}
+
+		try {
+			$this->extractArchive($zipFilePath, $tempBase);
+
+			$moduleDir  = $this->resolveExtractedModuleDir($tempBase);
+			$moduleName = $this->placeModuleFiles($moduleDir);
+
+			$this->installModule($moduleName);
+
+			// Keep a copy of the uploaded archive so it can be redistributed to
+			// LB servers (which have no access to the store for custom modules).
+			$manifest = $this->readModuleManifest($moduleName);
+			$version  = (string) ($manifest['version'] ?? '0.0.0');
+			$this->storeModuleArchive($zipFilePath, $moduleName, $version);
+
+			// Custom (non-store) module — no store rollback available.
+			$this->recordModuleSource($moduleName, 'local');
+
+			// If the manifest targets load balancers, push the archive to every LB.
+			$this->distributeToLoadBalancers($moduleName, $manifest, 'local', $version);
+
+			return $moduleName;
+		} finally {
+			$this->deleteDirectory($tempBase);
+		}
+	}
+
+	/**
+	 * LB-side: install a custom (non-store) module from a local archive,
+	 * deploying its FILES ONLY — no DB migrations (the shared DB was already
+	 * migrated by MAIN).
+	 *
+	 * @param string $zipFilePath Path to the .zip archive fetched from MAIN.
+	 * @return string Installed module name.
+	 */
+	public function deployFromArchiveFilesOnly(string $zipFilePath): string {
+		if (!is_file($zipFilePath)) {
+			throw new \InvalidArgumentException('Module archive not found.');
+		}
+
+		$tempBase = rtrim(sys_get_temp_dir(), '/') . '/xc_module_' . bin2hex(random_bytes(8));
+		if (!@mkdir($tempBase, 0755, true) && !is_dir($tempBase)) {
+			throw new \RuntimeException('Unable to create temporary directory.');
+		}
+
+		try {
+			$this->extractArchive($zipFilePath, $tempBase);
+
+			$moduleDir  = $this->resolveExtractedModuleDir($tempBase);
+			$moduleName = $this->placeModuleFiles($moduleDir);
+			$targetDir  = $this->modulePathFor($moduleName);
+
+			// Keep the archive locally too, so this LB can re-seed if needed.
+			$manifest = $this->readModuleManifest($moduleName);
+			$version  = (string) ($manifest['version'] ?? '0.0.0');
+			$this->storeModuleArchive($zipFilePath, $moduleName, $version);
+
+			$this->recordInstalledVersion($moduleName, $version);
+			$this->setState($moduleName, ModuleState::Enabled);
+			$this->hotReloadSafe($moduleName, $targetDir);
+
+			return $moduleName;
+		} finally {
+			$this->deleteDirectory($tempBase);
+		}
+	}
+
+	/**
+	 * Copy a module archive into the local archives directory as
+	 * {name}_{version}.zip (idempotent — overwrites any previous copy).
+	 */
+	private function storeModuleArchive(string $sourceZip, string $name, string $version): void {
+		$dest = $this->archivePathFor($name, $version);
+		$dir  = dirname($dest);
+		if (!is_dir($dir) && !@mkdir($dir, 0755, true) && !is_dir($dir)) {
+			throw new \RuntimeException('Unable to create modules archive directory.');
+		}
+		if (realpath($sourceZip) !== realpath($dest) && !@copy($sourceZip, $dest)) {
+			throw new \RuntimeException('Unable to store module archive.');
+		}
+		@chmod($dest, 0644);
+	}
+
+	/**
+	 * Read a module's manifest (module.json) from the modules directory.
+	 *
+	 * @return array Decoded manifest, or [] if missing/invalid.
+	 */
+	private function readModuleManifest(string $name): array {
+		$name = $this->sanitizeModuleName($name);
+		// Resolve the real {name}_{hash5} (or legacy bare) directory — reading the
+		// bare path would miss the manifest for a hash-suffixed module.
+		$file = $this->modulePathFor($name) . '/module.json';
+		if (!is_file($file)) {
+			return [];
+		}
+		$data = json_decode((string) @file_get_contents($file), true);
+		return is_array($data) ? $data : [];
+	}
+
+	/**
+	 * The module's version as declared in its module.json, or null if absent.
+	 * Authoritative source for the installed version (the module's getVersion()
+	 * is hardcoded and may drift from the shipped manifest).
+	 *
+	 * @param string $name Module name / directory.
+	 * @return string|null
+	 */
+	private function manifestVersion(string $name): ?string {
+		$v = $this->readModuleManifest($name)['version'] ?? null;
+		return (is_string($v) && $v !== '') ? $v : null;
+	}
+
+	/**
+	 * Tell every enabled load balancer to install a module, if the manifest
+	 * targets the LB environment. Runs only on MAIN.
+	 *
+	 * Inserts one `signals` row per LB with custom_data:
+	 *   {"action":"install_module","source":"platform|local","name":"…","version":"…"}
+	 * The LB's root signals daemon picks it up and runs `console.php module:install`.
+	 *
+	 * @param string $name     Module name / slug.
+	 * @param array  $manifest Decoded module.json.
+	 * @param string $source   'platform' (pull from store) or 'local' (pull archive from MAIN).
+	 * @param string $version  Module version.
+	 */
+	private function distributeToLoadBalancers(string $name, array $manifest, string $source, string $version): void {
+		// Only MAIN distributes. LB installs are file-only and never re-dispatch.
+		if ($this->isLoadBalancer()) {
+			return;
+		}
+
+		$environment = strtolower((string) ($manifest['environment'] ?? 'main'));
+		if (!in_array($environment, ['lb', 'any'], true)) {
+			return; // module is MAIN-only — nothing to distribute
+		}
+
+		$db = $this->getDb();
+		if ($db === null) {
+			return;
+		}
+
+		$payload = json_encode([
+			'action'  => 'install_module',
+			'source'  => $source === 'platform' ? 'platform' : 'local',
+			'name'    => $name,
+			'version' => $version,
+		]);
+
+		// LB servers are streaming servers (server_type = 0) that are not the
+		// main panel and are enabled. Collect ids first so the INSERT loop does
+		// not clobber the active result set.
+		$db->query('SELECT `id` FROM `servers` WHERE `server_type` = 0 AND `is_main` = 0 AND `enabled` = 1;');
+		$rServerIDs = [];
+		foreach ($db->get_rows() as $rRow) {
+			$rServerIDs[] = intval($rRow['id']);
+		}
+
+		foreach ($rServerIDs as $rServerID) {
+			$db->query(
+				'INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);',
+				$rServerID,
+				time(),
+				$payload
+			);
+		}
+	}
+
+	/**
+	 * @return bool True when running on a load balancer (is_lb = 1 in config).
+	 */
+	private function isLoadBalancer(): bool {
+		if (class_exists(ConfigReader::class)) {
+			return (bool) ConfigReader::get('is_lb');
+		}
+		if (defined('SERVER_TYPE')) {
+			// SERVER_TYPE is an external runtime constant (not define()d in-tree);
+			// use constant() so static analysis doesn't flag an undefined constant.
+			// Mirrors ModuleLoader::detectEnvironment().
+			return constant('SERVER_TYPE') === 'lb';
+		}
+		return false;
+	}
+
+	/**
+	 * Download a module from the SaaS platform and install it.
+	 *
+	 * Delegates the full download → key-unwrap → extract flow to the
+	 * XC_VM C extension, then runs installModule() to register it.
+	 * Fires PackageInstalledEvent and hot-reloads the module into the
+	 * current ServiceContainer without requiring a PHP-FPM restart.
+	 *
+	 * @param string      $slug    Module slug as listed on the platform.
+	 * @param string      $version Exact version string (e.g. "1.2.0"), or '' for the latest.
+	 * @param string|null $apiKey  API key for the SaaS platform.
+	 * @return void
+	 * @throws \RuntimeException If the C extension is missing, download fails, or install fails.
+	 */
+	public function downloadFromPlatform(string $slug, string $version = '', ?string $apiKey = null): void {
+		$slug      = $this->sanitizeModuleName($slug);
+		$targetDir = $this->modulesPath . '/' . $slug;
+
+		// Snapshot current state so a failed (re)install rolls back cleanly. We
+		// MOVE the existing module aside (outside modulesPath so the loader never
+		// scans it) — this both gives a clean dir for the new extract and a
+		// restore point. installed_version is captured for the version record.
+		$prevVersion = $this->readOverrides()[$slug]['installed_version'] ?? null;
+		$backupDir   = $this->backupModuleDir($slug, $targetDir);
+
+		try {
+			$result          = $this->pullFilesFromPlatform($slug, $version, $apiKey);
+			$modulePath      = $result['path'];
+			$resolvedVersion = (string) ($result['version'] ?: $version);
+
+			// Acquire the per-machine ionCube license BEFORE installModule(): if the
+			// platform encoded the module with --with-license, the loader rejects the
+			// encoded files at require-time unless a valid .lic is already present.
+			// No-op when the platform has licensing disabled.
+			$this->acquireModuleLicense($slug, $apiKey);
+
+			// Record the version the PLATFORM served (authoritative for store
+			// installs); the module's module.json/getVersion() may lag behind.
+			$this->installModule($slug, $resolvedVersion);
+
+			EventDispatcher::dispatch(new PackageInstalledEvent(
+				slug:        $result['module'],
+				version:     $resolvedVersion,
+				path:        $modulePath,
+				installedAt: time(),
+			));
+
+			$this->hotReload($slug, $modulePath);
+
+			// Mark as store-installed and remember the version the Rollback
+			// button should target. The previous version is authoritative from
+			// the PLATFORM (it holds release history); it may be null when the
+			// platform has no prior approved version. (NB: $prevVersion below is
+			// the LOCAL pre-install version, used only for failure rollback.)
+			$this->recordPlatformSource($slug, $result['previous_version'] ?? null);
+
+			// If the manifest targets load balancers, tell every LB to pull the
+			// same module from the platform with its own install_id (MAIN-only).
+			$this->distributeToLoadBalancers($slug, $this->readModuleManifest($slug), 'platform', $resolvedVersion);
+
+			// Success — drop the rollback snapshot.
+			if ($backupDir !== null) {
+				$this->deleteDirectory($backupDir);
+			}
+		} catch (\Throwable $e) {
+			$restored = $this->restoreModuleBackup($slug, $targetDir, $backupDir, $prevVersion);
+			throw new \RuntimeException(
+				"Platform install of '{$slug}' failed"
+				. ($restored
+					? ' — rolled back to previous version' . ($prevVersion ? " {$prevVersion}" : '')
+					: '')
+				. ': ' . $e->getMessage(),
+				0,
+				$e
+			);
+		}
+	}
+
+	/**
+	 * Roll a store-installed module back to its previously installed version.
+	 *
+	 * Uses the `previous_version` recorded at the last store install (still
+	 * available on the platform within its retention window). Re-installs that
+	 * exact version, then clears `previous_version` (one-shot rollback). LBs are
+	 * re-synced to the rolled-back version via the normal distribution path.
+	 *
+	 * @param string      $slug   Module slug.
+	 * @param string|null $apiKey Platform API key.
+	 * @throws \RuntimeException If the module was not installed from the store or
+	 *                          has no recorded previous version.
+	 */
+	public function rollbackFromPlatform(string $slug, ?string $apiKey = null): void {
+		$slug      = $this->sanitizeModuleName($slug);
+		$overrides = $this->readOverrides();
+		$entry     = $overrides[$slug] ?? [];
+
+		if (($entry['source'] ?? '') !== 'platform') {
+			throw new \RuntimeException("Module '{$slug}' was not installed from the store; cannot roll back.");
+		}
+		$previous = $entry['previous_version'] ?? '';
+		if ($previous === '') {
+			throw new \RuntimeException("No previous version recorded for '{$slug}'.");
+		}
+
+		// Re-installs the previous version (explicit, not "latest").
+		$this->downloadFromPlatform($slug, $previous, $apiKey);
+
+		// One-shot: drop the previous-version marker so the rollback button hides
+		// until the next successful update creates a new restore point.
+		$this->clearPreviousVersion($slug);
+	}
+
+	/** Mark a module as store-installed and (optionally) record the replaced version. */
+	private function recordPlatformSource(string $name, ?string $previousVersion): void {
+		$overrides = $this->readOverrides();
+		if (!isset($overrides[$name]) || !is_array($overrides[$name])) {
+			$overrides[$name] = [];
+		}
+		$overrides[$name]['source'] = 'platform';
+		if ($previousVersion !== null && $previousVersion !== '') {
+			$overrides[$name]['previous_version'] = $previousVersion;
+		}
+		$this->writeOverrides($overrides);
+	}
+
+	/** Record the install source for a module (e.g. 'platform' or 'local'). */
+	private function recordModuleSource(string $name, string $source): void {
+		$overrides = $this->readOverrides();
+		if (!isset($overrides[$name]) || !is_array($overrides[$name])) {
+			$overrides[$name] = [];
+		}
+		$overrides[$name]['source'] = $source;
+		$this->writeOverrides($overrides);
+	}
+
+	/**
+	 * Fetch and install the per-machine ionCube license for a module.
+	 *
+	 * Generates this machine's ionCube server-data, asks the platform to mint a
+	 * hardware-bound + expiring .lic (XC_VM::module_license) and writes it next to
+	 * the encoded files (the name the encoder's --with-license expects).
+	 *
+	 * Best-effort: when the platform has licensing disabled, the module is not
+	 * entitled, or the loader/extension lacks the needed functions, it silently
+	 * writes nothing — so unlicensed-encoded modules still install normally.
+	 *
+	 * @return bool True if a .lic was written.
+	 */
+	private function acquireModuleLicense(string $slug, ?string $apiKey): bool {
+		if (!class_exists('XC_VM') || !function_exists('ioncube_server_data')) {
+			return false;
+		}
+
+		$serverData = @ioncube_server_data();
+		if (!is_string($serverData) || $serverData === '') {
+			error_log("ModuleManager: license skipped for '{$slug}': ioncube_server_data() empty");
+			return false;
+		}
+
+		try {
+			$res = \XC_VM::module_license($slug, base64_encode($serverData), $apiKey ?? '');
+		} catch (\Throwable $e) {
+			error_log("ModuleManager: license request failed for '{$slug}': " . $e->getMessage());
+			return false;
+		}
+
+		if (!is_array($res) || empty($res['ok'])) {
+			$reason = is_array($res) ? ($res['reason'] ?? 'unknown') : 'no_response';
+			error_log("ModuleManager: license NOT issued for '{$slug}': {$reason}"
+				. (($apiKey ?? '') === '' ? ' (api_key пуст — для лицензии он обязателен)' : ''));
+			return false;
+		}
+
+		$licName  = basename((string) ($res['license_name'] ?? 'module.lic'));
+		$licBytes = base64_decode((string) ($res['license'] ?? ''), true);
+		if ($licName === '' || $licBytes === false || $licBytes === '') {
+			error_log("ModuleManager: license for '{$slug}' empty/undecodable in response");
+			return false;
+		}
+
+		$dir = $this->modulesPath . '/' . $slug;
+		if (!is_dir($dir)) {
+			error_log("ModuleManager: module dir missing for '{$slug}': {$dir}");
+			return false;
+		}
+
+		if (@file_put_contents($dir . '/' . $licName, $licBytes) === false) {
+			error_log("ModuleManager: failed to write license {$dir}/{$licName} (права?)");
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Re-issue the per-machine license for an installed platform module — call
+	 * before expiry, or after a "license expired/invalid" load failure. The SaaS
+	 * refusing to mint (lapsed subscription / revoked) is the effective kill.
+	 *
+	 * @return bool True if a fresh .lic was written.
+	 */
+	public function renewModuleLicense(string $slug, ?string $apiKey = null): bool {
+		return $this->acquireModuleLicense($this->sanitizeModuleName($slug), $apiKey);
+	}
+
+	/** Remove the recorded previous version for a module. */
+	private function clearPreviousVersion(string $name): void {
+		$overrides = $this->readOverrides();
+		if (isset($overrides[$name]['previous_version'])) {
+			unset($overrides[$name]['previous_version']);
+			$this->writeOverrides($overrides);
+		}
+	}
+
+	/**
+	 * Move an installed module directory to a backup location outside the
+	 * modules path (so ModuleLoader never scans it). Returns the backup path,
+	 * or null if the module was not installed. Falls back to copy+delete if the
+	 * move (rename) fails.
+	 */
+	private function backupModuleDir(string $slug, string $targetDir): ?string {
+		if (!is_dir($targetDir)) {
+			return null;
+		}
+		$base = dirname($this->modulesPath) . '/.module_backups';
+		if (!is_dir($base) && !@mkdir($base, 0755, true) && !is_dir($base)) {
+			// Cannot create a backup area — copy in place as a last resort is not
+			// possible; proceed without rollback rather than block the install.
+			return null;
+		}
+		$backupDir = $base . '/' . $slug . '_' . bin2hex(random_bytes(4));
+		if (@rename($targetDir, $backupDir)) {
+			return $backupDir;
+		}
+		// rename failed (e.g. cross-device) — copy then remove the original.
+		$this->copyDirectory($targetDir, $backupDir);
+		$this->deleteDirectory($targetDir);
+		return $backupDir;
+	}
+
+	/**
+	 * Restore a module backup created by backupModuleDir() after a failed
+	 * install, re-recording the previous installed version. Returns true if a
+	 * backup was restored.
+	 */
+	private function restoreModuleBackup(string $slug, string $targetDir, ?string $backupDir, ?string $prevVersion): bool {
+		// Remove the (possibly partial) failed install first.
+		$realModules = realpath($this->modulesPath);
+		$realTarget  = realpath($targetDir) ?: $targetDir;
+		if ($realModules && str_starts_with($realTarget, $realModules . '/')) {
+			$this->deleteDirectory($targetDir);
+		}
+
+		if ($backupDir === null || !is_dir($backupDir)) {
+			return false;
+		}
+
+		if (!@rename($backupDir, $targetDir)) {
+			$this->copyDirectory($backupDir, $targetDir);
+			$this->deleteDirectory($backupDir);
+		}
+
+		if ($prevVersion !== null) {
+			$this->recordInstalledVersion($slug, $prevVersion);
+		}
+		$this->setState($slug, ModuleState::Enabled);
+		return true;
+	}
+
+	/**
+	 * LB-side: download a store module from the platform and deploy its FILES
+	 * ONLY — no DB migrations.
+	 *
+	 * LB servers share MAIN's database, so the module's schema migrations have
+	 * already been applied by MAIN. Here we only need the decrypted code on the
+	 * LB so it loads under environment=lb/any. Each LB registers and downloads
+	 * with its OWN install_id.
+	 *
+	 * @param string      $slug    Module slug on the platform.
+	 * @param string      $version Exact version string.
+	 * @param string|null $apiKey  Shared platform API key (from settings).
+	 * @return void
+	 */
+	public function deployFromPlatformFilesOnly(string $slug, string $version, ?string $apiKey = null): void {
+		$result = $this->pullFilesFromPlatform($slug, $version, $apiKey);
+
+		EventDispatcher::dispatch(new PackageInstalledEvent(
+			slug:        $result['module'],
+			version:     $result['version'],
+			path:        $result['path'],
+			installedAt: time(),
+		));
+
+		$this->recordInstalledVersion($slug, (string) ($result['version'] ?: $version));
+		$this->setState($slug, ModuleState::Enabled);
+		$this->hotReloadSafe($slug, $result['path']);
+	}
+
+	/**
+	 * Register the panel and pull (download + decrypt + extract) a module's
+	 * files from the platform via the C extension. Does NOT run installModule().
+	 *
+	 * @return array{ok: bool, module: string, version: string, path: string}
+	 * @throws \RuntimeException On a missing extension, registration or download failure.
+	 */
+	private function pullFilesFromPlatform(string $slug, string $version, ?string $apiKey): array {
+		if (!class_exists('XC_VM')) {
+			throw new \RuntimeException('XC_VM extension is not loaded. Install xcvm_core.so and enable it in php.ini.');
+		}
+
+		// Ensure this panel is registered with the platform before installing.
+		// module_install() asks the SaaS to wrap the module key in an X25519
+		// SealedBox for *this* panel's public key; if the panel was never
+		// registered the /plugins/key endpoint answers "panel_not_registered"
+		// and the install fails. Registration is an idempotent upsert keyed by
+		// install_id, so running it before every install also guarantees the
+		// server holds the public key matching our current local secret key.
+		$reg = \XC_VM::panel_register($apiKey ?? '');
+		if (!is_array($reg) || empty($reg['ok'])) {
+			$regReason = $reg['message'] ?? ($reg['reason'] ?? 'unknown');
+			throw new \RuntimeException("Panel registration with platform failed for module '{$slug}': {$regReason}");
+		}
+
+		$result = \XC_VM::module_install($slug, $version, $apiKey ?? '');
+
+		if (!is_array($result) || empty($result['ok'])) {
+			$reason = $result['error'] ?? 'unknown';
+			throw new \RuntimeException("Platform download failed for module '{$slug}': {$reason}");
+		}
+
+		return [
+			'ok'               => true,
+			'module'           => $result['module'] ?? $slug,
+			'version'          => $result['version'] ?? $version,
+			'path'             => $result['path'] ?? ($this->modulesPath . '/' . $slug),
+			// Previous approved version reported by the platform (for the
+			// Rollback button). May be absent/null when there is no prior version.
+			'previous_version' => $result['previous_version'] ?? null,
+		];
+	}
+
+	/**
+	 * Hot-reload a newly installed module into the running ServiceContainer.
+	 *
+	 * Loads and boots the module within the current request so it becomes
+	 * immediately usable without a PHP-FPM restart.
+	 *
+	 * @param string $slug       Module name.
+	 * @param string $modulePath Absolute path to the module directory.
+	 */
+
+	/**
+	 * Hot-reload only when serving a web request, never crash the caller.
+	 *
+	 * On an LB the install runs from a root CLI cron where there is no live
+	 * request to keep warm and no router/container wired — the module simply
+	 * loads from disk on the next request. So skip hot-reload under CLI and
+	 * swallow any error.
+	 */
+	private function hotReloadSafe(string $slug, string $modulePath): void {
+		if (PHP_SAPI === 'cli') {
+			return;
+		}
+		try {
+			$this->hotReload($slug, $modulePath);
+		} catch (\Throwable $e) {
+			error_log("ModuleManager: hot-reload skipped for '{$slug}': " . $e->getMessage());
+		}
+	}
+
+	/**
+	 * Hot-reload a freshly installed module without restarting PHP-FPM.
+	 *
+	 * Loads the module, boots it and registers its routes against the live
+	 * container so it becomes usable within the current request lifecycle.
+	 *
+	 * @param string $slug       Module slug.
+	 * @param string $modulePath Filesystem path to the module.
+	 * @return void
+	 */
+	private function hotReload(string $slug, string $modulePath): void {
+		$container = ServiceContainer::getInstance();
+
+		$loader = new ModuleLoader();
+		if (!$loader->load($slug, $modulePath)) {
+			return;
+		}
+
+		$router = $container->getOrDefault('router');
+		$loader->bootAll($container, $router instanceof Router ? $router : null);
+	}
+
+	/**
+	 * Run migrations whose target version falls in (fromVersion, toVersion].
+	 *
+	 * @param array<string, callable> $migrations
+	 * @param string $fromVersion Currently installed version (exclusive lower bound).
+	 * @param string $toVersion   New version (inclusive upper bound).
+	 */
+	private function runPendingMigrations(array $migrations, string $fromVersion, string $toVersion): void {
+		$pending = [];
+		foreach ($migrations as $version => $callable) {
+			if (
+				version_compare($version, $fromVersion, '>') &&
+				version_compare($version, $toVersion, '<=')
+			) {
+				$pending[$version] = $callable;
+			}
+		}
+
+		uksort($pending, 'version_compare');
+
+		$db = $this->getDb();
+		foreach ($pending as $callable) {
+			if ($db !== null && method_exists($db, 'transactional')) {
+				$db->transactional(fn() => $callable($this->container));
+			} else {
+				$callable($this->container);
+			}
+		}
+	}
+
+	/**
+	 * Persist the installed version for a module in config/modules.php.
+	 *
+	 * @param string $name    Module name.
+	 * @param string $version Installed version string.
+	 */
+	private function recordInstalledVersion(string $name, string $version): void {
+		$overrides = $this->readOverrides();
+		if (!isset($overrides[$name]) || !is_array($overrides[$name])) {
+			$overrides[$name] = [];
+		}
+		$overrides[$name]['installed_version'] = $version;
+		$this->writeOverrides($overrides);
+	}
+
+	/**
+	 * Remove the recorded installed version for a module from config/modules.php.
+	 *
+	 * @param string $name Module name.
+	 */
+	private function clearInstalledVersion(string $name): void {
+		$overrides = $this->readOverrides();
+		if (!isset($overrides[$name]['installed_version'])) {
+			return;
+		}
+		unset($overrides[$name]['installed_version']);
+		if (empty($overrides[$name])) {
+			unset($overrides[$name]);
+		}
+		$this->writeOverrides($overrides);
+	}
+
+	/**
+	 * Record (or clear) the latest available version for a module in
+	 * config/modules.php — written by the update-availability check
+	 * (ModuleUpdatesCronJob) and read back by listModules()/the UI to show the
+	 * Update button only when a newer version actually exists at the source.
+	 *
+	 * A null/empty version clears the flag (nothing newer, or not checkable).
+	 *
+	 * @param string      $name    Module name.
+	 * @param string|null $version Latest available version, or null to clear.
+	 * @return void
+	 */
+	public function recordAvailableVersion(string $name, ?string $version): void {
+		$name    = $this->sanitizeModuleName($name);
+		$version = $version !== null ? trim($version) : '';
+
+		$overrides = $this->readOverrides();
+		$current   = (string) ($overrides[$name]['available_version'] ?? '');
+		if ($current === $version) {
+			return; // no change — avoid a needless config rewrite
+		}
+
+		if ($version === '') {
+			unset($overrides[$name]['available_version']);
+			if (isset($overrides[$name]) && empty($overrides[$name])) {
+				unset($overrides[$name]);
+			}
+		} else {
+			$overrides[$name]['available_version'] = $version;
+		}
+		$this->writeOverrides($overrides);
+	}
+
+	/**
+	 * Load and return a module instance by name.
+	 *
+	 * @param string $name Module name.
+	 * @return object Module instance implementing ModuleInterface.
+	 * @throws \RuntimeException If the module cannot be loaded or instantiated.
+	 */
+	private function loadModuleInstance(string $name) {
+		$name = $this->sanitizeModuleName($name);
+		$loader = new ModuleLoader();
+		// Resolve the real directory ({name}_{hash5}, or a legacy bare {name}) — the
+		// module rarely lives at the bare path, so passing that would fail to find
+		// the class file for a freshly-uploaded module and abort its install.
+		$ok = $loader->load($name, $this->modulePathFor($name));
+		if (!$ok) {
+			throw new ModuleNotFoundException('Cannot load module: ' . $name);
+		}
+
+		$module = $loader->getModule($name);
+		if (!$module) {
+			throw new ModuleNotFoundException('Module instance is not available: ' . $name);
+		}
+
+		return $module;
+	}
+
+	/**
+	 * Validate and sanitize a module name.
+	 *
+	 * @param string $name Raw module name.
+	 * @return string Sanitized module name.
+	 * @throws \InvalidArgumentException If the name is invalid.
+	 */
+	private function sanitizeModuleName(string $name): string {
+		$name = trim((string) $name);
+		if (!preg_match('/^[a-z0-9][a-z0-9\-]*$/', $name)) {
+			throw new ModuleException('Invalid module name.');
+		}
+		return $name;
+	}
+
+	/**
+	 * Read module overrides from config/modules.php.
+	 *
+	 * @return array<string, array> Module overrides keyed by module name.
+	 */
+	private function readOverrides(): array {
+		if (!file_exists($this->overridesPath)) {
+			return [];
+		}
+
+		$data = require $this->overridesPath;
+		return is_array($data) ? $data : [];
+	}
+
+	/**
+	 * Write module overrides to config/modules.php atomically.
+	 *
+	 * Writes to a sibling temp file then renames into place, so concurrent
+	 * requests can never read a partially-written file.
+	 *
+	 * @param array $overrides Module overrides to persist.
+	 * @return void
+	 * @throws \RuntimeException If the file cannot be written or renamed.
+	 */
+	private function writeOverrides(array $overrides): void {
+		ksort($overrides);
+
+		$content = "<?php\n\nreturn " . var_export($overrides, true) . ";\n";
+
+		$dir  = dirname($this->overridesPath);
+		$tmp  = @tempnam($dir, '.modules_tmp_');
+		if ($tmp === false) {
+			throw new \RuntimeException('Unable to create temporary file for config/modules.php');
+		}
+
+		try {
+			if (@file_put_contents($tmp, $content, LOCK_EX) === false) {
+				throw new \RuntimeException('Unable to write config/modules.php (temp stage)');
+			}
+
+			@chmod($tmp, 0644);
+
+			if (!@rename($tmp, $this->overridesPath)) {
+				throw new \RuntimeException('Unable to atomically replace config/modules.php');
+			}
+
+			// config/modules.php is read back via require(), which OPcache caches
+			// (validate_timestamps + revalidate_freq). Install does several
+			// read-modify-write cycles in one request (setState → recordInstalled
+			// → recordSource); without invalidation the later reads see a STALE
+			// array and the final write clobbers the module's state, leaving it
+			// not-Enabled until a manual disable/enable. Drop the cached entry so
+			// every readOverrides() in this request sees what we just wrote.
+			if (function_exists('opcache_invalidate')) {
+				opcache_invalidate($this->overridesPath, true);
+			}
+		} catch (\Throwable $e) {
+			@unlink($tmp);
+			throw $e;
+		}
+	}
+
+	/**
+	 * Extract a module archive (.zip or .tar.gz/.tgz/.tar) into $destination.
+	 *
+	 * The type is detected by magic bytes (uploads arrive as an extension-less tmp
+	 * file), then routed:
+	 *   - tar.gz : PharData (bundled with PHP, no extension) → fallback to `tar` CLI
+	 *   - zip    : ZipArchive (validated) → fallback to the `unzip` CLI
+	 *
+	 * $destination is always an isolated temp dir created by the caller, and the
+	 * CLI tools refuse to write outside it (they strip `../`/absolute members), so
+	 * extraction stays contained even without the per-entry PHP validation.
+	 *
+	 * @throws \RuntimeException If the archive cannot be extracted in this environment.
+	 */
+	private function extractArchive(string $archivePath, string $destination): void {
+		if (!is_dir($destination) && !@mkdir($destination, 0755, true) && !is_dir($destination)) {
+			throw new \RuntimeException('Unable to create extraction directory.');
+		}
+
+		if ($this->looksLikeTar($archivePath)) {
+			$this->extractTarArchive($archivePath, $destination);
+			return;
+		}
+
+		// ZIP: prefer the validated PHP extension, else the `unzip` CLI.
+		if (class_exists('ZipArchive')) {
+			$this->extractZipViaZipArchive($archivePath, $destination);
+			return;
+		}
+		if ($this->hasBinary('unzip')) {
+			// unzip exit 1 = success with warnings (e.g. skipped unsafe paths).
+			$this->runExtractor('unzip -oqq ' . escapeshellarg($archivePath) . ' -d ' . escapeshellarg($destination), 1);
+			return;
+		}
+		throw new \RuntimeException('Cannot extract .zip: install the PHP zip extension or the `unzip` command (or upload a .tar.gz).');
+	}
+
+	/** Detect a tar/tar.gz archive by extension, or gzip magic bytes for tmp uploads. */
+	private function looksLikeTar(string $path): bool {
+		$lower = strtolower($path);
+		if (str_ends_with($lower, '.tar.gz') || str_ends_with($lower, '.tgz') || str_ends_with($lower, '.tar')) {
+			return true;
+		}
+		if (str_ends_with($lower, '.zip')) {
+			return false;
+		}
+		// Extension-less (uploaded tmp file): sniff magic. gzip = 1f 8b.
+		$fh = @fopen($path, 'rb');
+		if ($fh === false) {
+			return false;
+		}
+		$magic = fread($fh, 3);
+		fclose($fh);
+		return strlen($magic) >= 2 && ord($magic[0]) === 0x1f && ord($magic[1]) === 0x8b;
+	}
+
+	/** Extract .tar/.tar.gz via PharData (no PHP extension needed) or the `tar` CLI. */
+	private function extractTarArchive(string $archivePath, string $destination): void {
+		if (class_exists('PharData')) {
+			try {
+				(new \PharData($archivePath))->extractTo($destination, null, true);
+				return;
+			} catch (\Throwable $e) {
+				// fall through to the CLI
+			}
+		}
+		if ($this->hasBinary('tar')) {
+			// GNU tar auto-detects gzip and strips unsafe (../, absolute) members.
+			$this->runExtractor('tar -xf ' . escapeshellarg($archivePath) . ' -C ' . escapeshellarg($destination), 0);
+			return;
+		}
+		throw new \RuntimeException('Cannot extract .tar.gz: PharData is unavailable and the `tar` command is missing.');
+	}
+
+	/** True if $bin resolves on PATH. */
+	private function hasBinary(string $bin): bool {
+		$out = @shell_exec('command -v ' . escapeshellarg($bin) . ' 2>/dev/null');
+		return is_string($out) && trim($out) !== '';
+	}
+
+	/** Run a CLI extractor; treat exit codes above $maxOkCode as failures. */
+	private function runExtractor(string $cmd, int $maxOkCode): void {
+		$out  = [];
+		$code = 0;
+		@exec($cmd . ' 2>&1', $out, $code);
+		if ($code > $maxOkCode) {
+			throw new \RuntimeException('Archive extraction failed (exit ' . $code . '): ' . implode(' ', array_slice($out, -3)));
+		}
+	}
+
+	/**
+	 * Safely extract a ZIP archive via the PHP zip extension.
+	 *
+	 * Validates each entry for path traversal attacks before extracting.
+	 *
+	 * @param string $zipFilePath  Path to the zip file.
+	 * @param string $destination  Extraction target directory.
+	 * @return void
+	 * @throws \RuntimeException If extraction fails or unsafe entries are detected.
+	 */
+	private function extractZipViaZipArchive(string $zipFilePath, string $destination): void {
+		$zip = new \ZipArchive();
+		if ($zip->open($zipFilePath) !== true) {
+			throw new \RuntimeException('Unable to open zip archive.');
+		}
+
+		try {
+			for ($i = 0; $i < $zip->numFiles; $i++) {
+				$entry = $zip->getNameIndex($i);
+				if ($entry === false || $entry === '') {
+					continue;
+				}
+
+				$entry = str_replace('\\', '/', $entry);
+				if (strpos($entry, '../') !== false || strpos($entry, '..\\') !== false || strpos($entry, ':') !== false) {
+					throw new \RuntimeException('Unsafe zip entry detected.');
+				}
+
+				$targetPath = rtrim($destination, '/') . '/' . ltrim($entry, '/');
+
+				if (substr($entry, -1) === '/') {
+					if (!is_dir($targetPath) && !@mkdir($targetPath, 0755, true)) {
+						throw new \RuntimeException('Unable to create directory while extracting zip.');
+					}
+					continue;
+				}
+
+				$dir = dirname($targetPath);
+				if (!is_dir($dir) && !@mkdir($dir, 0755, true)) {
+					throw new \RuntimeException('Unable to create directory while extracting zip.');
+				}
+
+				$in = $zip->getStream($entry);
+				if (!$in) {
+					throw new \RuntimeException('Unable to read zip entry stream.');
+				}
+
+				$out = @fopen($targetPath, 'wb');
+				if (!$out) {
+					fclose($in);
+					throw new \RuntimeException('Unable to write extracted file.');
+				}
+
+				while (!feof($in)) {
+					$chunk = fread($in, 8192);
+					if ($chunk === false) {
+						break;
+					}
+					fwrite($out, $chunk);
+				}
+
+				fclose($in);
+				fclose($out);
+			}
+		} finally {
+			$zip->close();
+		}
+	}
+
+	/**
+	 * Resolve the module root directory from the extracted temp path.
+	 *
+	 * Handles both flat and nested zip layouts.
+	 *
+	 * @param string $tempBase Temporary extraction directory.
+	 * @return string Path to the directory containing module.json.
+	 * @throws \RuntimeException If module.json is not found or ambiguous.
+	 */
+	private function resolveExtractedModuleDir(string $tempBase): string {
+		$rootJson = $tempBase . '/module.json';
+		if (is_file($rootJson)) {
+			return $tempBase;
+		}
+
+		$jsonFiles = glob($tempBase . '/*/module.json') ?: [];
+		if (count($jsonFiles) !== 1) {
+			throw new \RuntimeException('Archive must contain exactly one module with module.json.');
+		}
+
+		return dirname($jsonFiles[0]);
+	}
+
+	/**
+	 * The module's canonical name from its module.json ("name"), falling back to
+	 * the directory basename. The manifest is authoritative: extracting a flat
+	 * archive (module.json at the root) or a differently-named wrapper dir would
+	 * otherwise yield the random temp-dir name (e.g. "xc_module_ab12"), which fails
+	 * sanitizeModuleName() with "Invalid module name."
+	 */
+	private function manifestNameFromDir(string $moduleDir): string {
+		$meta = json_decode((string) @file_get_contents($moduleDir . '/module.json'), true);
+		$name = is_array($meta) ? trim((string) ($meta['name'] ?? '')) : '';
+		return $name !== '' ? $name : basename($moduleDir);
+	}
+
+	/**
+	 * Recursively delete a directory and its contents.
+	 *
+	 * @param string $path Path to delete.
+	 * @return void
+	 */
+	private function deleteDirectory(string $path): void {
+		if (!file_exists($path)) {
+			return;
+		}
+
+		if (is_file($path) || is_link($path)) {
+			@unlink($path);
+			return;
+		}
+
+		$items = scandir($path);
+		if (!$items) {
+			@rmdir($path);
+			return;
+		}
+
+		foreach ($items as $item) {
+			if ($item === '.' || $item === '..') {
+				continue;
+			}
+			$this->deleteDirectory($path . '/' . $item);
+		}
+
+		@rmdir($path);
+	}
+
+	/**
+	 * Recursively copy a directory.
+	 *
+	 * @param string $source      Source directory path.
+	 * @param string $destination Destination directory path.
+	 * @return void
+	 * @throws \RuntimeException If copying fails.
+	 */
+	private function copyDirectory(string $source, string $destination): void {
+		if (!is_dir($source)) {
+			throw new \RuntimeException('Source directory not found: ' . $source);
+		}
+
+		if (!is_dir($destination) && !@mkdir($destination, 0755, true)) {
+			throw new \RuntimeException('Unable to create module directory.');
+		}
+
+		$items = scandir($source);
+		if (!$items) {
+			return;
+		}
+
+		foreach ($items as $item) {
+			if ($item === '.' || $item === '..') {
+				continue;
+			}
+
+			$src = $source . '/' . $item;
+			$dst = $destination . '/' . $item;
+
+			if (is_dir($src)) {
+				$this->copyDirectory($src, $dst);
+			} else {
+				if (!@copy($src, $dst)) {
+					throw new \RuntimeException('Unable to copy file: ' . $item);
+				}
+			}
+		}
+	}
 }
diff --git a/src/Core/Module/ModuleMigrator.php b/src/Core/Module/ModuleMigrator.php
index 1557b7a3..02dc3821 100644
--- a/src/Core/Module/ModuleMigrator.php
+++ b/src/Core/Module/ModuleMigrator.php
@@ -36,136 +36,135 @@ namespace XcVm\Core\Module;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ModuleMigrator {
+	/**
+	 * Apply the module's master schema on a fresh install.
+	 *
+	 * Runs `database.sql` (the full current schema) when present. A module that
+	 * ships no master but only version deltas falls back to replaying every
+	 * `migrations/<semver>.sql` up to `$to` — this keeps delta-only modules
+	 * installable.
+	 *
+	 * @param string $modulePath Absolute path of the module directory.
+	 * @param object $db         Database handler (query() API).
+	 * @param string $to         Target version (used only by the delta fallback).
+	 * @return string[] What ran: `['database.sql']`, or the replayed delta versions.
+	 */
+	public static function install(string $modulePath, object $db, string $to): array {
+		$master = $modulePath . '/database.sql';
+		if (is_file($master)) {
+			self::runFile($db, $master);
+			return ['database.sql'];
+		}
+		// No master schema — replay forward deltas up to the target version.
+		return self::up($modulePath, $db, null, $to);
+	}
 
-    /**
-     * Apply the module's master schema on a fresh install.
-     *
-     * Runs `database.sql` (the full current schema) when present. A module that
-     * ships no master but only version deltas falls back to replaying every
-     * `migrations/<semver>.sql` up to `$to` — this keeps delta-only modules
-     * installable.
-     *
-     * @param string $modulePath Absolute path of the module directory.
-     * @param object $db         Database handler (query() API).
-     * @param string $to         Target version (used only by the delta fallback).
-     * @return string[] What ran: `['database.sql']`, or the replayed delta versions.
-     */
-    public static function install(string $modulePath, object $db, string $to): array {
-        $master = $modulePath . '/database.sql';
-        if (is_file($master)) {
-            self::runFile($db, $master);
-            return ['database.sql'];
-        }
-        // No master schema — replay forward deltas up to the target version.
-        return self::up($modulePath, $db, null, $to);
-    }
+	/**
+	 * Tear the module's schema down on uninstall.
+	 *
+	 * Runs the single `database_drop.sql` when present. No-op if the module ships
+	 * no teardown file.
+	 *
+	 * @param string $modulePath Absolute path of the module directory.
+	 * @param object $db         Database handler.
+	 * @return string[] `['database_drop.sql']` if it ran, otherwise `[]`.
+	 */
+	public static function uninstall(string $modulePath, object $db): array {
+		$drop = $modulePath . '/database_drop.sql';
+		if (is_file($drop)) {
+			self::runFile($db, $drop);
+			return ['database_drop.sql'];
+		}
+		return [];
+	}
 
-    /**
-     * Tear the module's schema down on uninstall.
-     *
-     * Runs the single `database_drop.sql` when present. No-op if the module ships
-     * no teardown file.
-     *
-     * @param string $modulePath Absolute path of the module directory.
-     * @param object $db         Database handler.
-     * @return string[] `['database_drop.sql']` if it ran, otherwise `[]`.
-     */
-    public static function uninstall(string $modulePath, object $db): array {
-        $drop = $modulePath . '/database_drop.sql';
-        if (is_file($drop)) {
-            self::runFile($db, $drop);
-            return ['database_drop.sql'];
-        }
-        return [];
-    }
+	/**
+	 * Apply forward version deltas for versions in the (`$from`, `$to`] range.
+	 *
+	 * Used on update to bring an already-installed panel up to the current
+	 * schema. Deltas are forward-only — teardown is handled by database_drop.sql.
+	 *
+	 * @param string      $modulePath Absolute path of the module directory.
+	 * @param object      $db         Database handler.
+	 * @param string|null $from       Already-applied version, or null to run all ≤ $to.
+	 * @param string      $to         Target version (inclusive).
+	 * @return string[] Versions whose delta ran, in apply order.
+	 */
+	public static function up(string $modulePath, object $db, ?string $from, string $to): array {
+		$applied = [];
+		foreach (self::discover($modulePath) as [$version, $file]) {
+			if ($from !== null && version_compare($version, $from, '<=')) {
+				continue;
+			}
+			if (version_compare($version, $to, '>')) {
+				continue;
+			}
+			self::runFile($db, $file);
+			$applied[] = $version;
+		}
+		return $applied;
+	}
 
-    /**
-     * Apply forward version deltas for versions in the (`$from`, `$to`] range.
-     *
-     * Used on update to bring an already-installed panel up to the current
-     * schema. Deltas are forward-only — teardown is handled by database_drop.sql.
-     *
-     * @param string      $modulePath Absolute path of the module directory.
-     * @param object      $db         Database handler.
-     * @param string|null $from       Already-applied version, or null to run all ≤ $to.
-     * @param string      $to         Target version (inclusive).
-     * @return string[] Versions whose delta ran, in apply order.
-     */
-    public static function up(string $modulePath, object $db, ?string $from, string $to): array {
-        $applied = [];
-        foreach (self::discover($modulePath) as [$version, $file]) {
-            if ($from !== null && version_compare($version, $from, '<=')) {
-                continue;
-            }
-            if (version_compare($version, $to, '>')) {
-                continue;
-            }
-            self::runFile($db, $file);
-            $applied[] = $version;
-        }
-        return $applied;
-    }
+	/**
+	 * Whether the module ships any schema files at all (master, teardown, or deltas).
+	 */
+	public static function has(string $modulePath): bool {
+		return is_file($modulePath . '/database.sql')
+			|| is_file($modulePath . '/database_drop.sql')
+			|| !empty(self::discover($modulePath));
+	}
 
-    /**
-     * Whether the module ships any schema files at all (master, teardown, or deltas).
-     */
-    public static function has(string $modulePath): bool {
-        return is_file($modulePath . '/database.sql')
-            || is_file($modulePath . '/database_drop.sql')
-            || !empty(self::discover($modulePath));
-    }
+	/**
+	 * Discover forward delta files, sorted ascending by version.
+	 *
+	 * Files are `migrations/<semver>.sql` (forward-only; no `.up`/`.down` suffix —
+	 * teardown lives in database_drop.sql). Anything not matching dotted-numeric
+	 * semver is ignored.
+	 *
+	 * @return array<int, array{0: string, 1: string}> [version, absolute path]
+	 */
+	private static function discover(string $modulePath): array {
+		$dir = $modulePath . '/migrations';
+		if (!is_dir($dir)) {
+			return [];
+		}
 
-    /**
-     * Discover forward delta files, sorted ascending by version.
-     *
-     * Files are `migrations/<semver>.sql` (forward-only; no `.up`/`.down` suffix —
-     * teardown lives in database_drop.sql). Anything not matching dotted-numeric
-     * semver is ignored.
-     *
-     * @return array<int, array{0: string, 1: string}> [version, absolute path]
-     */
-    private static function discover(string $modulePath): array {
-        $dir = $modulePath . '/migrations';
-        if (!is_dir($dir)) {
-            return [];
-        }
+		$out = [];
+		foreach (glob($dir . '/*.sql') ?: [] as $file) {
+			$version = basename($file, '.sql');
+			// Accept dotted numeric semver only (e.g. 1.0.0, 2.1); ignore anything else.
+			if (preg_match('/^\d+(?:\.\d+)*$/', $version)) {
+				$out[] = [$version, $file];
+			}
+		}
+		usort($out, static fn($a, $b) => version_compare($a[0], $b[0])); // ascending
+		return $out;
+	}
 
-        $out = [];
-        foreach (glob($dir . '/*.sql') ?: [] as $file) {
-            $version = basename($file, '.sql');
-            // Accept dotted numeric semver only (e.g. 1.0.0, 2.1); ignore anything else.
-            if (preg_match('/^\d+(?:\.\d+)*$/', $version)) {
-                $out[] = [$version, $file];
-            }
-        }
-        usort($out, static fn($a, $b) => version_compare($a[0], $b[0])); // ascending
-        return $out;
-    }
+	/**
+	 * Execute every statement in a SQL file. Throws on the first failure.
+	 */
+	private static function runFile(object $db, string $file): void {
+		$sql = trim((string) file_get_contents($file));
+		if ($sql === '') {
+			return;
+		}
 
-    /**
-     * Execute every statement in a SQL file. Throws on the first failure.
-     */
-    private static function runFile(object $db, string $file): void {
-        $sql = trim((string) file_get_contents($file));
-        if ($sql === '') {
-            return;
-        }
-
-        foreach (array_filter(array_map('trim', explode(';', $sql))) as $statement) {
-            // Drop comment-only lines so the residual statement is real SQL.
-            $lines = array_filter(
-                explode("\n", $statement),
-                static fn($line) => strpos(ltrim($line), '--') !== 0
-            );
-            $statement = trim(implode("\n", $lines));
-            if ($statement === '') {
-                continue;
-            }
-            if (!$db->query($statement . ';')) {
-                throw new \RuntimeException(
-                    'Module migration failed in ' . basename($file) . ': ' . $statement
-                );
-            }
-        }
-    }
+		foreach (array_filter(array_map('trim', explode(';', $sql))) as $statement) {
+			// Drop comment-only lines so the residual statement is real SQL.
+			$lines = array_filter(
+				explode("\n", $statement),
+				static fn($line) => strpos(ltrim($line), '--') !== 0
+			);
+			$statement = trim(implode("\n", $lines));
+			if ($statement === '') {
+				continue;
+			}
+			if (!$db->query($statement . ';')) {
+				throw new \RuntimeException(
+					'Module migration failed in ' . basename($file) . ': ' . $statement
+				);
+			}
+		}
+	}
 }
diff --git a/src/Core/Module/ModuleUpdateChecker.php b/src/Core/Module/ModuleUpdateChecker.php
index e1871c17..fc86d27e 100644
--- a/src/Core/Module/ModuleUpdateChecker.php
+++ b/src/Core/Module/ModuleUpdateChecker.php
@@ -26,102 +26,101 @@ use XcVm\Core\Updates\GitHubReleases;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ModuleUpdateChecker {
+	/** Why the last latestAvailable() call could not check its source (null = checked fine). */
+	private ?string $lastError = null;
 
-    /** Why the last latestAvailable() call could not check its source (null = checked fine). */
-    private ?string $lastError = null;
+	/**
+	 * Error message from the most recent latestAvailable() call, or null when the
+	 * source was checked successfully. Lets callers distinguish "no update" from
+	 * "could not check" (both return null from latestAvailable()).
+	 */
+	public function lastError(): ?string {
+		return $this->lastError;
+	}
 
-    /**
-     * Error message from the most recent latestAvailable() call, or null when the
-     * source was checked successfully. Lets callers distinguish "no update" from
-     * "could not check" (both return null from latestAvailable()).
-     */
-    public function lastError(): ?string {
-        return $this->lastError;
-    }
+	/**
+	 * Latest available version for a module (a listModules() row), or null.
+	 *
+	 * @param array $module Module row with keys `update`, `version`, `installed_version`.
+	 * @return string|null Version string, or null if nothing newer / not checkable.
+	 */
+	public function latestAvailable(array $module): ?string {
+		$this->lastError = null;
 
-    /**
-     * Latest available version for a module (a listModules() row), or null.
-     *
-     * @param array $module Module row with keys `update`, `version`, `installed_version`.
-     * @return string|null Version string, or null if nothing newer / not checkable.
-     */
-    public function latestAvailable(array $module): ?string {
-        $this->lastError = null;
+		$update    = is_array($module['update'] ?? null) ? $module['update'] : [];
+		$source    = (string) ($update['source'] ?? 'bundled');
+		$installed = (string) ($module['installed_version'] ?? '');
 
-        $update    = is_array($module['update'] ?? null) ? $module['update'] : [];
-        $source    = (string) ($update['source'] ?? 'bundled');
-        $installed = (string) ($module['installed_version'] ?? '');
+		return match ($source) {
+			'git'      => $this->fromGit($update, $installed),
+			'url'      => $this->fromUrl($update),
+			'platform' => $this->fromPlatform($update),
+			default    => ((string) ($module['version'] ?? '')) ?: null, // bundled
+		};
+	}
 
-        return match ($source) {
-            'git'      => $this->fromGit($update, $installed),
-            'url'      => $this->fromUrl($update),
-            'platform' => $this->fromPlatform($update),
-            default    => ((string) ($module['version'] ?? '')) ?: null, // bundled
-        };
-    }
+	/** GitHub releases of update.repository, newest newer-than-installed (or null). */
+	private function fromGit(array $update, string $installed): ?string {
+		$repo = (string) ($update['repository'] ?? '');
+		// https://github.com/OWNER/REPO(.git)  |  git@github.com:OWNER/REPO.git
+		if (!preg_match('~github\.com[:/]+([^/]+)/([^/]+?)(?:\.git)?/?$~i', $repo, $m)) {
+			$this->lastError = 'update.repository is not a GitHub URL: ' . ($repo !== '' ? $repo : '(empty)');
+			return null;
+		}
+		// Map the manifest channel onto GitHubReleases' stable/beta.
+		$channel = in_array((string) ($update['channel'] ?? 'stable'), ['beta', 'unstable'], true)
+			? 'beta'
+			: 'stable';
+		try {
+			$gh = new GitHubReleases($m[1], $m[2], $channel);
+			return $gh->getLatestVersion($installed !== '' ? $installed : '0.0.0');
+		} catch (\Throwable $e) {
+			$this->lastError = $e->getMessage();
+			error_log('ModuleUpdateChecker(git): ' . $e->getMessage());
+			return null;
+		}
+	}
 
-    /** GitHub releases of update.repository, newest newer-than-installed (or null). */
-    private function fromGit(array $update, string $installed): ?string {
-        $repo = (string) ($update['repository'] ?? '');
-        // https://github.com/OWNER/REPO(.git)  |  git@github.com:OWNER/REPO.git
-        if (!preg_match('~github\.com[:/]+([^/]+)/([^/]+?)(?:\.git)?/?$~i', $repo, $m)) {
-            $this->lastError = 'update.repository is not a GitHub URL: ' . ($repo !== '' ? $repo : '(empty)');
-            return null;
-        }
-        // Map the manifest channel onto GitHubReleases' stable/beta.
-        $channel = in_array((string) ($update['channel'] ?? 'stable'), ['beta', 'unstable'], true)
-            ? 'beta'
-            : 'stable';
-        try {
-            $gh = new GitHubReleases($m[1], $m[2], $channel);
-            return $gh->getLatestVersion($installed !== '' ? $installed : '0.0.0');
-        } catch (\Throwable $e) {
-            $this->lastError = $e->getMessage();
-            error_log('ModuleUpdateChecker(git): ' . $e->getMessage());
-            return null;
-        }
-    }
+	/** version.json at a self-hosted https URL: {"version":"1.2.3"}. */
+	private function fromUrl(array $update): ?string {
+		$url = (string) ($update['url'] ?? '');
+		if ($url === '' || stripos($url, 'https://') !== 0) {
+			$this->lastError = 'update.url must be an https:// URL'; // https only — SSRF/downgrade guard
+			return null;
+		}
+		$data = json_decode($this->httpGet($url), true);
+		$ver  = is_array($data) ? trim((string) ($data['version'] ?? '')) : '';
+		if ($ver === '') {
+			$this->lastError = 'no valid version.json at ' . $url;
+			return null;
+		}
+		return $ver;
+	}
 
-    /** version.json at a self-hosted https URL: {"version":"1.2.3"}. */
-    private function fromUrl(array $update): ?string {
-        $url = (string) ($update['url'] ?? '');
-        if ($url === '' || stripos($url, 'https://') !== 0) {
-            $this->lastError = 'update.url must be an https:// URL'; // https only — SSRF/downgrade guard
-            return null;
-        }
-        $data = json_decode($this->httpGet($url), true);
-        $ver  = is_array($data) ? trim((string) ($data['version'] ?? '')) : '';
-        if ($ver === '') {
-            $this->lastError = 'no valid version.json at ' . $url;
-            return null;
-        }
-        return $ver;
-    }
+	/** SaaS store latest version — best-effort; skipped if the extension has no such API. */
+	private function fromPlatform(array $update): ?string {
+		if (!class_exists('XC_VM') || !method_exists('XC_VM', 'module_latest')) {
+			return null; // store resolves "latest approved" at install time
+		}
+		try {
+			$r = \XC_VM::module_latest((string) ($update['slug'] ?? ''));
+			return is_array($r) && !empty($r['version']) ? (string) $r['version'] : null;
+		} catch (\Throwable $e) {
+			$this->lastError = $e->getMessage();
+			return null;
+		}
+	}
 
-    /** SaaS store latest version — best-effort; skipped if the extension has no such API. */
-    private function fromPlatform(array $update): ?string {
-        if (!class_exists('XC_VM') || !method_exists('XC_VM', 'module_latest')) {
-            return null; // store resolves "latest approved" at install time
-        }
-        try {
-            $r = \XC_VM::module_latest((string) ($update['slug'] ?? ''));
-            return is_array($r) && !empty($r['version']) ? (string) $r['version'] : null;
-        } catch (\Throwable $e) {
-            $this->lastError = $e->getMessage();
-            return null;
-        }
-    }
-
-    /** cURL GET (file_get_contents over https does not work under PHP-FPM here). */
-    private function httpGet(string $url): string {
-        $ch = curl_init($url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'XC_VM-ModuleUpdateChecker');
-        $body = curl_exec($ch);
-        curl_close($ch);
-        return is_string($body) ? $body : '';
-    }
+	/** cURL GET (file_get_contents over https does not work under PHP-FPM here). */
+	private function httpGet(string $url): string {
+		$ch = curl_init($url);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_USERAGENT, 'XC_VM-ModuleUpdateChecker');
+		$body = curl_exec($ch);
+		curl_close($ch);
+		return is_string($body) ? $body : '';
+	}
 }
diff --git a/src/Core/Module/NavbarItem.php b/src/Core/Module/NavbarItem.php
index deb9db53..8553e157 100644
--- a/src/Core/Module/NavbarItem.php
+++ b/src/Core/Module/NavbarItem.php
@@ -24,181 +24,192 @@ namespace XcVm\Core\Module;
  */
 
 class NavbarItem {
+	/** @var string Unique dot-separated key, e.g. 'management.service_setup.watch' */
+	public $key;
 
-    /** @var string Unique dot-separated key, e.g. 'management.service_setup.watch' */
-    public $key;
-    /** @var string|null Parent key, null for top-level items */
-    public $parent = null;
-    /** @var string Target URL or '#' for group headers */
-    public $url = '#';
-    /** @var string Translation key passed to $language::get() */
-    public $translationKey = '';
-    /** @var string Fallback text used when translationKey is empty */
-    public $fallbackTitle = '';
-    /** @var string[] Permission names; OR-checked; empty means no permission gate */
-    public $permissions = [];
-    /** @var int Sort order within the same parent level */
-    public $order = 100;
-    /** @var string CSS class(es) for the icon element, e.g. 'fas fa-server' */
-    public $icon = '';
-    /** @var bool When true, item is hidden on mobile */
-    public $desktopOnly = false;
-    /** @var bool When true, submenu is not rendered on mobile */
-    public $noMobileSubmenu = false;
-    /** @var string Extra CSS class on the <ul class="submenu"> element, e.g. 'megamenu' */
-    public $submenuClass = '';
-    /** @var string Settings key; when non-empty and settings[key] is truthy, item is hidden */
-    public $settingDisabled = '';
-    /** @var bool When true, renders as a visual divider (no link) */
-    public $divider = false;
+	/** @var string|null Parent key, null for top-level items */
+	public $parent = null;
 
-    /**
-     * Create a new navbar item with the given unique key.
-     *
-     * @param string $key Unique dot-separated identifier, e.g. 'management.service_setup.watch'
-     */
-    public function __construct(string $key) {
-        $this->key = $key;
-    }
+	/** @var string Target URL or '#' for group headers */
+	public $url = '#';
 
-    /**
-     * Set the parent item key for hierarchical navigation.
-     *
-     * @param string $parentKey Dot-separated key of the parent item
-     * @return self
-     */
-    public function parent(string $parentKey): self {
-        $this->parent = $parentKey;
-        return $this;
-    }
+	/** @var string Translation key passed to $language::get() */
+	public $translationKey = '';
 
-    /**
-     * Set the target URL for this navigation item.
-     *
-     * Use '#' for group headers that expand to show child items.
-     *
-     * @param string $url Target URL or '#'
-     * @return self
-     */
-    public function url(string $url): self {
-        $this->url = $url;
-        return $this;
-    }
+	/** @var string Fallback text used when translationKey is empty */
+	public $fallbackTitle = '';
 
-    /**
-     * Set the display label for this navigation item.
-     *
-     * The label is resolved via $language::get() using the translation key.
-     * If translation key is empty, the fallback text is used directly.
-     *
-     * @param string $translationKey Translation key for $language::get()
-     * @param string $fallback       Literal fallback text when translationKey is empty
-     * @return self
-     */
-    public function label(string $translationKey, string $fallback = ''): self {
-        $this->translationKey = $translationKey;
-        $this->fallbackTitle  = $fallback;
-        return $this;
-    }
+	/** @var string[] Permission names; OR-checked; empty means no permission gate */
+	public $permissions = [];
 
-    /**
-     * Set required permissions for this navigation item.
-     *
-     * User must have at least one of the listed permissions to see this item.
-     * Empty array means no permission check.
-     *
-     * @param string[] $permissions List of permission names
-     * @return self
-     */
-    public function permissions(array $permissions): self {
-        $this->permissions = $permissions;
-        return $this;
-    }
+	/** @var int Sort order within the same parent level */
+	public $order = 100;
 
-    /**
-     * Set the sort order within the same parent level.
-     *
-     * Lower values appear first. Default is 100.
-     *
-     * @param int $order Sort order
-     * @return self
-     */
-    public function order(int $order): self {
-        $this->order = $order;
-        return $this;
-    }
+	/** @var string CSS class(es) for the icon element, e.g. 'fas fa-server' */
+	public $icon = '';
 
-    /**
-     * Set the CSS icon class(es) for this navigation item.
-     *
-     * @param string $icon CSS classes, e.g. 'fas fa-server' or 'fe-activity'
-     * @return self
-     */
-    public function icon(string $icon): self {
-        $this->icon = $icon;
-        return $this;
-    }
+	/** @var bool When true, item is hidden on mobile */
+	public $desktopOnly = false;
 
-    /**
-     * Mark this item as desktop-only.
-     *
-     * When true, the item is hidden on mobile devices.
-     *
-     * @return self
-     */
-    public function desktopOnly(): self {
-        $this->desktopOnly = true;
-        return $this;
-    }
+	/** @var bool When true, submenu is not rendered on mobile */
+	public $noMobileSubmenu = false;
 
-    /**
-     * Hide the submenu on mobile devices.
-     *
-     * When true, child items are not rendered in mobile view.
-     *
-     * @return self
-     */
-    public function noMobileSubmenu(): self {
-        $this->noMobileSubmenu = true;
-        return $this;
-    }
+	/** @var string Extra CSS class on the <ul class="submenu"> element, e.g. 'megamenu' */
+	public $submenuClass = '';
 
-    /**
-     * Add an extra CSS class to the submenu <ul> element.
-     *
-     * Useful for mega menu layouts or custom styling.
-     *
-     * @param string $cls CSS class name, e.g. 'megamenu'
-     * @return self
-     */
-    public function submenuClass(string $cls): self {
-        $this->submenuClass = $cls;
-        return $this;
-    }
+	/** @var string Settings key; when non-empty and settings[key] is truthy, item is hidden */
+	public $settingDisabled = '';
 
-    /**
-     * Conditionally hide this item based on a system setting.
-     *
-     * If the setting with the given key exists and evaluates to true,
-     * this navigation item will not be displayed.
-     *
-     * @param string $key Setting key name
-     * @return self
-     */
-    public function settingDisabled(string $key): self {
-        $this->settingDisabled = $key;
-        return $this;
-    }
+	/** @var bool When true, renders as a visual divider (no link) */
+	public $divider = false;
 
-    /**
-     * Render this item as a visual divider.
-     *
-     * Dividers are non-clickable elements that separate groups of items.
-     *
-     * @return self
-     */
-    public function makeDivider(): self {
-        $this->divider = true;
-        return $this;
-    }
+	/**
+	 * Create a new navbar item with the given unique key.
+	 *
+	 * @param string $key Unique dot-separated identifier, e.g. 'management.service_setup.watch'
+	 */
+	public function __construct(string $key) {
+		$this->key = $key;
+	}
+
+	/**
+	 * Set the parent item key for hierarchical navigation.
+	 *
+	 * @param string $parentKey Dot-separated key of the parent item
+	 * @return self
+	 */
+	public function parent(string $parentKey): self {
+		$this->parent = $parentKey;
+		return $this;
+	}
+
+	/**
+	 * Set the target URL for this navigation item.
+	 *
+	 * Use '#' for group headers that expand to show child items.
+	 *
+	 * @param string $url Target URL or '#'
+	 * @return self
+	 */
+	public function url(string $url): self {
+		$this->url = $url;
+		return $this;
+	}
+
+	/**
+	 * Set the display label for this navigation item.
+	 *
+	 * The label is resolved via $language::get() using the translation key.
+	 * If translation key is empty, the fallback text is used directly.
+	 *
+	 * @param string $translationKey Translation key for $language::get()
+	 * @param string $fallback       Literal fallback text when translationKey is empty
+	 * @return self
+	 */
+	public function label(string $translationKey, string $fallback = ''): self {
+		$this->translationKey = $translationKey;
+		$this->fallbackTitle  = $fallback;
+		return $this;
+	}
+
+	/**
+	 * Set required permissions for this navigation item.
+	 *
+	 * User must have at least one of the listed permissions to see this item.
+	 * Empty array means no permission check.
+	 *
+	 * @param string[] $permissions List of permission names
+	 * @return self
+	 */
+	public function permissions(array $permissions): self {
+		$this->permissions = $permissions;
+		return $this;
+	}
+
+	/**
+	 * Set the sort order within the same parent level.
+	 *
+	 * Lower values appear first. Default is 100.
+	 *
+	 * @param int $order Sort order
+	 * @return self
+	 */
+	public function order(int $order): self {
+		$this->order = $order;
+		return $this;
+	}
+
+	/**
+	 * Set the CSS icon class(es) for this navigation item.
+	 *
+	 * @param string $icon CSS classes, e.g. 'fas fa-server' or 'fe-activity'
+	 * @return self
+	 */
+	public function icon(string $icon): self {
+		$this->icon = $icon;
+		return $this;
+	}
+
+	/**
+	 * Mark this item as desktop-only.
+	 *
+	 * When true, the item is hidden on mobile devices.
+	 *
+	 * @return self
+	 */
+	public function desktopOnly(): self {
+		$this->desktopOnly = true;
+		return $this;
+	}
+
+	/**
+	 * Hide the submenu on mobile devices.
+	 *
+	 * When true, child items are not rendered in mobile view.
+	 *
+	 * @return self
+	 */
+	public function noMobileSubmenu(): self {
+		$this->noMobileSubmenu = true;
+		return $this;
+	}
+
+	/**
+	 * Add an extra CSS class to the submenu <ul> element.
+	 *
+	 * Useful for mega menu layouts or custom styling.
+	 *
+	 * @param string $cls CSS class name, e.g. 'megamenu'
+	 * @return self
+	 */
+	public function submenuClass(string $cls): self {
+		$this->submenuClass = $cls;
+		return $this;
+	}
+
+	/**
+	 * Conditionally hide this item based on a system setting.
+	 *
+	 * If the setting with the given key exists and evaluates to true,
+	 * this navigation item will not be displayed.
+	 *
+	 * @param string $key Setting key name
+	 * @return self
+	 */
+	public function settingDisabled(string $key): self {
+		$this->settingDisabled = $key;
+		return $this;
+	}
+
+	/**
+	 * Render this item as a visual divider.
+	 *
+	 * Dividers are non-clickable elements that separate groups of items.
+	 *
+	 * @return self
+	 */
+	public function makeDivider(): self {
+		$this->divider = true;
+		return $this;
+	}
 }
diff --git a/src/Core/Module/NavbarRegistry.php b/src/Core/Module/NavbarRegistry.php
index 66693bfe..4d89099c 100644
--- a/src/Core/Module/NavbarRegistry.php
+++ b/src/Core/Module/NavbarRegistry.php
@@ -17,123 +17,124 @@ namespace XcVm\Core\Module;
  */
 
 class NavbarRegistry {
+	/** @var NavbarItem[] Key → NavbarItem map */
+	private static $items = [];
 
-    /** @var NavbarItem[] Key → NavbarItem map */
-    private static $items = [];
+	/**
+	 * Register a single navigation item in the registry.
+	 *
+	 * Items are stored by their unique dot-separated key.
+	 * Duplicate keys will overwrite previously registered items.
+	 *
+	 * @param NavbarItem $item The navigation item to register
+	 * @return void
+	 */
+	public static function add(NavbarItem $item): void {
+		self::$items[$item->key] = $item;
+	}
 
-    /**
-     * Register a single navigation item in the registry.
-     *
-     * Items are stored by their unique dot-separated key.
-     * Duplicate keys will overwrite previously registered items.
-     *
-     * @param NavbarItem $item The navigation item to register
-     * @return void
-     */
-    public static function add(NavbarItem $item): void {
-        self::$items[$item->key] = $item;
-    }
+	/**
+	 * Returns all top-level navigation items.
+	 *
+	 * Top-level items are those with parent === null.
+	 * Items are sorted by their order property (ascending).
+	 *
+	 * @return NavbarItem[] Array of top-level items sorted by order
+	 */
+	public static function getTopLevel(): array {
+		return self::_sorted(null);
+	}
 
-    /**
-     * Returns all top-level navigation items.
-     *
-     * Top-level items are those with parent === null.
-     * Items are sorted by their order property (ascending).
-     *
-     * @return NavbarItem[] Array of top-level items sorted by order
-     */
-    public static function getTopLevel(): array {
-        return self::_sorted(null);
-    }
+	/**
+	 * Returns direct children of the given parent key.
+	 *
+	 * Only immediate children are returned (not descendants).
+	 * Items are sorted by their order property (ascending).
+	 *
+	 * @param string $parentKey The dot-separated key of the parent item
+	 * @return NavbarItem[] Array of child items sorted by order
+	 */
+	public static function getChildren(string $parentKey): array {
+		return self::_sorted($parentKey);
+	}
 
-    /**
-     * Returns direct children of the given parent key.
-     *
-     * Only immediate children are returned (not descendants).
-     * Items are sorted by their order property (ascending).
-     *
-     * @param string $parentKey The dot-separated key of the parent item
-     * @return NavbarItem[] Array of child items sorted by order
-     */
-    public static function getChildren(string $parentKey): array {
-        return self::_sorted($parentKey);
-    }
+	/**
+	 * Check if a navigation item has any child items.
+	 *
+	 * @param string $key The dot-separated key of the item to check
+	 * @return bool True if the item has at least one child, false otherwise
+	 */
+	public static function hasChildren(string $key): bool {
+		foreach (self::$items as $item) {
+			if ($item->parent === $key) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    /**
-     * Check if a navigation item has any child items.
-     *
-     * @param string $key The dot-separated key of the item to check
-     * @return bool True if the item has at least one child, false otherwise
-     */
-    public static function hasChildren(string $key): bool {
-        foreach (self::$items as $item) {
-            if ($item->parent === $key) return true;
-        }
-        return false;
-    }
+	/**
+	 * Collapse dividers in an already visibility-filtered item list.
+	 *
+	 * Removes leading and trailing dividers and squashes consecutive ones
+	 * into a single divider. Used when rendering flat dropdowns (e.g. the
+	 * admin profile menu) whose items — core and module — may be hidden by
+	 * permission checks, which would otherwise leave orphan separators.
+	 *
+	 * @param NavbarItem[] $items Visible items in render order
+	 * @return NavbarItem[] Items with orphan dividers removed
+	 */
+	public static function collapseDividers(array $items): array {
+		$result = [];
+		$prevDivider = true; // treat the start as a divider so a leading one drops
+		foreach ($items as $item) {
+			if ($item->divider) {
+				if ($prevDivider) {
+					continue;
+				}
+				$prevDivider = true;
+			} else {
+				$prevDivider = false;
+			}
+			$result[] = $item;
+		}
+		while (!empty($result) && end($result)->divider) {
+			array_pop($result);
+		}
+		return $result;
+	}
 
-    /**
-     * Collapse dividers in an already visibility-filtered item list.
-     *
-     * Removes leading and trailing dividers and squashes consecutive ones
-     * into a single divider. Used when rendering flat dropdowns (e.g. the
-     * admin profile menu) whose items — core and module — may be hidden by
-     * permission checks, which would otherwise leave orphan separators.
-     *
-     * @param NavbarItem[] $items Visible items in render order
-     * @return NavbarItem[] Items with orphan dividers removed
-     */
-    public static function collapseDividers(array $items): array {
-        $result = [];
-        $prevDivider = true; // treat the start as a divider so a leading one drops
-        foreach ($items as $item) {
-            if ($item->divider) {
-                if ($prevDivider) {
-                    continue;
-                }
-                $prevDivider = true;
-            } else {
-                $prevDivider = false;
-            }
-            $result[] = $item;
-        }
-        while (!empty($result) && end($result)->divider) {
-            array_pop($result);
-        }
-        return $result;
-    }
+	/**
+	 * Reset the registry by clearing all registered items.
+	 *
+	 * Primarily useful for unit testing to ensure a clean state
+	 * between test cases.
+	 *
+	 * @return void
+	 */
+	public static function reset(): void {
+		self::$items = [];
+	}
 
-    /**
-     * Reset the registry by clearing all registered items.
-     *
-     * Primarily useful for unit testing to ensure a clean state
-     * between test cases.
-     *
-     * @return void
-     */
-    public static function reset(): void {
-        self::$items = [];
-    }
-
-    /**
-     * Get all navigation items belonging to a specific parent.
-     *
-     * Internal helper method that filters and sorts items by their
-     * order property. Returns empty array if no items match.
-     *
-     * @param string|null $parent Parent key (null for top-level items)
-     * @return NavbarItem[] Array of matching items sorted by order
-     */
-    private static function _sorted(?string $parent): array {
-        $result = [];
-        foreach (self::$items as $item) {
-            if ($item->parent === $parent) {
-                $result[] = $item;
-            }
-        }
-        usort($result, function ($a, $b) {
-            return $a->order - $b->order;
-        });
-        return $result;
-    }
+	/**
+	 * Get all navigation items belonging to a specific parent.
+	 *
+	 * Internal helper method that filters and sorts items by their
+	 * order property. Returns empty array if no items match.
+	 *
+	 * @param string|null $parent Parent key (null for top-level items)
+	 * @return NavbarItem[] Array of matching items sorted by order
+	 */
+	private static function _sorted(?string $parent): array {
+		$result = [];
+		foreach (self::$items as $item) {
+			if ($item->parent === $parent) {
+				$result[] = $item;
+			}
+		}
+		usort($result, function ($a, $b) {
+			return $a->order - $b->order;
+		});
+		return $result;
+	}
 }
diff --git a/src/Core/Module/PermissionRegistry.php b/src/Core/Module/PermissionRegistry.php
index 7aecebc2..b7b9b479 100644
--- a/src/Core/Module/PermissionRegistry.php
+++ b/src/Core/Module/PermissionRegistry.php
@@ -24,26 +24,25 @@ namespace XcVm\Core\Module;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class PermissionRegistry {
+	/** @var array<string,true> permission key => registered (ordered set) */
+	private static array $keys = [];
 
-    /** @var array<string,true> permission key => registered (ordered set) */
-    private static array $keys = [];
+	/** Register a reseller sub-permission key a module gates on. */
+	public static function add(string $key): void {
+		self::$keys[$key] = true;
+	}
 
-    /** Register a reseller sub-permission key a module gates on. */
-    public static function add(string $key): void {
-        self::$keys[$key] = true;
-    }
+	/**
+	 * All module-registered permission keys, in registration order.
+	 *
+	 * @return string[]
+	 */
+	public static function keys(): array {
+		return array_keys(self::$keys);
+	}
 
-    /**
-     * All module-registered permission keys, in registration order.
-     *
-     * @return string[]
-     */
-    public static function keys(): array {
-        return array_keys(self::$keys);
-    }
-
-    /** Clear all registered keys (used by tests / a fresh boot). */
-    public static function reset(): void {
-        self::$keys = [];
-    }
+	/** Clear all registered keys (used by tests / a fresh boot). */
+	public static function reset(): void {
+		self::$keys = [];
+	}
 }
diff --git a/src/Core/Module/QuickToolsRegistry.php b/src/Core/Module/QuickToolsRegistry.php
index 9e7209cc..42a902c9 100644
--- a/src/Core/Module/QuickToolsRegistry.php
+++ b/src/Core/Module/QuickToolsRegistry.php
@@ -27,46 +27,45 @@ namespace XcVm\Core\Module;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class QuickToolsRegistry {
+	/** @var array<string,array<int,array{0:string,1:string}>> group => list of [key, label] */
+	private static array $tools = [];
 
-    /** @var array<string,array<int,array{0:string,1:string}>> group => list of [key, label] */
-    private static array $tools = [];
+	/** @var array<string,callable> key => handler */
+	private static array $handlers = [];
 
-    /** @var array<string,callable> key => handler */
-    private static array $handlers = [];
+	/** Register a Quick Tools action (button + handler). */
+	public static function add(string $group, string $key, string $label, callable $handler): void {
+		self::$tools[$group][] = [$key, $label];
+		self::$handlers[$key] = $handler;
+	}
 
-    /** Register a Quick Tools action (button + handler). */
-    public static function add(string $group, string $key, string $label, callable $handler): void {
-        self::$tools[$group][] = [$key, $label];
-        self::$handlers[$key] = $handler;
-    }
+	/** Groups that have at least one module tool. */
+	public static function groups(): array {
+		return array_keys(self::$tools);
+	}
 
-    /** Groups that have at least one module tool. */
-    public static function groups(): array {
-        return array_keys(self::$tools);
-    }
+	/**
+	 * `[key, label]` rows a module added to a group (for the view).
+	 *
+	 * @return array<int,array{0:string,1:string}>
+	 */
+	public static function forGroup(string $group): array {
+		return self::$tools[$group] ?? [];
+	}
 
-    /**
-     * `[key, label]` rows a module added to a group (for the view).
-     *
-     * @return array<int,array{0:string,1:string}>
-     */
-    public static function forGroup(string $group): array {
-        return self::$tools[$group] ?? [];
-    }
+	/** All registered tool keys (for post.php dispatch). */
+	public static function keys(): array {
+		return array_keys(self::$handlers);
+	}
 
-    /** All registered tool keys (for post.php dispatch). */
-    public static function keys(): array {
-        return array_keys(self::$handlers);
-    }
+	/** The handler for a tool key, or null. */
+	public static function handler(string $key): ?callable {
+		return self::$handlers[$key] ?? null;
+	}
 
-    /** The handler for a tool key, or null. */
-    public static function handler(string $key): ?callable {
-        return self::$handlers[$key] ?? null;
-    }
-
-    /** Clear all registered tools (used by tests / a fresh boot). */
-    public static function reset(): void {
-        self::$tools = [];
-        self::$handlers = [];
-    }
+	/** Clear all registered tools (used by tests / a fresh boot). */
+	public static function reset(): void {
+		self::$tools = [];
+		self::$handlers = [];
+	}
 }
diff --git a/src/Core/Module/TableRegistry.php b/src/Core/Module/TableRegistry.php
index 4dde77b1..d299e57d 100644
--- a/src/Core/Module/TableRegistry.php
+++ b/src/Core/Module/TableRegistry.php
@@ -31,32 +31,31 @@ namespace XcVm\Core\Module;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class TableRegistry {
+	/** @var array<string,callable> table id => handler */
+	private static array $handlers = [];
 
-    /** @var array<string,callable> table id => handler */
-    private static array $handlers = [];
+	/**
+	 * Register (or override) the serverSide handler for a table id.
+	 *
+	 * @param string   $id      Table id (the DataTables ajax `d.id`), e.g. 'watch_output'.
+	 * @param callable $handler fn(array $return, int $start, int $limit, bool $isApi): array
+	 */
+	public static function register(string $id, callable $handler): void {
+		self::$handlers[$id] = $handler;
+	}
 
-    /**
-     * Register (or override) the serverSide handler for a table id.
-     *
-     * @param string   $id      Table id (the DataTables ajax `d.id`), e.g. 'watch_output'.
-     * @param callable $handler fn(array $return, int $start, int $limit, bool $isApi): array
-     */
-    public static function register(string $id, callable $handler): void {
-        self::$handlers[$id] = $handler;
-    }
+	/** Whether a module handler is registered for this table id. */
+	public static function has(string $id): bool {
+		return isset(self::$handlers[$id]);
+	}
 
-    /** Whether a module handler is registered for this table id. */
-    public static function has(string $id): bool {
-        return isset(self::$handlers[$id]);
-    }
+	/** The handler for a table id, or null. */
+	public static function get(string $id): ?callable {
+		return self::$handlers[$id] ?? null;
+	}
 
-    /** The handler for a table id, or null. */
-    public static function get(string $id): ?callable {
-        return self::$handlers[$id] ?? null;
-    }
-
-    /** Clear all handlers (used by tests / a fresh boot). */
-    public static function reset(): void {
-        self::$handlers = [];
-    }
+	/** Clear all handlers (used by tests / a fresh boot). */
+	public static function reset(): void {
+		self::$handlers = [];
+	}
 }
diff --git a/src/Core/Module/TopbarRegistry.php b/src/Core/Module/TopbarRegistry.php
index d33d3f60..706d24cf 100644
--- a/src/Core/Module/TopbarRegistry.php
+++ b/src/Core/Module/TopbarRegistry.php
@@ -30,98 +30,97 @@ namespace XcVm\Core\Module;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class TopbarRegistry {
+	/** @var array<string,array<string,array{spec:array{0:?string,1:?string,2:?string},order:int}>> page => label => entry */
+	private static array $entries = [];
 
-    /** @var array<string,array<string,array{spec:array{0:?string,1:?string,2:?string},order:int}>> page => label => entry */
-    private static array $entries = [];
+	/** @var array<string,true> pages a module marked as export (CSV/JSON) pages */
+	private static array $exportPages = [];
 
-    /** @var array<string,true> pages a module marked as export (CSV/JSON) pages */
-    private static array $exportPages = [];
+	/** @var array<string,string> page => clear-logs type (for the btn-clear-logs button) */
+	private static array $logTypes = [];
 
-    /** @var array<string,string> page => clear-logs type (for the btn-clear-logs button) */
-    private static array $logTypes = [];
+	/**
+	 * Register (or override) one topbar button for a page.
+	 *
+	 * @param string      $page       Topbar page key (AdminHelpers::getPageName()), e.g. 'watch' or 'movies'.
+	 * @param string      $label      Button label (also the per-page dedup key).
+	 * @param string|null $url        Target page/URL; null for a JS-only action (pair with $attr).
+	 * @param string|null $permission 'adv' sub-permission required to see the button; null = always.
+	 * @param string|null $attr       Raw extra attributes (onClick="...", id="btn-export-csv", …).
+	 * @param int         $order      Sort order among a page's module entries (ascending).
+	 */
+	public static function add(
+		string $page,
+		string $label,
+		?string $url = null,
+		?string $permission = null,
+		?string $attr = null,
+		int $order = 100
+	): void {
+		self::$entries[$page][$label] = [
+			'spec'  => [$url, $permission, $attr],
+			'order' => $order,
+		];
+	}
 
-    /**
-     * Register (or override) one topbar button for a page.
-     *
-     * @param string      $page       Topbar page key (AdminHelpers::getPageName()), e.g. 'watch' or 'movies'.
-     * @param string      $label      Button label (also the per-page dedup key).
-     * @param string|null $url        Target page/URL; null for a JS-only action (pair with $attr).
-     * @param string|null $permission 'adv' sub-permission required to see the button; null = always.
-     * @param string|null $attr       Raw extra attributes (onClick="...", id="btn-export-csv", …).
-     * @param int         $order      Sort order among a page's module entries (ascending).
-     */
-    public static function add(
-        string $page,
-        string $label,
-        ?string $url = null,
-        ?string $permission = null,
-        ?string $attr = null,
-        int $order = 100
-    ): void {
-        self::$entries[$page][$label] = [
-            'spec'  => [$url, $permission, $attr],
-            'order' => $order,
-        ];
-    }
+	/**
+	 * Page keys that have at least one module-contributed entry.
+	 *
+	 * @return string[]
+	 */
+	public static function pages(): array {
+		return array_keys(self::$entries);
+	}
 
-    /**
-     * Page keys that have at least one module-contributed entry.
-     *
-     * @return string[]
-     */
-    public static function pages(): array {
-        return array_keys(self::$entries);
-    }
+	/**
+	 * Ordered `label => [url, permission, attr]` entries for one page.
+	 *
+	 * @return array<string,array{0:?string,1:?string,2:?string}>
+	 */
+	public static function forPage(string $page): array {
+		$rItems = self::$entries[$page] ?? [];
+		uasort($rItems, static fn(array $a, array $b): int => $a['order'] <=> $b['order']);
 
-    /**
-     * Ordered `label => [url, permission, attr]` entries for one page.
-     *
-     * @return array<string,array{0:?string,1:?string,2:?string}>
-     */
-    public static function forPage(string $page): array {
-        $rItems = self::$entries[$page] ?? [];
-        uasort($rItems, static fn(array $a, array $b): int => $a['order'] <=> $b['order']);
+		$rOut = [];
+		foreach ($rItems as $rLabel => $rEntry) {
+			$rOut[$rLabel] = $rEntry['spec'];
+		}
+		return $rOut;
+	}
 
-        $rOut = [];
-        foreach ($rItems as $rLabel => $rEntry) {
-            $rOut[$rLabel] = $rEntry['spec'];
-        }
-        return $rOut;
-    }
+	/**
+	 * Mark a page as a report/export page so its "Export as CSV/JSON" topbar
+	 * buttons pass the core export gate (still additionally requires the
+	 * `backups` permission). Use for a module's own log/report page.
+	 */
+	public static function markExportPage(string $page): void {
+		self::$exportPages[$page] = true;
+	}
 
-    /**
-     * Mark a page as a report/export page so its "Export as CSV/JSON" topbar
-     * buttons pass the core export gate (still additionally requires the
-     * `backups` permission). Use for a module's own log/report page.
-     */
-    public static function markExportPage(string $page): void {
-        self::$exportPages[$page] = true;
-    }
+	/** Whether a module marked this page as an export page. */
+	public static function isExportPage(string $page): bool {
+		return isset(self::$exportPages[$page]);
+	}
 
-    /** Whether a module marked this page as an export page. */
-    public static function isExportPage(string $page): bool {
-        return isset(self::$exportPages[$page]);
-    }
+	/**
+	 * Declare the clear-logs type for a page's `btn-clear-logs` button
+	 * (the `type` sent to action=clear_logs), for a module-owned log page.
+	 */
+	public static function setLogType(string $page, string $type): void {
+		self::$logTypes[$page] = $type;
+	}
 
-    /**
-     * Declare the clear-logs type for a page's `btn-clear-logs` button
-     * (the `type` sent to action=clear_logs), for a module-owned log page.
-     */
-    public static function setLogType(string $page, string $type): void {
-        self::$logTypes[$page] = $type;
-    }
+	/** The clear-logs type a module declared for a page, or null. */
+	public static function logType(string $page): ?string {
+		return self::$logTypes[$page] ?? null;
+	}
 
-    /** The clear-logs type a module declared for a page, or null. */
-    public static function logType(string $page): ?string {
-        return self::$logTypes[$page] ?? null;
-    }
-
-    /**
-     * Clear all registered entries (used by tests / a fresh boot).
-     */
-    public static function reset(): void {
-        self::$entries = [];
-        self::$exportPages = [];
-        self::$logTypes = [];
-    }
+	/**
+	 * Clear all registered entries (used by tests / a fresh boot).
+	 */
+	public static function reset(): void {
+		self::$entries = [];
+		self::$exportPages = [];
+		self::$logTypes = [];
+	}
 }
diff --git a/src/Core/Parsing/File.php b/src/Core/Parsing/File.php
index edd79d26..1ef6588b 100644
--- a/src/Core/Parsing/File.php
+++ b/src/Core/Parsing/File.php
@@ -5,8 +5,11 @@ namespace XcVm\Core\Parsing;
 class File implements StreamInterface {
 	/** @var resource */
 	private $handle;
+
 	private int $readBytes = 0;
+
 	private int $chunkSize;
+
 	/** @var callable|null */
 	private $chunkCallback;
 
@@ -48,7 +51,7 @@ class File implements StreamInterface {
 			$this->readBytes += strlen($buffer);
 
 			if (is_callable($this->chunkCallback)) {
-				call_user_func_array($this->chunkCallback, array($buffer, $this->readBytes));
+				call_user_func_array($this->chunkCallback, [$buffer, $this->readBytes]);
 			}
 
 			return $buffer;
diff --git a/src/Core/Parsing/StringWalker.php b/src/Core/Parsing/StringWalker.php
index 15f737a9..b4151512 100644
--- a/src/Core/Parsing/StringWalker.php
+++ b/src/Core/Parsing/StringWalker.php
@@ -11,36 +11,43 @@ class StringWalker implements ParserInterface {
 	 * @var array
 	 */
 	protected $options;
+
 	/**
 	 * Is this the first run?
 	 * @var boolean
 	 */
 	protected $firstRun = true;
+
 	/**
 	 * What depth are we currently at?
 	 * @var integer
 	 */
 	protected $depth = 0;
+
 	/**
 	 * The latest chunk from the stream
 	 * @var string
 	 */
 	protected $chunk;
+
 	/**
 	 * Last XML node in the making, used for anti-freeze detection
 	 * @var null|string
 	 */
 	protected $lastChunk;
+
 	/**
 	 * XML node in the making
 	 * @var null|string
 	 */
 	protected $shaved;
+
 	/**
 	 * Whether to capture or not
 	 * @var boolean
 	 */
 	protected $capture = false;
+
 	/**
 	 * If extractContainer is true, this will grow with the XML captured before and after the specified capture depth
 	 * @var string
@@ -51,25 +58,25 @@ class StringWalker implements ParserInterface {
 	 * Parser contructor
 	 * @param array $options An options array
 	 */
-	public function __construct(array $options = array()) {
-		$this->options = array_merge(array(
+	public function __construct(array $options = []) {
+		$this->options = array_merge([
 			'captureDepth' => 2,
 			'expectGT' => false,
-			'tags' => array(
-				array('<?', '?>', 0),
-				array('<!--', '-->', 0),
-				array('<![CDATA[', ']]>', 0),
-				array('<!', '>', 0),
-				array('</', '>', -1),
-				array('<', '/>', 0),
-				array('<', '>', 1)
-			),
-			'tagsWithAllowedGT' => array(
-				array('<!--', '-->'),
-				array('<![CDATA[', ']]>')
-			),
+			'tags' => [
+				['<?', '?>', 0],
+				['<!--', '-->', 0],
+				['<![CDATA[', ']]>', 0],
+				['<!', '>', 0],
+				['</', '>', -1],
+				['<', '/>', 0],
+				['<', '>', 1]
+			],
+			'tagsWithAllowedGT' => [
+				['<!--', '-->'],
+				['<![CDATA[', ']]>']
+			],
 			'extractContainer' => false
-		), $options);
+		], $options);
 	}
 
 	/**
@@ -103,7 +110,7 @@ class StringWalker implements ParserInterface {
 			$data = substr($this->chunk, 0, $offset);
 			$this->chunk = substr($this->chunk, $offset + strlen($captured));
 
-			return array($captured, $data . $captured);
+			return [$captured, $data . $captured];
 		}
 
 		return false;
@@ -114,7 +121,7 @@ class StringWalker implements ParserInterface {
 	 * @param  string $element XML element
 	 * @return array{string, string, int}|null 0 => Opening tag, 1 => Closing tag, 2 => Depth delta (null if no tag matches)
 	 */
-	protected function getEdges($element) {
+	protected function getEdges(string $element) {
 		foreach ($this->options['tags'] as $tag) {
 			list($opening, $closing, $depth) = $tag;
 
diff --git a/src/Core/Parsing/UniqueNode.php b/src/Core/Parsing/UniqueNode.php
index f29b8531..b027f868 100644
--- a/src/Core/Parsing/UniqueNode.php
+++ b/src/Core/Parsing/UniqueNode.php
@@ -14,41 +14,49 @@ class UniqueNode implements ParserInterface {
 	 * @var array
 	 */
 	protected $options;
+
 	/**
 	 * Current working XML blob
 	 * @var string
 	 */
 	private $workingBlob = '';
+
 	/**
 	 * The flushed node
 	 * @var string
 	 */
 	private $flushed = '';
+
 	/**
 	 * Start position of the given element in the workingBlob
 	 * @var integer
 	 */
 	private $startPos = 0;
+
 	/**
 	 * Records how far we've searched in the XML blob so far
 	 * @var integer
 	 */
 	private $hasSearchedUntilPos = -1;
+
 	/**
 	 * Next action to perform
 	 * @var integer
 	 */
 	private $nextAction = 0;
+
 	/**
 	 * Indicates short closing tag
 	 * @var bool
 	 */
 	private $shortClosedTagNow = false;
+
 	/**
 	 * If extractContainer is true, this will grow with the XML captured before and after the specified capture depth
 	 * @var string
 	 */
 	protected $containerXml = '';
+
 	/**
 	 * Whether we're found our first capture target or not
 	 * @var bool
@@ -60,8 +68,8 @@ class UniqueNode implements ParserInterface {
 	 * @param array $options An options array
 	 * @throws \Exception if the required option uniqueNode isn't set
 	 */
-	public function __construct(array $options = array()) {
-		$this->options = array_merge(array('extractContainer' => false), $options);
+	public function __construct(array $options = []) {
+		$this->options = array_merge(['extractContainer' => false], $options);
 
 		if (!isset($this->options['uniqueNode'])) {
 			throw new \Exception('Required option \'uniqueNode\' not set');
@@ -89,11 +97,9 @@ class UniqueNode implements ParserInterface {
 	/**
 	 * Search short closing tag in $workingBlob before
 	 *
-	 * @param string $workingBlob
-	 * @param int $len
 	 * @return bool|int Either returns the char position of the short closing tag or false
 	 */
-	private function checkShortClosingTag($workingBlob, $len) {
+	private function checkShortClosingTag(string $workingBlob, int $len) {
 		$resultEndPositionInBlob = false;
 
 		while ($len = strpos($workingBlob, '/>', $len + 1)) {
@@ -144,7 +150,7 @@ class UniqueNode implements ParserInterface {
 	 * Set the start position in the workingBlob from where we should start reading when the closing tag is found
 	 * @param  int $startPositionInBlob Position of starting tag
 	 */
-	protected function startSalvaging($startPositionInBlob) {
+	protected function startSalvaging(int $startPositionInBlob) {
 		$this->startPos = $startPositionInBlob;
 	}
 
@@ -152,7 +158,7 @@ class UniqueNode implements ParserInterface {
 	 * Cut everything from the start position to the end position in the workingBlob (+ tag length) and flush it out for later return in getNodeFrom
 	 * @param  int $endPositionInBlob Position of the closing tag
 	 */
-	protected function flush($endPositionInBlob) {
+	protected function flush(int $endPositionInBlob) {
 		$endTagLen = ($this->shortClosedTagNow ? 0 : strlen('</' . $this->options['uniqueNode'] . '>'));
 		$realEndPosition = $endPositionInBlob + $endTagLen;
 		$this->flushed = substr($this->workingBlob, $this->startPos, $realEndPosition - $this->startPos);
diff --git a/src/Core/Parsing/XmlStringStreamer.php b/src/Core/Parsing/XmlStringStreamer.php
index dd2af831..2ea856f4 100644
--- a/src/Core/Parsing/XmlStringStreamer.php
+++ b/src/Core/Parsing/XmlStringStreamer.php
@@ -11,6 +11,7 @@ class XmlStringStreamer {
 	 * @var ParserInterface
 	 */
 	protected $parser;
+
 	/**
 	 * The current stream
 	 * @var StreamInterface
@@ -33,7 +34,7 @@ class XmlStringStreamer {
 	 * @param  array           $options Parser configuration
 	 * @return XmlStringStreamer        A streamer ready for use
 	 */
-	public static function createStringWalkerParser($file, $options = array()) {
+	public static function createStringWalkerParser($file, array $options = []) {
 		$stream = new File($file, 16384);
 		$parser = new StringWalker($options);
 
@@ -46,7 +47,7 @@ class XmlStringStreamer {
 	 * @param  array           $options Parser configuration
 	 * @return XmlStringStreamer        A streamer ready for use
 	 */
-	public static function createUniqueNodeParser($file, $options = array()) {
+	public static function createUniqueNodeParser($file, array $options = []) {
 		$stream = new File($file, 16384);
 		$parser = new UniqueNode($options);
 
diff --git a/src/Core/Process/Multithread.php b/src/Core/Process/Multithread.php
index 90032824..21c3e317 100644
--- a/src/Core/Process/Multithread.php
+++ b/src/Core/Process/Multithread.php
@@ -22,94 +22,93 @@ namespace XcVm\Core\Process;
  */
 
 class Multithread {
+	/** @var array Вывод каждой команды */
+	public $output = [];
 
-    /** @var array Вывод каждой команды */
-    public $output = array();
+	/** @var array Ошибки каждой команды */
+	public $error = [];
 
-    /** @var array Ошибки каждой команды */
-    public $error = array();
+	/** @var Thread[]|null Активные потоки */
+	public $thread = null;
 
-    /** @var Thread[]|null Активные потоки */
-    public $thread = null;
+	/** @var array Команды в работе */
+	public $commands = [];
 
-    /** @var array Команды в работе */
-    public $commands = array();
+	/** @var bool Используется ли пул */
+	public $hasPool = false;
 
-    /** @var bool Используется ли пул */
-    public $hasPool = false;
+	/** @var array Очередь команд для пула */
+	public $toExecuted = [];
 
-    /** @var array Очередь команд для пула */
-    public $toExecuted = array();
+	/**
+	 * @param array $commands Массив shell-команд
+	 * @param int $sizePool Размер пула (0 = без ограничений)
+	 */
+	public function __construct(array $commands, int $sizePool = 0) {
+		$this->hasPool = 0 < $sizePool;
+		if (!$this->hasPool) {
+		} else {
+			$this->toExecuted = array_splice($commands, $sizePool);
+		}
+		$this->commands = $commands;
+		foreach ($this->commands as $key => $command) {
+			$this->thread[$key] = Thread::create($command);
+		}
+	}
 
-    /**
-     * @param array $commands Массив shell-команд
-     * @param int $sizePool Размер пула (0 = без ограничений)
-     */
-    public function __construct($commands, $sizePool = 0) {
-        $this->hasPool = 0 < $sizePool;
-        if (!$this->hasPool) {
-        } else {
-            $this->toExecuted = array_splice($commands, $sizePool);
-        }
-        $this->commands = $commands;
-        foreach ($this->commands as $key => $command) {
-            $this->thread[$key] = Thread::create($command);
-        }
-    }
+	/**
+	 * Выполнить все команды и дождаться завершения
+	 *
+	 * @return array Массив выводов
+	 */
+	public function run() {
+		while (0 < count($this->commands)) {
+			foreach ($this->commands as $key => $command) {
+				if (!isset($this->thread[$key])) {
+					unset($this->commands[$key]);
+					$this->launchNextInQueue();
+					continue;
+				}
+				if (!isset($this->output[$key])) {
+					$this->output[$key] = '';
+				}
+				if (!isset($this->error[$key])) {
+					$this->error[$key] = '';
+				}
+				$this->output[$key] .= @$this->thread[$key]->listen();
+				$this->error[$key] .= @$this->thread[$key]->getError();
+				if ($this->thread[$key]->isActive()) {
+					$this->output[$key] .= $this->thread[$key]->listen();
+					if (!$this->thread[$key]->isBusy()) {
+					} else {
+						$this->thread[$key]->close();
+						unset($this->commands[$key]);
+						$this->launchNextInQueue();
+					}
+				} else {
+					$this->thread[$key]->close();
+					unset($this->commands[$key]);
+					$this->launchNextInQueue();
+				}
+			}
+		}
+		return $this->output;
+	}
 
-    /**
-     * Выполнить все команды и дождаться завершения
-     *
-     * @return array Массив выводов
-     */
-    public function run() {
-        while (0 < count($this->commands)) {
-            foreach ($this->commands as $key => $command) {
-                if (!isset($this->thread[$key])) {
-                    unset($this->commands[$key]);
-                    $this->launchNextInQueue();
-                    continue;
-                }
-                if (!isset($this->output[$key])) {
-                    $this->output[$key] = '';
-                }
-                if (!isset($this->error[$key])) {
-                    $this->error[$key] = '';
-                }
-                $this->output[$key] .= @$this->thread[$key]->listen();
-                $this->error[$key] .= @$this->thread[$key]->getError();
-                if ($this->thread[$key]->isActive()) {
-                    $this->output[$key] .= $this->thread[$key]->listen();
-                    if (!$this->thread[$key]->isBusy()) {
-                    } else {
-                        $this->thread[$key]->close();
-                        unset($this->commands[$key]);
-                        $this->launchNextInQueue();
-                    }
-                } else {
-                    $this->thread[$key]->close();
-                    unset($this->commands[$key]);
-                    $this->launchNextInQueue();
-                }
-            }
-        }
-        return $this->output;
-    }
-
-    /**
-     * Запустить следующую команду из очереди
-     *
-     * @return bool|void
-     */
-    public function launchNextInQueue() {
-        if (count($this->toExecuted) != 0) {
-            reset($this->toExecuted);
-            $keyToExecuted = key($this->toExecuted);
-            $this->commands[$keyToExecuted] = $this->toExecuted[$keyToExecuted];
-            $this->thread[$keyToExecuted] = Thread::create($this->toExecuted[$keyToExecuted]);
-            unset($this->toExecuted[$keyToExecuted]);
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Запустить следующую команду из очереди
+	 *
+	 * @return bool|void
+	 */
+	public function launchNextInQueue() {
+		if (count($this->toExecuted) != 0) {
+			reset($this->toExecuted);
+			$keyToExecuted = key($this->toExecuted);
+			$this->commands[$keyToExecuted] = $this->toExecuted[$keyToExecuted];
+			$this->thread[$keyToExecuted] = Thread::create($this->toExecuted[$keyToExecuted]);
+			unset($this->toExecuted[$keyToExecuted]);
+		} else {
+			return true;
+		}
+	}
 }
diff --git a/src/Core/Process/ProcessManager.php b/src/Core/Process/ProcessManager.php
index 8e9cf324..31440cb3 100644
--- a/src/Core/Process/ProcessManager.php
+++ b/src/Core/Process/ProcessManager.php
@@ -37,639 +37,632 @@ namespace XcVm\Core\Process;
  */
 
 class ProcessManager {
-
-    /** @var array Static cache for /proc existence checks */
-    protected static $procCache = [];
-
-    /** @var float Cache TTL in seconds */
-    protected static $cacheTtl = 1.0;
-
-    // ───────────────────────────────────────────────────────────
-    //  Process Checking
-    // ───────────────────────────────────────────────────────────
-
-    /**
-     * Check if a process is running via /proc filesystem
-     *
-     * @param int $pid Process ID
-     * @param string|null $exe Expected executable name (e.g., 'ffmpeg', 'php')
-     * @return bool
-     */
-    public static function isRunning($pid, $exe = null) {
-        $pid = (int)$pid;
-
-        if ($pid <= 0) {
-            return false;
-        }
-
-        if (!self::procExists($pid)) {
-            return false;
-        }
-
-        // If no exe filter — just check /proc exists
-        if ($exe === null) {
-            return true;
-        }
-
-        // Check executable matches
-        if (!is_readable('/proc/' . $pid . '/exe')) {
-            return false;
-        }
-
-        $actualExe = @basename(@readlink('/proc/' . $pid . '/exe'));
-
-        return strpos($actualExe, basename($exe)) === 0;
-    }
-
-    /**
-     * Check if a named process is running (e.g., XC_VM[123])
-     *
-     * Reads /proc/PID/cmdline and matches against "NAME[ID]" pattern.
-     *
-     * @param int $pid Process ID
-     * @param string $processName Process name prefix (e.g., 'XC_VM', 'Thumbnail', 'TVArchive')
-     * @param int|string $identifier Stream/task ID
-     * @param string $exe Expected executable (default: PHP_BIN)
-     * @return bool
-     */
-    public static function isNamedProcessRunning($pid, $processName, $identifier, $exe = null) {
-        $pid = (int)$pid;
-
-        if ($pid <= 0) {
-            return false;
-        }
-
-        if ($exe === null && defined('PHP_BIN')) {
-            $exe = PHP_BIN;
-        }
-
-        clearstatcache(true);
-
-        if (!self::procExists($pid)) {
-            return false;
-        }
-
-        if ($exe && !is_readable('/proc/' . $pid . '/exe')) {
-            return false;
-        }
-
-        if ($exe) {
-            $actualExe = @basename(@readlink('/proc/' . $pid . '/exe'));
-            if (strpos($actualExe, basename($exe)) !== 0) {
-                return false;
-            }
-        }
-
-        $cmdline = trim(@file_get_contents('/proc/' . $pid . '/cmdline'));
-        $expected = $processName . '[' . $identifier . ']';
-
-        return $cmdline === $expected;
-    }
-
-    /**
-     * Check if a stream (ffmpeg/php) process is running
-     *
-     * Specialized check for streaming processes that match
-     * either ffmpeg with specific stream output files, or PHP processes.
-     *
-     * @param int $pid Process ID
-     * @param int $streamId Stream ID
-     * @return bool
-     */
-    public static function isStreamRunning($pid, $streamId) {
-        $pid = (int)$pid;
-
-        if ($pid <= 0) {
-            return false;
-        }
-
-        if (!self::procExists($pid) || !is_readable('/proc/' . $pid . '/exe')) {
-            return false;
-        }
-
-        $exe = @basename(@readlink('/proc/' . $pid . '/exe'));
-
-        if (strpos($exe, 'ffmpeg') === 0) {
-            $cmdline = trim(@file_get_contents('/proc/' . $pid . '/cmdline'));
-            return (
-                stristr($cmdline, '/' . $streamId . '_.m3u8') ||
-                stristr($cmdline, '/' . $streamId . '_%d.ts')
-            );
-        }
-
-        // The fanout daemon's native remuxer (`xc_fanout remux … <streams>/<id>_.m3u8`),
-        // which produces a copy-only stream in ffmpeg's place. Its own subcommand
-        // and this stream's playlist must both be there: the daemon process shares
-        // the executable but names no stream playlist.
-        if (strpos($exe, 'xc_fanout') === 0) {
-            $cmdline = (string) @file_get_contents('/proc/' . $pid . '/cmdline');
-            return strpos($cmdline, "\0remux\0") !== false && strpos($cmdline, '/' . $streamId . '_.m3u8') !== false;
-        }
-
-        if (strpos($exe, 'php') === 0) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * What kind of producer a stream's pid is, for the panel's stream list.
-     *
-     * @param int $pid Process ID
-     * @return string|null 'fanout' (xc_fanout remux), 'ffmpeg', 'php' (the LLOD
-     *                     segmenter / loopback relay), or null when it cannot be read.
-     */
-    public static function producerKind($pid) {
-        $pid = (int)$pid;
-
-        if ($pid <= 0 || !self::procExists($pid) || !is_readable('/proc/' . $pid . '/exe')) {
-            return null;
-        }
-
-        $exe = @basename(@readlink('/proc/' . $pid . '/exe'));
-
-        if (strpos($exe, 'xc_fanout') === 0) {
-            $cmdline = (string) @file_get_contents('/proc/' . $pid . '/cmdline');
-            return strpos($cmdline, "\0remux\0") !== false ? 'fanout' : null;
-        }
-        if (strpos($exe, 'ffmpeg') === 0) {
-            return 'ffmpeg';
-        }
-        if (strpos($exe, 'php') === 0) {
-            return 'php';
-        }
-
-        return null;
-    }
-
-    /**
-     * One CPU/memory reading for a process, from /proc/PID/stat.
-     *
-     * CPU is cumulative (the ticks the process has burned since it started), so a
-     * percentage needs two readings — see cpuPercent(). Memory is resident set
-     * size in bytes, which is the figure that matters for a box running hundreds
-     * of encoders: what they actually hold in RAM.
-     *
-     * @param int $pid Process ID
-     * @return array{ticks:int,rss:int,at:float,start:int}|null Null when the process is gone.
-     */
-    public static function resourceSample($pid) {
-        $pid = (int)$pid;
-
-        if ($pid <= 1) {
-            return null;
-        }
-
-        $stat = @file_get_contents('/proc/' . $pid . '/stat');
-        if (!is_string($stat) || $stat === '') {
-            return null;
-        }
-
-        // Field 2 (comm) is parenthesised and may itself contain spaces and
-        // brackets — "(ffmpeg (x))" is a legal name — so everything before the
-        // LAST ')' is skipped and the split starts at field 3 (state).
-        $rClose = strrpos($stat, ')');
-        if ($rClose === false) {
-            return null;
-        }
-        $rFields = preg_split('/\s+/', trim(substr($stat, $rClose + 1)));
-        if (!is_array($rFields) || count($rFields) < 22) {
-            return null;
-        }
-
-        // $rFields[$i] is /proc/PID/stat field $i + 3: utime 14, stime 15,
-        // starttime 22 (ticks after boot), rss 24.
-        return [
-            'ticks' => (int) $rFields[11] + (int) $rFields[12],
-            'rss'   => (int) $rFields[21] * self::pageSize(),
-            'at'    => microtime(true),
-            'start' => (int) $rFields[19],
-        ];
-    }
-
-    /**
-     * CPU use averaged over the process's whole life, in percent of one core —
-     * what `ps` reports. The fallback when there is no earlier sample to take a
-     * difference against (the first reading of a producer), so a stream shows a
-     * figure at once rather than a dash for a whole pass.
-     *
-     * The age comes from the process's own start time in /proc/PID/stat against
-     * /proc/uptime, not from the mtime of /proc/PID: that inode is created when
-     * something first looks at the directory, which for a long-running process
-     * can be much later than its start.
-     *
-     * @param array $sample A resourceSample() reading.
-     * @return float|null Null when the age cannot be read.
-     */
-    public static function cpuPercentSinceStart(array $sample) {
-        if (!isset($sample['ticks'], $sample['start'])) {
-            return null;
-        }
-        $rUptime = (float) strtok((string) @file_get_contents('/proc/uptime'), ' ');
-        $rAge = $rUptime - ((int) $sample['start'] / 100);
-        if ($rUptime <= 0 || $rAge < 1) {
-            return null; // a process younger than a second says nothing yet
-        }
-
-        return round(((int) $sample['ticks'] / 100) / $rAge * 100, 1);
-    }
-
-    /**
-     * CPU use between two resourceSample() readings, in percent of one core.
-     *
-     * @param array $now  The newer sample.
-     * @param array $prev The older one (from the previous pass).
-     * @return float|null Null when the pair says nothing: no previous reading, a
-     *                    restarted process (its counter went backwards), or two
-     *                    readings from the same instant.
-     */
-    public static function cpuPercent(array $now, array $prev) {
-        if (!isset($now['ticks'], $now['at'], $prev['ticks'], $prev['at'])) {
-            return null;
-        }
-
-        $rSeconds = (float) $now['at'] - (float) $prev['at'];
-        $rTicks = (int) $now['ticks'] - (int) $prev['ticks'];
-        if ($rSeconds <= 0 || $rTicks < 0) {
-            return null;
-        }
-
-        // /proc reports CPU time in USER_HZ, which is 100 on Linux whatever the
-        // kernel's own tick rate — it is part of the /proc ABI, not CONFIG_HZ.
-        return round(($rTicks / 100) / $rSeconds * 100, 1);
-    }
-
-    /**
-     * The kernel page size, in bytes — /proc/PID/stat counts RSS in pages.
-     *
-     * Derived from this process's own two views of its memory (statm in pages,
-     * status in kB) rather than assumed, because 64K pages are normal on arm64.
-     *
-     * @return int
-     */
-    protected static function pageSize() {
-        static $rSize = null;
-        if ($rSize !== null) {
-            return $rSize;
-        }
-
-        $rSize = 4096;
-        $rStatm = @file_get_contents('/proc/self/statm');
-        $rStatus = @file_get_contents('/proc/self/status');
-        if (is_string($rStatm) && is_string($rStatus) && preg_match('/^VmRSS:\s+(\d+) kB/m', $rStatus, $rMatch)) {
-            $rPages = (int) (preg_split('/\s+/', trim($rStatm))[1] ?? 0);
-            if ($rPages > 0) {
-                // The two files are read a moment apart, so snap the ratio to a
-                // real page size instead of trusting it to the byte.
-                $rRatio = ((int) $rMatch[1] * 1024) / $rPages;
-                foreach ([4096, 8192, 16384, 65536] as $rCandidate) {
-                    if ($rRatio >= $rCandidate * 0.75 && $rRatio <= $rCandidate * 1.25) {
-                        $rSize = $rCandidate;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return $rSize;
-    }
-
-    // ───────────────────────────────────────────────────────────
-    //  Process Control
-    // ───────────────────────────────────────────────────────────
-
-    /**
-     * Kill a process by PID
-     *
-     * @param int $pid Process ID
-     * @param int $signal Signal to send (default: SIGKILL = 9)
-     * @return bool
-     */
-    public static function kill($pid, $signal = 9) {
-        $pid = (int)$pid;
-
-        if ($pid <= 0) {
-            return false;
-        }
-
-        if (!self::procExists($pid)) {
-            return false;
-        }
-
-        return posix_kill($pid, $signal);
-    }
-
-    /**
-     * Get the age of a process in seconds (how long it has been running).
-     *
-     * On Linux the mtime of the /proc/PID directory is fixed to the
-     * process start time, so `time() - filemtime()` yields the same figure
-     * as `ps -o etimes` without shelling out to ps — consistent with the
-     * rest of this class reading /proc directly.
-     *
-     * Used to detect daemons that are still present but wedged (e.g. a
-     * watchdog blocked in poll() on a half-open MariaDB socket): a normally
-     * short-lived generation that has been alive far too long is stale.
-     *
-     * @param int $pid Process ID
-     * @return int Age in seconds, or -1 if it cannot be determined
-     */
-    public static function getProcessAge($pid) {
-        $pid = (int)$pid;
-
-        if ($pid <= 0 || !self::procExists($pid)) {
-            return -1;
-        }
-
-        clearstatcache(true, '/proc/' . $pid);
-        $rStart = @filemtime('/proc/' . $pid);
-
-        if ($rStart === false) {
-            return -1;
-        }
-
-        $rAge = time() - $rStart;
-
-        return $rAge > 0 ? $rAge : 0;
-    }
-
-    // ───────────────────────────────────────────────────────────
-    //  Cron Lock Management
-    // ───────────────────────────────────────────────────────────
-
-    /**
-     * Acquire a cron lock (PID file)
-     *
-     * If a lock file exists with a running process, exits with 'Running...'.
-     * If the process is stale (older than $timeout), kills it and takes over.
-     * Creates a new lock file with the current PID.
-     *
-     * This replaces CoreUtilities::checkCron().
-     *
-     * @param string $lockFile Path to PID lock file
-     * @param int $timeout Maximum age in seconds before considering stale (default: 1800 = 30min)
-     * @return bool Always returns true (exits on conflict)
-     */
-    public static function acquireCronLock($lockFile, $timeout = 1800) {
-        if (file_exists($lockFile)) {
-            // Read content + mtime up front. A competing cron can remove the lock
-            // file between the exists() check and these reads (TOCTOU), which would
-            // otherwise emit "failed to open stream" / "stat failed" warnings. If it
-            // vanished, fall through and take the lock ourselves.
-            $contents = @file_get_contents($lockFile);
-            $mtime = @filemtime($lockFile);
-
-            if ($contents !== false && $mtime !== false) {
-                $pid = (int)trim($contents);
-
-                if (self::procExists($pid)) {
-                    // Process is running — check if it's stale
-                    if (time() - $mtime >= $timeout) {
-                        // Stale — kill and take over
-                        if ($pid > 0) {
-                            posix_kill($pid, 9);
-                        }
-                    } else {
-                        // Still fresh — another instance is running
-                        exit('Running...');
-                    }
-                }
-            }
-        }
-
-        // Write our PID
-        $lockDir = dirname($lockFile);
-        if (!is_dir($lockDir)) {
-            @mkdir($lockDir, 0775, true);
-        }
-
-        // When running as root, chown created dirs to xc_vm so other
-        // crons (cache, streams, etc.) can write into tmp/ subtree.
-        if (posix_geteuid() === 0 && function_exists('posix_getpwnam') && defined('MAIN_HOME')) {
-            $rUser = posix_getpwnam('xc_vm');
-            if ($rUser) {
-                $rMainHome = rtrim(MAIN_HOME, '/');
-                $rDir = $lockDir;
-                while ($rDir && $rDir !== $rMainHome && strlen($rDir) > strlen($rMainHome)) {
-                    if (is_dir($rDir) && fileowner($rDir) === 0) {
-                        @chown($rDir, $rUser['uid']);
-                        @chgrp($rDir, $rUser['gid']);
-                    }
-                    $rDir = dirname($rDir);
-                }
-            }
-        }
-
-        file_put_contents($lockFile, getmypid());
-
-        return true;
-    }
-
-    // ───────────────────────────────────────────────────────────
-    //  Internal Helpers
-    // ───────────────────────────────────────────────────────────
-
-    /**
-     * Check if /proc/PID exists with caching
-     *
-     * @param int $pid
-     * @return bool
-     */
-    protected static function procExists($pid) {
-        $now = microtime(true);
-        $key = (int)$pid;
-
-        if (isset(self::$procCache[$key]) && ($now - self::$procCache[$key]['time']) < self::$cacheTtl) {
-            return self::$procCache[$key]['exists'];
-        }
-
-        $exists = file_exists('/proc/' . $pid);
-        self::$procCache[$key] = ['exists' => $exists, 'time' => $now];
-
-        return $exists;
-    }
-
-    /**
-     * Clear the proc cache
-     *
-     * Useful before critical checks where stale cache could be dangerous.
-     */
-    public static function clearCache() {
-        self::$procCache = [];
-    }
-
-    // ───────────────────────────────────────────────────────────
-    //  Streaming-specific Process Methods
-    //  Extracted from StreamingUtilities
-    // ───────────────────────────────────────────────────────────
-
-    /**
-     * Check if a stream process is alive (simplified cmdline search).
-     *
-     * Extracted from ProcessManager::isStreamAlive().
-     * Searches for $streamID anywhere in /proc/PID/cmdline (case-insensitive).
-     *
-     * @param int $pid Process ID
-     * @param int|string $streamID Stream identifier to search for
-     * @return bool
-     */
-    public static function isStreamAlive($pid, $streamID) {
-        $pid = (int)$pid;
-        if ($pid <= 1) {
-            return false;
-        }
-
-        if (!self::procExists($pid)) {
-            return false;
-        }
-
-        if (!is_link('/proc/' . $pid . '/exe')) {
-            return false;
-        }
-
-        static $cache = [];
-        $cacheKey = $pid . '|' . $streamID;
-        if (isset($cache[$cacheKey]) && $cache[$cacheKey]['time'] > time() - 4) {
-            return $cache[$cacheKey]['alive'];
-        }
-
-        $cmd = @file_get_contents('/proc/' . $pid . '/cmdline');
-        if ($cmd === false) {
-            $alive = false;
-        } else {
-            $cmd = str_replace("\0", ' ', $cmd);
-            $alive = stripos($cmd, $streamID) !== false;
-        }
-
-        $cache[$cacheKey] = ['alive' => $alive, 'time' => time()];
-        return $alive;
-    }
-
-    /**
-     * Check if a monitor/proxy process is running.
-     *
-     * Extracted from ProcessManager::isMonitorAlive().
-     * Checks for XC_VM[streamID] OR XC_VMProxy[streamID] in cmdline.
-     *
-     * @param int $pid Process ID
-     * @param int|string $streamID Stream identifier
-     * @param string|null $exe Expected executable (default: PHP_BIN)
-     * @return bool
-     */
-    public static function isMonitorAlive($pid, $streamID, $exe = null) {
-        $pid = (int)$pid;
-        if ($pid <= 0) {
-            return false;
-        }
-
-        if ($exe === null && defined('PHP_BIN')) {
-            $exe = PHP_BIN;
-        }
-
-        if (!self::procExists($pid)) {
-            return false;
-        }
-
-        if (!$exe || !is_readable('/proc/' . $pid . '/exe')) {
-            return false;
-        }
-
-        if (strpos(basename(@readlink('/proc/' . $pid . '/exe')), basename($exe)) !== 0) {
-            return false;
-        }
-
-        $cmdline = trim(@file_get_contents('/proc/' . $pid . '/cmdline'));
-        return ($cmdline == 'XC_VM[' . $streamID . ']');
-    }
-
-    /**
-     * Start a stream monitor process in background.
-     *
-     * Always the PHP watchdog. Stream code calls StreamProcess::startMonitor()
-     * instead, which hands the stream to the fanout daemon's supervisor when this
-     * server supervises and only falls back to this.
-     *
-     * @param int $streamID
-     * @param int $restart
-     * @return bool
-     */
-    public static function startMonitor($streamID, $restart = 0) {
-        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php monitor ' . intval($streamID) . ' ' . intval($restart) . ' >/dev/null 2>/dev/null &');
-        return true;
-    }
-
-
-    // ───────────────────────────────────────────────────────────
-    //  Utility
-    // ───────────────────────────────────────────────────────────
-
-    /**
-     * Check if an nginx master process is running.
-     *
-     * Replaces CoreUtilities::isRunning().
-     *
-     * The master is owned by root on typical installs (workers run as
-     * xc_vm), so the scan must not be restricted to the xc_vm user —
-     * a false negative here makes cron:servers/cron:streams bail out
-     * every run and no daemon ever gets revived.
-     *
-     * @return bool
-     */
-    public static function isNginxRunning() {
-        foreach (glob('/proc/*/cmdline') ?: [] as $rCmdFile) {
-            $rRaw = @file_get_contents($rCmdFile);
-            if ($rRaw && strpos(str_replace("\0", ' ', $rRaw), 'nginx: master') !== false) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Find PIDs of processes whose command line contains one of the given
-     * substrings. Reads /proc directly instead of ps|grep pipelines, which
-     * match unrelated processes (e.g. ffmpeg's -thread_queue_size satisfied
-     * the "queue" daemon check, so the encode queue was never revived).
-     *
-     * @param array $rTerms Cmdline substrings to match (exact, case-sensitive)
-     * @param int   $rLimit Stop after this many matches (0 = no limit)
-     * @return array<int> Matching PIDs (own PID excluded)
-     */
-    public static function findProcessPIDs(array $rTerms, $rLimit = 0) {
-        $rPIDs = array();
-        $rSelf = getmypid();
-        foreach (glob('/proc/[0-9]*/cmdline') ?: [] as $rCmdFile) {
-            $rPID = intval(basename(dirname($rCmdFile)));
-            if ($rPID == $rSelf) {
-                continue;
-            }
-            $rRaw = @file_get_contents($rCmdFile);
-            if (!$rRaw) {
-                continue;
-            }
-            $rCmd = str_replace("\0", ' ', $rRaw);
-            foreach ($rTerms as $rTerm) {
-                if (strpos($rCmd, $rTerm) !== false) {
-                    $rPIDs[] = $rPID;
-                    if ($rLimit > 0 && count($rPIDs) >= $rLimit) {
-                        return $rPIDs;
-                    }
-                    break;
-                }
-            }
-        }
-        return $rPIDs;
-    }
-
-    /**
-     * Check whether any process (any user) matches one of the given
-     * cmdline substrings.
-     *
-     * @param array $rTerms Cmdline substrings to match
-     * @return bool
-     */
-    public static function isAnyProcessRunning(array $rTerms) {
-        return count(self::findProcessPIDs($rTerms, 1)) > 0;
-    }
+	/** @var array Static cache for /proc existence checks */
+	protected static $procCache = [];
+
+	/** @var float Cache TTL in seconds */
+	protected static $cacheTtl = 1.0;
+
+	// ───────────────────────────────────────────────────────────
+	//  Process Checking
+	// ───────────────────────────────────────────────────────────
+
+	/**
+	 * Check if a process is running via /proc filesystem
+	 *
+	 * @param int $pid Process ID
+	 * @param string|null $exe Expected executable name (e.g., 'ffmpeg', 'php')
+	 * @return bool
+	 */
+	public static function isRunning(int $pid, ?string $exe = null) {
+		$pid = (int) $pid;
+
+		if ($pid <= 0) {
+			return false;
+		}
+
+		if (!self::procExists($pid)) {
+			return false;
+		}
+
+		// If no exe filter — just check /proc exists
+		if ($exe === null) {
+			return true;
+		}
+
+		// Check executable matches
+		if (!is_readable('/proc/' . $pid . '/exe')) {
+			return false;
+		}
+
+		$actualExe = @basename(@readlink('/proc/' . $pid . '/exe'));
+
+		return strpos($actualExe, basename($exe)) === 0;
+	}
+
+	/**
+	 * Check if a named process is running (e.g., XC_VM[123])
+	 *
+	 * Reads /proc/PID/cmdline and matches against "NAME[ID]" pattern.
+	 *
+	 * @param int $pid Process ID
+	 * @param string $processName Process name prefix (e.g., 'XC_VM', 'Thumbnail', 'TVArchive')
+	 * @param int|string $identifier Stream/task ID
+	 * @param string $exe Expected executable (default: PHP_BIN)
+	 * @return bool
+	 */
+	public static function isNamedProcessRunning(int $pid, string $processName, int|string $identifier, string $exe = null) {
+		$pid = (int) $pid;
+
+		if ($pid <= 0) {
+			return false;
+		}
+
+		if ($exe === null && defined('PHP_BIN')) {
+			$exe = PHP_BIN;
+		}
+
+		clearstatcache(true);
+
+		if (!self::procExists($pid)) {
+			return false;
+		}
+
+		if ($exe && !is_readable('/proc/' . $pid . '/exe')) {
+			return false;
+		}
+
+		if ($exe) {
+			$actualExe = @basename(@readlink('/proc/' . $pid . '/exe'));
+			if (strpos($actualExe, basename($exe)) !== 0) {
+				return false;
+			}
+		}
+
+		$cmdline = trim(@file_get_contents('/proc/' . $pid . '/cmdline'));
+		$expected = $processName . '[' . $identifier . ']';
+
+		return $cmdline === $expected;
+	}
+
+	/**
+	 * Check if a stream (ffmpeg/php) process is running
+	 *
+	 * Specialized check for streaming processes that match
+	 * either ffmpeg with specific stream output files, or PHP processes.
+	 *
+	 * @param int $pid Process ID
+	 * @param int $streamId Stream ID
+	 * @return bool
+	 */
+	public static function isStreamRunning(int $pid, int $streamId) {
+		$pid = (int) $pid;
+
+		if ($pid <= 0) {
+			return false;
+		}
+
+		if (!self::procExists($pid) || !is_readable('/proc/' . $pid . '/exe')) {
+			return false;
+		}
+
+		$exe = @basename(@readlink('/proc/' . $pid . '/exe'));
+
+		if (strpos($exe, 'ffmpeg') === 0) {
+			$cmdline = trim(@file_get_contents('/proc/' . $pid . '/cmdline'));
+			return (stristr($cmdline, '/' . $streamId . '_.m3u8') ||
+				stristr($cmdline, '/' . $streamId . '_%d.ts'));
+		}
+
+		// The fanout daemon's native remuxer (`xc_fanout remux … <streams>/<id>_.m3u8`),
+		// which produces a copy-only stream in ffmpeg's place. Its own subcommand
+		// and this stream's playlist must both be there: the daemon process shares
+		// the executable but names no stream playlist.
+		if (strpos($exe, 'xc_fanout') === 0) {
+			$cmdline = (string) @file_get_contents('/proc/' . $pid . '/cmdline');
+			return strpos($cmdline, "\0remux\0") !== false && strpos($cmdline, '/' . $streamId . '_.m3u8') !== false;
+		}
+
+		if (strpos($exe, 'php') === 0) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * What kind of producer a stream's pid is, for the panel's stream list.
+	 *
+	 * @param int $pid Process ID
+	 * @return string|null 'fanout' (xc_fanout remux), 'ffmpeg', 'php' (the LLOD
+	 *                     segmenter / loopback relay), or null when it cannot be read.
+	 */
+	public static function producerKind(int $pid) {
+		$pid = (int) $pid;
+
+		if ($pid <= 0 || !self::procExists($pid) || !is_readable('/proc/' . $pid . '/exe')) {
+			return null;
+		}
+
+		$exe = @basename(@readlink('/proc/' . $pid . '/exe'));
+
+		if (strpos($exe, 'xc_fanout') === 0) {
+			$cmdline = (string) @file_get_contents('/proc/' . $pid . '/cmdline');
+			return strpos($cmdline, "\0remux\0") !== false ? 'fanout' : null;
+		}
+		if (strpos($exe, 'ffmpeg') === 0) {
+			return 'ffmpeg';
+		}
+		if (strpos($exe, 'php') === 0) {
+			return 'php';
+		}
+
+		return null;
+	}
+
+	/**
+	 * One CPU/memory reading for a process, from /proc/PID/stat.
+	 *
+	 * CPU is cumulative (the ticks the process has burned since it started), so a
+	 * percentage needs two readings — see cpuPercent(). Memory is resident set
+	 * size in bytes, which is the figure that matters for a box running hundreds
+	 * of encoders: what they actually hold in RAM.
+	 *
+	 * @param int $pid Process ID
+	 * @return array{ticks:int,rss:int,at:float,start:int}|null Null when the process is gone.
+	 */
+	public static function resourceSample(int $pid) {
+		$pid = (int) $pid;
+
+		if ($pid <= 1) {
+			return null;
+		}
+
+		$stat = @file_get_contents('/proc/' . $pid . '/stat');
+		if (!is_string($stat) || $stat === '') {
+			return null;
+		}
+
+		// Field 2 (comm) is parenthesised and may itself contain spaces and
+		// brackets — "(ffmpeg (x))" is a legal name — so everything before the
+		// LAST ')' is skipped and the split starts at field 3 (state).
+		$rClose = strrpos($stat, ')');
+		if ($rClose === false) {
+			return null;
+		}
+		$rFields = preg_split('/\s+/', trim(substr($stat, $rClose + 1)));
+		if (!is_array($rFields) || count($rFields) < 22) {
+			return null;
+		}
+
+		// $rFields[$i] is /proc/PID/stat field $i + 3: utime 14, stime 15,
+		// starttime 22 (ticks after boot), rss 24.
+		return [
+			'ticks' => (int) $rFields[11] + (int) $rFields[12],
+			'rss'   => (int) $rFields[21] * self::pageSize(),
+			'at'    => microtime(true),
+			'start' => (int) $rFields[19],
+		];
+	}
+
+	/**
+	 * CPU use averaged over the process's whole life, in percent of one core —
+	 * what `ps` reports. The fallback when there is no earlier sample to take a
+	 * difference against (the first reading of a producer), so a stream shows a
+	 * figure at once rather than a dash for a whole pass.
+	 *
+	 * The age comes from the process's own start time in /proc/PID/stat against
+	 * /proc/uptime, not from the mtime of /proc/PID: that inode is created when
+	 * something first looks at the directory, which for a long-running process
+	 * can be much later than its start.
+	 *
+	 * @param array $sample A resourceSample() reading.
+	 * @return float|null Null when the age cannot be read.
+	 */
+	public static function cpuPercentSinceStart(array $sample) {
+		if (!isset($sample['ticks'], $sample['start'])) {
+			return null;
+		}
+		$rUptime = (float) strtok((string) @file_get_contents('/proc/uptime'), ' ');
+		$rAge = $rUptime - ((int) $sample['start'] / 100);
+		if ($rUptime <= 0 || $rAge < 1) {
+			return null; // a process younger than a second says nothing yet
+		}
+
+		return round(((int) $sample['ticks'] / 100) / $rAge * 100, 1);
+	}
+
+	/**
+	 * CPU use between two resourceSample() readings, in percent of one core.
+	 *
+	 * @param array $now  The newer sample.
+	 * @param array $prev The older one (from the previous pass).
+	 * @return float|null Null when the pair says nothing: no previous reading, a
+	 *                    restarted process (its counter went backwards), or two
+	 *                    readings from the same instant.
+	 */
+	public static function cpuPercent(array $now, array $prev) {
+		if (!isset($now['ticks'], $now['at'], $prev['ticks'], $prev['at'])) {
+			return null;
+		}
+
+		$rSeconds = (float) $now['at'] - (float) $prev['at'];
+		$rTicks = (int) $now['ticks'] - (int) $prev['ticks'];
+		if ($rSeconds <= 0 || $rTicks < 0) {
+			return null;
+		}
+
+		// /proc reports CPU time in USER_HZ, which is 100 on Linux whatever the
+		// kernel's own tick rate — it is part of the /proc ABI, not CONFIG_HZ.
+		return round(($rTicks / 100) / $rSeconds * 100, 1);
+	}
+
+	/**
+	 * The kernel page size, in bytes — /proc/PID/stat counts RSS in pages.
+	 *
+	 * Derived from this process's own two views of its memory (statm in pages,
+	 * status in kB) rather than assumed, because 64K pages are normal on arm64.
+	 *
+	 * @return int
+	 */
+	protected static function pageSize() {
+		static $rSize = null;
+		if ($rSize !== null) {
+			return $rSize;
+		}
+
+		$rSize = 4096;
+		$rStatm = @file_get_contents('/proc/self/statm');
+		$rStatus = @file_get_contents('/proc/self/status');
+		if (is_string($rStatm) && is_string($rStatus) && preg_match('/^VmRSS:\s+(\d+) kB/m', $rStatus, $rMatch)) {
+			$rPages = (int) (preg_split('/\s+/', trim($rStatm))[1] ?? 0);
+			if ($rPages > 0) {
+				// The two files are read a moment apart, so snap the ratio to a
+				// real page size instead of trusting it to the byte.
+				$rRatio = ((int) $rMatch[1] * 1024) / $rPages;
+				foreach ([4096, 8192, 16384, 65536] as $rCandidate) {
+					if ($rRatio >= $rCandidate * 0.75 && $rRatio <= $rCandidate * 1.25) {
+						$rSize = $rCandidate;
+						break;
+					}
+				}
+			}
+		}
+
+		return $rSize;
+	}
+
+	// ───────────────────────────────────────────────────────────
+	//  Process Control
+	// ───────────────────────────────────────────────────────────
+
+	/**
+	 * Kill a process by PID
+	 *
+	 * @param int $pid Process ID
+	 * @param int $signal Signal to send (default: SIGKILL = 9)
+	 * @return bool
+	 */
+	public static function kill(int $pid, int $signal = 9) {
+		$pid = (int) $pid;
+
+		if ($pid <= 0) {
+			return false;
+		}
+
+		if (!self::procExists($pid)) {
+			return false;
+		}
+
+		return posix_kill($pid, $signal);
+	}
+
+	/**
+	 * Get the age of a process in seconds (how long it has been running).
+	 *
+	 * On Linux the mtime of the /proc/PID directory is fixed to the
+	 * process start time, so `time() - filemtime()` yields the same figure
+	 * as `ps -o etimes` without shelling out to ps — consistent with the
+	 * rest of this class reading /proc directly.
+	 *
+	 * Used to detect daemons that are still present but wedged (e.g. a
+	 * watchdog blocked in poll() on a half-open MariaDB socket): a normally
+	 * short-lived generation that has been alive far too long is stale.
+	 *
+	 * @param int $pid Process ID
+	 * @return int Age in seconds, or -1 if it cannot be determined
+	 */
+	public static function getProcessAge(int $pid) {
+		$pid = (int) $pid;
+
+		if ($pid <= 0 || !self::procExists($pid)) {
+			return -1;
+		}
+
+		clearstatcache(true, '/proc/' . $pid);
+		$rStart = @filemtime('/proc/' . $pid);
+
+		if ($rStart === false) {
+			return -1;
+		}
+
+		$rAge = time() - $rStart;
+
+		return $rAge > 0 ? $rAge : 0;
+	}
+
+	// ───────────────────────────────────────────────────────────
+	//  Cron Lock Management
+	// ───────────────────────────────────────────────────────────
+
+	/**
+	 * Acquire a cron lock (PID file)
+	 *
+	 * If a lock file exists with a running process, exits with 'Running...'.
+	 * If the process is stale (older than $timeout), kills it and takes over.
+	 * Creates a new lock file with the current PID.
+	 *
+	 * This replaces CoreUtilities::checkCron().
+	 *
+	 * @param string $lockFile Path to PID lock file
+	 * @param int $timeout Maximum age in seconds before considering stale (default: 1800 = 30min)
+	 * @return bool Always returns true (exits on conflict)
+	 */
+	public static function acquireCronLock(string $lockFile, int $timeout = 1800) {
+		if (file_exists($lockFile)) {
+			// Read content + mtime up front. A competing cron can remove the lock
+			// file between the exists() check and these reads (TOCTOU), which would
+			// otherwise emit "failed to open stream" / "stat failed" warnings. If it
+			// vanished, fall through and take the lock ourselves.
+			$contents = @file_get_contents($lockFile);
+			$mtime = @filemtime($lockFile);
+
+			if ($contents !== false && $mtime !== false) {
+				$pid = (int) trim($contents);
+
+				if (self::procExists($pid)) {
+					// Process is running — check if it's stale
+					if (time() - $mtime >= $timeout) {
+						// Stale — kill and take over
+						if ($pid > 0) {
+							posix_kill($pid, 9);
+						}
+					} else {
+						// Still fresh — another instance is running
+						exit('Running...');
+					}
+				}
+			}
+		}
+
+		// Write our PID
+		$lockDir = dirname($lockFile);
+		if (!is_dir($lockDir)) {
+			@mkdir($lockDir, 0775, true);
+		}
+
+		// When running as root, chown created dirs to xc_vm so other
+		// crons (cache, streams, etc.) can write into tmp/ subtree.
+		if (posix_geteuid() === 0 && function_exists('posix_getpwnam') && defined('MAIN_HOME')) {
+			$rUser = posix_getpwnam('xc_vm');
+			if ($rUser) {
+				$rMainHome = rtrim(MAIN_HOME, '/');
+				$rDir = $lockDir;
+				while ($rDir && $rDir !== $rMainHome && strlen($rDir) > strlen($rMainHome)) {
+					if (is_dir($rDir) && fileowner($rDir) === 0) {
+						@chown($rDir, $rUser['uid']);
+						@chgrp($rDir, $rUser['gid']);
+					}
+					$rDir = dirname($rDir);
+				}
+			}
+		}
+
+		file_put_contents($lockFile, getmypid());
+
+		return true;
+	}
+
+	// ───────────────────────────────────────────────────────────
+	//  Internal Helpers
+	// ───────────────────────────────────────────────────────────
+
+	/**
+	 * Check if /proc/PID exists with caching
+	 *
+	 * @return bool
+	 */
+	protected static function procExists(int $pid) {
+		$now = microtime(true);
+		$key = (int) $pid;
+
+		if (isset(self::$procCache[$key]) && ($now - self::$procCache[$key]['time']) < self::$cacheTtl) {
+			return self::$procCache[$key]['exists'];
+		}
+
+		$exists = file_exists('/proc/' . $pid);
+		self::$procCache[$key] = ['exists' => $exists, 'time' => $now];
+
+		return $exists;
+	}
+
+	/**
+	 * Clear the proc cache
+	 *
+	 * Useful before critical checks where stale cache could be dangerous.
+	 */
+	public static function clearCache() {
+		self::$procCache = [];
+	}
+
+	// ───────────────────────────────────────────────────────────
+	//  Streaming-specific Process Methods
+	//  Extracted from StreamingUtilities
+	// ───────────────────────────────────────────────────────────
+
+	/**
+	 * Check if a stream process is alive (simplified cmdline search).
+	 *
+	 * Extracted from ProcessManager::isStreamAlive().
+	 * Searches for $streamID anywhere in /proc/PID/cmdline (case-insensitive).
+	 *
+	 * @param int $pid Process ID
+	 * @param int|string $streamID Stream identifier to search for
+	 * @return bool
+	 */
+	public static function isStreamAlive(int $pid, int|string $streamID) {
+		$pid = (int) $pid;
+		if ($pid <= 1) {
+			return false;
+		}
+
+		if (!self::procExists($pid)) {
+			return false;
+		}
+
+		if (!is_link('/proc/' . $pid . '/exe')) {
+			return false;
+		}
+
+		static $cache = [];
+		$cacheKey = $pid . '|' . $streamID;
+		if (isset($cache[$cacheKey]) && $cache[$cacheKey]['time'] > time() - 4) {
+			return $cache[$cacheKey]['alive'];
+		}
+
+		$cmd = @file_get_contents('/proc/' . $pid . '/cmdline');
+		if ($cmd === false) {
+			$alive = false;
+		} else {
+			$cmd = str_replace("\0", ' ', $cmd);
+			$alive = stripos($cmd, $streamID) !== false;
+		}
+
+		$cache[$cacheKey] = ['alive' => $alive, 'time' => time()];
+		return $alive;
+	}
+
+	/**
+	 * Check if a monitor/proxy process is running.
+	 *
+	 * Extracted from ProcessManager::isMonitorAlive().
+	 * Checks for XC_VM[streamID] OR XC_VMProxy[streamID] in cmdline.
+	 *
+	 * @param int $pid Process ID
+	 * @param int|string $streamID Stream identifier
+	 * @param string|null $exe Expected executable (default: PHP_BIN)
+	 * @return bool
+	 */
+	public static function isMonitorAlive(int $pid, int|string $streamID, ?string $exe = null) {
+		$pid = (int) $pid;
+		if ($pid <= 0) {
+			return false;
+		}
+
+		if ($exe === null && defined('PHP_BIN')) {
+			$exe = PHP_BIN;
+		}
+
+		if (!self::procExists($pid)) {
+			return false;
+		}
+
+		if (!$exe || !is_readable('/proc/' . $pid . '/exe')) {
+			return false;
+		}
+
+		if (strpos(basename(@readlink('/proc/' . $pid . '/exe')), basename($exe)) !== 0) {
+			return false;
+		}
+
+		$cmdline = trim(@file_get_contents('/proc/' . $pid . '/cmdline'));
+		return ($cmdline == 'XC_VM[' . $streamID . ']');
+	}
+
+	/**
+	 * Start a stream monitor process in background.
+	 *
+	 * Always the PHP watchdog. Stream code calls StreamProcess::startMonitor()
+	 * instead, which hands the stream to the fanout daemon's supervisor when this
+	 * server supervises and only falls back to this.
+	 *
+	 * @return bool
+	 */
+	public static function startMonitor(int $streamID, int $restart = 0) {
+		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php monitor ' . intval($streamID) . ' ' . intval($restart) . ' >/dev/null 2>/dev/null &');
+		return true;
+	}
+
+	// ───────────────────────────────────────────────────────────
+	//  Utility
+	// ───────────────────────────────────────────────────────────
+
+	/**
+	 * Check if an nginx master process is running.
+	 *
+	 * Replaces CoreUtilities::isRunning().
+	 *
+	 * The master is owned by root on typical installs (workers run as
+	 * xc_vm), so the scan must not be restricted to the xc_vm user —
+	 * a false negative here makes cron:servers/cron:streams bail out
+	 * every run and no daemon ever gets revived.
+	 *
+	 * @return bool
+	 */
+	public static function isNginxRunning() {
+		foreach (glob('/proc/*/cmdline') ?: [] as $rCmdFile) {
+			$rRaw = @file_get_contents($rCmdFile);
+			if ($rRaw && strpos(str_replace("\0", ' ', $rRaw), 'nginx: master') !== false) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Find PIDs of processes whose command line contains one of the given
+	 * substrings. Reads /proc directly instead of ps|grep pipelines, which
+	 * match unrelated processes (e.g. ffmpeg's -thread_queue_size satisfied
+	 * the "queue" daemon check, so the encode queue was never revived).
+	 *
+	 * @param array $rTerms Cmdline substrings to match (exact, case-sensitive)
+	 * @param int   $rLimit Stop after this many matches (0 = no limit)
+	 * @return array<int> Matching PIDs (own PID excluded)
+	 */
+	public static function findProcessPIDs(array $rTerms, int $rLimit = 0) {
+		$rPIDs = [];
+		$rSelf = getmypid();
+		foreach (glob('/proc/[0-9]*/cmdline') ?: [] as $rCmdFile) {
+			$rPID = intval(basename(dirname($rCmdFile)));
+			if ($rPID == $rSelf) {
+				continue;
+			}
+			$rRaw = @file_get_contents($rCmdFile);
+			if (!$rRaw) {
+				continue;
+			}
+			$rCmd = str_replace("\0", ' ', $rRaw);
+			foreach ($rTerms as $rTerm) {
+				if (strpos($rCmd, $rTerm) !== false) {
+					$rPIDs[] = $rPID;
+					if ($rLimit > 0 && count($rPIDs) >= $rLimit) {
+						return $rPIDs;
+					}
+					break;
+				}
+			}
+		}
+		return $rPIDs;
+	}
+
+	/**
+	 * Check whether any process (any user) matches one of the given
+	 * cmdline substrings.
+	 *
+	 * @param array $rTerms Cmdline substrings to match
+	 * @return bool
+	 */
+	public static function isAnyProcessRunning(array $rTerms) {
+		return count(self::findProcessPIDs($rTerms, 1)) > 0;
+	}
 }
diff --git a/src/Core/Process/Thread.php b/src/Core/Process/Thread.php
index 887f46d5..032830e4 100644
--- a/src/Core/Process/Thread.php
+++ b/src/Core/Process/Thread.php
@@ -18,130 +18,128 @@ namespace XcVm\Core\Process;
  */
 
 class Thread {
+	/** @var resource|null proc_open handle */
+	public $process = null;
 
-    /** @var resource|null proc_open handle */
-    public $process = null;
+	/** @var array Pipes (stdin, stdout, stderr) */
+	public $pipes = null;
 
-    /** @var array Pipes (stdin, stdout, stderr) */
-    public $pipes = null;
+	/** @var string Внутренний буфер */
+	public $buffer = null;
 
-    /** @var string Внутренний буфер */
-    public $buffer = null;
+	/** @var string Накопленный stdout */
+	public $output = null;
 
-    /** @var string Накопленный stdout */
-    public $output = null;
+	/** @var string Накопленный stderr */
+	public $error = null;
 
-    /** @var string Накопленный stderr */
-    public $error = null;
+	/** @var int Таймаут в секундах (0 = без ограничений) */
+	public $timeout = null;
 
-    /** @var int Таймаут в секундах (0 = без ограничений) */
-    public $timeout = null;
+	/** @var int Время запуска процесса */
+	public $start_time = null;
 
-    /** @var int Время запуска процесса */
-    public $start_time = null;
+	/**
+	 * Initialize an empty process-thread state.
+	 */
+	public function __construct() {
+		$this->process = null;
+		$this->buffer = '';
+		$this->pipes = (array) null;
+		$this->output = '';
+		$this->error = '';
+		$this->start_time = time();
+		$this->timeout = 0;
+	}
 
-    /**
-     * Initialize an empty process-thread state.
-     */
-    public function __construct() {
-        $this->process = null;
-        $this->buffer = '';
-        $this->pipes = (array) null;
-        $this->output = '';
-        $this->error = '';
-        $this->start_time = time();
-        $this->timeout = 0;
-    }
+	/**
+	 * Создать новый процесс из команды
+	 *
+	 * @param string $command Shell-команда
+	 * @return Thread
+	 */
+	public static function create(string $command) {
+		$t = new Thread();
+		$descriptor = [['pipe', 'r'], ['pipe', 'w'], ['pipe', 'w']];
+		$t->process = proc_open($command, $descriptor, $t->pipes);
+		stream_set_blocking($t->pipes[1], false);
+		stream_set_blocking($t->pipes[2], false);
+		return $t;
+	}
 
-    /**
-     * Создать новый процесс из команды
-     *
-     * @param string $command Shell-команда
-     * @return Thread
-     */
-    public static function create($command) {
-        $t = new Thread();
-        $descriptor = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
-        $t->process = proc_open($command, $descriptor, $t->pipes);
-        stream_set_blocking($t->pipes[1], false);
-        stream_set_blocking($t->pipes[2], false);
-        return $t;
-    }
+	/**
+	 * Проверить, активен ли процесс
+	 *
+	 * @return bool
+	 */
+	public function isActive() {
+		$this->buffer .= $this->listen();
+		$f = stream_get_meta_data($this->pipes[1]);
+		return !$f['eof'];
+	}
 
-    /**
-     * Проверить, активен ли процесс
-     *
-     * @return bool
-     */
-    public function isActive() {
-        $this->buffer .= $this->listen();
-        $f = stream_get_meta_data($this->pipes[1]);
-        return !$f['eof'];
-    }
+	/**
+	 * Закрыть процесс
+	 *
+	 * @return int Exit code
+	 */
+	public function close() {
+		$r = proc_close($this->process);
+		$this->process = null;
+		return $r;
+	}
 
-    /**
-     * Закрыть процесс
-     *
-     * @return int Exit code
-     */
-    public function close() {
-        $r = proc_close($this->process);
-        $this->process = null;
-        return $r;
-    }
+	/**
+	 * Отправить данные в stdin процесса
+	 *
+	 */
+	public function tell(string $thought) {
+		fwrite($this->pipes[0], $thought);
+	}
 
-    /**
-     * Отправить данные в stdin процесса
-     *
-     * @param string $thought
-     */
-    public function tell($thought) {
-        fwrite($this->pipes[0], $thought);
-    }
+	/**
+	 * Прочитать вывод из stdout
+	 *
+	 * @return string
+	 */
+	public function listen() {
+		$buffer = $this->buffer;
+		$this->buffer = '';
+		while ($r = fgets($this->pipes[1], 1024)) {
+			$buffer .= $r;
+			$this->output .= $r;
+		}
+		return $buffer;
+	}
 
-    /**
-     * Прочитать вывод из stdout
-     *
-     * @return string
-     */
-    public function listen() {
-        $buffer = $this->buffer;
-        $this->buffer = '';
-        while ($r = fgets($this->pipes[1], 1024)) {
-            $buffer .= $r;
-            $this->output .= $r;
-        }
-        return $buffer;
-    }
+	/**
+	 * Получить статус процесса
+	 *
+	 * @return array
+	 */
+	public function getStatus() {
+		return proc_get_status($this->process);
+	}
 
-    /**
-     * Получить статус процесса
-     *
-     * @return array
-     */
-    public function getStatus() {
-        return proc_get_status($this->process);
-    }
+	/**
+	 * Проверить, превышен ли таймаут
+	 *
+	 * @return bool
+	 */
+	public function isBusy() {
+		return 0 < $this->timeout && $this->start_time + $this->timeout < time();
+	}
 
-    /**
-     * Проверить, превышен ли таймаут
-     *
-     * @return bool
-     */
-    public function isBusy() {
-        return 0 < $this->timeout && $this->start_time + $this->timeout < time();
-    }
-
-    /**
-     * Прочитать stderr
-     *
-     * @return string
-     */
-    public function getError() {
-        $buffer = '';
-        while ($r = fgets($this->pipes[2], 1024)) {
-            $buffer .= $r;
-        }
-        return $buffer;
-    }
+	/**
+	 * Прочитать stderr
+	 *
+	 * @return string
+	 */
+	public function getError() {
+		$buffer = '';
+		while ($r = fgets($this->pipes[2], 1024)) {
+			$buffer .= $r;
+		}
+		return $buffer;
+	}
 }
diff --git a/src/Core/Proxy/ProxyArchiveUpdater.php b/src/Core/Proxy/ProxyArchiveUpdater.php
index 421593fd..f69918cc 100644
--- a/src/Core/Proxy/ProxyArchiveUpdater.php
+++ b/src/Core/Proxy/ProxyArchiveUpdater.php
@@ -28,7 +28,6 @@ use XcVm\Core\Updates\GitHubReleases;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ProxyArchiveUpdater {
-
 	/** Asset file name published on every XC_VM_Proxy release. */
 	private const ASSET = 'proxy.tar.gz';
 
@@ -187,15 +186,15 @@ class ProxyArchiveUpdater {
 	/** @return array{version?: string, md5?: string} */
 	private function readIndex(): array {
 		if (!is_file($this->indexPath)) {
-			return array();
+			return [];
 		}
 		$rData = json_decode((string) file_get_contents($this->indexPath), true);
-		return is_array($rData) ? $rData : array();
+		return is_array($rData) ? $rData : [];
 	}
 
 	private function writeIndex(string $rVersion, string $rMd5): void {
 		$rJson = json_encode(
-			array('version' => $rVersion, 'md5' => $rMd5),
+			['version' => $rVersion, 'md5' => $rMd5],
 			JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES
 		);
 		@file_put_contents($this->indexPath, $rJson . "\n");
@@ -204,6 +203,6 @@ class ProxyArchiveUpdater {
 
 	/** @return array{version: ?string, action: string, error: ?string} */
 	private function result(?string $rVersion, string $rAction, ?string $rError): array {
-		return array('version' => $rVersion, 'action' => $rAction, 'error' => $rError);
+		return ['version' => $rVersion, 'action' => $rAction, 'error' => $rError];
 	}
 }
diff --git a/src/Core/Reference/DeviceReference.php b/src/Core/Reference/DeviceReference.php
index fcf77010..789929da 100644
--- a/src/Core/Reference/DeviceReference.php
+++ b/src/Core/Reference/DeviceReference.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Reference;
 
@@ -17,15 +16,15 @@ namespace XcVm\Core\Reference;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class DeviceReference {
-    /** Supported MAG / Aura STB model identifiers. */
-    private const MAG_MODELS = array('AuraHD', 'AuraHD2', 'AuraHD3', 'AuraHD4', 'AuraHD5', 'AuraHD6', 'AuraHD7', 'AuraHD8', 'AuraHD9', 'MAG200', 'MAG245', 'MAG245D', 'MAG250', 'MAG254', 'MAG255', 'MAG256', 'MAG257', 'MAG260', 'MAG270', 'MAG275', 'MAG322', 'MAG323', 'MAG324', 'MAG325', 'MAG349', 'MAG350', 'MAG351', 'MAG352', 'MAG420', 'WR320', 'TH100', 'MAG424', 'MAG424W3');
+	/** Supported MAG / Aura STB model identifiers. */
+	private const MAG_MODELS = ['AuraHD', 'AuraHD2', 'AuraHD3', 'AuraHD4', 'AuraHD5', 'AuraHD6', 'AuraHD7', 'AuraHD8', 'AuraHD9', 'MAG200', 'MAG245', 'MAG245D', 'MAG250', 'MAG254', 'MAG255', 'MAG256', 'MAG257', 'MAG260', 'MAG270', 'MAG275', 'MAG322', 'MAG323', 'MAG324', 'MAG325', 'MAG349', 'MAG350', 'MAG351', 'MAG352', 'MAG420', 'WR320', 'TH100', 'MAG424', 'MAG424W3'];
 
-    /**
-     * Supported MAG / Aura STB model identifiers.
-     *
-     * @return array<int, string>
-     */
-    public static function magModels(): array {
-        return self::MAG_MODELS;
-    }
+	/**
+	 * Supported MAG / Aura STB model identifiers.
+	 *
+	 * @return array<int, string>
+	 */
+	public static function magModels(): array {
+		return self::MAG_MODELS;
+	}
 }
diff --git a/src/Core/Reference/GeoReference.php b/src/Core/Reference/GeoReference.php
index 67c82067..6d1b87db 100644
--- a/src/Core/Reference/GeoReference.php
+++ b/src/Core/Reference/GeoReference.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Reference;
 
@@ -19,40 +18,40 @@ namespace XcVm\Core\Reference;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class GeoReference {
-    /** ISO 3166-1 alpha-2 code => official country name. */
-    private const COUNTRY_CODES = array('AF' => 'Afghanistan', 'AL' => 'Albania', 'DZ' => 'Algeria', 'AS' => 'American Samoa', 'AD' => 'Andorra', 'AO' => 'Angola', 'AI' => 'Anguilla', 'AQ' => 'Antarctica', 'AG' => 'Antigua and Barbuda', 'AR' => 'Argentina', 'AM' => 'Armenia', 'AW' => 'Aruba', 'AU' => 'Australia', 'AT' => 'Austria', 'AZ' => 'Azerbaijan', 'BS' => 'Bahamas', 'BH' => 'Bahrain', 'BD' => 'Bangladesh', 'BB' => 'Barbados', 'BY' => 'Belarus', 'BE' => 'Belgium', 'BZ' => 'Belize', 'BJ' => 'Benin', 'BM' => 'Bermuda', 'BT' => 'Bhutan', 'BO' => 'Bolivia (Plurinational State of)', 'BQ' => 'Bonaire, Sint Eustatius and Saba', 'BA' => 'Bosnia and Herzegovina', 'BW' => 'Botswana', 'BV' => 'Bouvet Island', 'BR' => 'Brazil', 'IO' => 'British Indian Ocean Territory', 'BN' => 'Brunei Darussalam', 'BG' => 'Bulgaria', 'BF' => 'Burkina Faso', 'BI' => 'Burundi', 'CV' => 'Cabo Verde', 'KH' => 'Cambodia', 'CM' => 'Cameroon', 'CA' => 'Canada', 'KY' => 'Cayman Islands', 'CF' => 'Central African Republic', 'TD' => 'Chad', 'CL' => 'Chile', 'CN' => 'China', 'CX' => 'Christmas Island', 'CC' => 'Cocos (Keeling) Islands', 'CO' => 'Colombia', 'KM' => 'Comoros', 'CD' => 'Congo (the Democratic Republic of the)', 'CG' => 'Congo', 'CK' => 'Cook Islands', 'CR' => 'Costa Rica', 'HR' => 'Croatia', 'CU' => 'Cuba', 'CW' => 'Curaçao', 'CY' => 'Cyprus', 'CZ' => 'Czechia', 'CI' => "Côte d'Ivoire", 'DK' => 'Denmark', 'DJ' => 'Djibouti', 'DM' => 'Dominica', 'DO' => 'Dominican Republic', 'EC' => 'Ecuador', 'EG' => 'Egypt', 'SV' => 'El Salvador', 'GQ' => 'Equatorial Guinea', 'ER' => 'Eritrea', 'EE' => 'Estonia', 'SZ' => 'Eswatini', 'ET' => 'Ethiopia', 'FK' => 'Falkland Islands [Malvinas]', 'FO' => 'Faroe Islands', 'FJ' => 'Fiji', 'FI' => 'Finland', 'FR' => 'France', 'GF' => 'French Guiana', 'PF' => 'French Polynesia', 'TF' => 'French Southern Territories', 'GA' => 'Gabon', 'GM' => 'Gambia', 'GE' => 'Georgia', 'DE' => 'Germany', 'GH' => 'Ghana', 'GI' => 'Gibraltar', 'GR' => 'Greece', 'GL' => 'Greenland', 'GD' => 'Grenada', 'GP' => 'Guadeloupe', 'GU' => 'Guam', 'GT' => 'Guatemala', 'GG' => 'Guernsey', 'GN' => 'Guinea', 'GW' => 'Guinea-Bissau', 'GY' => 'Guyana', 'HT' => 'Haiti', 'HM' => 'Heard Island and McDonald Islands', 'VA' => 'Holy See', 'HN' => 'Honduras', 'HK' => 'Hong Kong', 'HU' => 'Hungary', 'IS' => 'Iceland', 'IN' => 'India', 'ID' => 'Indonesia', 'IR' => 'Iran (Islamic Republic of)', 'IQ' => 'Iraq', 'IE' => 'Ireland', 'IM' => 'Isle of Man', 'IL' => 'Israel', 'IT' => 'Italy', 'JM' => 'Jamaica', 'JP' => 'Japan', 'JE' => 'Jersey', 'JO' => 'Jordan', 'KZ' => 'Kazakhstan', 'KE' => 'Kenya', 'KI' => 'Kiribati', 'KP' => "Korea (the Democratic People's Republic of)", 'KR' => 'Korea (the Republic of)', 'KW' => 'Kuwait', 'KG' => 'Kyrgyzstan', 'LA' => "Lao People's Democratic Republic", 'LV' => 'Latvia', 'LB' => 'Lebanon', 'LS' => 'Lesotho', 'LR' => 'Liberia', 'LY' => 'Libya', 'LI' => 'Liechtenstein', 'LT' => 'Lithuania', 'LU' => 'Luxembourg', 'MO' => 'Macao', 'MG' => 'Madagascar', 'MW' => 'Malawi', 'MY' => 'Malaysia', 'MV' => 'Maldives', 'ML' => 'Mali', 'MT' => 'Malta', 'MH' => 'Marshall Islands', 'MQ' => 'Martinique', 'MR' => 'Mauritania', 'MU' => 'Mauritius', 'YT' => 'Mayotte', 'MX' => 'Mexico', 'FM' => 'Micronesia (Federated States of)', 'MD' => 'Moldova (the Republic of)', 'MC' => 'Monaco', 'MN' => 'Mongolia', 'ME' => 'Montenegro', 'MS' => 'Montserrat', 'MA' => 'Morocco', 'MZ' => 'Mozambique', 'MM' => 'Myanmar', 'NA' => 'Namibia', 'NR' => 'Nauru', 'NP' => 'Nepal', 'NL' => 'Netherlands', 'NC' => 'New Caledonia', 'NZ' => 'New Zealand', 'NI' => 'Nicaragua', 'NE' => 'Niger', 'NG' => 'Nigeria', 'NU' => 'Niue', 'NF' => 'Norfolk Island', 'MP' => 'Northern Mariana Islands', 'NO' => 'Norway', 'OM' => 'Oman', 'PK' => 'Pakistan', 'PW' => 'Palau', 'PS' => 'Palestine, State of', 'PA' => 'Panama', 'PG' => 'Papua New Guinea', 'PY' => 'Paraguay', 'PE' => 'Peru', 'PH' => 'Philippines', 'PN' => 'Pitcairn', 'PL' => 'Poland', 'PT' => 'Portugal', 'PR' => 'Puerto Rico', 'QA' => 'Qatar', 'MK' => 'Republic of North Macedonia', 'RO' => 'Romania', 'RU' => 'Russian Federation', 'RW' => 'Rwanda', 'RE' => 'Réunion', 'BL' => 'Saint Barthélemy', 'SH' => 'Saint Helena, Ascension and Tristan da Cunha', 'KN' => 'Saint Kitts and Nevis', 'LC' => 'Saint Lucia', 'MF' => 'Saint Martin (French part)', 'PM' => 'Saint Pierre and Miquelon', 'VC' => 'Saint Vincent and the Grenadines', 'WS' => 'Samoa', 'SM' => 'San Marino', 'ST' => 'Sao Tome and Principe', 'SA' => 'Saudi Arabia', 'SN' => 'Senegal', 'RS' => 'Serbia', 'SC' => 'Seychelles', 'SL' => 'Sierra Leone', 'SG' => 'Singapore', 'SX' => 'Sint Maarten (Dutch part)', 'SK' => 'Slovakia', 'SI' => 'Slovenia', 'SB' => 'Solomon Islands', 'SO' => 'Somalia', 'ZA' => 'South Africa', 'GS' => 'South Georgia and the South Sandwich Islands', 'SS' => 'South Sudan', 'ES' => 'Spain', 'LK' => 'Sri Lanka', 'SD' => 'Sudan', 'SR' => 'Suriname', 'SJ' => 'Svalbard and Jan Mayen', 'SE' => 'Sweden', 'CH' => 'Switzerland', 'SY' => 'Syrian Arab Republic', 'TW' => 'Taiwan (Province of China)', 'TJ' => 'Tajikistan', 'TZ' => 'Tanzania, United Republic of', 'TH' => 'Thailand', 'TL' => 'Timor-Leste', 'TG' => 'Togo', 'TK' => 'Tokelau', 'TO' => 'Tonga', 'TT' => 'Trinidad and Tobago', 'TN' => 'Tunisia', 'TR' => 'Turkey', 'TM' => 'Turkmenistan', 'TC' => 'Turks and Caicos Islands', 'TV' => 'Tuvalu', 'UG' => 'Uganda', 'UA' => 'Ukraine', 'AE' => 'United Arab Emirates', 'GB' => 'United Kingdom', 'UM' => 'United States Minor Outlying Islands', 'US' => 'United States of America', 'UY' => 'Uruguay', 'UZ' => 'Uzbekistan', 'VU' => 'Vanuatu', 'VE' => 'Venezuela (Bolivarian Republic of)', 'VN' => 'Viet Nam', 'VG' => 'Virgin Islands (British)', 'VI' => 'Virgin Islands (U.S.)', 'WF' => 'Wallis and Futuna', 'EH' => 'Western Sahara', 'YE' => 'Yemen', 'ZM' => 'Zambia', 'ZW' => 'Zimbabwe', 'AX' => 'Åland Islands');
+	/** ISO 3166-1 alpha-2 code => official country name. */
+	private const COUNTRY_CODES = ['AF' => 'Afghanistan', 'AL' => 'Albania', 'DZ' => 'Algeria', 'AS' => 'American Samoa', 'AD' => 'Andorra', 'AO' => 'Angola', 'AI' => 'Anguilla', 'AQ' => 'Antarctica', 'AG' => 'Antigua and Barbuda', 'AR' => 'Argentina', 'AM' => 'Armenia', 'AW' => 'Aruba', 'AU' => 'Australia', 'AT' => 'Austria', 'AZ' => 'Azerbaijan', 'BS' => 'Bahamas', 'BH' => 'Bahrain', 'BD' => 'Bangladesh', 'BB' => 'Barbados', 'BY' => 'Belarus', 'BE' => 'Belgium', 'BZ' => 'Belize', 'BJ' => 'Benin', 'BM' => 'Bermuda', 'BT' => 'Bhutan', 'BO' => 'Bolivia (Plurinational State of)', 'BQ' => 'Bonaire, Sint Eustatius and Saba', 'BA' => 'Bosnia and Herzegovina', 'BW' => 'Botswana', 'BV' => 'Bouvet Island', 'BR' => 'Brazil', 'IO' => 'British Indian Ocean Territory', 'BN' => 'Brunei Darussalam', 'BG' => 'Bulgaria', 'BF' => 'Burkina Faso', 'BI' => 'Burundi', 'CV' => 'Cabo Verde', 'KH' => 'Cambodia', 'CM' => 'Cameroon', 'CA' => 'Canada', 'KY' => 'Cayman Islands', 'CF' => 'Central African Republic', 'TD' => 'Chad', 'CL' => 'Chile', 'CN' => 'China', 'CX' => 'Christmas Island', 'CC' => 'Cocos (Keeling) Islands', 'CO' => 'Colombia', 'KM' => 'Comoros', 'CD' => 'Congo (the Democratic Republic of the)', 'CG' => 'Congo', 'CK' => 'Cook Islands', 'CR' => 'Costa Rica', 'HR' => 'Croatia', 'CU' => 'Cuba', 'CW' => 'Curaçao', 'CY' => 'Cyprus', 'CZ' => 'Czechia', 'CI' => "Côte d'Ivoire", 'DK' => 'Denmark', 'DJ' => 'Djibouti', 'DM' => 'Dominica', 'DO' => 'Dominican Republic', 'EC' => 'Ecuador', 'EG' => 'Egypt', 'SV' => 'El Salvador', 'GQ' => 'Equatorial Guinea', 'ER' => 'Eritrea', 'EE' => 'Estonia', 'SZ' => 'Eswatini', 'ET' => 'Ethiopia', 'FK' => 'Falkland Islands [Malvinas]', 'FO' => 'Faroe Islands', 'FJ' => 'Fiji', 'FI' => 'Finland', 'FR' => 'France', 'GF' => 'French Guiana', 'PF' => 'French Polynesia', 'TF' => 'French Southern Territories', 'GA' => 'Gabon', 'GM' => 'Gambia', 'GE' => 'Georgia', 'DE' => 'Germany', 'GH' => 'Ghana', 'GI' => 'Gibraltar', 'GR' => 'Greece', 'GL' => 'Greenland', 'GD' => 'Grenada', 'GP' => 'Guadeloupe', 'GU' => 'Guam', 'GT' => 'Guatemala', 'GG' => 'Guernsey', 'GN' => 'Guinea', 'GW' => 'Guinea-Bissau', 'GY' => 'Guyana', 'HT' => 'Haiti', 'HM' => 'Heard Island and McDonald Islands', 'VA' => 'Holy See', 'HN' => 'Honduras', 'HK' => 'Hong Kong', 'HU' => 'Hungary', 'IS' => 'Iceland', 'IN' => 'India', 'ID' => 'Indonesia', 'IR' => 'Iran (Islamic Republic of)', 'IQ' => 'Iraq', 'IE' => 'Ireland', 'IM' => 'Isle of Man', 'IL' => 'Israel', 'IT' => 'Italy', 'JM' => 'Jamaica', 'JP' => 'Japan', 'JE' => 'Jersey', 'JO' => 'Jordan', 'KZ' => 'Kazakhstan', 'KE' => 'Kenya', 'KI' => 'Kiribati', 'KP' => "Korea (the Democratic People's Republic of)", 'KR' => 'Korea (the Republic of)', 'KW' => 'Kuwait', 'KG' => 'Kyrgyzstan', 'LA' => "Lao People's Democratic Republic", 'LV' => 'Latvia', 'LB' => 'Lebanon', 'LS' => 'Lesotho', 'LR' => 'Liberia', 'LY' => 'Libya', 'LI' => 'Liechtenstein', 'LT' => 'Lithuania', 'LU' => 'Luxembourg', 'MO' => 'Macao', 'MG' => 'Madagascar', 'MW' => 'Malawi', 'MY' => 'Malaysia', 'MV' => 'Maldives', 'ML' => 'Mali', 'MT' => 'Malta', 'MH' => 'Marshall Islands', 'MQ' => 'Martinique', 'MR' => 'Mauritania', 'MU' => 'Mauritius', 'YT' => 'Mayotte', 'MX' => 'Mexico', 'FM' => 'Micronesia (Federated States of)', 'MD' => 'Moldova (the Republic of)', 'MC' => 'Monaco', 'MN' => 'Mongolia', 'ME' => 'Montenegro', 'MS' => 'Montserrat', 'MA' => 'Morocco', 'MZ' => 'Mozambique', 'MM' => 'Myanmar', 'NA' => 'Namibia', 'NR' => 'Nauru', 'NP' => 'Nepal', 'NL' => 'Netherlands', 'NC' => 'New Caledonia', 'NZ' => 'New Zealand', 'NI' => 'Nicaragua', 'NE' => 'Niger', 'NG' => 'Nigeria', 'NU' => 'Niue', 'NF' => 'Norfolk Island', 'MP' => 'Northern Mariana Islands', 'NO' => 'Norway', 'OM' => 'Oman', 'PK' => 'Pakistan', 'PW' => 'Palau', 'PS' => 'Palestine, State of', 'PA' => 'Panama', 'PG' => 'Papua New Guinea', 'PY' => 'Paraguay', 'PE' => 'Peru', 'PH' => 'Philippines', 'PN' => 'Pitcairn', 'PL' => 'Poland', 'PT' => 'Portugal', 'PR' => 'Puerto Rico', 'QA' => 'Qatar', 'MK' => 'Republic of North Macedonia', 'RO' => 'Romania', 'RU' => 'Russian Federation', 'RW' => 'Rwanda', 'RE' => 'Réunion', 'BL' => 'Saint Barthélemy', 'SH' => 'Saint Helena, Ascension and Tristan da Cunha', 'KN' => 'Saint Kitts and Nevis', 'LC' => 'Saint Lucia', 'MF' => 'Saint Martin (French part)', 'PM' => 'Saint Pierre and Miquelon', 'VC' => 'Saint Vincent and the Grenadines', 'WS' => 'Samoa', 'SM' => 'San Marino', 'ST' => 'Sao Tome and Principe', 'SA' => 'Saudi Arabia', 'SN' => 'Senegal', 'RS' => 'Serbia', 'SC' => 'Seychelles', 'SL' => 'Sierra Leone', 'SG' => 'Singapore', 'SX' => 'Sint Maarten (Dutch part)', 'SK' => 'Slovakia', 'SI' => 'Slovenia', 'SB' => 'Solomon Islands', 'SO' => 'Somalia', 'ZA' => 'South Africa', 'GS' => 'South Georgia and the South Sandwich Islands', 'SS' => 'South Sudan', 'ES' => 'Spain', 'LK' => 'Sri Lanka', 'SD' => 'Sudan', 'SR' => 'Suriname', 'SJ' => 'Svalbard and Jan Mayen', 'SE' => 'Sweden', 'CH' => 'Switzerland', 'SY' => 'Syrian Arab Republic', 'TW' => 'Taiwan (Province of China)', 'TJ' => 'Tajikistan', 'TZ' => 'Tanzania, United Republic of', 'TH' => 'Thailand', 'TL' => 'Timor-Leste', 'TG' => 'Togo', 'TK' => 'Tokelau', 'TO' => 'Tonga', 'TT' => 'Trinidad and Tobago', 'TN' => 'Tunisia', 'TR' => 'Turkey', 'TM' => 'Turkmenistan', 'TC' => 'Turks and Caicos Islands', 'TV' => 'Tuvalu', 'UG' => 'Uganda', 'UA' => 'Ukraine', 'AE' => 'United Arab Emirates', 'GB' => 'United Kingdom', 'UM' => 'United States Minor Outlying Islands', 'US' => 'United States of America', 'UY' => 'Uruguay', 'UZ' => 'Uzbekistan', 'VU' => 'Vanuatu', 'VE' => 'Venezuela (Bolivarian Republic of)', 'VN' => 'Viet Nam', 'VG' => 'Virgin Islands (British)', 'VI' => 'Virgin Islands (U.S.)', 'WF' => 'Wallis and Futuna', 'EH' => 'Western Sahara', 'YE' => 'Yemen', 'ZM' => 'Zambia', 'ZW' => 'Zimbabwe', 'AX' => 'Åland Islands'];
 
-    /** Ordered list of `['id' => code, 'name' => label]` rows (blocking dropdown; "Off" first). */
-    private const COUNTRIES = array(array('id' => '', 'name' => 'Off'), array('id' => 'A1', 'name' => 'Anonymous Proxy'), array('id' => 'A2', 'name' => 'Satellite Provider'), array('id' => 'O1', 'name' => 'Other Country'), array('id' => 'AF', 'name' => 'Afghanistan'), array('id' => 'AX', 'name' => 'Aland Islands'), array('id' => 'AL', 'name' => 'Albania'), array('id' => 'DZ', 'name' => 'Algeria'), array('id' => 'AS', 'name' => 'American Samoa'), array('id' => 'AD', 'name' => 'Andorra'), array('id' => 'AO', 'name' => 'Angola'), array('id' => 'AI', 'name' => 'Anguilla'), array('id' => 'AQ', 'name' => 'Antarctica'), array('id' => 'AG', 'name' => 'Antigua And Barbuda'), array('id' => 'AR', 'name' => 'Argentina'), array('id' => 'AM', 'name' => 'Armenia'), array('id' => 'AW', 'name' => 'Aruba'), array('id' => 'AU', 'name' => 'Australia'), array('id' => 'AT', 'name' => 'Austria'), array('id' => 'AZ', 'name' => 'Azerbaijan'), array('id' => 'BS', 'name' => 'Bahamas'), array('id' => 'BH', 'name' => 'Bahrain'), array('id' => 'BD', 'name' => 'Bangladesh'), array('id' => 'BB', 'name' => 'Barbados'), array('id' => 'BY', 'name' => 'Belarus'), array('id' => 'BE', 'name' => 'Belgium'), array('id' => 'BZ', 'name' => 'Belize'), array('id' => 'BJ', 'name' => 'Benin'), array('id' => 'BM', 'name' => 'Bermuda'), array('id' => 'BT', 'name' => 'Bhutan'), array('id' => 'BO', 'name' => 'Bolivia'), array('id' => 'BA', 'name' => 'Bosnia And Herzegovina'), array('id' => 'BW', 'name' => 'Botswana'), array('id' => 'BV', 'name' => 'Bouvet Island'), array('id' => 'BR', 'name' => 'Brazil'), array('id' => 'IO', 'name' => 'British Indian Ocean Territory'), array('id' => 'BN', 'name' => 'Brunei Darussalam'), array('id' => 'BG', 'name' => 'Bulgaria'), array('id' => 'BF', 'name' => 'Burkina Faso'), array('id' => 'BI', 'name' => 'Burundi'), array('id' => 'KH', 'name' => 'Cambodia'), array('id' => 'CM', 'name' => 'Cameroon'), array('id' => 'CA', 'name' => 'Canada'), array('id' => 'CV', 'name' => 'Cape Verde'), array('id' => 'KY', 'name' => 'Cayman Islands'), array('id' => 'CF', 'name' => 'Central African Republic'), array('id' => 'TD', 'name' => 'Chad'), array('id' => 'CL', 'name' => 'Chile'), array('id' => 'CN', 'name' => 'China'), array('id' => 'CX', 'name' => 'Christmas Island'), array('id' => 'CC', 'name' => 'Cocos (Keeling) Islands'), array('id' => 'CO', 'name' => 'Colombia'), array('id' => 'KM', 'name' => 'Comoros'), array('id' => 'CG', 'name' => 'Congo'), array('id' => 'CD', 'name' => 'Congo, Democratic Republic'), array('id' => 'CK', 'name' => 'Cook Islands'), array('id' => 'CR', 'name' => 'Costa Rica'), array('id' => 'CI', 'name' => "Cote D'Ivoire"), array('id' => 'HR', 'name' => 'Croatia'), array('id' => 'CU', 'name' => 'Cuba'), array('id' => 'CY', 'name' => 'Cyprus'), array('id' => 'CZ', 'name' => 'Czech Republic'), array('id' => 'DK', 'name' => 'Denmark'), array('id' => 'DJ', 'name' => 'Djibouti'), array('id' => 'DM', 'name' => 'Dominica'), array('id' => 'DO', 'name' => 'Dominican Republic'), array('id' => 'EC', 'name' => 'Ecuador'), array('id' => 'EG', 'name' => 'Egypt'), array('id' => 'SV', 'name' => 'El Salvador'), array('id' => 'GQ', 'name' => 'Equatorial Guinea'), array('id' => 'ER', 'name' => 'Eritrea'), array('id' => 'EE', 'name' => 'Estonia'), array('id' => 'ET', 'name' => 'Ethiopia'), array('id' => 'FK', 'name' => 'Falkland Islands (Malvinas)'), array('id' => 'FO', 'name' => 'Faroe Islands'), array('id' => 'FJ', 'name' => 'Fiji'), array('id' => 'FI', 'name' => 'Finland'), array('id' => 'FR', 'name' => 'France'), array('id' => 'GF', 'name' => 'French Guiana'), array('id' => 'PF', 'name' => 'French Polynesia'), array('id' => 'TF', 'name' => 'French Southern Territories'), array('id' => 'MK', 'name' => 'Fyrom'), array('id' => 'GA', 'name' => 'Gabon'), array('id' => 'GM', 'name' => 'Gambia'), array('id' => 'GE', 'name' => 'Georgia'), array('id' => 'DE', 'name' => 'Germany'), array('id' => 'GH', 'name' => 'Ghana'), array('id' => 'GI', 'name' => 'Gibraltar'), array('id' => 'GR', 'name' => 'Greece'), array('id' => 'GL', 'name' => 'Greenland'), array('id' => 'GD', 'name' => 'Grenada'), array('id' => 'GP', 'name' => 'Guadeloupe'), array('id' => 'GU', 'name' => 'Guam'), array('id' => 'GT', 'name' => 'Guatemala'), array('id' => 'GG', 'name' => 'Guernsey'), array('id' => 'GN', 'name' => 'Guinea'), array('id' => 'GW', 'name' => 'Guinea-Bissau'), array('id' => 'GY', 'name' => 'Guyana'), array('id' => 'HT', 'name' => 'Haiti'), array('id' => 'HM', 'name' => 'Heard Island & Mcdonald Islands'), array('id' => 'VA', 'name' => 'Holy See (Vatican City State)'), array('id' => 'HN', 'name' => 'Honduras'), array('id' => 'HK', 'name' => 'Hong Kong'), array('id' => 'HU', 'name' => 'Hungary'), array('id' => 'IS', 'name' => 'Iceland'), array('id' => 'IN', 'name' => 'India'), array('id' => 'ID', 'name' => 'Indonesia'), array('id' => 'IR', 'name' => 'Iran, Islamic Republic Of'), array('id' => 'IQ', 'name' => 'Iraq'), array('id' => 'IE', 'name' => 'Ireland'), array('id' => 'IM', 'name' => 'Isle Of Man'), array('id' => 'IL', 'name' => 'Israel'), array('id' => 'IT', 'name' => 'Italy'), array('id' => 'JM', 'name' => 'Jamaica'), array('id' => 'JP', 'name' => 'Japan'), array('id' => 'JE', 'name' => 'Jersey'), array('id' => 'JO', 'name' => 'Jordan'), array('id' => 'KZ', 'name' => 'Kazakhstan'), array('id' => 'KE', 'name' => 'Kenya'), array('id' => 'KI', 'name' => 'Kiribati'), array('id' => 'KR', 'name' => 'Korea'), array('id' => 'KW', 'name' => 'Kuwait'), array('id' => 'KG', 'name' => 'Kyrgyzstan'), array('id' => 'LA', 'name' => "Lao People's Democratic Republic"), array('id' => 'LV', 'name' => 'Latvia'), array('id' => 'LB', 'name' => 'Lebanon'), array('id' => 'LS', 'name' => 'Lesotho'), array('id' => 'LR', 'name' => 'Liberia'), array('id' => 'LY', 'name' => 'Libyan Arab Jamahiriya'), array('id' => 'LI', 'name' => 'Liechtenstein'), array('id' => 'LT', 'name' => 'Lithuania'), array('id' => 'LU', 'name' => 'Luxembourg'), array('id' => 'MO', 'name' => 'Macao'), array('id' => 'MG', 'name' => 'Madagascar'), array('id' => 'MW', 'name' => 'Malawi'), array('id' => 'MY', 'name' => 'Malaysia'), array('id' => 'MV', 'name' => 'Maldives'), array('id' => 'ML', 'name' => 'Mali'), array('id' => 'MT', 'name' => 'Malta'), array('id' => 'MH', 'name' => 'Marshall Islands'), array('id' => 'MQ', 'name' => 'Martinique'), array('id' => 'MR', 'name' => 'Mauritania'), array('id' => 'MU', 'name' => 'Mauritius'), array('id' => 'YT', 'name' => 'Mayotte'), array('id' => 'MX', 'name' => 'Mexico'), array('id' => 'FM', 'name' => 'Micronesia, Federated States Of'), array('id' => 'MD', 'name' => 'Moldova'), array('id' => 'MC', 'name' => 'Monaco'), array('id' => 'MN', 'name' => 'Mongolia'), array('id' => 'ME', 'name' => 'Montenegro'), array('id' => 'MS', 'name' => 'Montserrat'), array('id' => 'MA', 'name' => 'Morocco'), array('id' => 'MZ', 'name' => 'Mozambique'), array('id' => 'MM', 'name' => 'Myanmar'), array('id' => 'NA', 'name' => 'Namibia'), array('id' => 'NR', 'name' => 'Nauru'), array('id' => 'NP', 'name' => 'Nepal'), array('id' => 'NL', 'name' => 'Netherlands'), array('id' => 'AN', 'name' => 'Netherlands Antilles'), array('id' => 'NC', 'name' => 'New Caledonia'), array('id' => 'NZ', 'name' => 'New Zealand'), array('id' => 'NI', 'name' => 'Nicaragua'), array('id' => 'NE', 'name' => 'Niger'), array('id' => 'NG', 'name' => 'Nigeria'), array('id' => 'NU', 'name' => 'Niue'), array('id' => 'NF', 'name' => 'Norfolk Island'), array('id' => 'MP', 'name' => 'Northern Mariana Islands'), array('id' => 'NO', 'name' => 'Norway'), array('id' => 'OM', 'name' => 'Oman'), array('id' => 'PK', 'name' => 'Pakistan'), array('id' => 'PW', 'name' => 'Palau'), array('id' => 'PS', 'name' => 'Palestinian Territory, Occupied'), array('id' => 'PA', 'name' => 'Panama'), array('id' => 'PG', 'name' => 'Papua New Guinea'), array('id' => 'PY', 'name' => 'Paraguay'), array('id' => 'PE', 'name' => 'Peru'), array('id' => 'PH', 'name' => 'Philippines'), array('id' => 'PN', 'name' => 'Pitcairn'), array('id' => 'PL', 'name' => 'Poland'), array('id' => 'PT', 'name' => 'Portugal'), array('id' => 'PR', 'name' => 'Puerto Rico'), array('id' => 'QA', 'name' => 'Qatar'), array('id' => 'RE', 'name' => 'Reunion'), array('id' => 'RO', 'name' => 'Romania'), array('id' => 'RU', 'name' => 'Russian Federation'), array('id' => 'RW', 'name' => 'Rwanda'), array('id' => 'BL', 'name' => 'Saint Barthelemy'), array('id' => 'SH', 'name' => 'Saint Helena'), array('id' => 'KN', 'name' => 'Saint Kitts And Nevis'), array('id' => 'LC', 'name' => 'Saint Lucia'), array('id' => 'MF', 'name' => 'Saint Martin'), array('id' => 'PM', 'name' => 'Saint Pierre And Miquelon'), array('id' => 'VC', 'name' => 'Saint Vincent And Grenadines'), array('id' => 'WS', 'name' => 'Samoa'), array('id' => 'SM', 'name' => 'San Marino'), array('id' => 'ST', 'name' => 'Sao Tome And Principe'), array('id' => 'SA', 'name' => 'Saudi Arabia'), array('id' => 'SN', 'name' => 'Senegal'), array('id' => 'RS', 'name' => 'Serbia'), array('id' => 'SC', 'name' => 'Seychelles'), array('id' => 'SL', 'name' => 'Sierra Leone'), array('id' => 'SG', 'name' => 'Singapore'), array('id' => 'SK', 'name' => 'Slovakia'), array('id' => 'SI', 'name' => 'Slovenia'), array('id' => 'SB', 'name' => 'Solomon Islands'), array('id' => 'SO', 'name' => 'Somalia'), array('id' => 'ZA', 'name' => 'South Africa'), array('id' => 'GS', 'name' => 'South Georgia And Sandwich Isl.'), array('id' => 'ES', 'name' => 'Spain'), array('id' => 'LK', 'name' => 'Sri Lanka'), array('id' => 'SD', 'name' => 'Sudan'), array('id' => 'SR', 'name' => 'Suriname'), array('id' => 'SJ', 'name' => 'Svalbard And Jan Mayen'), array('id' => 'SZ', 'name' => 'Swaziland'), array('id' => 'SE', 'name' => 'Sweden'), array('id' => 'CH', 'name' => 'Switzerland'), array('id' => 'SY', 'name' => 'Syrian Arab Republic'), array('id' => 'TW', 'name' => 'Taiwan'), array('id' => 'TJ', 'name' => 'Tajikistan'), array('id' => 'TZ', 'name' => 'Tanzania'), array('id' => 'TH', 'name' => 'Thailand'), array('id' => 'TL', 'name' => 'Timor-Leste'), array('id' => 'TG', 'name' => 'Togo'), array('id' => 'TK', 'name' => 'Tokelau'), array('id' => 'TO', 'name' => 'Tonga'), array('id' => 'TT', 'name' => 'Trinidad And Tobago'), array('id' => 'TN', 'name' => 'Tunisia'), array('id' => 'TR', 'name' => 'Turkey'), array('id' => 'TM', 'name' => 'Turkmenistan'), array('id' => 'TC', 'name' => 'Turks And Caicos Islands'), array('id' => 'TV', 'name' => 'Tuvalu'), array('id' => 'UG', 'name' => 'Uganda'), array('id' => 'UA', 'name' => 'Ukraine'), array('id' => 'AE', 'name' => 'United Arab Emirates'), array('id' => 'GB', 'name' => 'United Kingdom'), array('id' => 'US', 'name' => 'United States'), array('id' => 'UM', 'name' => 'United States Outlying Islands'), array('id' => 'UY', 'name' => 'Uruguay'), array('id' => 'UZ', 'name' => 'Uzbekistan'), array('id' => 'VU', 'name' => 'Vanuatu'), array('id' => 'VE', 'name' => 'Venezuela'), array('id' => 'VN', 'name' => 'Viet Nam'), array('id' => 'VG', 'name' => 'Virgin Islands, British'), array('id' => 'VI', 'name' => 'Virgin Islands, U.S.'), array('id' => 'WF', 'name' => 'Wallis And Futuna'), array('id' => 'EH', 'name' => 'Western Sahara'), array('id' => 'YE', 'name' => 'Yemen'), array('id' => 'ZM', 'name' => 'Zambia'), array('id' => 'ZW', 'name' => 'Zimbabwe'));
+	/** Ordered list of `['id' => code, 'name' => label]` rows (blocking dropdown; "Off" first). */
+	private const COUNTRIES = [['id' => '', 'name' => 'Off'], ['id' => 'A1', 'name' => 'Anonymous Proxy'], ['id' => 'A2', 'name' => 'Satellite Provider'], ['id' => 'O1', 'name' => 'Other Country'], ['id' => 'AF', 'name' => 'Afghanistan'], ['id' => 'AX', 'name' => 'Aland Islands'], ['id' => 'AL', 'name' => 'Albania'], ['id' => 'DZ', 'name' => 'Algeria'], ['id' => 'AS', 'name' => 'American Samoa'], ['id' => 'AD', 'name' => 'Andorra'], ['id' => 'AO', 'name' => 'Angola'], ['id' => 'AI', 'name' => 'Anguilla'], ['id' => 'AQ', 'name' => 'Antarctica'], ['id' => 'AG', 'name' => 'Antigua And Barbuda'], ['id' => 'AR', 'name' => 'Argentina'], ['id' => 'AM', 'name' => 'Armenia'], ['id' => 'AW', 'name' => 'Aruba'], ['id' => 'AU', 'name' => 'Australia'], ['id' => 'AT', 'name' => 'Austria'], ['id' => 'AZ', 'name' => 'Azerbaijan'], ['id' => 'BS', 'name' => 'Bahamas'], ['id' => 'BH', 'name' => 'Bahrain'], ['id' => 'BD', 'name' => 'Bangladesh'], ['id' => 'BB', 'name' => 'Barbados'], ['id' => 'BY', 'name' => 'Belarus'], ['id' => 'BE', 'name' => 'Belgium'], ['id' => 'BZ', 'name' => 'Belize'], ['id' => 'BJ', 'name' => 'Benin'], ['id' => 'BM', 'name' => 'Bermuda'], ['id' => 'BT', 'name' => 'Bhutan'], ['id' => 'BO', 'name' => 'Bolivia'], ['id' => 'BA', 'name' => 'Bosnia And Herzegovina'], ['id' => 'BW', 'name' => 'Botswana'], ['id' => 'BV', 'name' => 'Bouvet Island'], ['id' => 'BR', 'name' => 'Brazil'], ['id' => 'IO', 'name' => 'British Indian Ocean Territory'], ['id' => 'BN', 'name' => 'Brunei Darussalam'], ['id' => 'BG', 'name' => 'Bulgaria'], ['id' => 'BF', 'name' => 'Burkina Faso'], ['id' => 'BI', 'name' => 'Burundi'], ['id' => 'KH', 'name' => 'Cambodia'], ['id' => 'CM', 'name' => 'Cameroon'], ['id' => 'CA', 'name' => 'Canada'], ['id' => 'CV', 'name' => 'Cape Verde'], ['id' => 'KY', 'name' => 'Cayman Islands'], ['id' => 'CF', 'name' => 'Central African Republic'], ['id' => 'TD', 'name' => 'Chad'], ['id' => 'CL', 'name' => 'Chile'], ['id' => 'CN', 'name' => 'China'], ['id' => 'CX', 'name' => 'Christmas Island'], ['id' => 'CC', 'name' => 'Cocos (Keeling) Islands'], ['id' => 'CO', 'name' => 'Colombia'], ['id' => 'KM', 'name' => 'Comoros'], ['id' => 'CG', 'name' => 'Congo'], ['id' => 'CD', 'name' => 'Congo, Democratic Republic'], ['id' => 'CK', 'name' => 'Cook Islands'], ['id' => 'CR', 'name' => 'Costa Rica'], ['id' => 'CI', 'name' => "Cote D'Ivoire"], ['id' => 'HR', 'name' => 'Croatia'], ['id' => 'CU', 'name' => 'Cuba'], ['id' => 'CY', 'name' => 'Cyprus'], ['id' => 'CZ', 'name' => 'Czech Republic'], ['id' => 'DK', 'name' => 'Denmark'], ['id' => 'DJ', 'name' => 'Djibouti'], ['id' => 'DM', 'name' => 'Dominica'], ['id' => 'DO', 'name' => 'Dominican Republic'], ['id' => 'EC', 'name' => 'Ecuador'], ['id' => 'EG', 'name' => 'Egypt'], ['id' => 'SV', 'name' => 'El Salvador'], ['id' => 'GQ', 'name' => 'Equatorial Guinea'], ['id' => 'ER', 'name' => 'Eritrea'], ['id' => 'EE', 'name' => 'Estonia'], ['id' => 'ET', 'name' => 'Ethiopia'], ['id' => 'FK', 'name' => 'Falkland Islands (Malvinas)'], ['id' => 'FO', 'name' => 'Faroe Islands'], ['id' => 'FJ', 'name' => 'Fiji'], ['id' => 'FI', 'name' => 'Finland'], ['id' => 'FR', 'name' => 'France'], ['id' => 'GF', 'name' => 'French Guiana'], ['id' => 'PF', 'name' => 'French Polynesia'], ['id' => 'TF', 'name' => 'French Southern Territories'], ['id' => 'MK', 'name' => 'Fyrom'], ['id' => 'GA', 'name' => 'Gabon'], ['id' => 'GM', 'name' => 'Gambia'], ['id' => 'GE', 'name' => 'Georgia'], ['id' => 'DE', 'name' => 'Germany'], ['id' => 'GH', 'name' => 'Ghana'], ['id' => 'GI', 'name' => 'Gibraltar'], ['id' => 'GR', 'name' => 'Greece'], ['id' => 'GL', 'name' => 'Greenland'], ['id' => 'GD', 'name' => 'Grenada'], ['id' => 'GP', 'name' => 'Guadeloupe'], ['id' => 'GU', 'name' => 'Guam'], ['id' => 'GT', 'name' => 'Guatemala'], ['id' => 'GG', 'name' => 'Guernsey'], ['id' => 'GN', 'name' => 'Guinea'], ['id' => 'GW', 'name' => 'Guinea-Bissau'], ['id' => 'GY', 'name' => 'Guyana'], ['id' => 'HT', 'name' => 'Haiti'], ['id' => 'HM', 'name' => 'Heard Island & Mcdonald Islands'], ['id' => 'VA', 'name' => 'Holy See (Vatican City State)'], ['id' => 'HN', 'name' => 'Honduras'], ['id' => 'HK', 'name' => 'Hong Kong'], ['id' => 'HU', 'name' => 'Hungary'], ['id' => 'IS', 'name' => 'Iceland'], ['id' => 'IN', 'name' => 'India'], ['id' => 'ID', 'name' => 'Indonesia'], ['id' => 'IR', 'name' => 'Iran, Islamic Republic Of'], ['id' => 'IQ', 'name' => 'Iraq'], ['id' => 'IE', 'name' => 'Ireland'], ['id' => 'IM', 'name' => 'Isle Of Man'], ['id' => 'IL', 'name' => 'Israel'], ['id' => 'IT', 'name' => 'Italy'], ['id' => 'JM', 'name' => 'Jamaica'], ['id' => 'JP', 'name' => 'Japan'], ['id' => 'JE', 'name' => 'Jersey'], ['id' => 'JO', 'name' => 'Jordan'], ['id' => 'KZ', 'name' => 'Kazakhstan'], ['id' => 'KE', 'name' => 'Kenya'], ['id' => 'KI', 'name' => 'Kiribati'], ['id' => 'KR', 'name' => 'Korea'], ['id' => 'KW', 'name' => 'Kuwait'], ['id' => 'KG', 'name' => 'Kyrgyzstan'], ['id' => 'LA', 'name' => "Lao People's Democratic Republic"], ['id' => 'LV', 'name' => 'Latvia'], ['id' => 'LB', 'name' => 'Lebanon'], ['id' => 'LS', 'name' => 'Lesotho'], ['id' => 'LR', 'name' => 'Liberia'], ['id' => 'LY', 'name' => 'Libyan Arab Jamahiriya'], ['id' => 'LI', 'name' => 'Liechtenstein'], ['id' => 'LT', 'name' => 'Lithuania'], ['id' => 'LU', 'name' => 'Luxembourg'], ['id' => 'MO', 'name' => 'Macao'], ['id' => 'MG', 'name' => 'Madagascar'], ['id' => 'MW', 'name' => 'Malawi'], ['id' => 'MY', 'name' => 'Malaysia'], ['id' => 'MV', 'name' => 'Maldives'], ['id' => 'ML', 'name' => 'Mali'], ['id' => 'MT', 'name' => 'Malta'], ['id' => 'MH', 'name' => 'Marshall Islands'], ['id' => 'MQ', 'name' => 'Martinique'], ['id' => 'MR', 'name' => 'Mauritania'], ['id' => 'MU', 'name' => 'Mauritius'], ['id' => 'YT', 'name' => 'Mayotte'], ['id' => 'MX', 'name' => 'Mexico'], ['id' => 'FM', 'name' => 'Micronesia, Federated States Of'], ['id' => 'MD', 'name' => 'Moldova'], ['id' => 'MC', 'name' => 'Monaco'], ['id' => 'MN', 'name' => 'Mongolia'], ['id' => 'ME', 'name' => 'Montenegro'], ['id' => 'MS', 'name' => 'Montserrat'], ['id' => 'MA', 'name' => 'Morocco'], ['id' => 'MZ', 'name' => 'Mozambique'], ['id' => 'MM', 'name' => 'Myanmar'], ['id' => 'NA', 'name' => 'Namibia'], ['id' => 'NR', 'name' => 'Nauru'], ['id' => 'NP', 'name' => 'Nepal'], ['id' => 'NL', 'name' => 'Netherlands'], ['id' => 'AN', 'name' => 'Netherlands Antilles'], ['id' => 'NC', 'name' => 'New Caledonia'], ['id' => 'NZ', 'name' => 'New Zealand'], ['id' => 'NI', 'name' => 'Nicaragua'], ['id' => 'NE', 'name' => 'Niger'], ['id' => 'NG', 'name' => 'Nigeria'], ['id' => 'NU', 'name' => 'Niue'], ['id' => 'NF', 'name' => 'Norfolk Island'], ['id' => 'MP', 'name' => 'Northern Mariana Islands'], ['id' => 'NO', 'name' => 'Norway'], ['id' => 'OM', 'name' => 'Oman'], ['id' => 'PK', 'name' => 'Pakistan'], ['id' => 'PW', 'name' => 'Palau'], ['id' => 'PS', 'name' => 'Palestinian Territory, Occupied'], ['id' => 'PA', 'name' => 'Panama'], ['id' => 'PG', 'name' => 'Papua New Guinea'], ['id' => 'PY', 'name' => 'Paraguay'], ['id' => 'PE', 'name' => 'Peru'], ['id' => 'PH', 'name' => 'Philippines'], ['id' => 'PN', 'name' => 'Pitcairn'], ['id' => 'PL', 'name' => 'Poland'], ['id' => 'PT', 'name' => 'Portugal'], ['id' => 'PR', 'name' => 'Puerto Rico'], ['id' => 'QA', 'name' => 'Qatar'], ['id' => 'RE', 'name' => 'Reunion'], ['id' => 'RO', 'name' => 'Romania'], ['id' => 'RU', 'name' => 'Russian Federation'], ['id' => 'RW', 'name' => 'Rwanda'], ['id' => 'BL', 'name' => 'Saint Barthelemy'], ['id' => 'SH', 'name' => 'Saint Helena'], ['id' => 'KN', 'name' => 'Saint Kitts And Nevis'], ['id' => 'LC', 'name' => 'Saint Lucia'], ['id' => 'MF', 'name' => 'Saint Martin'], ['id' => 'PM', 'name' => 'Saint Pierre And Miquelon'], ['id' => 'VC', 'name' => 'Saint Vincent And Grenadines'], ['id' => 'WS', 'name' => 'Samoa'], ['id' => 'SM', 'name' => 'San Marino'], ['id' => 'ST', 'name' => 'Sao Tome And Principe'], ['id' => 'SA', 'name' => 'Saudi Arabia'], ['id' => 'SN', 'name' => 'Senegal'], ['id' => 'RS', 'name' => 'Serbia'], ['id' => 'SC', 'name' => 'Seychelles'], ['id' => 'SL', 'name' => 'Sierra Leone'], ['id' => 'SG', 'name' => 'Singapore'], ['id' => 'SK', 'name' => 'Slovakia'], ['id' => 'SI', 'name' => 'Slovenia'], ['id' => 'SB', 'name' => 'Solomon Islands'], ['id' => 'SO', 'name' => 'Somalia'], ['id' => 'ZA', 'name' => 'South Africa'], ['id' => 'GS', 'name' => 'South Georgia And Sandwich Isl.'], ['id' => 'ES', 'name' => 'Spain'], ['id' => 'LK', 'name' => 'Sri Lanka'], ['id' => 'SD', 'name' => 'Sudan'], ['id' => 'SR', 'name' => 'Suriname'], ['id' => 'SJ', 'name' => 'Svalbard And Jan Mayen'], ['id' => 'SZ', 'name' => 'Swaziland'], ['id' => 'SE', 'name' => 'Sweden'], ['id' => 'CH', 'name' => 'Switzerland'], ['id' => 'SY', 'name' => 'Syrian Arab Republic'], ['id' => 'TW', 'name' => 'Taiwan'], ['id' => 'TJ', 'name' => 'Tajikistan'], ['id' => 'TZ', 'name' => 'Tanzania'], ['id' => 'TH', 'name' => 'Thailand'], ['id' => 'TL', 'name' => 'Timor-Leste'], ['id' => 'TG', 'name' => 'Togo'], ['id' => 'TK', 'name' => 'Tokelau'], ['id' => 'TO', 'name' => 'Tonga'], ['id' => 'TT', 'name' => 'Trinidad And Tobago'], ['id' => 'TN', 'name' => 'Tunisia'], ['id' => 'TR', 'name' => 'Turkey'], ['id' => 'TM', 'name' => 'Turkmenistan'], ['id' => 'TC', 'name' => 'Turks And Caicos Islands'], ['id' => 'TV', 'name' => 'Tuvalu'], ['id' => 'UG', 'name' => 'Uganda'], ['id' => 'UA', 'name' => 'Ukraine'], ['id' => 'AE', 'name' => 'United Arab Emirates'], ['id' => 'GB', 'name' => 'United Kingdom'], ['id' => 'US', 'name' => 'United States'], ['id' => 'UM', 'name' => 'United States Outlying Islands'], ['id' => 'UY', 'name' => 'Uruguay'], ['id' => 'UZ', 'name' => 'Uzbekistan'], ['id' => 'VU', 'name' => 'Vanuatu'], ['id' => 'VE', 'name' => 'Venezuela'], ['id' => 'VN', 'name' => 'Viet Nam'], ['id' => 'VG', 'name' => 'Virgin Islands, British'], ['id' => 'VI', 'name' => 'Virgin Islands, U.S.'], ['id' => 'WF', 'name' => 'Wallis And Futuna'], ['id' => 'EH', 'name' => 'Western Sahara'], ['id' => 'YE', 'name' => 'Yemen'], ['id' => 'ZM', 'name' => 'Zambia'], ['id' => 'ZW', 'name' => 'Zimbabwe']];
 
-    /** GeoIP filter code => country name ("All Countries" + special buckets first). */
-    private const GEO_COUNTRIES = array('ALL' => 'All Countries', 'A1' => 'Anonymous Proxy', 'A2' => 'Satellite Provider', 'O1' => 'Other Country', 'AF' => 'Afghanistan', 'AX' => 'Aland Islands', 'AL' => 'Albania', 'DZ' => 'Algeria', 'AS' => 'American Samoa', 'AD' => 'Andorra', 'AO' => 'Angola', 'AI' => 'Anguilla', 'AQ' => 'Antarctica', 'AG' => 'Antigua And Barbuda', 'AR' => 'Argentina', 'AM' => 'Armenia', 'AW' => 'Aruba', 'AU' => 'Australia', 'AT' => 'Austria', 'AZ' => 'Azerbaijan', 'BS' => 'Bahamas', 'BH' => 'Bahrain', 'BD' => 'Bangladesh', 'BB' => 'Barbados', 'BY' => 'Belarus', 'BE' => 'Belgium', 'BZ' => 'Belize', 'BJ' => 'Benin', 'BM' => 'Bermuda', 'BT' => 'Bhutan', 'BO' => 'Bolivia', 'BA' => 'Bosnia And Herzegovina', 'BW' => 'Botswana', 'BV' => 'Bouvet Island', 'BR' => 'Brazil', 'IO' => 'British Indian Ocean Territory', 'BN' => 'Brunei Darussalam', 'BG' => 'Bulgaria', 'BF' => 'Burkina Faso', 'BI' => 'Burundi', 'KH' => 'Cambodia', 'CM' => 'Cameroon', 'CA' => 'Canada', 'CV' => 'Cape Verde', 'KY' => 'Cayman Islands', 'CF' => 'Central African Republic', 'TD' => 'Chad', 'CL' => 'Chile', 'CN' => 'China', 'CX' => 'Christmas Island', 'CC' => 'Cocos (Keeling) Islands', 'CO' => 'Colombia', 'KM' => 'Comoros', 'CG' => 'Congo', 'CD' => 'Congo, Democratic Republic', 'CK' => 'Cook Islands', 'CR' => 'Costa Rica', 'CI' => "Cote D'Ivoire", 'HR' => 'Croatia', 'CU' => 'Cuba', 'CY' => 'Cyprus', 'CZ' => 'Czech Republic', 'DK' => 'Denmark', 'DJ' => 'Djibouti', 'DM' => 'Dominica', 'DO' => 'Dominican Republic', 'EC' => 'Ecuador', 'EG' => 'Egypt', 'SV' => 'El Salvador', 'GQ' => 'Equatorial Guinea', 'ER' => 'Eritrea', 'EE' => 'Estonia', 'ET' => 'Ethiopia', 'FK' => 'Falkland Islands (Malvinas)', 'FO' => 'Faroe Islands', 'FJ' => 'Fiji', 'FI' => 'Finland', 'FR' => 'France', 'GF' => 'French Guiana', 'PF' => 'French Polynesia', 'TF' => 'French Southern Territories', 'MK' => 'Fyrom', 'GA' => 'Gabon', 'GM' => 'Gambia', 'GE' => 'Georgia', 'DE' => 'Germany', 'GH' => 'Ghana', 'GI' => 'Gibraltar', 'GR' => 'Greece', 'GL' => 'Greenland', 'GD' => 'Grenada', 'GP' => 'Guadeloupe', 'GU' => 'Guam', 'GT' => 'Guatemala', 'GG' => 'Guernsey', 'GN' => 'Guinea', 'GW' => 'Guinea-Bissau', 'GY' => 'Guyana', 'HT' => 'Haiti', 'HM' => 'Heard Island & Mcdonald Islands', 'VA' => 'Holy See (Vatican City State)', 'HN' => 'Honduras', 'HK' => 'Hong Kong', 'HU' => 'Hungary', 'IS' => 'Iceland', 'IN' => 'India', 'ID' => 'Indonesia', 'IR' => 'Iran, Islamic Republic Of', 'IQ' => 'Iraq', 'IE' => 'Ireland', 'IM' => 'Isle Of Man', 'IL' => 'Israel', 'IT' => 'Italy', 'JM' => 'Jamaica', 'JP' => 'Japan', 'JE' => 'Jersey', 'JO' => 'Jordan', 'KZ' => 'Kazakhstan', 'KE' => 'Kenya', 'KI' => 'Kiribati', 'KR' => 'Korea', 'KW' => 'Kuwait', 'KG' => 'Kyrgyzstan', 'LA' => "Lao People's Democratic Republic", 'LV' => 'Latvia', 'LB' => 'Lebanon', 'LS' => 'Lesotho', 'LR' => 'Liberia', 'LY' => 'Libyan Arab Jamahiriya', 'LI' => 'Liechtenstein', 'LT' => 'Lithuania', 'LU' => 'Luxembourg', 'MO' => 'Macao', 'MG' => 'Madagascar', 'MW' => 'Malawi', 'MY' => 'Malaysia', 'MV' => 'Maldives', 'ML' => 'Mali', 'MT' => 'Malta', 'MH' => 'Marshall Islands', 'MQ' => 'Martinique', 'MR' => 'Mauritania', 'MU' => 'Mauritius', 'YT' => 'Mayotte', 'MX' => 'Mexico', 'FM' => 'Micronesia, Federated States Of', 'MD' => 'Moldova', 'MC' => 'Monaco', 'MN' => 'Mongolia', 'ME' => 'Montenegro', 'MS' => 'Montserrat', 'MA' => 'Morocco', 'MZ' => 'Mozambique', 'MM' => 'Myanmar', 'NA' => 'Namibia', 'NR' => 'Nauru', 'NP' => 'Nepal', 'NL' => 'Netherlands', 'AN' => 'Netherlands Antilles', 'NC' => 'New Caledonia', 'NZ' => 'New Zealand', 'NI' => 'Nicaragua', 'NE' => 'Niger', 'NG' => 'Nigeria', 'NU' => 'Niue', 'NF' => 'Norfolk Island', 'MP' => 'Northern Mariana Islands', 'NO' => 'Norway', 'OM' => 'Oman', 'PK' => 'Pakistan', 'PW' => 'Palau', 'PS' => 'Palestinian Territory, Occupied', 'PA' => 'Panama', 'PG' => 'Papua New Guinea', 'PY' => 'Paraguay', 'PE' => 'Peru', 'PH' => 'Philippines', 'PN' => 'Pitcairn', 'PL' => 'Poland', 'PT' => 'Portugal', 'PR' => 'Puerto Rico', 'QA' => 'Qatar', 'RE' => 'Reunion', 'RO' => 'Romania', 'RU' => 'Russian Federation', 'RW' => 'Rwanda', 'BL' => 'Saint Barthelemy', 'SH' => 'Saint Helena', 'KN' => 'Saint Kitts And Nevis', 'LC' => 'Saint Lucia', 'MF' => 'Saint Martin', 'PM' => 'Saint Pierre And Miquelon', 'VC' => 'Saint Vincent And Grenadines', 'WS' => 'Samoa', 'SM' => 'San Marino', 'ST' => 'Sao Tome And Principe', 'SA' => 'Saudi Arabia', 'SN' => 'Senegal', 'RS' => 'Serbia', 'SC' => 'Seychelles', 'SL' => 'Sierra Leone', 'SG' => 'Singapore', 'SK' => 'Slovakia', 'SI' => 'Slovenia', 'SB' => 'Solomon Islands', 'SO' => 'Somalia', 'ZA' => 'South Africa', 'GS' => 'South Georgia And Sandwich Isl.', 'ES' => 'Spain', 'LK' => 'Sri Lanka', 'SD' => 'Sudan', 'SR' => 'Suriname', 'SJ' => 'Svalbard And Jan Mayen', 'SZ' => 'Swaziland', 'SE' => 'Sweden', 'CH' => 'Switzerland', 'SY' => 'Syrian Arab Republic', 'TW' => 'Taiwan', 'TJ' => 'Tajikistan', 'TZ' => 'Tanzania', 'TH' => 'Thailand', 'TL' => 'Timor-Leste', 'TG' => 'Togo', 'TK' => 'Tokelau', 'TO' => 'Tonga', 'TT' => 'Trinidad And Tobago', 'TN' => 'Tunisia', 'TR' => 'Turkey', 'TM' => 'Turkmenistan', 'TC' => 'Turks And Caicos Islands', 'TV' => 'Tuvalu', 'UG' => 'Uganda', 'UA' => 'Ukraine', 'AE' => 'United Arab Emirates', 'GB' => 'United Kingdom', 'US' => 'United States', 'UM' => 'United States Outlying Islands', 'UY' => 'Uruguay', 'UZ' => 'Uzbekistan', 'VU' => 'Vanuatu', 'VE' => 'Venezuela', 'VN' => 'Viet Nam', 'VG' => 'Virgin Islands, British', 'VI' => 'Virgin Islands, U.S.', 'WF' => 'Wallis And Futuna', 'EH' => 'Western Sahara', 'YE' => 'Yemen', 'ZM' => 'Zambia', 'ZW' => 'Zimbabwe');
+	/** GeoIP filter code => country name ("All Countries" + special buckets first). */
+	private const GEO_COUNTRIES = ['ALL' => 'All Countries', 'A1' => 'Anonymous Proxy', 'A2' => 'Satellite Provider', 'O1' => 'Other Country', 'AF' => 'Afghanistan', 'AX' => 'Aland Islands', 'AL' => 'Albania', 'DZ' => 'Algeria', 'AS' => 'American Samoa', 'AD' => 'Andorra', 'AO' => 'Angola', 'AI' => 'Anguilla', 'AQ' => 'Antarctica', 'AG' => 'Antigua And Barbuda', 'AR' => 'Argentina', 'AM' => 'Armenia', 'AW' => 'Aruba', 'AU' => 'Australia', 'AT' => 'Austria', 'AZ' => 'Azerbaijan', 'BS' => 'Bahamas', 'BH' => 'Bahrain', 'BD' => 'Bangladesh', 'BB' => 'Barbados', 'BY' => 'Belarus', 'BE' => 'Belgium', 'BZ' => 'Belize', 'BJ' => 'Benin', 'BM' => 'Bermuda', 'BT' => 'Bhutan', 'BO' => 'Bolivia', 'BA' => 'Bosnia And Herzegovina', 'BW' => 'Botswana', 'BV' => 'Bouvet Island', 'BR' => 'Brazil', 'IO' => 'British Indian Ocean Territory', 'BN' => 'Brunei Darussalam', 'BG' => 'Bulgaria', 'BF' => 'Burkina Faso', 'BI' => 'Burundi', 'KH' => 'Cambodia', 'CM' => 'Cameroon', 'CA' => 'Canada', 'CV' => 'Cape Verde', 'KY' => 'Cayman Islands', 'CF' => 'Central African Republic', 'TD' => 'Chad', 'CL' => 'Chile', 'CN' => 'China', 'CX' => 'Christmas Island', 'CC' => 'Cocos (Keeling) Islands', 'CO' => 'Colombia', 'KM' => 'Comoros', 'CG' => 'Congo', 'CD' => 'Congo, Democratic Republic', 'CK' => 'Cook Islands', 'CR' => 'Costa Rica', 'CI' => "Cote D'Ivoire", 'HR' => 'Croatia', 'CU' => 'Cuba', 'CY' => 'Cyprus', 'CZ' => 'Czech Republic', 'DK' => 'Denmark', 'DJ' => 'Djibouti', 'DM' => 'Dominica', 'DO' => 'Dominican Republic', 'EC' => 'Ecuador', 'EG' => 'Egypt', 'SV' => 'El Salvador', 'GQ' => 'Equatorial Guinea', 'ER' => 'Eritrea', 'EE' => 'Estonia', 'ET' => 'Ethiopia', 'FK' => 'Falkland Islands (Malvinas)', 'FO' => 'Faroe Islands', 'FJ' => 'Fiji', 'FI' => 'Finland', 'FR' => 'France', 'GF' => 'French Guiana', 'PF' => 'French Polynesia', 'TF' => 'French Southern Territories', 'MK' => 'Fyrom', 'GA' => 'Gabon', 'GM' => 'Gambia', 'GE' => 'Georgia', 'DE' => 'Germany', 'GH' => 'Ghana', 'GI' => 'Gibraltar', 'GR' => 'Greece', 'GL' => 'Greenland', 'GD' => 'Grenada', 'GP' => 'Guadeloupe', 'GU' => 'Guam', 'GT' => 'Guatemala', 'GG' => 'Guernsey', 'GN' => 'Guinea', 'GW' => 'Guinea-Bissau', 'GY' => 'Guyana', 'HT' => 'Haiti', 'HM' => 'Heard Island & Mcdonald Islands', 'VA' => 'Holy See (Vatican City State)', 'HN' => 'Honduras', 'HK' => 'Hong Kong', 'HU' => 'Hungary', 'IS' => 'Iceland', 'IN' => 'India', 'ID' => 'Indonesia', 'IR' => 'Iran, Islamic Republic Of', 'IQ' => 'Iraq', 'IE' => 'Ireland', 'IM' => 'Isle Of Man', 'IL' => 'Israel', 'IT' => 'Italy', 'JM' => 'Jamaica', 'JP' => 'Japan', 'JE' => 'Jersey', 'JO' => 'Jordan', 'KZ' => 'Kazakhstan', 'KE' => 'Kenya', 'KI' => 'Kiribati', 'KR' => 'Korea', 'KW' => 'Kuwait', 'KG' => 'Kyrgyzstan', 'LA' => "Lao People's Democratic Republic", 'LV' => 'Latvia', 'LB' => 'Lebanon', 'LS' => 'Lesotho', 'LR' => 'Liberia', 'LY' => 'Libyan Arab Jamahiriya', 'LI' => 'Liechtenstein', 'LT' => 'Lithuania', 'LU' => 'Luxembourg', 'MO' => 'Macao', 'MG' => 'Madagascar', 'MW' => 'Malawi', 'MY' => 'Malaysia', 'MV' => 'Maldives', 'ML' => 'Mali', 'MT' => 'Malta', 'MH' => 'Marshall Islands', 'MQ' => 'Martinique', 'MR' => 'Mauritania', 'MU' => 'Mauritius', 'YT' => 'Mayotte', 'MX' => 'Mexico', 'FM' => 'Micronesia, Federated States Of', 'MD' => 'Moldova', 'MC' => 'Monaco', 'MN' => 'Mongolia', 'ME' => 'Montenegro', 'MS' => 'Montserrat', 'MA' => 'Morocco', 'MZ' => 'Mozambique', 'MM' => 'Myanmar', 'NA' => 'Namibia', 'NR' => 'Nauru', 'NP' => 'Nepal', 'NL' => 'Netherlands', 'AN' => 'Netherlands Antilles', 'NC' => 'New Caledonia', 'NZ' => 'New Zealand', 'NI' => 'Nicaragua', 'NE' => 'Niger', 'NG' => 'Nigeria', 'NU' => 'Niue', 'NF' => 'Norfolk Island', 'MP' => 'Northern Mariana Islands', 'NO' => 'Norway', 'OM' => 'Oman', 'PK' => 'Pakistan', 'PW' => 'Palau', 'PS' => 'Palestinian Territory, Occupied', 'PA' => 'Panama', 'PG' => 'Papua New Guinea', 'PY' => 'Paraguay', 'PE' => 'Peru', 'PH' => 'Philippines', 'PN' => 'Pitcairn', 'PL' => 'Poland', 'PT' => 'Portugal', 'PR' => 'Puerto Rico', 'QA' => 'Qatar', 'RE' => 'Reunion', 'RO' => 'Romania', 'RU' => 'Russian Federation', 'RW' => 'Rwanda', 'BL' => 'Saint Barthelemy', 'SH' => 'Saint Helena', 'KN' => 'Saint Kitts And Nevis', 'LC' => 'Saint Lucia', 'MF' => 'Saint Martin', 'PM' => 'Saint Pierre And Miquelon', 'VC' => 'Saint Vincent And Grenadines', 'WS' => 'Samoa', 'SM' => 'San Marino', 'ST' => 'Sao Tome And Principe', 'SA' => 'Saudi Arabia', 'SN' => 'Senegal', 'RS' => 'Serbia', 'SC' => 'Seychelles', 'SL' => 'Sierra Leone', 'SG' => 'Singapore', 'SK' => 'Slovakia', 'SI' => 'Slovenia', 'SB' => 'Solomon Islands', 'SO' => 'Somalia', 'ZA' => 'South Africa', 'GS' => 'South Georgia And Sandwich Isl.', 'ES' => 'Spain', 'LK' => 'Sri Lanka', 'SD' => 'Sudan', 'SR' => 'Suriname', 'SJ' => 'Svalbard And Jan Mayen', 'SZ' => 'Swaziland', 'SE' => 'Sweden', 'CH' => 'Switzerland', 'SY' => 'Syrian Arab Republic', 'TW' => 'Taiwan', 'TJ' => 'Tajikistan', 'TZ' => 'Tanzania', 'TH' => 'Thailand', 'TL' => 'Timor-Leste', 'TG' => 'Togo', 'TK' => 'Tokelau', 'TO' => 'Tonga', 'TT' => 'Trinidad And Tobago', 'TN' => 'Tunisia', 'TR' => 'Turkey', 'TM' => 'Turkmenistan', 'TC' => 'Turks And Caicos Islands', 'TV' => 'Tuvalu', 'UG' => 'Uganda', 'UA' => 'Ukraine', 'AE' => 'United Arab Emirates', 'GB' => 'United Kingdom', 'US' => 'United States', 'UM' => 'United States Outlying Islands', 'UY' => 'Uruguay', 'UZ' => 'Uzbekistan', 'VU' => 'Vanuatu', 'VE' => 'Venezuela', 'VN' => 'Viet Nam', 'VG' => 'Virgin Islands, British', 'VI' => 'Virgin Islands, U.S.', 'WF' => 'Wallis And Futuna', 'EH' => 'Western Sahara', 'YE' => 'Yemen', 'ZM' => 'Zambia', 'ZW' => 'Zimbabwe'];
 
-    /**
-     * ISO 3166-1 alpha-2 code => official country name.
-     *
-     * @return array<string, string>
-     */
-    public static function countryCodes(): array {
-        return self::COUNTRY_CODES;
-    }
+	/**
+	 * ISO 3166-1 alpha-2 code => official country name.
+	 *
+	 * @return array<string, string>
+	 */
+	public static function countryCodes(): array {
+		return self::COUNTRY_CODES;
+	}
 
-    /**
-     * Ordered list of `['id' => code, 'name' => label]` rows for the
-     * country blocking dropdown (leading "Off" + special buckets).
-     *
-     * @return array<int, array{id: string, name: string}>
-     */
-    public static function countries(): array {
-        return self::COUNTRIES;
-    }
+	/**
+	 * Ordered list of `['id' => code, 'name' => label]` rows for the
+	 * country blocking dropdown (leading "Off" + special buckets).
+	 *
+	 * @return array<int, array{id: string, name: string}>
+	 */
+	public static function countries(): array {
+		return self::COUNTRIES;
+	}
 
-    /**
-     * GeoIP filter code => country name (leading "All Countries" bucket).
-     *
-     * @return array<string, string>
-     */
-    public static function geoCountries(): array {
-        return self::GEO_COUNTRIES;
-    }
+	/**
+	 * GeoIP filter code => country name (leading "All Countries" bucket).
+	 *
+	 * @return array<string, string>
+	 */
+	public static function geoCountries(): array {
+		return self::GEO_COUNTRIES;
+	}
 }
diff --git a/src/Core/Reference/LocaleReference.php b/src/Core/Reference/LocaleReference.php
index 6d85ce8a..45e99d1e 100644
--- a/src/Core/Reference/LocaleReference.php
+++ b/src/Core/Reference/LocaleReference.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Reference;
 
@@ -17,16 +16,16 @@ namespace XcVm\Core\Reference;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class LocaleReference {
-    /** ISO 639-1 language code => display name (leading "Default - EN"). */
-    private const TMDB_LANGUAGES = array('' => 'Default - EN', 'aa' => 'Afar', 'af' => 'Afrikaans', 'ak' => 'Akan', 'an' => 'Aragonese', 'as' => 'Assamese', 'av' => 'Avaric', 'ae' => 'Avestan', 'ay' => 'Aymara', 'az' => 'Azerbaijani', 'ba' => 'Bashkir', 'bm' => 'Bambara', 'bi' => 'Bislama', 'bo' => 'Tibetan', 'br' => 'Breton', 'ca' => 'Catalan', 'cs' => 'Czech', 'ce' => 'Chechen', 'cu' => 'Slavic', 'cv' => 'Chuvash', 'kw' => 'Cornish', 'co' => 'Corsican', 'cr' => 'Cree', 'cy' => 'Welsh', 'da' => 'Danish', 'de' => 'German', 'dv' => 'Divehi', 'dz' => 'Dzongkha', 'eo' => 'Esperanto', 'et' => 'Estonian', 'eu' => 'Basque', 'fo' => 'Faroese', 'fj' => 'Fijian', 'fi' => 'Finnish', 'fr' => 'French', 'fy' => 'Frisian', 'ff' => 'Fulah', 'gd' => 'Gaelic', 'ga' => 'Irish', 'gl' => 'Galician', 'gv' => 'Manx', 'gn' => 'Guarani', 'gu' => 'Gujarati', 'ht' => 'Haitian', 'ha' => 'Hausa', 'sh' => 'Serbo-Croatian', 'hz' => 'Herero', 'ho' => 'Hiri Motu', 'hr' => 'Croatian', 'hu' => 'Hungarian', 'ig' => 'Igbo', 'io' => 'Ido', 'ii' => 'Yi', 'iu' => 'Inuktitut', 'ie' => 'Interlingue', 'ia' => 'Interlingua', 'id' => 'Indonesian', 'ik' => 'Inupiaq', 'is' => 'Icelandic', 'it' => 'Italian', 'ja' => 'Japanese', 'kl' => 'Kalaallisut', 'kn' => 'Kannada', 'ks' => 'Kashmiri', 'kr' => 'Kanuri', 'kk' => 'Kazakh', 'km' => 'Khmer', 'ki' => 'Kikuyu', 'rw' => 'Kinyarwanda', 'ky' => 'Kirghiz', 'kv' => 'Komi', 'kg' => 'Kongo', 'ko' => 'Korean', 'kj' => 'Kuanyama', 'ku' => 'Kurdish', 'lo' => 'Lao', 'la' => 'Latin', 'lv' => 'Latvian', 'li' => 'Limburgish', 'ln' => 'Lingala', 'lt' => 'Lithuanian', 'lb' => 'Letzeburgesch', 'lu' => 'Luba-Katanga', 'lg' => 'Ganda', 'mh' => 'Marshall', 'ml' => 'Malayalam', 'mr' => 'Marathi', 'mg' => 'Malagasy', 'mt' => 'Maltese', 'mo' => 'Moldavian', 'mn' => 'Mongolian', 'mi' => 'Maori', 'ms' => 'Malay', 'my' => 'Burmese', 'na' => 'Nauru', 'nv' => 'Navajo', 'nr' => 'Ndebele', 'nd' => 'Ndebele', 'ng' => 'Ndonga', 'ne' => 'Nepali', 'nl' => 'Dutch', 'nn' => 'Norwegian Nynorsk', 'nb' => 'Norwegian Bokmal', 'no' => 'Norwegian', 'ny' => 'Chichewa', 'oc' => 'Occitan', 'oj' => 'Ojibwa', 'or' => 'Oriya', 'om' => 'Oromo', 'os' => 'Ossetian; Ossetic', 'pi' => 'Pali', 'pl' => 'Polish', 'pt' => 'Portuguese', 'pt-BR' => 'Portuguese - Brazil', 'qu' => 'Quechua', 'rm' => 'Raeto-Romance', 'ro' => 'Romanian', 'rn' => 'Rundi', 'ru' => 'Russian', 'sg' => 'Sango', 'sa' => 'Sanskrit', 'si' => 'Sinhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'se' => 'Northern Sami', 'sm' => 'Samoan', 'sn' => 'Shona', 'sd' => 'Sindhi', 'so' => 'Somali', 'st' => 'Sotho', 'es' => 'Spanish', 'sq' => 'Albanian', 'sc' => 'Sardinian', 'sr' => 'Serbian', 'ss' => 'Swati', 'su' => 'Sundanese', 'sw' => 'Swahili', 'sv' => 'Swedish', 'ty' => 'Tahitian', 'ta' => 'Tamil', 'tt' => 'Tatar', 'te' => 'Telugu', 'tg' => 'Tajik', 'tl' => 'Tagalog', 'th' => 'Thai', 'ti' => 'Tigrinya', 'to' => 'Tonga', 'tn' => 'Tswana', 'ts' => 'Tsonga', 'tk' => 'Turkmen', 'tr' => 'Turkish', 'tw' => 'Twi', 'ug' => 'Uighur', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek', 've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'wa' => 'Walloon', 'wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'za' => 'Zhuang', 'zu' => 'Zulu', 'ab' => 'Abkhazian', 'zh' => 'Mandarin', 'ps' => 'Pushto', 'am' => 'Amharic', 'ar' => 'Arabic', 'bg' => 'Bulgarian', 'cn' => 'Cantonese', 'mk' => 'Macedonian', 'el' => 'Greek', 'fa' => 'Persian', 'he' => 'Hebrew', 'hi' => 'Hindi', 'hy' => 'Armenian', 'en' => 'English', 'ee' => 'Ewe', 'ka' => 'Georgian', 'pa' => 'Punjabi', 'bn' => 'Bengali', 'bs' => 'Bosnian', 'ch' => 'Chamorro', 'be' => 'Belarusian', 'yo' => 'Yoruba');
+	/** ISO 639-1 language code => display name (leading "Default - EN"). */
+	private const TMDB_LANGUAGES = ['' => 'Default - EN', 'aa' => 'Afar', 'af' => 'Afrikaans', 'ak' => 'Akan', 'an' => 'Aragonese', 'as' => 'Assamese', 'av' => 'Avaric', 'ae' => 'Avestan', 'ay' => 'Aymara', 'az' => 'Azerbaijani', 'ba' => 'Bashkir', 'bm' => 'Bambara', 'bi' => 'Bislama', 'bo' => 'Tibetan', 'br' => 'Breton', 'ca' => 'Catalan', 'cs' => 'Czech', 'ce' => 'Chechen', 'cu' => 'Slavic', 'cv' => 'Chuvash', 'kw' => 'Cornish', 'co' => 'Corsican', 'cr' => 'Cree', 'cy' => 'Welsh', 'da' => 'Danish', 'de' => 'German', 'dv' => 'Divehi', 'dz' => 'Dzongkha', 'eo' => 'Esperanto', 'et' => 'Estonian', 'eu' => 'Basque', 'fo' => 'Faroese', 'fj' => 'Fijian', 'fi' => 'Finnish', 'fr' => 'French', 'fy' => 'Frisian', 'ff' => 'Fulah', 'gd' => 'Gaelic', 'ga' => 'Irish', 'gl' => 'Galician', 'gv' => 'Manx', 'gn' => 'Guarani', 'gu' => 'Gujarati', 'ht' => 'Haitian', 'ha' => 'Hausa', 'sh' => 'Serbo-Croatian', 'hz' => 'Herero', 'ho' => 'Hiri Motu', 'hr' => 'Croatian', 'hu' => 'Hungarian', 'ig' => 'Igbo', 'io' => 'Ido', 'ii' => 'Yi', 'iu' => 'Inuktitut', 'ie' => 'Interlingue', 'ia' => 'Interlingua', 'id' => 'Indonesian', 'ik' => 'Inupiaq', 'is' => 'Icelandic', 'it' => 'Italian', 'ja' => 'Japanese', 'kl' => 'Kalaallisut', 'kn' => 'Kannada', 'ks' => 'Kashmiri', 'kr' => 'Kanuri', 'kk' => 'Kazakh', 'km' => 'Khmer', 'ki' => 'Kikuyu', 'rw' => 'Kinyarwanda', 'ky' => 'Kirghiz', 'kv' => 'Komi', 'kg' => 'Kongo', 'ko' => 'Korean', 'kj' => 'Kuanyama', 'ku' => 'Kurdish', 'lo' => 'Lao', 'la' => 'Latin', 'lv' => 'Latvian', 'li' => 'Limburgish', 'ln' => 'Lingala', 'lt' => 'Lithuanian', 'lb' => 'Letzeburgesch', 'lu' => 'Luba-Katanga', 'lg' => 'Ganda', 'mh' => 'Marshall', 'ml' => 'Malayalam', 'mr' => 'Marathi', 'mg' => 'Malagasy', 'mt' => 'Maltese', 'mo' => 'Moldavian', 'mn' => 'Mongolian', 'mi' => 'Maori', 'ms' => 'Malay', 'my' => 'Burmese', 'na' => 'Nauru', 'nv' => 'Navajo', 'nr' => 'Ndebele', 'nd' => 'Ndebele', 'ng' => 'Ndonga', 'ne' => 'Nepali', 'nl' => 'Dutch', 'nn' => 'Norwegian Nynorsk', 'nb' => 'Norwegian Bokmal', 'no' => 'Norwegian', 'ny' => 'Chichewa', 'oc' => 'Occitan', 'oj' => 'Ojibwa', 'or' => 'Oriya', 'om' => 'Oromo', 'os' => 'Ossetian; Ossetic', 'pi' => 'Pali', 'pl' => 'Polish', 'pt' => 'Portuguese', 'pt-BR' => 'Portuguese - Brazil', 'qu' => 'Quechua', 'rm' => 'Raeto-Romance', 'ro' => 'Romanian', 'rn' => 'Rundi', 'ru' => 'Russian', 'sg' => 'Sango', 'sa' => 'Sanskrit', 'si' => 'Sinhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'se' => 'Northern Sami', 'sm' => 'Samoan', 'sn' => 'Shona', 'sd' => 'Sindhi', 'so' => 'Somali', 'st' => 'Sotho', 'es' => 'Spanish', 'sq' => 'Albanian', 'sc' => 'Sardinian', 'sr' => 'Serbian', 'ss' => 'Swati', 'su' => 'Sundanese', 'sw' => 'Swahili', 'sv' => 'Swedish', 'ty' => 'Tahitian', 'ta' => 'Tamil', 'tt' => 'Tatar', 'te' => 'Telugu', 'tg' => 'Tajik', 'tl' => 'Tagalog', 'th' => 'Thai', 'ti' => 'Tigrinya', 'to' => 'Tonga', 'tn' => 'Tswana', 'ts' => 'Tsonga', 'tk' => 'Turkmen', 'tr' => 'Turkish', 'tw' => 'Twi', 'ug' => 'Uighur', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek', 've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'wa' => 'Walloon', 'wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'za' => 'Zhuang', 'zu' => 'Zulu', 'ab' => 'Abkhazian', 'zh' => 'Mandarin', 'ps' => 'Pushto', 'am' => 'Amharic', 'ar' => 'Arabic', 'bg' => 'Bulgarian', 'cn' => 'Cantonese', 'mk' => 'Macedonian', 'el' => 'Greek', 'fa' => 'Persian', 'he' => 'Hebrew', 'hi' => 'Hindi', 'hy' => 'Armenian', 'en' => 'English', 'ee' => 'Ewe', 'ka' => 'Georgian', 'pa' => 'Punjabi', 'bn' => 'Bengali', 'bs' => 'Bosnian', 'ch' => 'Chamorro', 'be' => 'Belarusian', 'yo' => 'Yoruba'];
 
-    /**
-     * ISO 639-1 language code => display name for TMDb metadata language
-     * selectors (leading empty key = "Default - EN").
-     *
-     * @return array<string, string>
-     */
-    public static function tmdbLanguages(): array {
-        return self::TMDB_LANGUAGES;
-    }
+	/**
+	 * ISO 639-1 language code => display name for TMDb metadata language
+	 * selectors (leading empty key = "Default - EN").
+	 *
+	 * @return array<string, string>
+	 */
+	public static function tmdbLanguages(): array {
+		return self::TMDB_LANGUAGES;
+	}
 }
diff --git a/src/Core/Reference/PermissionReference.php b/src/Core/Reference/PermissionReference.php
index 402171ae..3c891f46 100644
--- a/src/Core/Reference/PermissionReference.php
+++ b/src/Core/Reference/PermissionReference.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Reference;
 
@@ -22,140 +21,140 @@ use XcVm\Core\Module\PermissionRegistry;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class PermissionReference {
-    /** Ordered list of reseller sub-permission keys. */
-    private const KEYS = array(
-        'add_rtmp',
-        'add_bouquet',
-        'add_cat',
-        'add_e2',
-        'add_epg',
-        'add_episode',
-        'add_group',
-        'add_mag',
-        'add_movie',
-        'add_packages',
-        'add_radio',
-        'add_reguser',
-        'add_server',
-        'add_stream',
-        'tprofile',
-        'add_series',
-        'add_user',
-        'block_ips',
-        'block_isps',
-        'block_uas',
-        'create_channel',
-        'edit_bouquet',
-        'edit_cat',
-        'channel_order',
-        'edit_cchannel',
-        'edit_e2',
-        'epg_edit',
-        'edit_episode',
-        'settings',
-        'edit_group',
-        'edit_mag',
-        'edit_movie',
-        'edit_package',
-        'edit_radio',
-        'edit_reguser',
-        'edit_server',
-        'edit_stream',
-        'edit_series',
-        'edit_user',
-        'fingerprint',
-        'import_episodes',
-        'import_movies',
-        'import_streams',
-        'database',
-        'mass_delete',
-        'mass_sedits_vod',
-        'mass_sedits',
-        'mass_edit_users',
-        'mass_edit_lines',
-        'mass_edit_mags',
-        'mass_edit_enigmas',
-        'mass_edit_streams',
-        'mass_edit_radio',
-        'mass_edit_reguser',
-        'ticket',
-        'subreseller',
-        'stream_tools',
-        'bouquets',
-        'categories',
-        'client_request_log',
-        'connection_logs',
-        'manage_cchannels',
-        'credits_log',
-        'index',
-        'manage_e2',
-        'epg',
-        'mng_groups',
-        'live_connections',
-        'login_logs',
-        'manage_mag',
-        'manage_events',
-        'movies',
-        'mng_packages',
-        'player',
-        'process_monitor',
-        'radio',
-        'mng_regusers',
-        'reg_userlog',
-        'rtmp',
-        'servers',
-        'stream_errors',
-        'streams',
-        'subresellers',
-        'manage_tickets',
-        'tprofiles',
-        'series',
-        'users',
-        'episodes',
-        'edit_tprofile',
-        'add_code',
-        'add_hmac',
-        'block_asns',
-        'panel_logs',
-        'quick_tools',
-        'restream_logs'
-    );
+	/** Ordered list of reseller sub-permission keys. */
+	private const KEYS = [
+		'add_rtmp',
+		'add_bouquet',
+		'add_cat',
+		'add_e2',
+		'add_epg',
+		'add_episode',
+		'add_group',
+		'add_mag',
+		'add_movie',
+		'add_packages',
+		'add_radio',
+		'add_reguser',
+		'add_server',
+		'add_stream',
+		'tprofile',
+		'add_series',
+		'add_user',
+		'block_ips',
+		'block_isps',
+		'block_uas',
+		'create_channel',
+		'edit_bouquet',
+		'edit_cat',
+		'channel_order',
+		'edit_cchannel',
+		'edit_e2',
+		'epg_edit',
+		'edit_episode',
+		'settings',
+		'edit_group',
+		'edit_mag',
+		'edit_movie',
+		'edit_package',
+		'edit_radio',
+		'edit_reguser',
+		'edit_server',
+		'edit_stream',
+		'edit_series',
+		'edit_user',
+		'fingerprint',
+		'import_episodes',
+		'import_movies',
+		'import_streams',
+		'database',
+		'mass_delete',
+		'mass_sedits_vod',
+		'mass_sedits',
+		'mass_edit_users',
+		'mass_edit_lines',
+		'mass_edit_mags',
+		'mass_edit_enigmas',
+		'mass_edit_streams',
+		'mass_edit_radio',
+		'mass_edit_reguser',
+		'ticket',
+		'subreseller',
+		'stream_tools',
+		'bouquets',
+		'categories',
+		'client_request_log',
+		'connection_logs',
+		'manage_cchannels',
+		'credits_log',
+		'index',
+		'manage_e2',
+		'epg',
+		'mng_groups',
+		'live_connections',
+		'login_logs',
+		'manage_mag',
+		'manage_events',
+		'movies',
+		'mng_packages',
+		'player',
+		'process_monitor',
+		'radio',
+		'mng_regusers',
+		'reg_userlog',
+		'rtmp',
+		'servers',
+		'stream_errors',
+		'streams',
+		'subresellers',
+		'manage_tickets',
+		'tprofiles',
+		'series',
+		'users',
+		'episodes',
+		'edit_tprofile',
+		'add_code',
+		'add_hmac',
+		'block_asns',
+		'panel_logs',
+		'quick_tools',
+		'restream_logs'
+	];
 
-    /** @var array<int, array{0: string, 1: string, 2: string}>|null Memoised advanced-permission rows. */
-    private static ?array $advanced = null;
+	/** @var array<int, array{0: string, 1: string, 2: string}>|null Memoised advanced-permission rows. */
+	private static ?array $advanced = null;
 
-    /**
-     * Ordered list of reseller sub-permission keys.
-     *
-     * @return array<int, string>
-     */
-    public static function keys(): array {
-        // Core keys plus any a module contributed (PermissionProviderInterface),
-        // so a module owns the permissions it gates on instead of them living here.
-        return array_values(array_unique(array_merge(self::KEYS, PermissionRegistry::keys())));
-    }
+	/**
+	 * Ordered list of reseller sub-permission keys.
+	 *
+	 * @return array<int, string>
+	 */
+	public static function keys(): array {
+		// Core keys plus any a module contributed (PermissionProviderInterface),
+		// so a module owns the permissions it gates on instead of them living here.
+		return array_values(array_unique(array_merge(self::KEYS, PermissionRegistry::keys())));
+	}
 
-    /**
-     * Localized advanced-permission rows for the group editor, each row
-     * being `[key, title, description]`. Built once and memoised.
-     *
-     * @return array<int, array{0: string, 1: string, 2: string}>
-     */
-    public static function advanced(): array {
-        if (self::$advanced !== null) {
-            return self::$advanced;
-        }
+	/**
+	 * Localized advanced-permission rows for the group editor, each row
+	 * being `[key, title, description]`. Built once and memoised.
+	 *
+	 * @return array<int, array{0: string, 1: string, 2: string}>
+	 */
+	public static function advanced(): array {
+		if (self::$advanced !== null) {
+			return self::$advanced;
+		}
 
-        $rows = [];
-        foreach (self::keys() as $key) {
-            $rows[] = array(
-                $key,
-                Translator::get('permission_' . $key),
-                Translator::get('permission_' . $key . '_text'),
-            );
-        }
+		$rows = [];
+		foreach (self::keys() as $key) {
+			$rows[] = [
+				$key,
+				Translator::get('permission_' . $key),
+				Translator::get('permission_' . $key . '_text'),
+			];
+		}
 
-        self::$advanced = $rows;
-        return $rows;
-    }
+		self::$advanced = $rows;
+		return $rows;
+	}
 }
diff --git a/src/Core/Reference/StatusBadge.php b/src/Core/Reference/StatusBadge.php
index fc037c96..87c32189 100644
--- a/src/Core/Reference/StatusBadge.php
+++ b/src/Core/Reference/StatusBadge.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Reference;
 
@@ -23,64 +22,64 @@ namespace XcVm\Core\Reference;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class StatusBadge {
-    /** Live stream status code => badge HTML. */
-    private const STREAM = array(-1 => "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light btn-fixed-xl'>NO SERVERS</button>", 0 => "<button type='button' class='btn btn-dark btn-xs waves-effect waves-light btn-fixed-xl'>STOPPED</button>", 1 => "<button type='button' class='btn btn-success btn-xs waves-effect waves-light btn-fixed-xl'>ONLINE</button>", 2 => "<button type='button' class='btn btn-warning btn-xs waves-effect waves-light btn-fixed'>STARTING</button>", 3 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light btn-fixed'>DOWN</button>", 4 => "<button type='button' class='btn btn-info btn-xs waves-effect waves-light btn-fixed-xl'>ON DEMAND</button>", 5 => "<button type='button' class='btn btn-purple btn-xs waves-effect waves-light btn-fixed-xl'>DIRECT SOURCE</button>", 6 => "<button type='button' class='btn btn-primary btn-xs waves-effect waves-light btn-fixed-xl'>CREATING...</button>", 7 => "<button type='button' class='btn btn-purple btn-xs waves-effect waves-light btn-fixed-xl'>DIRECT STREAM</button>");
+	/** Live stream status code => badge HTML. */
+	private const STREAM = [-1 => "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light btn-fixed-xl'>NO SERVERS</button>", 0 => "<button type='button' class='btn btn-dark btn-xs waves-effect waves-light btn-fixed-xl'>STOPPED</button>", 1 => "<button type='button' class='btn btn-success btn-xs waves-effect waves-light btn-fixed-xl'>ONLINE</button>", 2 => "<button type='button' class='btn btn-warning btn-xs waves-effect waves-light btn-fixed'>STARTING</button>", 3 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light btn-fixed'>DOWN</button>", 4 => "<button type='button' class='btn btn-info btn-xs waves-effect waves-light btn-fixed-xl'>ON DEMAND</button>", 5 => "<button type='button' class='btn btn-purple btn-xs waves-effect waves-light btn-fixed-xl'>DIRECT SOURCE</button>", 6 => "<button type='button' class='btn btn-primary btn-xs waves-effect waves-light btn-fixed-xl'>CREATING...</button>", 7 => "<button type='button' class='btn btn-purple btn-xs waves-effect waves-light btn-fixed-xl'>DIRECT STREAM</button>"];
 
-    /** Live-search animated status code => badge HTML (legacy positional keys preserved). */
-    private const SEARCH = array(-1 => "<button type='button' class='btn bg-animate-secondary btn-xs waves-effect waves-light no-border btn-fixed-xl'>NO SERVERS</button>", 0 => "<button type='button' class='btn bg-animate-dark btn-xs waves-effect waves-light no-border btn-fixed-xl'>STOPPED</button>", "<button type='button' class='btn bg-animate-warning btn-xs waves-effect waves-light no-border btn-fixed-xl'>STARTING</button>", "<button type='button' class='btn bg-animate-danger btn-xs waves-effect waves-light no-border btn-fixed-xl'>DOWN</button>", "<button type='button' class='btn bg-animate-success btn-xs waves-effect waves-light no-border btn-fixed-xl'>ON DEMAND</button>", "<button type='button' class='btn bg-animate-purple btn-xs waves-effect waves-light no-border btn-fixed-xl'>DIRECT</button>", 7 => "<button type='button' class='btn bg-animate-warning btn-xs waves-effect waves-light no-border btn-fixed-xl'>ENCODING</button>", 8 => "<button type='button' class='btn bg-animate-dark btn-xs waves-effect waves-light no-border btn-fixed-xl'>NOT ENCODED</button>", 9 => "<button type='button' class='btn bg-animate-info btn-xs waves-effect waves-light no-border btn-fixed-xl'>ENCODED</button>", 10 => "<button type='button' class='btn bg-animate-danger btn-xs waves-effect waves-light no-border btn-fixed-xl'>BROKEN</button>");
+	/** Live-search animated status code => badge HTML (legacy positional keys preserved). */
+	private const SEARCH = [-1 => "<button type='button' class='btn bg-animate-secondary btn-xs waves-effect waves-light no-border btn-fixed-xl'>NO SERVERS</button>", 0 => "<button type='button' class='btn bg-animate-dark btn-xs waves-effect waves-light no-border btn-fixed-xl'>STOPPED</button>", "<button type='button' class='btn bg-animate-warning btn-xs waves-effect waves-light no-border btn-fixed-xl'>STARTING</button>", "<button type='button' class='btn bg-animate-danger btn-xs waves-effect waves-light no-border btn-fixed-xl'>DOWN</button>", "<button type='button' class='btn bg-animate-success btn-xs waves-effect waves-light no-border btn-fixed-xl'>ON DEMAND</button>", "<button type='button' class='btn bg-animate-purple btn-xs waves-effect waves-light no-border btn-fixed-xl'>DIRECT</button>", 7 => "<button type='button' class='btn bg-animate-warning btn-xs waves-effect waves-light no-border btn-fixed-xl'>ENCODING</button>", 8 => "<button type='button' class='btn bg-animate-dark btn-xs waves-effect waves-light no-border btn-fixed-xl'>NOT ENCODED</button>", 9 => "<button type='button' class='btn bg-animate-info btn-xs waves-effect waves-light no-border btn-fixed-xl'>ENCODED</button>", 10 => "<button type='button' class='btn bg-animate-danger btn-xs waves-effect waves-light no-border btn-fixed-xl'>BROKEN</button>"];
 
-    /** VOD encode status code => badge HTML. */
-    private const VOD = array(-1 => "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light tooltip' title='No Server Selected'><i class='text-white mdi mdi-triangle'></i></button>", 0 => "<button type='button' class='btn btn-dark btn-xs waves-effect waves-light tooltip' title='Not Encoded'><i class='text-white mdi mdi-checkbox-blank-circle'></i></button>", 1 => "<button type='button' class='btn btn-success btn-xs waves-effect waves-light tooltip' title='Encoded'><i class='text-white mdi mdi-check-circle'></i></button>", 2 => "<button type='button' class='btn btn-warning btn-xs waves-effect waves-light tooltip' title='Encoding'><i class='text-white mdi mdi-checkbox-blank-circle'></i></button>", 3 => "<button type='button' class='btn btn-primary btn-xs waves-effect waves-light tooltip' title='Direct Source'><i class='text-white mdi mdi mdi-web'></i></button>", 4 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light tooltip' title='Down'><i class='text-white mdi mdi-triangle'></i></button>", 5 => "<button type='button' class='btn btn-info btn-xs waves-effect waves-light tooltip' title='Direct Stream'><i class='text-white mdi mdi mdi-web'></i></button>");
+	/** VOD encode status code => badge HTML. */
+	private const VOD = [-1 => "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light tooltip' title='No Server Selected'><i class='text-white mdi mdi-triangle'></i></button>", 0 => "<button type='button' class='btn btn-dark btn-xs waves-effect waves-light tooltip' title='Not Encoded'><i class='text-white mdi mdi-checkbox-blank-circle'></i></button>", 1 => "<button type='button' class='btn btn-success btn-xs waves-effect waves-light tooltip' title='Encoded'><i class='text-white mdi mdi-check-circle'></i></button>", 2 => "<button type='button' class='btn btn-warning btn-xs waves-effect waves-light tooltip' title='Encoding'><i class='text-white mdi mdi-checkbox-blank-circle'></i></button>", 3 => "<button type='button' class='btn btn-primary btn-xs waves-effect waves-light tooltip' title='Direct Source'><i class='text-white mdi mdi mdi-web'></i></button>", 4 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light tooltip' title='Down'><i class='text-white mdi mdi-triangle'></i></button>", 5 => "<button type='button' class='btn btn-info btn-xs waves-effect waves-light tooltip' title='Direct Stream'><i class='text-white mdi mdi mdi-web'></i></button>"];
 
-    /** VOD folder-watch import status code => badge HTML. */
-    private const WATCH = array(1 => "<button type='button' class='btn btn-success btn-xs waves-effect waves-light'>ADDED</button>", 2 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light'>SQL FAILED</button>", 3 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light'>NO CATEGORY</button>", 4 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light'>NO TMDb MATCH</button>", 5 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light'>INVALID FILE</button>", 6 => "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>UPGRADED</button>");
+	/** VOD folder-watch import status code => badge HTML. */
+	private const WATCH = [1 => "<button type='button' class='btn btn-success btn-xs waves-effect waves-light'>ADDED</button>", 2 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light'>SQL FAILED</button>", 3 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light'>NO CATEGORY</button>", 4 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light'>NO TMDb MATCH</button>", 5 => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light'>INVALID FILE</button>", 6 => "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>UPGRADED</button>"];
 
-    /** Stream failure/log action => badge HTML. */
-    private const FAILURE = array('STREAM_STOP' => "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light btn-fixed-xl'>STOPPED</button>", 'STREAM_START_FAIL' => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light btn-fixed-xl'>START FAILED</button>", 'STREAM_START' => "<button type='button' class='btn btn-success btn-xs waves-effect waves-light btn-fixed-xl'>STARTED</button>", 'STREAM_RESTART' => "<button type='button' class='btn btn-info btn-xs waves-effect waves-light btn-fixed-xl'>RESTARTED</button>", 'STREAM_FAILED' => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light btn-fixed-xl'>STREAM FAILED</button>");
+	/** Stream failure/log action => badge HTML. */
+	private const FAILURE = ['STREAM_STOP' => "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light btn-fixed-xl'>STOPPED</button>", 'STREAM_START_FAIL' => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light btn-fixed-xl'>START FAILED</button>", 'STREAM_START' => "<button type='button' class='btn btn-success btn-xs waves-effect waves-light btn-fixed-xl'>STARTED</button>", 'STREAM_RESTART' => "<button type='button' class='btn btn-info btn-xs waves-effect waves-light btn-fixed-xl'>RESTARTED</button>", 'STREAM_FAILED' => "<button type='button' class='btn btn-danger btn-xs waves-effect waves-light btn-fixed-xl'>STREAM FAILED</button>"];
 
-    /** Stream-log action => human-readable label. */
-    private const STREAM_LOG = array('STREAM_FAILED' => 'Stream Failed', 'STREAM_START' => 'Stream Started', 'STREAM_RESTART' => 'Stream Restarted', 'STREAM_STOP' => 'Stream Stopped', 'FORCE_SOURCE' => 'Force Change Source', 'AUTO_RESTART' => 'Timed Auto Restart', 'AUDIO_LOSS' => 'Audio Lost', 'PRIORITY_SWITCH' => 'Priority Switch', 'DELAY_START' => 'Delay Started', 'FFMPEG_ERROR' => 'FFMPEG Error');
+	/** Stream-log action => human-readable label. */
+	private const STREAM_LOG = ['STREAM_FAILED' => 'Stream Failed', 'STREAM_START' => 'Stream Started', 'STREAM_RESTART' => 'Stream Restarted', 'STREAM_STOP' => 'Stream Stopped', 'FORCE_SOURCE' => 'Force Change Source', 'AUTO_RESTART' => 'Timed Auto Restart', 'AUDIO_LOSS' => 'Audio Lost', 'PRIORITY_SWITCH' => 'Priority Switch', 'DELAY_START' => 'Delay Started', 'FFMPEG_ERROR' => 'FFMPEG Error'];
 
-    /**
-     * Live stream status badge. Unknown codes fall back to the STOPPED
-     * badge, matching the legacy `$rStatusArray[$x] ?? $rStatusArray[0]`.
-     */
-    public static function stream(int $status): string {
-        return self::STREAM[$status] ?? self::STREAM[0];
-    }
+	/**
+	 * Live stream status badge. Unknown codes fall back to the STOPPED
+	 * badge, matching the legacy `$rStatusArray[$x] ?? $rStatusArray[0]`.
+	 */
+	public static function stream(int $status): string {
+		return self::STREAM[$status] ?? self::STREAM[0];
+	}
 
-    /**
-     * Live-search animated status badge ('' for unknown codes).
-     */
-    public static function search(int $status): string {
-        return self::SEARCH[$status] ?? '';
-    }
+	/**
+	 * Live-search animated status badge ('' for unknown codes).
+	 */
+	public static function search(int $status): string {
+		return self::SEARCH[$status] ?? '';
+	}
 
-    /**
-     * VOD encode status badge ('' for unknown codes).
-     */
-    public static function vod(int $status): string {
-        return self::VOD[$status] ?? '';
-    }
+	/**
+	 * VOD encode status badge ('' for unknown codes).
+	 */
+	public static function vod(int $status): string {
+		return self::VOD[$status] ?? '';
+	}
 
-    /**
-     * VOD folder-watch import status badge ('' for unknown codes).
-     */
-    public static function watch(int $status): string {
-        return self::WATCH[$status] ?? '';
-    }
+	/**
+	 * VOD folder-watch import status badge ('' for unknown codes).
+	 */
+	public static function watch(int $status): string {
+		return self::WATCH[$status] ?? '';
+	}
 
-    /**
-     * Stream failure/log action badge ('' for unknown actions).
-     */
-    public static function failure(string $action): string {
-        return self::FAILURE[$action] ?? '';
-    }
+	/**
+	 * Stream failure/log action badge ('' for unknown actions).
+	 */
+	public static function failure(string $action): string {
+		return self::FAILURE[$action] ?? '';
+	}
 
-    /**
-     * Stream-log action label ('' for unknown actions).
-     */
-    public static function streamLog(string $action): string {
-        return self::STREAM_LOG[$action] ?? '';
-    }
+	/**
+	 * Stream-log action label ('' for unknown actions).
+	 */
+	public static function streamLog(string $action): string {
+		return self::STREAM_LOG[$action] ?? '';
+	}
 }
diff --git a/src/Core/Reference/UiReference.php b/src/Core/Reference/UiReference.php
index 6ca9fdc9..41d73dba 100644
--- a/src/Core/Reference/UiReference.php
+++ b/src/Core/Reference/UiReference.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace XcVm\Core\Reference;
 
@@ -17,16 +16,16 @@ namespace XcVm\Core\Reference;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class UiReference {
-    /** CSS accent class => human-readable colour name (leading "" = Default). */
-    private const HUES = array('' => 'Default', 'primary' => 'Blue', 'info' => 'Light Blue', 'success' => 'Green', 'danger' => 'Red', 'warning' => 'Orange', 'purple' => 'Purple', 'pink' => 'Pink', 'dark' => 'Dark Grey', 'secondary' => 'Light Grey');
+	/** CSS accent class => human-readable colour name (leading "" = Default). */
+	private const HUES = ['' => 'Default', 'primary' => 'Blue', 'info' => 'Light Blue', 'success' => 'Green', 'danger' => 'Red', 'warning' => 'Orange', 'purple' => 'Purple', 'pink' => 'Pink', 'dark' => 'Dark Grey', 'secondary' => 'Light Grey'];
 
-    /**
-     * CSS accent class => human-readable colour name for the profile
-     * hue selector (leading empty key = "Default").
-     *
-     * @return array<string, string>
-     */
-    public static function hues(): array {
-        return self::HUES;
-    }
+	/**
+	 * CSS accent class => human-readable colour name for the profile
+	 * hue selector (leading empty key = "Default").
+	 *
+	 * @return array<string, string>
+	 */
+	public static function hues(): array {
+		return self::HUES;
+	}
 }
diff --git a/src/Core/Storage/DropboxClient.php b/src/Core/Storage/DropboxClient.php
index f0b57a7e..ff4542b3 100644
--- a/src/Core/Storage/DropboxClient.php
+++ b/src/Core/Storage/DropboxClient.php
@@ -20,13 +20,21 @@ class DropboxClient {
 	public const UPLOAD_CHUNK_SIZE = 2097152;
 
 	private $appParams;
+
 	private $consumerToken;
+
 	private $requestToken;
+
 	private $accessToken;
+
 	private $rootPath;
+
 	private $useCurl;
+
 	private $curlOptions;
+
 	private $_redirectUri;
+
 	private static $_curlHeadersRef;
 
 	/**
@@ -36,9 +44,9 @@ class DropboxClient {
 	 *
 	 * @throws DropboxException
 	 */
-	public function __construct($app_params = array()) {
+	public function __construct(array $app_params = []) {
 		$this->appParams = $app_params;
-		$this->consumerToken = array('t' => $this->appParams['app_key'], 's' => $this->appParams['app_secret']);
+		$this->consumerToken = ['t' => $this->appParams['app_key'], 's' => $this->appParams['app_secret']];
 		$this->rootPath = (empty($app_params['app_full_access']) ? 'sandbox' : 'dropbox');
 		$this->requestToken = null;
 		$this->accessToken = null;
@@ -63,12 +71,11 @@ class DropboxClient {
 	 * Sets whether to use cURL if its available or PHP HTTP wrappers otherwise
 	 *
 	 * @param boolean $use_it whether to use it or not
-	 * @param array $curlOptions
 	 *
 	 * @return bool Whether to actually use cURL (always false if not installed)
 	 * @throws DropboxException
 	 */
-	public function SetUseCUrl($use_it, $curlOptions = array()) {
+	public function SetUseCUrl(bool $use_it, array $curlOptions = []) {
 		if (!$use_it && !empty($curlOptions)) {
 			throw new DropboxException('not using cURL but specified cURL options');
 		}
@@ -86,7 +93,7 @@ class DropboxClient {
 	 *
 	 * @return string URL
 	 */
-	public function BuildAuthorizeUrl($redirect_uri, $state = '') {
+	public function BuildAuthorizeUrl(string $redirect_uri, string $state = '') {
 		$this->_redirectUri = $redirect_uri;
 
 		return 'https://www.dropbox.com/oauth2/authorize?response_type=code&client_id=' . $this->appParams['app_key'] . '&redirect_uri=' . urlencode($redirect_uri) . '&state=' . urlencode($state);
@@ -101,7 +108,7 @@ class DropboxClient {
 	 * @return array
 	 * @throws DropboxException
 	 */
-	public function GetBearerToken($code = '', $redirect_uri = '') {
+	public function GetBearerToken(string $code = '', string $redirect_uri = '') {
 		if (!empty($this->accessToken)) {
 			return $this->accessToken;
 		}
@@ -122,23 +129,22 @@ class DropboxClient {
 			throw new DropboxException('Redirect URI unknown, please specify or call BuildAuthorizeUrl() before!');
 		}
 
-		$res = $this->apiCall('oauth2/token', array('code' => $code, 'grant_type' => 'authorization_code', 'client_id' => $this->appParams['app_key'], 'client_secret' => $this->appParams['app_secret'], 'redirect_uri' => $this->_redirectUri));
+		$res = $this->apiCall('oauth2/token', ['code' => $code, 'grant_type' => 'authorization_code', 'client_id' => $this->appParams['app_key'], 'client_secret' => $this->appParams['app_secret'], 'redirect_uri' => $this->_redirectUri]);
 
 		if (empty($res) || empty($res->access_token)) {
 			throw new DropboxException(sprintf('Could not get bearer token! (code: %s)', $code));
 		}
 
-		return $this->accessToken = array('t' => $res->access_token, 'account_id' => $res->account_id);
+		return $this->accessToken = ['t' => $res->access_token, 'account_id' => $res->account_id];
 	}
 
 	/**
 	 * Sets a previously retrieved (and stored) bearer token.
 	 *
-	 * @param array|object $token
 	 *
 	 * @throws DropboxException
 	 */
-	public function SetBearerToken($token) {
+	public function SetBearerToken(array|object $token) {
 		$token = (array) $token;
 
 		if (empty($token['t'])) {
@@ -174,14 +180,11 @@ class DropboxClient {
 	}
 
 	/**
-	 * @param string $path
-	 * @param bool $recursive
-	 * @param bool $include_deleted
 	 *
 	 * @return mixed
 	 * @throws DropboxException
 	 */
-	public function GetFiles($path = '', $recursive = false, $include_deleted = false) {
+	public function GetFiles(string $path = '', bool $recursive = false, bool $include_deleted = false) {
 		if (is_object($path) && !empty($path->path)) {
 			$path = $path->path;
 		}
@@ -194,30 +197,28 @@ class DropboxClient {
 		$entries = $res->entries;
 
 		while ($res->has_more) {
-			$res = $this->apiCall('2/files/list_folder/continue', array('cursor' => $res->cursor));
+			$res = $this->apiCall('2/files/list_folder/continue', ['cursor' => $res->cursor]);
 			$entries = array_merge($entries, $res->entries);
 		}
 
-		$entries_assoc = array();
+		$entries_assoc = [];
 
 		foreach ($entries as $entry) {
 			$entries_assoc[trim($entry->path_display, '/')] = $entry;
 		}
 
-		return array_map(array(__CLASS__, 'compatMeta'), $entries_assoc);
+		return array_map([__CLASS__, 'compatMeta'], $entries_assoc);
 	}
 
 	/**
 	 * See https://www.dropbox.com/developers/documentation/http/documentation#files-get_metadata
 	 *
 	 * @param $path
-	 * @param bool $include_deleted
-	 * @param null $rev
 	 *
 	 * @return mixed
 	 * @throws DropboxException
 	 */
-	public function GetMetadata($path, $include_deleted = false, $rev = null) {
+	public function GetMetadata($path, bool $include_deleted = false, null $rev = null) {
 		if (is_object($path) && !empty($path->path)) {
 			$path = $path->path;
 		}
@@ -240,7 +241,7 @@ class DropboxClient {
 	 * @return object Dropbox file metadata
 	 * @throws DropboxException
 	 */
-	public function DownloadFile($path, $dest_path = '', $rev = null, $progress_changed_callback = null) {
+	public function DownloadFile(string|object $path, string $dest_path = '', string $rev = null, ?callable $progress_changed_callback = null) {
 		if (is_object($path) && !empty($path->path)) {
 			$path = $path->path;
 		}
@@ -267,7 +268,7 @@ class DropboxClient {
 			curl_setopt($context, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($context, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($context, CURLOPT_FILE, $fh);
-			$response_headers = array();
+			$response_headers = [];
 			self::execCurlAndClose($context, $response_headers);
 			fclose($fh);
 			$meta = self::getMetaFromHeaders($response_headers, true);
@@ -315,7 +316,7 @@ class DropboxClient {
 	 * @param object $meta Dropbox v2 metadata entry.
 	 * @return object The same object with legacy compatibility fields added.
 	 */
-	public static function compatMeta($meta) {
+	public static function compatMeta(object $meta) {
 		$meta->is_dir = $meta->{'.tag'} == 'folder';
 		$meta->path = $meta->path_display;
 		$meta->bytes = (isset($meta->size) ? $meta->size : 0);
@@ -330,12 +331,11 @@ class DropboxClient {
 	 *
 	 * @param string $src_file Local file to upload
 	 * @param string $path Dropbox path for destination
-	 * @param bool $overwrite
 	 *
 	 * @return object Dropbox file metadata
 	 * @throws DropboxException
 	 */
-	public function UploadFile($src_file, $path = '', $overwrite = true) {
+	public function UploadFile(string $src_file, string $path = '', bool $overwrite = true) {
 		if (empty($path)) {
 			$path = basename($src_file);
 		}
@@ -355,7 +355,7 @@ class DropboxClient {
 		}
 
 		$file_size = filesize($src_file);
-		$commit_params = array('path' => $path, 'mode' => $overwrite ? 'overwrite' : 'add', 'autorename' => true);
+		$commit_params = ['path' => $path, 'mode' => $overwrite ? 'overwrite' : 'add', 'autorename' => true];
 
 		if (2097152 < $file_size) {
 			$fh = fopen($src_file, 'rb');
@@ -365,12 +365,12 @@ class DropboxClient {
 			}
 
 			$offset = 0;
-			$res = $this->apiCall('2/files/upload_session/start', array(), true);
+			$res = $this->apiCall('2/files/upload_session/start', [], true);
 			$session_id = $res->session_id;
 
 			while (!feof($fh)) {
 				$content = fread($fh, 2097152);
-				$this->apiCall('2/files/upload_session/append_v2', array('cursor' => compact('session_id', 'offset')), true, $content);
+				$this->apiCall('2/files/upload_session/append_v2', ['cursor' => compact('session_id', 'offset')], true, $content);
 				$offset += strlen($content);
 				unset($content);
 
@@ -381,7 +381,7 @@ class DropboxClient {
 
 			@fclose($fh);
 
-			return $this->apiCall('2/files/upload_session/finish', array('cursor' => compact('session_id', 'offset'), 'commit' => $commit_params), true);
+			return $this->apiCall('2/files/upload_session/finish', ['cursor' => compact('session_id', 'offset'), 'commit' => $commit_params], true);
 		} else {
 			$content = file_get_contents($src_file);
 
@@ -396,14 +396,13 @@ class DropboxClient {
 	 *
 	 * @param $dropbox_file string Path to the image
 	 * @param $format string Image format of the thumbnail (jpeg or png)
-	 * @param bool $echo
 	 * @param $size string Thumbnail size (xs, s, m, l, xl)
 	 *
 	 * @return string Returns the thumbnail as binary image data
 	 */
-	public function GetThumbnail($dropbox_file, $size = 's', $format = 'jpeg', $echo = false) {
+	public function GetThumbnail($dropbox_file, $size = 's', $format = 'jpeg', bool $echo = false) {
 		$path = self::toPath($dropbox_file);
-		$size_transform = array('xs' => 'w32h32', 's' => 'w64h64', 'm' => 'w128h128', 'l' => 'w640h480', 'xl' => 'w1024h768');
+		$size_transform = ['xs' => 'w32h32', 's' => 'w64h64', 'm' => 'w128h128', 'l' => 'w640h480', 'xl' => 'w1024h768'];
 
 		if (isset($size_transform[$size])) {
 			$size = $size_transform[$size];
@@ -433,23 +432,23 @@ class DropboxClient {
 	 * @param int|null $expires  Out-param set to the link expiry (unix timestamp), when available.
 	 * @return string The link URL.
 	 */
-	public function GetLink($path, $preview = true, $_short = true, &$expires = null) {
+	public function GetLink(string $path, bool $preview = true, bool $_short = true, ?int &$expires = null) {
 		$path = self::toPath($path);
 
 		if (!$preview) {
-			$data = $this->apiCall('2/files/get_temporary_link', array('path' => $path));
+			$data = $this->apiCall('2/files/get_temporary_link', ['path' => $path]);
 			$expires = (time() + 14400) - 60;
 
 			return $data->link;
 		} else {
 			try {
-				$url = $this->apiCall('2/sharing/create_shared_link_with_settings', array(
+				$url = $this->apiCall('2/sharing/create_shared_link_with_settings', [
 					'path' => $path,
-					'settings' => array('requested_visibility' => 'public')
-				));
+					'settings' => ['requested_visibility' => 'public']
+				]);
 			} catch (DropboxException $ex) {
 				if ($ex->getTag() == 'shared_link_already_exists') {
-					$publicLinks = array_filter($this->apiCall('2/sharing/list_shared_links', array('path' => $path))->links, function ($link) {
+					$publicLinks = array_filter($this->apiCall('2/sharing/list_shared_links', ['path' => $path])->links, function ($link) {
 						return ($link->{'.tag'} == 'file') && ($link->link_permissions->resolved_visibility->{'.tag'} == 'public');
 					});
 					$url = reset($publicLinks);
@@ -468,8 +467,8 @@ class DropboxClient {
 	 * @param string $cursor Cursor from a previous Delta()/LatestCursor() call.
 	 * @return object Delta response (entries + new cursor).
 	 */
-	public function Delta($cursor) {
-		return $this->apiCall('2/files/list_folder/continue', array_merge(compact('cursor'), array()));
+	public function Delta(string $cursor) {
+		return $this->apiCall('2/files/list_folder/continue', array_merge(compact('cursor'), []));
 	}
 
 	/**
@@ -479,7 +478,7 @@ class DropboxClient {
 	 * @param bool   $include_media_info Include media info in the cursor scope.
 	 * @return object Response containing the cursor.
 	 */
-	public function LatestCursor($path = '', $include_media_info = false) {
+	public function LatestCursor(string $path = '', bool $include_media_info = false) {
 		$res = $this->apiCall('2/files/list_folder/get_latest_cursor', compact('path', 'include_media_info'));
 
 		return $res->cursor;
@@ -492,7 +491,7 @@ class DropboxClient {
 	 * @param int    $limit Maximum number of revisions to return.
 	 * @return object Response containing the revision list.
 	 */
-	public function GetRevisions($path, $limit = 10) {
+	public function GetRevisions(string $path, int $limit = 10) {
 		$path = self::toPath($path);
 
 		return $this->apiCall('2/files/list_revisions', compact('path', 'limit'))->entries;
@@ -505,7 +504,7 @@ class DropboxClient {
 	 * @param string        $rev          Revision id to restore.
 	 * @return object Metadata of the restored file.
 	 */
-	public function Restore($dropbox_file, $rev) {
+	public function Restore(string|object $dropbox_file, string $rev) {
 		if (is_object($dropbox_file) && !empty($dropbox_file->path)) {
 			$dropbox_file = $dropbox_file->path;
 		}
@@ -522,10 +521,10 @@ class DropboxClient {
 	 * @param bool   $include_deleted Include deleted entries.
 	 * @return array<object> Matched metadata entries.
 	 */
-	public function Search($path, $query, $max_results = 1000, $include_deleted = false) {
+	public function Search(string $path, string $query, int $max_results = 1000, bool $include_deleted = false) {
 		$path = self::toPath($path);
 		$mode = ($include_deleted ? 'deleted_filename' : 'filename');
-		$meta = array();
+		$meta = [];
 
 		foreach ($this->apiCall('2/files/search', compact('path', 'query', 'max_results', 'mode'))->matches as $match) {
 			$meta[] = self::compatMeta($match->metadata);
@@ -541,7 +540,7 @@ class DropboxClient {
 	 * @param int|false|null $expires     Out-param set to the reference expiry (unix timestamp, or false if unparseable).
 	 * @return object Copy-reference response.
 	 */
-	public function GetCopyRef($dropbox_file, &$expires = null) {
+	public function GetCopyRef(string|object $dropbox_file, int|false|null &$expires = null) {
 		if (is_object($dropbox_file) && !empty($dropbox_file->path)) {
 			$dropbox_file = $dropbox_file->path;
 		}
@@ -560,12 +559,12 @@ class DropboxClient {
 	 * @param bool   $copy_ref  Treat $from_path as a copy reference.
 	 * @return object Metadata of the copy.
 	 */
-	public function Copy($from_path, $to_path, $copy_ref = false) {
+	public function Copy(string $from_path, string $to_path, bool $copy_ref = false) {
 		if (is_object($from_path) && !empty($from_path->path)) {
 			$from_path = $from_path->path;
 		}
 
-		return $this->apiCall('fileops/copy', array('root' => $this->rootPath, $copy_ref ? 'from_copy_ref' : 'from_path' => $from_path, 'to_path' => $to_path));
+		return $this->apiCall('fileops/copy', ['root' => $this->rootPath, $copy_ref ? 'from_copy_ref' : 'from_path' => $from_path, 'to_path' => $to_path]);
 	}
 
 	/**
@@ -574,12 +573,11 @@ class DropboxClient {
 	 * @access public
 	 *
 	 * @param $path string The path to the new folder to create
-	 * @param bool $autorename
 	 *
 	 * @return object Dropbox folder metadata
 	 */
-	public function CreateFolder($path, $autorename = false) {
-		$res = $this->apiCall('2/files/create_folder_v2', array('path' => $path, 'autorename' => $autorename));
+	public function CreateFolder($path, bool $autorename = false) {
+		$res = $this->apiCall('2/files/create_folder_v2', ['path' => $path, 'autorename' => $autorename]);
 		$res->metadata->{'.tag'} = 'folder';
 
 		return self::compatMeta($res->metadata);
@@ -597,7 +595,7 @@ class DropboxClient {
 			$path = $path->path;
 		}
 
-		$res = $this->apiCall('2/files/delete_v2', array('path' => $path));
+		$res = $this->apiCall('2/files/delete_v2', ['path' => $path]);
 
 		return self::compatMeta($res->metadata);
 	}
@@ -609,12 +607,12 @@ class DropboxClient {
 	 * @param string $to_path   Destination path.
 	 * @return object Metadata of the moved entry.
 	 */
-	public function Move($from_path, $to_path) {
+	public function Move(string $from_path, string $to_path) {
 		if (is_object($from_path) && !empty($from_path->path)) {
 			$from_path = $from_path->path;
 		}
 
-		return $this->apiCall('fileops/move', array('root' => $this->rootPath, 'from_path' => $from_path, 'to_path' => $to_path));
+		return $this->apiCall('fileops/move', ['root' => $this->rootPath, 'from_path' => $from_path, 'to_path' => $to_path]);
 	}
 
 	/**
@@ -624,9 +622,9 @@ class DropboxClient {
 	 * @param array  $http_context Context with method, header and optional content.
 	 * @return \CurlHandle Configured cURL handle.
 	 */
-	private function createCurl($url, $http_context) {
+	private function createCurl(string $url, array $http_context) {
 		$ch = curl_init($url);
-		$curl_opts = array(CURLOPT_HEADER => false, CURLOPT_RETURNTRANSFER => true, CURLOPT_SSL_VERIFYPEER => false, CURLOPT_BINARYTRANSFER => true);
+		$curl_opts = [CURLOPT_HEADER => false, CURLOPT_RETURNTRANSFER => true, CURLOPT_SSL_VERIFYPEER => false, CURLOPT_BINARYTRANSFER => true];
 		$curl_opts[CURLOPT_CUSTOMREQUEST] = $http_context['method'];
 
 		if (!empty($http_context['content'])) {
@@ -659,7 +657,7 @@ class DropboxClient {
 	 * @param string               $header A single response header line.
 	 * @return int Number of bytes processed (required by cURL).
 	 */
-	private static function _curlHeaderCallback($ch, $header) {
+	private static function _curlHeaderCallback($ch, string $header) {
 		self::$_curlHeadersRef[] = trim($header);
 
 		return strlen($header);
@@ -673,10 +671,10 @@ class DropboxClient {
 	 * @return mixed The response body (by reference).
 	 * @throws DropboxException On cURL error.
 	 */
-	private static function &execCurlAndClose($ch, &$out_response_headers = null) {
+	private static function &execCurlAndClose($ch, ?array &$out_response_headers = null) {
 		if (is_array($out_response_headers)) {
 			self::$_curlHeadersRef = &$out_response_headers;
-			curl_setopt($ch, CURLOPT_HEADERFUNCTION, array(__CLASS__, '_curlHeaderCallback'));
+			curl_setopt($ch, CURLOPT_HEADERFUNCTION, [__CLASS__, '_curlHeaderCallback']);
 		}
 
 		$res = curl_exec($ch);
@@ -694,17 +692,15 @@ class DropboxClient {
 	/**
 	 * @param $url string
 	 * @param $params
-	 * @param string $content
-	 * @param int $bearer_token
 	 *
 	 * @return \CurlHandle|resource cURL handle (when useCurl) or a stream context resource
 	 */
-	private function createRequestContext($url, $params, &$content = '', $bearer_token = -1) {
+	private function createRequestContext($url, $params, string &$content = '', int $bearer_token = -1) {
 		if ($bearer_token === -1) {
 			$bearer_token = $this->accessToken['t'];
 		}
 
-		$http_context = array('method' => 'POST', 'header' => '', 'content' => '');
+		$http_context = ['method' => 'POST', 'header' => '', 'content' => ''];
 
 		if (strpos($url, '/oauth2/token') !== false) {
 			$http_context['header'] .= 'Content-Type: application/x-www-form-urlencoded' . "\r\n";
@@ -736,17 +732,15 @@ class DropboxClient {
 		$http_context['header'] = trim($http_context['header']);
 		$http_context['ignore_errors'] = true;
 
-		return $this->useCurl ? $this->createCurl($url, $http_context) : stream_context_create(array('http' => $http_context));
+		return $this->useCurl ? $this->createCurl($url, $http_context) : stream_context_create(['http' => $http_context]);
 	}
 
 	/**
-	 * @param object $resp
-	 * @param string $context
 	 *
 	 * @return object
 	 * @throws DropboxException
 	 */
-	private static function checkForError($resp, $context = null) {
+	private static function checkForError(object $resp, string $context = null) {
 		if (!empty($resp->error)) {
 			throw new DropboxException($resp, $context);
 		}
@@ -755,15 +749,11 @@ class DropboxClient {
 	}
 
 	/**
-	 * @param string $path
-	 * @param array $params
-	 * @param bool $content_call
-	 * @param string $content
 	 *
 	 * @return object
 	 * @throws DropboxException
 	 */
-	private function doSingleCall($path, $params = array(), $content_call = false, &$content = '') {
+	private function doSingleCall(string $path, array $params = [], bool $content_call = false, string &$content = '') {
 		$url = self::cleanUrl(($content_call ? 'https://content.dropboxapi.com/' : 'https://api.dropboxapi.com/') . $path);
 		$context = $this->createRequestContext($url, $params, $content);
 		$json = ($this->useCurl ? self::execCurlAndClose($context) : file_get_contents($url, false, $context));
@@ -772,7 +762,7 @@ class DropboxClient {
 		if (is_null($resp) && $content_call) {
 			// Content calls (e.g. upload_session/append) may return an empty body;
 			// hand back an empty object so the declared object return type holds.
-			return (object) array();
+			return (object) [];
 		}
 
 		if (is_null($resp) && !empty($json)) {
@@ -787,10 +777,8 @@ class DropboxClient {
 	}
 
 	/**
-	 * @param object $target
-	 * @param object $part
 	 */
-	private static function mergeContinue(&$target, $part) {
+	private static function mergeContinue(object &$target, object $part) {
 		$keys = array_keys(get_object_vars($target));
 
 		foreach ($keys as $k) {
@@ -804,15 +792,11 @@ class DropboxClient {
 	}
 
 	/**
-	 * @param string $path
-	 * @param array $params
-	 * @param bool $content_call
-	 * @param string $content
 	 *
 	 * @return object
 	 * @throws DropboxException
 	 */
-	private function apiCall($path, $params = array(), $content_call = false, &$content = '') {
+	private function apiCall(string $path, array $params = [], bool $content_call = false, string &$content = '') {
 		$resp = $this->doSingleCall($path, $params, $content_call, $content);
 
 		if (!empty($resp->has_more) && (strpos($path, '/continue') === false)) {
@@ -839,7 +823,7 @@ class DropboxClient {
 	 * @return object Normalized metadata object.
 	 * @throws DropboxException When metadata cannot be parsed and $throw_on_error is true.
 	 */
-	private static function getMetaFromHeaders(&$header_array, $throw_on_error = false) {
+	private static function getMetaFromHeaders(array &$header_array, bool $throw_on_error = false) {
 		$rApiHeaders = array_filter($header_array, function ($s) {
 			return stripos($s, 'dropbox-api-result:') === 0;
 		});
@@ -863,7 +847,7 @@ class DropboxClient {
 	 * @param string|object $file_or_path Path string or metadata object.
 	 * @return string Leading-slash path ('' for root).
 	 */
-	private static function toPath($file_or_path) {
+	private static function toPath(string|object $file_or_path) {
 		if (is_object($file_or_path)) {
 			$file_or_path = $file_or_path->path;
 		}
@@ -883,7 +867,7 @@ class DropboxClient {
 	 * @param string $url Full URL (scheme + path).
 	 * @return string Encoded URL.
 	 */
-	private static function cleanUrl($url) {
+	private static function cleanUrl(string $url) {
 		$p = substr($url, 0, 8);
 		$url = str_replace('//', '/', str_replace('\\', '/', substr($url, 8)));
 		$url = rawurlencode($url);
@@ -899,7 +883,7 @@ class DropboxClient {
 	 * @param int      $chunksize Read chunk size in bytes.
 	 * @return string Hex-encoded Dropbox content hash.
 	 */
-	public static function contentHashStream($stream, $chunksize = 8192) {
+	public static function contentHashStream($stream, int $chunksize = 8192) {
 		static $BLOCK_SIZE = 4194304;
 		$streamhasher = hash_init('sha256');
 		$blockhasher = hash_init('sha256');
@@ -938,7 +922,7 @@ class DropboxClient {
 	 * @param string $localFileName Path to the local file.
 	 * @return string Hex-encoded Dropbox content hash.
 	 */
-	public static function contentHashFile($localFileName) {
+	public static function contentHashFile(string $localFileName) {
 		$handle = fopen($localFileName, 'r');
 		$hash = self::contentHashStream($handle);
 		fclose($handle);
diff --git a/src/Core/Storage/DropboxException.php b/src/Core/Storage/DropboxException.php
index cd0594cd..14f3b916 100644
--- a/src/Core/Storage/DropboxException.php
+++ b/src/Core/Storage/DropboxException.php
@@ -11,7 +11,7 @@ class DropboxException extends \Exception {
 	 * @param object|string|null $resp    Error response object, message string, or null (use last PHP error).
 	 * @param string|null        $context Optional context appended to the message.
 	 */
-	public function __construct($resp = null, $context = null) {
+	public function __construct(object|string|null $resp = null, ?string $context = null) {
 		if (is_null($resp)) {
 			$el = error_get_last();
 			$this->message = $el['message'];
diff --git a/src/Core/Updates/GitHubReleases.php b/src/Core/Updates/GitHubReleases.php
index 846e5902..0a02da01 100644
--- a/src/Core/Updates/GitHubReleases.php
+++ b/src/Core/Updates/GitHubReleases.php
@@ -17,527 +17,537 @@ namespace XcVm\Core\Updates;
  */
 
 class GitHubReleases {
-    private string $owner;
-    private string $repo;
-    private string $api_url;
-    /** @var list<string> */
-    private array $headers;
-    private $timeout = 30; // Total transfer timeout in seconds (the /releases list ships changelogs and is tens of KB; 5s was too tight during installs when the link is saturated by apt/wget)
-    private $connect_timeout = 10; // Connection-phase timeout in seconds — fail fast on an unreachable host without capping slow transfers
-    private $cache_file = '/home/xc_vm/tmp/gitapi'; // Cache file path
-    private string $channel = 'stable'; // 'stable' or 'beta' ('unstable' accepted as a legacy alias)
-    private $hash_file = 'hashes.md5';
-    private $cache_ttl = 1800; // Cache TTL in seconds (30 minutes)
+	private string $owner;
 
-    /**
-     * Initialize a GitHubReleases instance.
-     *
-     * @param string $owner Repository owner
-     * @param string $repo Repository name
-     * @param string $channel Update channel: 'stable' or 'beta' ('unstable' is a legacy alias)
-     * @param string|null $token GitHub API token
-     */
-    public function __construct(string $owner, string $repo, ?string $channel = 'stable', ?string $token = null) {
-        $this->owner = $owner;
-        $this->repo = $repo;
-        $this->channel = self::normalizeChannel($channel);
-        $this->cache_file = "{$this->cache_file}_{$repo}_{$this->channel}"; // Уникальный кэш для канала
-        $this->api_url = "https://api.github.com/repos/{$owner}/{$repo}/releases";
-        $this->headers = $token ? [
-            "Authorization: Bearer {$token}",
-            'Accept: application/vnd.github+json',
-            'X-GitHub-Api-Version: 2022-11-28'
-        ] : [];
-    }
+	private string $repo;
 
-    /**
-     * Normalize a channel name to the canonical set. 'unstable' is a legacy alias
-     * for 'beta'; anything unrecognized falls back to 'stable'.
-     *
-     * @param string|null $channel Raw channel value (e.g. from settings)
-     * @return string 'stable' or 'beta'
-     */
-    private static function normalizeChannel(?string $channel): string {
-        $channel = ($channel === 'unstable') ? 'beta' : (string) $channel;
-        return in_array($channel, ['stable', 'beta'], true) ? $channel : 'stable';
-    }
+	private string $api_url;
 
-    /**
-     * Clear the cached release data by deleting the cache file.
-     */
-    public function clearCache(): void {
-        if (file_exists($this->cache_file)) {
-            unlink($this->cache_file);
-            error_log("Cache cleared for {$this->owner}/{$this->repo} by deleting {$this->cache_file}");
-        }
-    }
+	/** @var list<string> */
+	private array $headers;
 
-    /**
-     * Check if the cache file is still valid based on TTL.
-     *
-     * @return bool True if cache is valid, False otherwise.
-     */
-    private function isCacheValid(): bool {
-        if (!file_exists($this->cache_file)) {
-            return false;
-        }
-        $cache_timestamp = filemtime($this->cache_file);
-        return (time() - $cache_timestamp) < $this->cache_ttl;
-    }
+	private $timeout = 30; // Total transfer timeout in seconds (the /releases list ships changelogs and is tens of KB; 5s was too tight during installs when the link is saturated by apt/wget)
 
-    /**
-     * Load cache from file.
-     *
-     * @return array|null The cached data, or null if the file doesn't exist or is invalid.
-     */
-    private function loadCache(): ?array {
-        if (!file_exists($this->cache_file)) {
-            return null;
-        }
-        $content = file_get_contents($this->cache_file);
-        if ($content === false) {
-            error_log("Failed to read cache file {$this->cache_file}");
-            return null;
-        }
-        $data = json_decode($content, true);
-        if (json_last_error() !== JSON_ERROR_NONE) {
-            error_log("Failed to parse cache file {$this->cache_file}: " . json_last_error_msg());
-            return null;
-        }
-        return $data;
-    }
+	private $connect_timeout = 10; // Connection-phase timeout in seconds — fail fast on an unreachable host without capping slow transfers
 
-    /**
-     * Save data to cache file with file locking to prevent race conditions.
-     *
-     * @param array $data The data to cache.
-     * @return bool True on success, False on failure.
-     */
-    private function saveCache(array $data): bool {
-        $json = json_encode($data);
-        if ($json === false) {
-            error_log("Failed to encode cache data to JSON");
-            return false;
-        }
+	private $cache_file = '/home/xc_vm/tmp/gitapi'; // Cache file path
 
-        $file = fopen($this->cache_file, 'c');
-        if ($file === false) {
-            error_log("Failed to open cache file {$this->cache_file} for writing");
-            return false;
-        }
+	private string $channel = 'stable'; // 'stable' or 'beta' ('unstable' accepted as a legacy alias)
 
-        if (flock($file, LOCK_EX)) {
-            ftruncate($file, 0);
-            fwrite($file, $json);
-            fflush($file);
-            flock($file, LOCK_UN);
-            fclose($file);
-            error_log("Cache saved to {$this->cache_file}");
-            return true;
-        } else {
-            error_log("Failed to acquire lock on cache file {$this->cache_file}");
-            fclose($file);
-            return false;
-        }
-    }
+	private $hash_file = 'hashes.md5';
 
-    /**
-     * Fetch all release versions (tags) from the GitHub repository, using cache if valid.
-     *
-     * @return array List of version tags in descending order (latest first).
-     * @throws \Exception If the request fails.
-     */
-    public function getReleases(): array {
-        return array_values(array_map(fn($r) => $r['tag_name'], $this->getFilteredReleases()));
-    }
+	private $cache_ttl = 1800; // Cache TTL in seconds (30 minutes)
 
-    /**
-     * Fetch the channel-filtered release objects (with the tag_name AND the
-     * prerelease flag), newest first, using the cache when valid. Shared by
-     * getReleases() and the rollback picker, which needs the prerelease flag to
-     * mark beta builds.
-     *
-     * @return array<int,array<string,mixed>> Filtered GitHub release objects.
-     * @throws \Exception If the request fails.
-     */
-    private function getFilteredReleases(): array {
-        if ($this->isCacheValid()) {
-            error_log("Using cached releases (channel: {$this->channel}) from {$this->cache_file}");
-            $cache = $this->loadCache();
-            if ($cache !== null) {
-                return array_values($this->filterReleasesByChannel($cache));
-            }
-        }
+	/**
+	 * Initialize a GitHubReleases instance.
+	 *
+	 * @param string $owner Repository owner
+	 * @param string $repo Repository name
+	 * @param string $channel Update channel: 'stable' or 'beta' ('unstable' is a legacy alias)
+	 * @param string|null $token GitHub API token
+	 */
+	public function __construct(string $owner, string $repo, ?string $channel = 'stable', ?string $token = null) {
+		$this->owner = $owner;
+		$this->repo = $repo;
+		$this->channel = self::normalizeChannel($channel);
+		$this->cache_file = "{$this->cache_file}_{$repo}_{$this->channel}"; // Уникальный кэш для канала
+		$this->api_url = "https://api.github.com/repos/{$owner}/{$repo}/releases";
+		$this->headers = $token ? [
+			"Authorization: Bearer {$token}",
+			'Accept: application/vnd.github+json',
+			'X-GitHub-Api-Version: 2022-11-28'
+		] : [];
+	}
 
-        try {
-            error_log("Fetching releases for {$this->owner}/{$this->repo} (channel: {$this->channel})");
-            $response = $this->makeRequest($this->api_url);
-            $data = json_decode($response, true);
-            if ($data === null) {
-                throw new \Exception("Failed to parse API response: " . json_last_error_msg());
-            }
+	/**
+	 * Normalize a channel name to the canonical set. 'unstable' is a legacy alias
+	 * for 'beta'; anything unrecognized falls back to 'stable'.
+	 *
+	 * @param string|null $channel Raw channel value (e.g. from settings)
+	 * @return string 'stable' or 'beta'
+	 */
+	private static function normalizeChannel(?string $channel): string {
+		$channel = ($channel === 'unstable') ? 'beta' : (string) $channel;
+		return in_array($channel, ['stable', 'beta'], true) ? $channel : 'stable';
+	}
 
-            $this->saveCache($data); // Сохраняем полные данные, фильтруем при использовании
-            $filtered = array_values($this->filterReleasesByChannel($data));
-            error_log("Retrieved " . count($filtered) . " releases for channel '{$this->channel}'");
-            return $filtered;
-        } catch (\Exception $e) {
-            error_log("Failed to fetch releases: " . $e->getMessage());
-            throw $e;
-        }
-    }
+	/**
+	 * Clear the cached release data by deleting the cache file.
+	 */
+	public function clearCache(): void {
+		if (file_exists($this->cache_file)) {
+			unlink($this->cache_file);
+			error_log("Cache cleared for {$this->owner}/{$this->repo} by deleting {$this->cache_file}");
+		}
+	}
 
-    /**
-     * Get the latest available version that is newer than the current one.
-     *
-     * Unlike getNextVersion(), this skips intermediate versions and returns
-     * the newest release directly, allowing jump updates.
-     *
-     * @param string $current_version The current version tag (e.g., "1.0.0").
-     * @return string|null The latest version tag, or null if already up-to-date or version not found.
-     */
-    public function getLatestVersion(string $current_version): ?string {
-        $releases = $this->getReleases();
+	/**
+	 * Check if the cache file is still valid based on TTL.
+	 *
+	 * @return bool True if cache is valid, False otherwise.
+	 */
+	private function isCacheValid(): bool {
+		if (!file_exists($this->cache_file)) {
+			return false;
+		}
+		$cache_timestamp = filemtime($this->cache_file);
+		return (time() - $cache_timestamp) < $this->cache_ttl;
+	}
 
-        if (empty($releases)) {
-            return null;
-        }
+	/**
+	 * Load cache from file.
+	 *
+	 * @return array|null The cached data, or null if the file doesn't exist or is invalid.
+	 */
+	private function loadCache(): ?array {
+		if (!file_exists($this->cache_file)) {
+			return null;
+		}
+		$content = file_get_contents($this->cache_file);
+		if ($content === false) {
+			error_log("Failed to read cache file {$this->cache_file}");
+			return null;
+		}
+		$data = json_decode($content, true);
+		if (json_last_error() !== JSON_ERROR_NONE) {
+			error_log("Failed to parse cache file {$this->cache_file}: " . json_last_error_msg());
+			return null;
+		}
+		return $data;
+	}
 
-        $latest = $releases[0];
+	/**
+	 * Save data to cache file with file locking to prevent race conditions.
+	 *
+	 * @param array $data The data to cache.
+	 * @return bool True on success, False on failure.
+	 */
+	private function saveCache(array $data): bool {
+		$json = json_encode($data);
+		if ($json === false) {
+			error_log("Failed to encode cache data to JSON");
+			return false;
+		}
 
-        if (version_compare($latest, $current_version, '<=')) {
-            return null;
-        }
+		$file = fopen($this->cache_file, 'c');
+		if ($file === false) {
+			error_log("Failed to open cache file {$this->cache_file} for writing");
+			return false;
+		}
 
-        return $latest;
-    }
+		if (flock($file, LOCK_EX)) {
+			ftruncate($file, 0);
+			fwrite($file, $json);
+			fflush($file);
+			flock($file, LOCK_UN);
+			fclose($file);
+			error_log("Cache saved to {$this->cache_file}");
+			return true;
+		} else {
+			error_log("Failed to acquire lock on cache file {$this->cache_file}");
+			fclose($file);
+			return false;
+		}
+	}
 
-    /**
-     * Retrieve the MD5 hash of a release asset from its corresponding hash file.
-     *
-     * @param string $version The release tag (e.g., "1.0.0").
-     * @param string $asset_name The asset file name to get the hash for (e.g., "update.tar.gz").
-     * @return string|null The MD5 hash string, or null if not found or invalid.
-     */
-    public function getAssetHash(string $version, string $asset_name): ?string {
-        $hashURL = "https://github.com/{$this->owner}/{$this->repo}/releases/download/{$version}/{$this->hash_file}";
-        try {
-            $hash_response = $this->makeRequest($hashURL);
+	/**
+	 * Fetch all release versions (tags) from the GitHub repository, using cache if valid.
+	 *
+	 * @return array List of version tags in descending order (latest first).
+	 * @throws \Exception If the request fails.
+	 */
+	public function getReleases(): array {
+		return array_values(array_map(fn($r) => $r['tag_name'], $this->getFilteredReleases()));
+	}
 
-            $hash_text = trim($hash_response);
-            $lines = explode("\n", $hash_text);
+	/**
+	 * Fetch the channel-filtered release objects (with the tag_name AND the
+	 * prerelease flag), newest first, using the cache when valid. Shared by
+	 * getReleases() and the rollback picker, which needs the prerelease flag to
+	 * mark beta builds.
+	 *
+	 * @return array<int,array<string,mixed>> Filtered GitHub release objects.
+	 * @throws \Exception If the request fails.
+	 */
+	private function getFilteredReleases(): array {
+		if ($this->isCacheValid()) {
+			error_log("Using cached releases (channel: {$this->channel}) from {$this->cache_file}");
+			$cache = $this->loadCache();
+			if ($cache !== null) {
+				return array_values($this->filterReleasesByChannel($cache));
+			}
+		}
 
-            foreach ($lines as $line) {
-                $line = trim($line);
-                if (empty($line)) {
-                    continue;
-                }
-                $parts = preg_split('/\s+/', $line, 2);
-                if (count($parts) === 2 && $parts[1] === $asset_name) {
-                    error_log("Retrieved MD5 hash for {$asset_name} in version {$version}");
-                    return $parts[0];
-                }
-            }
-            error_log("Asset '{$asset_name}' not found in hash file for version {$version}");
-            return null;
-        } catch (\Exception $e) {
-            error_log("Failed to fetch asset hash from {$hashURL}: " . $e->getMessage());
-            return null;
-        }
-    }
+		try {
+			error_log("Fetching releases for {$this->owner}/{$this->repo} (channel: {$this->channel})");
+			$response = $this->makeRequest($this->api_url);
+			$data = json_decode($response, true);
+			if ($data === null) {
+				throw new \Exception("Failed to parse API response: " . json_last_error_msg());
+			}
 
-    /**
-     * Retrieve the changelog for a specific release from its changelog.json.
-     *
-     * The file is fetched from the repository at the given tag via raw.githubusercontent.
-     * It contains a single object: {"version": "X.Y.Z", "changes": [...]}.
-     *
-     * @param string $version The release tag to fetch the changelog for.
-     * @return array A JSON-compatible array containing the changelog entry wrapped in an array.
-     */
-    public function getChangelog(string $version): array {
-        try {
-            $url = "https://raw.githubusercontent.com/{$this->owner}/{$this->repo}/refs/tags/{$version}/changelog.json";
-            $response = $this->makeRequest($url);
-            $changelog = json_decode($response, true);
-            if ($changelog === null) {
-                error_log("Failed to parse changelog JSON for version {$version}");
-                return [];
-            }
-            error_log("Successfully retrieved changelog for version {$version} with " . count($changelog['changes'] ?? []) . " changes");
-            return [$changelog];
-        } catch (\Exception $e) {
-            error_log("Failed to fetch changelog for version {$version}: " . $e->getMessage());
-            return [];
-        }
-    }
+			$this->saveCache($data); // Сохраняем полные данные, фильтруем при использовании
+			$filtered = array_values($this->filterReleasesByChannel($data));
+			error_log("Retrieved " . count($filtered) . " releases for channel '{$this->channel}'");
+			return $filtered;
+		} catch (\Exception $e) {
+			error_log("Failed to fetch releases: " . $e->getMessage());
+			throw $e;
+		}
+	}
 
-    /**
-     * Validate whether a version string follows the format X.Y.Z.
-     *
-     * @param string $version The version string to validate (e.g., "1.0.0").
-     * @return bool True if valid, False otherwise.
-     * @throws \InvalidArgumentException If the version string is too long or contains invalid parts.
-     */
-    public static function isValidVersion(string $version): bool {
-        if (strlen($version) > 20) {
-            error_log("Version string too long");
-            throw new \InvalidArgumentException("Version string is too long");
-        }
+	/**
+	 * Get the latest available version that is newer than the current one.
+	 *
+	 * Unlike getNextVersion(), this skips intermediate versions and returns
+	 * the newest release directly, allowing jump updates.
+	 *
+	 * @param string $current_version The current version tag (e.g., "1.0.0").
+	 * @return string|null The latest version tag, or null if already up-to-date or version not found.
+	 */
+	public function getLatestVersion(string $current_version): ?string {
+		$releases = $this->getReleases();
 
-        if (!preg_match('/^[0-9]+\.[0-9]+\.[0-9]+$/', $version)) {
-            error_log("Invalid version format: {$version}");
-            return false;
-        }
+		if (empty($releases)) {
+			return null;
+		}
 
-        $parts = explode('.', $version);
-        if (count($parts) !== 3) {
-            error_log("Version must have three parts: {$version}");
-            return false;
-        }
+		$latest = $releases[0];
 
-        foreach ($parts as $part) {
-            $num = (int)$part;
-            if ($num < 0) {
-                error_log("Negative numbers are not allowed in version: {$version}");
-                return false;
-            }
-            if (strlen($part) > 1 && $part[0] === '0') {
-                error_log("Leading zeros are not allowed in version: {$version}");
-                return false;
-            }
-        }
+		if (version_compare($latest, $current_version, '<=')) {
+			return null;
+		}
 
-        return true;
-    }
+		return $latest;
+	}
 
-    /**
-     * Make an HTTP request using cURL.
-     *
-     * @param string $url The URL to request.
-     * @return string The response body.
-     * @throws \Exception If the request fails.
-     */
-    private function makeRequest(string $url): string {
-        $ch = curl_init($url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connect_timeout);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $this->headers);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Vateron-Media/XC_VM');
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+	/**
+	 * Retrieve the MD5 hash of a release asset from its corresponding hash file.
+	 *
+	 * @param string $version The release tag (e.g., "1.0.0").
+	 * @param string $asset_name The asset file name to get the hash for (e.g., "update.tar.gz").
+	 * @return string|null The MD5 hash string, or null if not found or invalid.
+	 */
+	public function getAssetHash(string $version, string $asset_name): ?string {
+		$hashURL = "https://github.com/{$this->owner}/{$this->repo}/releases/download/{$version}/{$this->hash_file}";
+		try {
+			$hash_response = $this->makeRequest($hashURL);
 
-        $response = curl_exec($ch);
-        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $error = curl_error($ch);
-        curl_close($ch);
+			$hash_text = trim($hash_response);
+			$lines = explode("\n", $hash_text);
 
-        if ($response === false) {
-            throw new \Exception("cURL error: {$error}");
-        }
+			foreach ($lines as $line) {
+				$line = trim($line);
+				if (empty($line)) {
+					continue;
+				}
+				$parts = preg_split('/\s+/', $line, 2);
+				if (count($parts) === 2 && $parts[1] === $asset_name) {
+					error_log("Retrieved MD5 hash for {$asset_name} in version {$version}");
+					return $parts[0];
+				}
+			}
+			error_log("Asset '{$asset_name}' not found in hash file for version {$version}");
+			return null;
+		} catch (\Exception $e) {
+			error_log("Failed to fetch asset hash from {$hashURL}: " . $e->getMessage());
+			return null;
+		}
+	}
 
-        if ($http_code !== 200) {
-            switch ($http_code) {
-                case 404:
-                    error_log("Resource not found (404)");
-                    throw new \Exception("Resource not found (404)");
-                case 403:
-                    error_log("Access forbidden (403) - Check API rate limits or permissions");
-                    throw new \Exception("Access forbidden (403)");
-                case 500:
-                    error_log("Server error (500)");
-                    throw new \Exception("Server error (500)");
-                default:
-                    error_log("Unexpected HTTP status code: {$http_code}");
-                    throw new \Exception("Unexpected HTTP status code: {$http_code}");
-            }
-        }
+	/**
+	 * Retrieve the changelog for a specific release from its changelog.json.
+	 *
+	 * The file is fetched from the repository at the given tag via raw.githubusercontent.
+	 * It contains a single object: {"version": "X.Y.Z", "changes": [...]}.
+	 *
+	 * @param string $version The release tag to fetch the changelog for.
+	 * @return array A JSON-compatible array containing the changelog entry wrapped in an array.
+	 */
+	public function getChangelog(string $version): array {
+		try {
+			$url = "https://raw.githubusercontent.com/{$this->owner}/{$this->repo}/refs/tags/{$version}/changelog.json";
+			$response = $this->makeRequest($url);
+			$changelog = json_decode($response, true);
+			if ($changelog === null) {
+				error_log("Failed to parse changelog JSON for version {$version}");
+				return [];
+			}
+			error_log("Successfully retrieved changelog for version {$version} with " . count($changelog['changes'] ?? []) . " changes");
+			return [$changelog];
+		} catch (\Exception $e) {
+			error_log("Failed to fetch changelog for version {$version}: " . $e->getMessage());
+			return [];
+		}
+	}
 
-        return $response;
-    }
+	/**
+	 * Validate whether a version string follows the format X.Y.Z.
+	 *
+	 * @param string $version The version string to validate (e.g., "1.0.0").
+	 * @return bool True if valid, False otherwise.
+	 * @throws \InvalidArgumentException If the version string is too long or contains invalid parts.
+	 */
+	public static function isValidVersion(string $version): bool {
+		if (strlen($version) > 20) {
+			error_log("Version string too long");
+			throw new \InvalidArgumentException("Version string is too long");
+		}
 
-    /**
-     * Get update file details for a specific file type and version.
-     *
-     * @param string $file_type The type of update file (main, lb, lb_update).
-     * @param string $version The current version tag (e.g., "1.0.0").
-     * @return array|null Array with URL and MD5 hash, or null if no next version.
-     * @throws \Exception If the file type is invalid.
-     */
-    public function getUpdateFile(string $file_type, string $version) {
-        switch ($file_type) {
-            case "main":
-                $update_file = "xc_vm.tar.gz";
-                break;
-            case "lb":
-                $update_file = "loadbalancer.tar.gz";
-                break;
-            case "lb_update":
-                $update_file = "loadbalancer.tar.gz";
-                break;
-            default:
-                throw new \Exception("Not valid file type");
-        }
-        $target_version = $this->getLatestVersion($version);
-        if (is_null($target_version)) {
-            $target_version = $version;
-        }
-        $upd_archive_url = "https://github.com/{$this->owner}/{$this->repo}/releases/download/{$target_version}/{$update_file}";
-        $hash_md5 = $this->getAssetHash($target_version, $update_file);
+		if (!preg_match('/^[0-9]+\.[0-9]+\.[0-9]+$/', $version)) {
+			error_log("Invalid version format: {$version}");
+			return false;
+		}
 
-        $data = ["url" => $upd_archive_url, "md5" => $hash_md5];
-        return $data;
-    }
+		$parts = explode('.', $version);
+		if (count($parts) !== 3) {
+			error_log("Version must have three parts: {$version}");
+			return false;
+		}
 
-    /**
-     * Build the download URL + MD5 for a SPECIFIC release version's asset.
-     *
-     * Unlike getUpdateFile(), which always resolves to the latest via
-     * getLatestVersion(), this targets the exact $version passed — used by the
-     * rollback flow to fetch an older release.
-     *
-     * @param string $file_type "main" (panel) or "lb"/"lb_update" (load balancer).
-     * @param string $version   Exact release tag to fetch (e.g. "2.4.0").
-     * @return array{url:string,md5:?string}
-     * @throws \Exception On an invalid file type.
-     */
-    public function getVersionFile(string $file_type, string $version): array {
-        switch ($file_type) {
-            case "main":
-                $update_file = "xc_vm.tar.gz";
-                break;
-            case "lb":
-            case "lb_update":
-                $update_file = "loadbalancer.tar.gz";
-                break;
-            default:
-                throw new \Exception("Not valid file type");
-        }
-        $url = "https://github.com/{$this->owner}/{$this->repo}/releases/download/{$version}/{$update_file}";
+		foreach ($parts as $part) {
+			$num = (int) $part;
+			if ($num < 0) {
+				error_log("Negative numbers are not allowed in version: {$version}");
+				return false;
+			}
+			if (strlen($part) > 1 && $part[0] === '0') {
+				error_log("Leading zeros are not allowed in version: {$version}");
+				return false;
+			}
+		}
 
-        return ["url" => $url, "md5" => $this->getAssetHash($version, $update_file)];
-    }
+		return true;
+	}
 
-    /**
-     * List the newest $limit released versions strictly older than
-     * $current_version, newest first. Populates the rollback version picker. Each
-     * entry carries a `beta` flag (GitHub prerelease) so the UI can tag it.
-     *
-     * @param string $current_version Current version tag (e.g. "2.4.1").
-     * @param int    $limit           Max versions to return.
-     * @return array<int,array{version:string,beta:bool}> Older releases, newest first.
-     */
-    public function getPreviousVersions(string $current_version, int $limit = 5): array {
-        $older = array();
-        foreach ($this->getFilteredReleases() as $rRelease) {
-            $tag = (string) ($rRelease['tag_name'] ?? '');
-            if ($tag !== '' && version_compare($tag, $current_version, '<')) {
-                $older[] = array('version' => $tag, 'beta' => !empty($rRelease['prerelease']));
-            }
-        }
-        usort($older, static fn($a, $b) => version_compare($b['version'], $a['version']));
+	/**
+	 * Make an HTTP request using cURL.
+	 *
+	 * @param string $url The URL to request.
+	 * @return string The response body.
+	 * @throws \Exception If the request fails.
+	 */
+	private function makeRequest(string $url): string {
+		$ch = curl_init($url);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connect_timeout);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $this->headers);
+		curl_setopt($ch, CURLOPT_USERAGENT, 'Vateron-Media/XC_VM');
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
 
-        return array_slice($older, 0, max(1, $limit));
-    }
+		$response = curl_exec($ch);
+		$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		$error = curl_error($ch);
+		curl_close($ch);
 
-    /**
-     * Retrieves update information for the specified version
-     * 
-     * @param string $version Current version to check for updates
-     * @return array|null Array with update information or null in case of error
-     * @throws \InvalidArgumentException If an incorrect version is passed
-     */
-    public function getUpdate(string $version): ?array {
-        try {
-            $latest_version = $this->getLatestVersion($version);
-            if ($latest_version === null) {
-                error_log("No update available for version {$version} on channel '{$this->channel}'");
-                return null;
-            }
+		if ($response === false) {
+			throw new \Exception("cURL error: {$error}");
+		}
 
-            $changelog = $this->getChangelog($latest_version);
+		if ($http_code !== 200) {
+			switch ($http_code) {
+				case 404:
+					error_log("Resource not found (404)");
+					throw new \Exception("Resource not found (404)");
+				case 403:
+					error_log("Access forbidden (403) - Check API rate limits or permissions");
+					throw new \Exception("Access forbidden (403)");
+				case 500:
+					error_log("Server error (500)");
+					throw new \Exception("Server error (500)");
+				default:
+					error_log("Unexpected HTTP status code: {$http_code}");
+					throw new \Exception("Unexpected HTTP status code: {$http_code}");
+			}
+		}
 
-            $url = "https://github.com/{$this->owner}/{$this->repo}/releases/tag/{$latest_version}";
+		return $response;
+	}
 
-            return [
-                "version" => $latest_version,
-                "changelog" => $changelog,
-                "url" => $url
-            ];
-        } catch (\Exception $e) {
-            error_log("Error while fetching update: " . $e->getMessage());
-            return null;
-        }
-    }
-    /**
-     * Build the browser download URL for a release asset.
-     *
-     * @param string $version Release tag.
-     * @param string $asset   Asset filename.
-     * @return string
-     */
-    public function assetUrl(string $version, string $asset): string {
-        return "https://github.com/{$this->owner}/{$this->repo}/releases/download/{$version}/{$asset}";
-    }
+	/**
+	 * Get update file details for a specific file type and version.
+	 *
+	 * @param string $file_type The type of update file (main, lb, lb_update).
+	 * @param string $version The current version tag (e.g., "1.0.0").
+	 * @return array|null Array with URL and MD5 hash, or null if no next version.
+	 * @throws \Exception If the file type is invalid.
+	 */
+	public function getUpdateFile(string $file_type, string $version) {
+		switch ($file_type) {
+			case "main":
+				$update_file = "xc_vm.tar.gz";
+				break;
+			case "lb":
+				$update_file = "loadbalancer.tar.gz";
+				break;
+			case "lb_update":
+				$update_file = "loadbalancer.tar.gz";
+				break;
+			default:
+				throw new \Exception("Not valid file type");
+		}
+		$target_version = $this->getLatestVersion($version);
+		if (is_null($target_version)) {
+			$target_version = $version;
+		}
+		$upd_archive_url = "https://github.com/{$this->owner}/{$this->repo}/releases/download/{$target_version}/{$update_file}";
+		$hash_md5 = $this->getAssetHash($target_version, $update_file);
 
-    /**
-     * Filter releases based on the selected channel.
-     *
-     * @param array $releases Raw releases from GitHub API
-     * @return array Filtered releases
-     */
-    private function filterReleasesByChannel(array $releases): array {
-        if ($this->channel === 'beta') {
-            return $releases; // Все релизы
-        }
+		$data = ["url" => $upd_archive_url, "md5" => $hash_md5];
+		return $data;
+	}
 
-        // stable: только не pre-release
-        return array_filter($releases, function ($release) {
-            return empty($release['prerelease']);
-        });
-    }
+	/**
+	 * Build the download URL + MD5 for a SPECIFIC release version's asset.
+	 *
+	 * Unlike getUpdateFile(), which always resolves to the latest via
+	 * getLatestVersion(), this targets the exact $version passed — used by the
+	 * rollback flow to fetch an older release.
+	 *
+	 * @param string $file_type "main" (panel) or "lb"/"lb_update" (load balancer).
+	 * @param string $version   Exact release tag to fetch (e.g. "2.4.0").
+	 * @return array{url:string,md5:?string}
+	 * @throws \Exception On an invalid file type.
+	 */
+	public function getVersionFile(string $file_type, string $version): array {
+		switch ($file_type) {
+			case "main":
+				$update_file = "xc_vm.tar.gz";
+				break;
+			case "lb":
+			case "lb_update":
+				$update_file = "loadbalancer.tar.gz";
+				break;
+			default:
+				throw new \Exception("Not valid file type");
+		}
+		$url = "https://github.com/{$this->owner}/{$this->repo}/releases/download/{$version}/{$update_file}";
 
-    /**
-     * Set the request timeout for cURL operations.
-     *
-     * @param int $seconds Timeout in seconds
-     */
-    public function setTimeout(int $seconds): void {
-        $this->timeout = max(1, $seconds);
-    }
+		return ["url" => $url, "md5" => $this->getAssetHash($version, $update_file)];
+	}
 
-    /**
-     * Change the update channel and clear cache.
-     *
-     * @param string $channel 'stable' or 'beta' ('unstable' is a legacy alias)
-     */
-    public function setChannel(string $channel): void {
-        $channel = ($channel === 'unstable') ? 'beta' : $channel;
-        if (!in_array($channel, ['stable', 'beta'])) {
-            throw new \InvalidArgumentException("Channel must be 'stable' or 'beta'");
-        }
-        if ($this->channel !== $channel) {
-            $oldCacheFile = $this->cache_file;
-            $baseCacheFile = preg_replace('/_(stable|beta|unstable)$/', '', $this->cache_file);
-            if (!is_string($baseCacheFile) || $baseCacheFile === '') {
-                $baseCacheFile = $this->cache_file;
-            }
+	/**
+	 * List the newest $limit released versions strictly older than
+	 * $current_version, newest first. Populates the rollback version picker. Each
+	 * entry carries a `beta` flag (GitHub prerelease) so the UI can tag it.
+	 *
+	 * @param string $current_version Current version tag (e.g. "2.4.1").
+	 * @param int    $limit           Max versions to return.
+	 * @return array<int,array{version:string,beta:bool}> Older releases, newest first.
+	 */
+	public function getPreviousVersions(string $current_version, int $limit = 5): array {
+		$older = [];
+		foreach ($this->getFilteredReleases() as $rRelease) {
+			$tag = (string) ($rRelease['tag_name'] ?? '');
+			if ($tag !== '' && version_compare($tag, $current_version, '<')) {
+				$older[] = ['version' => $tag, 'beta' => !empty($rRelease['prerelease'])];
+			}
+		}
+		usort($older, static fn($a, $b) => version_compare($b['version'], $a['version']));
 
-            $this->channel = $channel;
+		return array_slice($older, 0, max(1, $limit));
+	}
 
-            // Remove old-channel cache explicitly before switching file path.
-            if (file_exists($oldCacheFile)) {
-                unlink($oldCacheFile);
-            }
+	/**
+	 * Retrieves update information for the specified version
+	 *
+	 * @param string $version Current version to check for updates
+	 * @return array|null Array with update information or null in case of error
+	 * @throws \InvalidArgumentException If an incorrect version is passed
+	 */
+	public function getUpdate(string $version): ?array {
+		try {
+			$latest_version = $this->getLatestVersion($version);
+			if ($latest_version === null) {
+				error_log("No update available for version {$version} on channel '{$this->channel}'");
+				return null;
+			}
 
-            $this->cache_file = $baseCacheFile . "_{$channel}";
+			$changelog = $this->getChangelog($latest_version);
 
-            // Ensure target-channel cache is also reset.
-            $this->clearCache();
-            error_log("Update channel changed to '{$channel}' and cache cleared");
-        }
-    }
+			$url = "https://github.com/{$this->owner}/{$this->repo}/releases/tag/{$latest_version}";
+
+			return [
+				"version" => $latest_version,
+				"changelog" => $changelog,
+				"url" => $url
+			];
+		} catch (\Exception $e) {
+			error_log("Error while fetching update: " . $e->getMessage());
+			return null;
+		}
+	}
+
+	/**
+	 * Build the browser download URL for a release asset.
+	 *
+	 * @param string $version Release tag.
+	 * @param string $asset   Asset filename.
+	 * @return string
+	 */
+	public function assetUrl(string $version, string $asset): string {
+		return "https://github.com/{$this->owner}/{$this->repo}/releases/download/{$version}/{$asset}";
+	}
+
+	/**
+	 * Filter releases based on the selected channel.
+	 *
+	 * @param array $releases Raw releases from GitHub API
+	 * @return array Filtered releases
+	 */
+	private function filterReleasesByChannel(array $releases): array {
+		if ($this->channel === 'beta') {
+			return $releases; // Все релизы
+		}
+
+		// stable: только не pre-release
+		return array_filter($releases, function ($release) {
+			return empty($release['prerelease']);
+		});
+	}
+
+	/**
+	 * Set the request timeout for cURL operations.
+	 *
+	 * @param int $seconds Timeout in seconds
+	 */
+	public function setTimeout(int $seconds): void {
+		$this->timeout = max(1, $seconds);
+	}
+
+	/**
+	 * Change the update channel and clear cache.
+	 *
+	 * @param string $channel 'stable' or 'beta' ('unstable' is a legacy alias)
+	 */
+	public function setChannel(string $channel): void {
+		$channel = ($channel === 'unstable') ? 'beta' : $channel;
+		if (!in_array($channel, ['stable', 'beta'])) {
+			throw new \InvalidArgumentException("Channel must be 'stable' or 'beta'");
+		}
+		if ($this->channel !== $channel) {
+			$oldCacheFile = $this->cache_file;
+			$baseCacheFile = preg_replace('/_(stable|beta|unstable)$/', '', $this->cache_file);
+			if (!is_string($baseCacheFile) || $baseCacheFile === '') {
+				$baseCacheFile = $this->cache_file;
+			}
+
+			$this->channel = $channel;
+
+			// Remove old-channel cache explicitly before switching file path.
+			if (file_exists($oldCacheFile)) {
+				unlink($oldCacheFile);
+			}
+
+			$this->cache_file = $baseCacheFile . "_{$channel}";
+
+			// Ensure target-channel cache is also reset.
+			$this->clearCache();
+			error_log("Update channel changed to '{$channel}' and cache cleared");
+		}
+	}
 }
 
 /**
diff --git a/src/Core/Updates/UpdateChannels.php b/src/Core/Updates/UpdateChannels.php
index f82433e2..4ead1393 100644
--- a/src/Core/Updates/UpdateChannels.php
+++ b/src/Core/Updates/UpdateChannels.php
@@ -23,60 +23,59 @@ use XcVm\Core\Config\SettingsManager;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class UpdateChannels {
+	/**
+	 * Channel for the MAIN panel repository (also used by UPDATE/PROXY).
+	 *
+	 * @return string 'stable' or 'beta'
+	 */
+	public static function main(): string {
+		return self::normalize(SettingsManager::getString('update_channel_main', 'stable'));
+	}
 
-    /**
-     * Channel for the MAIN panel repository (also used by UPDATE/PROXY).
-     *
-     * @return string 'stable' or 'beta'
-     */
-    public static function main(): string {
-        return self::normalize(SettingsManager::getString('update_channel_main', 'stable'));
-    }
+	/**
+	 * Channel for the BIN compiled-binaries repository.
+	 *
+	 * @return string 'stable' or 'beta'
+	 */
+	public static function bin(): string {
+		return self::normalize(SettingsManager::getString('update_channel_bin', 'stable'));
+	}
 
-    /**
-     * Channel for the BIN compiled-binaries repository.
-     *
-     * @return string 'stable' or 'beta'
-     */
-    public static function bin(): string {
-        return self::normalize(SettingsManager::getString('update_channel_bin', 'stable'));
-    }
+	/**
+	 * Channel for the FANOUT (xc_fanout daemon) repository.
+	 *
+	 * @return string 'stable' or 'beta'
+	 */
+	public static function fanout(): string {
+		return self::normalize(SettingsManager::getString('update_channel_fanout', 'stable'));
+	}
 
-    /**
-     * Channel for the FANOUT (xc_fanout daemon) repository.
-     *
-     * @return string 'stable' or 'beta'
-     */
-    public static function fanout(): string {
-        return self::normalize(SettingsManager::getString('update_channel_fanout', 'stable'));
-    }
+	/**
+	 * Channel for a repository identified by its GitHub repo name (a GIT_REPO_*
+	 * constant value). Unknown repos — including UPDATE and PROXY — follow MAIN.
+	 *
+	 * @param string $repo Repository name (e.g. GIT_REPO_BIN)
+	 * @return string 'stable' or 'beta'
+	 */
+	public static function forRepo(string $repo): string {
+		if (defined('GIT_REPO_BIN') && $repo === GIT_REPO_BIN) {
+			return self::bin();
+		}
+		if (defined('GIT_REPO_FANOUT') && $repo === GIT_REPO_FANOUT) {
+			return self::fanout();
+		}
+		return self::main();
+	}
 
-    /**
-     * Channel for a repository identified by its GitHub repo name (a GIT_REPO_*
-     * constant value). Unknown repos — including UPDATE and PROXY — follow MAIN.
-     *
-     * @param string $repo Repository name (e.g. GIT_REPO_BIN)
-     * @return string 'stable' or 'beta'
-     */
-    public static function forRepo(string $repo): string {
-        if (defined('GIT_REPO_BIN') && $repo === GIT_REPO_BIN) {
-            return self::bin();
-        }
-        if (defined('GIT_REPO_FANOUT') && $repo === GIT_REPO_FANOUT) {
-            return self::fanout();
-        }
-        return self::main();
-    }
-
-    /**
-     * Normalize a raw channel value. 'unstable' is a legacy alias for 'beta';
-     * anything unrecognized falls back to 'stable'.
-     *
-     * @param string|null $channel Raw channel value (e.g. from settings)
-     * @return string 'stable' or 'beta'
-     */
-    private static function normalize(?string $channel): string {
-        $channel = ($channel === 'unstable') ? 'beta' : (string) $channel;
-        return in_array($channel, ['stable', 'beta'], true) ? $channel : 'stable';
-    }
+	/**
+	 * Normalize a raw channel value. 'unstable' is a legacy alias for 'beta';
+	 * anything unrecognized falls back to 'stable'.
+	 *
+	 * @param string|null $channel Raw channel value (e.g. from settings)
+	 * @return string 'stable' or 'beta'
+	 */
+	private static function normalize(?string $channel): string {
+		$channel = ($channel === 'unstable') ? 'beta' : (string) $channel;
+		return in_array($channel, ['stable', 'beta'], true) ? $channel : 'stable';
+	}
 }
diff --git a/src/Core/Util/AdminHelpers.php b/src/Core/Util/AdminHelpers.php
index 7bcb51ea..5d05e172 100644
--- a/src/Core/Util/AdminHelpers.php
+++ b/src/Core/Util/AdminHelpers.php
@@ -20,7 +20,7 @@ class AdminHelpers {
 	 * @param string $rCIDR IP or CIDR notation.
 	 * @return bool True if valid (mask within range when present).
 	 */
-	public static function validateCIDR($rCIDR) {
+	public static function validateCIDR(string $rCIDR) {
 		$rParts = explode('/', $rCIDR);
 		$rIP = $rParts[0];
 		$rNetmask = null;
@@ -54,7 +54,7 @@ class AdminHelpers {
 	 * @param array $rSkip      Keys to leave untouched.
 	 * @return array The merged row.
 	 */
-	public static function overwriteData($rData, $rOverwrite, $rSkip = array()) {
+	public static function overwriteData(array $rData, array $rOverwrite, array $rSkip = []) {
 		foreach ($rOverwrite as $rKey => $rValue) {
 			if (array_key_exists($rKey, $rData) && !in_array($rKey, $rSkip)) {
 				if (!(empty($rValue) && is_null($rData[$rKey]))) {
@@ -72,7 +72,7 @@ class AdminHelpers {
 	 * @param mixed $rIDs Raw id list.
 	 * @return array Validated integer ids.
 	 */
-	public static function confirmIDs($rIDs) {
+	public static function confirmIDs(mixed $rIDs) {
 		return InputValidator::confirmIDs($rIDs);
 	}
 
@@ -84,7 +84,7 @@ class AdminHelpers {
 	 * @param bool  $checkPositive Require ids to be > 0.
 	 * @return int[] Filtered ids.
 	 */
-	public static function filterIDs($ids, $availableIDs, $checkPositive = true) {
+	public static function filterIDs(mixed $ids, array $availableIDs, bool $checkPositive = true) {
 		$filtered = [];
 
 		if (!is_array($ids)) {
@@ -92,7 +92,7 @@ class AdminHelpers {
 		}
 
 		foreach ($ids as $id) {
-			$intID = (int)$id;
+			$intID = (int) $id;
 			$isValid = (!$checkPositive || $intID > 0) && in_array($intID, $availableIDs);
 
 			if ($isValid) {
@@ -110,7 +110,7 @@ class AdminHelpers {
 	 * @param int|float $search Target value.
 	 * @return mixed The nearest value.
 	 */
-	public static function getNearest($arr, $search) {
+	public static function getNearest(array $arr, int|float $search) {
 		return StreamSorter::getNearest($arr, $search);
 	}
 
@@ -121,7 +121,7 @@ class AdminHelpers {
 	 * @param int       $x Multiple to round to.
 	 * @return float Rounded value.
 	 */
-	public static function roundUpToAny($n, $x = 5) {
+	public static function roundUpToAny(int|float $n, int $x = 5) {
 		return round(($n + $x / 2) / $x) * $x;
 	}
 
@@ -131,7 +131,7 @@ class AdminHelpers {
 	 * @param int $strength Number of characters.
 	 * @return string Random string.
 	 */
-	public static function generateString($strength = 10) {
+	public static function generateString(int $strength = 10) {
 		$input = '23456789abcdefghjkmnpqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ';
 		$input_length = strlen($input);
 		$random_string = '';
@@ -153,12 +153,12 @@ class AdminHelpers {
 	 * @param array $rSort  Desired order of values.
 	 * @return array Reordered array.
 	 */
-	public static function sortArrayByArray($rArray, $rSort) {
+	public static function sortArrayByArray(array $rArray, array $rSort) {
 		if (empty($rArray) || empty($rSort)) {
-			return array();
+			return [];
 		}
 
-		$rOrdered = array();
+		$rOrdered = [];
 
 		foreach ($rSort as $rValue) {
 			if (($rKey = array_search($rValue, $rArray)) !== false) {
@@ -176,7 +176,7 @@ class AdminHelpers {
 	 * @param int $rInt Percentage (0–100).
 	 * @return string 'bg-danger' (>=75), 'bg-warning' (>=50) or 'bg-success'.
 	 */
-	public static function getBarColour($rInt) {
+	public static function getBarColour(int $rInt) {
 		if (75 <= $rInt) {
 			return 'bg-danger';
 		}
@@ -194,7 +194,7 @@ class AdminHelpers {
 	 * @param int $rUptime Seconds.
 	 * @return string e.g. "02d 03h 04m" or "03h 04m 05s".
 	 */
-	public static function formatUptime($rUptime) {
+	public static function formatUptime(int $rUptime) {
 		$rUptime = (int) $rUptime;
 		if (86400 <= $rUptime) {
 			$rUptime = sprintf('%02dd %02dh %02dm', intdiv($rUptime, 86400), intdiv($rUptime, 3600) % 24, intdiv($rUptime, 60) % 60);
@@ -213,7 +213,7 @@ class AdminHelpers {
 	public static function getFooter() {
 		$currentYear = date('Y');
 		$startYear = 2025;
-		$yearRange = ($startYear === (int)$currentYear) ? $startYear : "{$startYear}\u{2013}{$currentYear}";
+		$yearRange = ($startYear === (int) $currentYear) ? $startYear : "{$startYear}\u{2013}{$currentYear}";
 
 		$brand = "<a href='https://github.com/Vateron-Media/XC_VM' target='_blank' rel='noopener noreferrer'>Vateron Media</a>";
 		$license = "<a href='https://www.gnu.org/licenses/agpl-3.0.html' target='_blank' rel='noopener noreferrer'>AGPL-3.0</a>";
@@ -269,7 +269,7 @@ class AdminHelpers {
 	 * @param array[] $rData Rows (associative arrays).
 	 * @return string Path to the generated CSV file in TMP_PATH.
 	 */
-	public static function convertToCSV($rData) {
+	public static function convertToCSV(array $rData) {
 		$rHeader = false;
 		$rFilename = TMP_PATH . self::generateString(32) . '.csv';
 		$rFile = fopen($rFilename, 'w');
@@ -295,7 +295,7 @@ class AdminHelpers {
 	 * @param array  $rParams POST parameters.
 	 * @return string|bool Response body, or false on failure.
 	 */
-	public static function generateReport($rURL, $rParams) {
+	public static function generateReport(string $rURL, array $rParams) {
 		$rPost = http_build_query($rParams);
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $rURL);
@@ -365,7 +365,7 @@ class AdminHelpers {
 	 * @param string $rURL URL to parse.
 	 * @return string|null Lowercased page name, or null if $rURL is empty.
 	 */
-	public static function getPageFromURL($rURL) {
+	public static function getPageFromURL(string $rURL) {
 		if ($rURL) {
 			return strtolower(basename(ltrim(parse_url($rURL)['path'], '/'), '.php'));
 		}
@@ -380,7 +380,7 @@ class AdminHelpers {
 	 * @param bool  $rGet  Also merge the args into the request manager.
 	 * @return string Inline <script> updating the browser URL.
 	 */
-	public static function setArgs($rArgs, $rGet = true) {
+	public static function setArgs(array $rArgs, bool $rGet = true) {
 		$rURL = self::getPageName();
 
 		if (count($rArgs) > 0) {
@@ -402,7 +402,7 @@ class AdminHelpers {
 	 * @param string $rRelease Release/file name.
 	 * @return array|null Parsed metadata, or null on failure.
 	 */
-	public static function parserelease($rRelease) {
+	public static function parserelease(string $rRelease) {
 		if (SettingsManager::get('parse_type') == 'guessit') {
 			$rCommand = MAIN_HOME . 'bin/guess ' . escapeshellarg(pathinfo($rRelease)['filename'] . '.mkv');
 		} else {
diff --git a/src/Core/Util/Encryption.php b/src/Core/Util/Encryption.php
index a298c38f..5f6ed7f4 100644
--- a/src/Core/Util/Encryption.php
+++ b/src/Core/Util/Encryption.php
@@ -18,208 +18,207 @@ namespace XcVm\Core\Util;
  */
 
 class Encryption {
+	/**
+	 * Encrypt data using AES-256-CBC
+	 *
+	 * @param string $data Data to encrypt
+	 * @param string $key Encryption key (e.g., live_streaming_pass)
+	 * @param string $deviceId Device/context identifier
+	 * @return string Base64url-encoded encrypted data
+	 */
+	public static function encrypt(string $data, string $key, string $deviceId) {
+		$derivedKey = md5(sha1($deviceId) . $key);
+		$iv = substr(md5(sha1($key)), 0, 16);
 
-    /**
-     * Encrypt data using AES-256-CBC
-     *
-     * @param string $data Data to encrypt
-     * @param string $key Encryption key (e.g., live_streaming_pass)
-     * @param string $deviceId Device/context identifier
-     * @return string Base64url-encoded encrypted data
-     */
-    public static function encrypt($data, $key, $deviceId) {
-        $derivedKey = md5(sha1($deviceId) . $key);
-        $iv = substr(md5(sha1($key)), 0, 16);
+		$encrypted = openssl_encrypt(
+			$data,
+			'aes-256-cbc',
+			$derivedKey,
+			OPENSSL_RAW_DATA,
+			$iv
+		);
 
-        $encrypted = openssl_encrypt(
-            $data,
-            'aes-256-cbc',
-            $derivedKey,
-            OPENSSL_RAW_DATA,
-            $iv
-        );
+		return self::base64urlEncode($encrypted);
+	}
 
-        return self::base64urlEncode($encrypted);
-    }
+	/**
+	 * Decrypt data using AES-256-CBC
+	 *
+	 * @param string $data Base64url-encoded encrypted data
+	 * @param string $key Decryption key
+	 * @param string $deviceId Device/context identifier
+	 * @return string|false Decrypted data or false on failure
+	 */
+	public static function decrypt(string $data, string $key, string $deviceId) {
+		$derivedKey = md5(sha1($deviceId) . $key);
+		$iv = substr(md5(sha1($key)), 0, 16);
 
-    /**
-     * Decrypt data using AES-256-CBC
-     *
-     * @param string $data Base64url-encoded encrypted data
-     * @param string $key Decryption key
-     * @param string $deviceId Device/context identifier
-     * @return string|false Decrypted data or false on failure
-     */
-    public static function decrypt($data, $key, $deviceId) {
-        $derivedKey = md5(sha1($deviceId) . $key);
-        $iv = substr(md5(sha1($key)), 0, 16);
+		return openssl_decrypt(
+			self::base64urlDecode($data),
+			'aes-256-cbc',
+			$derivedKey,
+			OPENSSL_RAW_DATA,
+			$iv
+		);
+	}
 
-        return openssl_decrypt(
-            self::base64urlDecode($data),
-            'aes-256-cbc',
-            $derivedKey,
-            OPENSSL_RAW_DATA,
-            $iv
-        );
-    }
+	/**
+	 * Seal $data as a token that cannot be read or altered without the key.
+	 *
+	 * AES-256-GCM under a key derived from $key and $deviceId, with a fresh
+	 * random nonce: base64url(nonce ‖ ciphertext ‖ tag). Same URL-safe alphabet
+	 * as encrypt(), so no route or pattern that carries a token changes.
+	 *
+	 * encrypt() is AES-CBC with a fixed IV and no MAC. A modified token decrypts
+	 * to modified bytes, and whether its padding holds shows in the response —
+	 * with patience, enough to read someone's token or to write one. Stream links
+	 * that the server trusts as they stand (live/vod token data, HLS segment and
+	 * key tokens, the web player's proxy URL) must be sealed.
+	 *
+	 * @param string $data     Plaintext.
+	 * @param string $key      Secret (live_streaming_pass).
+	 * @param string $deviceId Context string, as for encrypt().
+	 * @return string
+	 */
+	public static function seal(string $data, string $key, string $deviceId) {
+		$rNonce = random_bytes(self::SEAL_NONCE);
+		$rTag = '';
+		$rCipher = openssl_encrypt((string) $data, 'aes-256-gcm', self::sealKey($key, $deviceId), OPENSSL_RAW_DATA, $rNonce, $rTag, '', self::SEAL_TAG);
+		return self::base64urlEncode($rNonce . $rCipher . $rTag);
+	}
 
-    /**
-     * Seal $data as a token that cannot be read or altered without the key.
-     *
-     * AES-256-GCM under a key derived from $key and $deviceId, with a fresh
-     * random nonce: base64url(nonce ‖ ciphertext ‖ tag). Same URL-safe alphabet
-     * as encrypt(), so no route or pattern that carries a token changes.
-     *
-     * encrypt() is AES-CBC with a fixed IV and no MAC. A modified token decrypts
-     * to modified bytes, and whether its padding holds shows in the response —
-     * with patience, enough to read someone's token or to write one. Stream links
-     * that the server trusts as they stand (live/vod token data, HLS segment and
-     * key tokens, the web player's proxy URL) must be sealed.
-     *
-     * @param string $data     Plaintext.
-     * @param string $key      Secret (live_streaming_pass).
-     * @param string $deviceId Context string, as for encrypt().
-     * @return string
-     */
-    public static function seal($data, $key, $deviceId) {
-        $rNonce = random_bytes(self::SEAL_NONCE);
-        $rTag = '';
-        $rCipher = openssl_encrypt((string) $data, 'aes-256-gcm', self::sealKey($key, $deviceId), OPENSSL_RAW_DATA, $rNonce, $rTag, '', self::SEAL_TAG);
-        return self::base64urlEncode($rNonce . $rCipher . $rTag);
-    }
+	/**
+	 * Open a token made by seal().
+	 *
+	 * @return string|false The plaintext, or false for anything that is not a
+	 *                      token sealed with this key and context — an altered
+	 *                      one, a legacy encrypt() token, garbage, a non-string.
+	 */
+	public static function open($token, $key, $deviceId) {
+		if (!is_string($token) || $token === '') {
+			return false;
+		}
+		$rRaw = self::base64urlDecode($token);
+		if (!is_string($rRaw) || strlen($rRaw) < self::SEAL_NONCE + self::SEAL_TAG) {
+			return false;
+		}
+		return openssl_decrypt(
+			substr($rRaw, self::SEAL_NONCE, -self::SEAL_TAG),
+			'aes-256-gcm',
+			self::sealKey($key, $deviceId),
+			OPENSSL_RAW_DATA,
+			substr($rRaw, 0, self::SEAL_NONCE),
+			substr($rRaw, -self::SEAL_TAG)
+		);
+	}
 
-    /**
-     * Open a token made by seal().
-     *
-     * @return string|false The plaintext, or false for anything that is not a
-     *                      token sealed with this key and context — an altered
-     *                      one, a legacy encrypt() token, garbage, a non-string.
-     */
-    public static function open($token, $key, $deviceId) {
-        if (!is_string($token) || $token === '') {
-            return false;
-        }
-        $rRaw = self::base64urlDecode($token);
-        if (!is_string($rRaw) || strlen($rRaw) < self::SEAL_NONCE + self::SEAL_TAG) {
-            return false;
-        }
-        return openssl_decrypt(
-            substr($rRaw, self::SEAL_NONCE, -self::SEAL_TAG),
-            'aes-256-gcm',
-            self::sealKey($key, $deviceId),
-            OPENSSL_RAW_DATA,
-            substr($rRaw, 0, self::SEAL_NONCE),
-            substr($rRaw, -self::SEAL_TAG)
-        );
-    }
+	/**
+	 * Make a stream-link token: sealed when $rSealed (the secure_stream_tokens
+	 * setting), otherwise the legacy format servers on an older version read.
+	 */
+	public static function mintToken($data, $key, $deviceId, bool $rSealed) {
+		return $rSealed ? self::seal($data, $key, $deviceId) : self::encrypt($data, $key, $deviceId);
+	}
 
-    /**
-     * Make a stream-link token: sealed when $rSealed (the secure_stream_tokens
-     * setting), otherwise the legacy format servers on an older version read.
-     */
-    public static function mintToken($data, $key, $deviceId, bool $rSealed) {
-        return $rSealed ? self::seal($data, $key, $deviceId) : self::encrypt($data, $key, $deviceId);
-    }
+	/**
+	 * Read a stream-link token: a sealed one always; a legacy one only where
+	 * $rAcceptLegacy — the secure_stream_tokens setting is off, or the token
+	 * only carries credentials the caller checks against the database again.
+	 *
+	 * @return string|false
+	 */
+	public static function readToken($token, $key, $deviceId, bool $rAcceptLegacy) {
+		$rPlain = self::open($token, $key, $deviceId);
+		if ($rPlain !== false || !$rAcceptLegacy || !is_string($token)) {
+			return $rPlain;
+		}
+		return self::decrypt($token, $key, $deviceId);
+	}
 
-    /**
-     * Read a stream-link token: a sealed one always; a legacy one only where
-     * $rAcceptLegacy — the secure_stream_tokens setting is off, or the token
-     * only carries credentials the caller checks against the database again.
-     *
-     * @return string|false
-     */
-    public static function readToken($token, $key, $deviceId, bool $rAcceptLegacy) {
-        $rPlain = self::open($token, $key, $deviceId);
-        if ($rPlain !== false || !$rAcceptLegacy || !is_string($token)) {
-            return $rPlain;
-        }
-        return self::decrypt($token, $key, $deviceId);
-    }
+	private const SEAL_NONCE = 12;
+	private const SEAL_TAG = 16;
 
-    private const SEAL_NONCE = 12;
-    private const SEAL_TAG = 16;
+	/** The sealing key: an HMAC of the context under the secret, so an empty secret never throws. */
+	private static function sealKey($key, $deviceId) {
+		return hash_hmac('sha256', 'xc_vm stream token v2|' . $deviceId, (string) $key, true);
+	}
 
-    /** The sealing key: an HMAC of the context under the secret, so an empty secret never throws. */
-    private static function sealKey($key, $deviceId) {
-        return hash_hmac('sha256', 'xc_vm stream token v2|' . $deviceId, (string) $key, true);
-    }
+	/**
+	 * Base64url encode (URL-safe base64 without padding)
+	 *
+	 * @param string $data Raw data
+	 * @return string Encoded string
+	 */
+	public static function base64urlEncode(string $data) {
+		return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
+	}
 
-    /**
-     * Base64url encode (URL-safe base64 without padding)
-     *
-     * @param string $data Raw data
-     * @return string Encoded string
-     */
-    public static function base64urlEncode($data) {
-        return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
-    }
+	/**
+	 * Base64url decode
+	 *
+	 * @param string $data Encoded string
+	 * @return string|false Decoded data
+	 */
+	public static function base64urlDecode(string $data) {
+		return base64_decode(strtr($data, '-_', '+/'));
+	}
 
-    /**
-     * Base64url decode
-     *
-     * @param string $data Encoded string
-     * @return string|false Decoded data
-     */
-    public static function base64urlDecode($data) {
-        return base64_decode(strtr($data, '-_', '+/'));
-    }
+	/**
+	 * Generate a random alphanumeric string
+	 *
+	 * @param int $length String length (default: 10)
+	 * @return string
+	 */
+	public static function randomString(int $length = 10) {
+		$chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+		$max = strlen($chars) - 1;
+		$result = '';
 
-    /**
-     * Generate a random alphanumeric string
-     *
-     * @param int $length String length (default: 10)
-     * @return string
-     */
-    public static function randomString($length = 10) {
-        $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-        $max = strlen($chars) - 1;
-        $result = '';
+		for ($i = 0; $i < $length; $i++) {
+			$result .= $chars[random_int(0, $max)];
+		}
 
-        for ($i = 0; $i < $length; $i++) {
-            $result .= $chars[random_int(0, $max)];
-        }
+		return $result;
+	}
 
-        return $result;
-    }
+	/**
+	 * Generate a secure random token (hex-encoded)
+	 *
+	 * @param int $bytes Number of random bytes (default: 32 = 64 hex chars)
+	 * @return string Hex-encoded token
+	 */
+	public static function randomToken(int $bytes = 32) {
+		return bin2hex(random_bytes($bytes));
+	}
 
-    /**
-     * Generate a secure random token (hex-encoded)
-     *
-     * @param int $bytes Number of random bytes (default: 32 = 64 hex chars)
-     * @return string Hex-encoded token
-     */
-    public static function randomToken($bytes = 32) {
-        return bin2hex(random_bytes($bytes));
-    }
+	/**
+	 * Generate a random AES key
+	 *
+	 * @param int $bits Key size in bits (128, 192, or 256)
+	 * @return string Raw key bytes
+	 */
+	public static function generateKey(int $bits = 128) {
+		return openssl_random_pseudo_bytes($bits / 8);
+	}
 
-    /**
-     * Generate a random AES key
-     *
-     * @param int $bits Key size in bits (128, 192, or 256)
-     * @return string Raw key bytes
-     */
-    public static function generateKey($bits = 128) {
-        return openssl_random_pseudo_bytes($bits / 8);
-    }
+	/**
+	 * Generate a random IV for AES-128-CBC
+	 *
+	 * @param string $cipher OpenSSL cipher (default: AES-128-CBC)
+	 * @return string Raw IV bytes
+	 */
+	public static function generateIV(string $cipher = 'AES-128-CBC') {
+		$ivSize = openssl_cipher_iv_length($cipher);
+		return openssl_random_pseudo_bytes($ivSize);
+	}
 
-    /**
-     * Generate a random IV for AES-128-CBC
-     *
-     * @param string $cipher OpenSSL cipher (default: AES-128-CBC)
-     * @return string Raw IV bytes
-     */
-    public static function generateIV($cipher = 'AES-128-CBC') {
-        $ivSize = openssl_cipher_iv_length($cipher);
-        return openssl_random_pseudo_bytes($ivSize);
-    }
-
-    /**
-     * Генерирует уникальный код панели на основе пароля.
-     *
-     * @param string $pass  Пароль (live_streaming_pass)
-     * @return string 15-символьный хеш
-     */
-    public static function generateUniqueCode($pass) {
-        return substr(md5($pass ?? ''), 0, 15);
-    }
+	/**
+	 * Генерирует уникальный код панели на основе пароля.
+	 *
+	 * @param string $pass  Пароль (live_streaming_pass)
+	 * @return string 15-символьный хеш
+	 */
+	public static function generateUniqueCode(string $pass) {
+		return substr(md5($pass ?? ''), 0, 15);
+	}
 }
diff --git a/src/Core/Util/GeoIP.php b/src/Core/Util/GeoIP.php
index af321918..44b7558f 100644
--- a/src/Core/Util/GeoIP.php
+++ b/src/Core/Util/GeoIP.php
@@ -23,131 +23,130 @@ namespace XcVm\Core\Util;
  */
 
 class GeoIP {
+	/** @var string Cache directory for GeoIP lookups */
+	protected static $cachePath = null;
 
-    /** @var string Cache directory for GeoIP lookups */
-    protected static $cachePath = null;
+	/**
+	 * Get ISP information for an IP address
+	 *
+	 * Results are cached in CONS_TMP_PATH/{md5(ip)}_isp
+	 *
+	 * @param string $ip IP address
+	 * @return array|false ISP data array or false
+	 */
+	public static function getISP(string $ip) {
+		if (empty($ip)) {
+			return false;
+		}
 
-    /**
-     * Get ISP information for an IP address
-     *
-     * Results are cached in CONS_TMP_PATH/{md5(ip)}_isp
-     *
-     * @param string $ip IP address
-     * @return array|false ISP data array or false
-     */
-    public static function getISP($ip) {
-        if (empty($ip)) {
-            return false;
-        }
+		$cachePath = self::getCachePath();
+		$cacheFile = $cachePath . md5($ip) . '_isp';
 
-        $cachePath = self::getCachePath();
-        $cacheFile = $cachePath . md5($ip) . '_isp';
+		if (file_exists($cacheFile)) {
+			return json_decode(file_get_contents($cacheFile), true);
+		}
 
-        if (file_exists($cacheFile)) {
-            return json_decode(file_get_contents($cacheFile), true);
-        }
+		if (!defined('GEOISP_BIN') || !file_exists(GEOISP_BIN)) {
+			return false;
+		}
 
-        if (!defined('GEOISP_BIN') || !file_exists(GEOISP_BIN)) {
-            return false;
-        }
+		try {
+			$reader = new \MaxMind\Db\Reader(GEOISP_BIN);
+			$response = $reader->get($ip);
+			$reader->close();
 
-        try {
-            $reader = new \MaxMind\Db\Reader(GEOISP_BIN);
-            $response = $reader->get($ip);
-            $reader->close();
+			if ($response) {
+				file_put_contents($cacheFile, json_encode($response));
+			}
 
-            if ($response) {
-                file_put_contents($cacheFile, json_encode($response));
-            }
+			return $response;
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
 
-            return $response;
-        } catch (\Exception $e) {
-            return false;
-        }
-    }
+	/**
+	 * Get country/city information for an IP address
+	 *
+	 * Results are cached in CONS_TMP_PATH/{md5(ip)}_geo2
+	 *
+	 * @param string $ip IP address
+	 * @return array|false GeoIP data array or false
+	 */
+	public static function getCountry(string $ip) {
+		if (empty($ip)) {
+			return false;
+		}
 
-    /**
-     * Get country/city information for an IP address
-     *
-     * Results are cached in CONS_TMP_PATH/{md5(ip)}_geo2
-     *
-     * @param string $ip IP address
-     * @return array|false GeoIP data array or false
-     */
-    public static function getCountry($ip) {
-        if (empty($ip)) {
-            return false;
-        }
+		$cachePath = self::getCachePath();
+		$cacheFile = $cachePath . md5($ip) . '_geo2';
 
-        $cachePath = self::getCachePath();
-        $cacheFile = $cachePath . md5($ip) . '_geo2';
+		if (file_exists($cacheFile)) {
+			return json_decode(file_get_contents($cacheFile), true);
+		}
 
-        if (file_exists($cacheFile)) {
-            return json_decode(file_get_contents($cacheFile), true);
-        }
+		if (!defined('GEOLITE2_BIN') || !file_exists(GEOLITE2_BIN)) {
+			return false;
+		}
 
-        if (!defined('GEOLITE2_BIN') || !file_exists(GEOLITE2_BIN)) {
-            return false;
-        }
+		try {
+			$reader = new \MaxMind\Db\Reader(GEOLITE2_BIN);
+			$response = $reader->get($ip);
+			$reader->close();
 
-        try {
-            $reader = new \MaxMind\Db\Reader(GEOLITE2_BIN);
-            $response = $reader->get($ip);
-            $reader->close();
+			if ($response) {
+				file_put_contents($cacheFile, json_encode($response));
+			}
 
-            if ($response) {
-                file_put_contents($cacheFile, json_encode($response));
-            }
+			return $response;
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
 
-            return $response;
-        } catch (\Exception $e) {
-            return false;
-        }
-    }
+	/**
+	 * Check if an ISP name is in the blocked list
+	 *
+	 * @param string $ispName ISP name to check
+	 * @param array $blockedISPs Array of blocked ISP entries (each with 'isp' and 'blocked' keys)
+	 * @return int 0 = not blocked, 1+ = blocked type
+	 */
+	public static function isISPBlocked(string $ispName, array $blockedISPs) {
+		foreach ($blockedISPs as $entry) {
+			if (strtolower($ispName) === strtolower($entry['isp'])) {
+				return (int) $entry['blocked'];
+			}
+		}
+		return 0;
+	}
 
-    /**
-     * Check if an ISP name is in the blocked list
-     *
-     * @param string $ispName ISP name to check
-     * @param array $blockedISPs Array of blocked ISP entries (each with 'isp' and 'blocked' keys)
-     * @return int 0 = not blocked, 1+ = blocked type
-     */
-    public static function isISPBlocked($ispName, array $blockedISPs) {
-        foreach ($blockedISPs as $entry) {
-            if (strtolower($ispName) === strtolower($entry['isp'])) {
-                return (int)$entry['blocked'];
-            }
-        }
-        return 0;
-    }
+	/**
+	 * Check if an ASN is in the blocked servers list
+	 *
+	 * @param string|int $asn ASN to check
+	 * @param array $blockedServers Array of blocked ASNs
+	 * @return bool
+	 */
+	public static function isASNBlocked(string|int $asn, array $blockedServers) {
+		return in_array($asn, $blockedServers);
+	}
 
-    /**
-     * Check if an ASN is in the blocked servers list
-     *
-     * @param string|int $asn ASN to check
-     * @param array $blockedServers Array of blocked ASNs
-     * @return bool
-     */
-    public static function isASNBlocked($asn, array $blockedServers) {
-        return in_array($asn, $blockedServers);
-    }
+	/**
+	 * Get the cache directory path
+	 *
+	 * @return string
+	 */
+	protected static function getCachePath() {
+		if (self::$cachePath !== null) {
+			return self::$cachePath;
+		}
 
-    /**
-     * Get the cache directory path
-     *
-     * @return string
-     */
-    protected static function getCachePath() {
-        if (self::$cachePath !== null) {
-            return self::$cachePath;
-        }
+		if (defined('CONS_TMP_PATH')) {
+			self::$cachePath = CONS_TMP_PATH;
+		} else {
+			self::$cachePath = (defined('TMP_PATH') ? TMP_PATH : '/tmp/') . 'connections/';
+		}
 
-        if (defined('CONS_TMP_PATH')) {
-            self::$cachePath = CONS_TMP_PATH;
-        } else {
-            self::$cachePath = (defined('TMP_PATH') ? TMP_PATH : '/tmp/') . 'connections/';
-        }
-
-        return self::$cachePath;
-    }
+		return self::$cachePath;
+	}
 }
diff --git a/src/Core/Util/ImageResizeService.php b/src/Core/Util/ImageResizeService.php
index 0ede5afc..ba4ee7a7 100644
--- a/src/Core/Util/ImageResizeService.php
+++ b/src/Core/Util/ImageResizeService.php
@@ -26,7 +26,6 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class ImageResizeService {
-
 	/**
 	 * Process resize request and send image response.
 	 *
@@ -40,9 +39,9 @@ class ImageResizeService {
 		set_time_limit(2);
 		ini_set('default_socket_timeout', 2);
 
-		$rCacheDir     = $rOptions['cacheDir']     ?? (defined('IMAGES_PATH') ? IMAGES_PATH . 'admin/' : '');
-		$rPlaceholder  = $rOptions['placeholder']  ?? null;
-		$rExtraParams  = $rOptions['extraParams']  ?? false;
+		$rCacheDir     = $rOptions['cacheDir'] ?? (defined('IMAGES_PATH') ? IMAGES_PATH . 'admin/' : '');
+		$rPlaceholder  = $rOptions['placeholder'] ?? null;
+		$rExtraParams  = $rOptions['extraParams'] ?? false;
 
 		if ($rCacheDir && !is_dir($rCacheDir)) {
 			@mkdir($rCacheDir, 0755, true);
@@ -115,7 +114,10 @@ class ImageResizeService {
 
 				if ($rImageSize === null) {
 					$rImageSize = ImageUtils::getImageSizeKeepAspectRatio(
-						$rImageInfo[0], $rImageInfo[1], $rMaxW, $rMaxH
+						$rImageInfo[0],
+						$rImageInfo[1],
+						$rMaxW,
+						$rMaxH
 					);
 				}
 
@@ -133,10 +135,16 @@ class ImageResizeService {
 						imagealphablending($rImageP, false);
 						imagesavealpha($rImageP, true);
 						imagecopyresampled(
-							$rImageP, $rImage,
-							0, 0, 0, 0,
-							$rImageSize['width'], $rImageSize['height'],
-							$rImageInfo[0], $rImageInfo[1]
+							$rImageP,
+							$rImage,
+							0,
+							0,
+							0,
+							0,
+							$rImageSize['width'],
+							$rImageSize['height'],
+							$rImageInfo[0],
+							$rImageInfo[1]
 						);
 						@imagepng($rImageP, $rImagePath);
 					}
diff --git a/src/Core/Util/ImageUtils.php b/src/Core/Util/ImageUtils.php
index 0f89e3b4..2c295a9e 100644
--- a/src/Core/Util/ImageUtils.php
+++ b/src/Core/Util/ImageUtils.php
@@ -23,7 +23,7 @@ class ImageUtils {
 	 * @param string|null $rForceProtocol Force http/https when resolving server URLs.
 	 * @return string Resolved public URL ('' if the server cannot be resolved).
 	 */
-	public static function validateURL($rURL, $rForceProtocol = null) {
+	public static function validateURL(string $rURL, ?string $rForceProtocol = null) {
 		if (substr($rURL, 0, 2) == 's:') {
 			$rSplit = explode(':', $rURL, 3);
 			$rServerURL = ServerRepository::getPublicURL(intval($rSplit[1]), $rForceProtocol);
@@ -43,7 +43,7 @@ class ImageUtils {
 	 * @param int    $rMaxH Max height.
 	 * @return string Public URL of the resized image, or the validated source.
 	 */
-	public static function resize($rURL, $rMaxW, $rMaxH) {
+	public static function resize(string $rURL, int $rMaxW, int $rMaxH) {
 		list($rExtension) = explode('.', strtolower(pathinfo($rURL)['extension']));
 		$rImagePath = IMAGES_PATH . 'admin/' . md5($rURL) . '_' . $rMaxW . '_' . $rMaxH . '.' . $rExtension;
 
@@ -64,7 +64,7 @@ class ImageUtils {
 	 * @param int    $rType  Stream type controlling target dimensions.
 	 * @return bool True if the thumbnail exists/was created, false otherwise.
 	 */
-	public static function generateThumbnail($rImage, $rType) {
+	public static function generateThumbnail(string $rImage, int $rType) {
 		if ($rType == 1 || $rType == 5 || $rType == 4) {
 			$rMaxW = 96;
 			$rMaxH = 32;
@@ -82,7 +82,7 @@ class ImageUtils {
 			}
 		}
 		list($rExtension) = explode('.', strtolower(pathinfo($rImage)['extension']));
-		if (!in_array($rExtension, array('png', 'jpg', 'jpeg'))) {
+		if (!in_array($rExtension, ['png', 'jpg', 'jpeg'])) {
 		} else {
 			$rImagePath = IMAGES_PATH . 'admin/' . md5($rImage) . '_' . $rMaxW . '_' . $rMaxH . '.' . $rExtension;
 			if (file_exists($rImagePath)) {
@@ -126,7 +126,7 @@ class ImageUtils {
 	 * @param int|null $rType  Optional stream type (unused placeholder).
 	 * @return string Internal `s:` reference, or the original URL.
 	 */
-	public static function downloadImage($rImage, $rType = null) {
+	public static function downloadImage(string $rImage, ?int $rType = null) {
 		if (0 < strlen($rImage) && substr(strtolower($rImage), 0, 4) == 'http') {
 			$rPathInfo = pathinfo(parse_url($rImage, PHP_URL_PATH) ?: $rImage);
 			$rExt = strtolower($rPathInfo['extension'] ?? '');
@@ -136,7 +136,7 @@ class ImageUtils {
 					list(, $rExt) = explode('/', strtolower($rImageInfo['mime']), 2);
 				}
 			}
-			if (in_array(strtolower($rExt), array('jpg', 'jpeg', 'png'))) {
+			if (in_array(strtolower($rExt), ['jpg', 'jpeg', 'png'])) {
 				$rFilename = Encryption::encrypt($rImage, SettingsManager::get('live_streaming_pass'), OPENSSL_EXTRA);
 				// A single filename component is capped at 255 bytes on ext4/most
 				// filesystems. Long source URLs produce an encrypted name that
@@ -185,7 +185,7 @@ class ImageUtils {
 	 * @param int $maxHeight  Max height (0 = no limit).
 	 * @return array ['width' => int, 'height' => int].
 	 */
-	public static function getImageSizeKeepAspectRatio($origWidth, $origHeight, $maxWidth, $maxHeight) {
+	public static function getImageSizeKeepAspectRatio(int $origWidth, int $origHeight, int $maxWidth, int $maxHeight) {
 		if ($maxWidth == 0) {
 			$maxWidth = $origWidth;
 		}
@@ -202,7 +202,7 @@ class ImageUtils {
 			$newHeight = $origHeight;
 			$newWidth = $origWidth;
 		}
-		return array('height' => round($newHeight, 0), 'width' => round($newWidth, 0));
+		return ['height' => round($newHeight, 0), 'width' => round($newWidth, 0)];
 	}
 
 	/**
@@ -211,7 +211,7 @@ class ImageUtils {
 	 * @param string $rURL Candidate URL.
 	 * @return bool True if absolute.
 	 */
-	public static function isAbsoluteUrl($rURL) {
+	public static function isAbsoluteUrl(string $rURL) {
 		$rPattern = "/^(?:ftp|https?|feed)?:?\\/\\/(?:(?:(?:[\\w\\.\\-\\+!\$&'\\(\\)*\\+,;=]|%[0-9a-f]{2})+:)*" . "\n" . "        (?:[\\w\\.\\-\\+%!\$&'\\(\\)*\\+,;=]|%[0-9a-f]{2})+@)?(?:" . "\n" . '        (?:[a-z0-9\\-\\.]|%[0-9a-f]{2})+|(?:\\[(?:[0-9a-f]{0,4}:)*(?:[0-9a-f]{0,4})\\]))(?::[0-9]+)?(?:[\\/|\\?]' . "\n" . "        (?:[\\w#!:\\.\\?\\+\\|=&@\$'~*,;\\/\\(\\)\\[\\]\\-]|%[0-9a-f]{2})*)?\$/xi";
 		return (bool) preg_match($rPattern, $rURL);
 	}
diff --git a/src/Core/Util/NetworkUtils.php b/src/Core/Util/NetworkUtils.php
index 1368cf3c..c539a636 100644
--- a/src/Core/Util/NetworkUtils.php
+++ b/src/Core/Util/NetworkUtils.php
@@ -18,217 +18,214 @@ use XcVm\Core\Process\ProcessManager;
  */
 
 class NetworkUtils {
+	/**
+	 * Get the client's IP address
+	 *
+	 * @return string IP address
+	 */
+	public static function getClientIP() {
+		// Check proxy headers first
+		$headers = ['HTTP_X_FORWARDED_FOR', 'HTTP_X_REAL_IP'];
 
-    /**
-     * Get the client's IP address
-     *
-     * @return string IP address
-     */
-    public static function getClientIP() {
-        // Check proxy headers first
-        $headers = ['HTTP_X_FORWARDED_FOR', 'HTTP_X_REAL_IP'];
+		foreach ($headers as $header) {
+			if (!empty($_SERVER[$header])) {
+				$ip = trim(explode(',', $_SERVER[$header])[0]);
+				if (filter_var($ip, FILTER_VALIDATE_IP)) {
+					return $ip;
+				}
+			}
+		}
 
-        foreach ($headers as $header) {
-            if (!empty($_SERVER[$header])) {
-                $ip = trim(explode(',', $_SERVER[$header])[0]);
-                if (filter_var($ip, FILTER_VALIDATE_IP)) {
-                    return $ip;
-                }
-            }
-        }
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0';
+	}
 
-        return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0';
-    }
+	/**
+	 * Whether two IPs match — exactly, or on the same /24 (first three octets)
+	 * when $rSubnetMatch is on. Used to compare a stored connection IP against
+	 * the current client IP.
+	 *
+	 * @param bool        $rSubnetMatch Compare only the leading three octets.
+	 * @param string|null $rTargetIP    Stored / other IP.
+	 * @param string|null $rClientIP    Current client IP.
+	 * @return bool
+	 */
+	public static function ipMatches(bool $rSubnetMatch, ?string $rTargetIP, ?string $rClientIP): bool {
+		if ($rSubnetMatch) {
+			return implode(".", array_slice(explode(".", (string) $rTargetIP), 0, -1)) == implode(".", array_slice(explode(".", (string) $rClientIP), 0, -1));
+		}
+		return $rTargetIP == $rClientIP;
+	}
 
-    /**
-     * Whether two IPs match — exactly, or on the same /24 (first three octets)
-     * when $rSubnetMatch is on. Used to compare a stored connection IP against
-     * the current client IP.
-     *
-     * @param bool        $rSubnetMatch Compare only the leading three octets.
-     * @param string|null $rTargetIP    Stored / other IP.
-     * @param string|null $rClientIP    Current client IP.
-     * @return bool
-     */
-    public static function ipMatches($rSubnetMatch, $rTargetIP, $rClientIP): bool {
-        if ($rSubnetMatch) {
-            return implode(".", array_slice(explode(".", (string) $rTargetIP), 0, -1)) == implode(".", array_slice(explode(".", (string) $rClientIP), 0, -1));
-        }
-        return $rTargetIP == $rClientIP;
-    }
+	/**
+	 * Check if an IP address is in a CIDR range
+	 *
+	 * @param string $ip IP address to check
+	 * @param string $cidr CIDR notation (e.g., "192.168.1.0/24")
+	 * @return bool
+	 */
+	public static function ipInCIDR(string $ip, string $cidr) {
+		if (strpos($cidr, '/') === false) {
+			return $ip === $cidr;
+		}
 
-    /**
-     * Check if an IP address is in a CIDR range
-     *
-     * @param string $ip IP address to check
-     * @param string $cidr CIDR notation (e.g., "192.168.1.0/24")
-     * @return bool
-     */
-    public static function ipInCIDR($ip, $cidr) {
-        if (strpos($cidr, '/') === false) {
-            return $ip === $cidr;
-        }
+		list($subnet, $bits) = explode('/', $cidr);
+		$ip = ip2long($ip);
+		$subnet = ip2long($subnet);
+		$mask = -1 << (32 - (int) $bits);
 
-        list($subnet, $bits) = explode('/', $cidr);
-        $ip = ip2long($ip);
-        $subnet = ip2long($subnet);
-        $mask = -1 << (32 - (int)$bits);
+		return ($ip & $mask) === ($subnet & $mask);
+	}
 
-        return ($ip & $mask) === ($subnet & $mask);
-    }
+	/**
+	 * Check if an IP is in any of the given CIDR ranges
+	 *
+	 * @param string $ip IP address
+	 * @param array $cidrs Array of CIDR strings
+	 * @return bool
+	 */
+	public static function ipInAnyCIDR(string $ip, array $cidrs) {
+		foreach ($cidrs as $cidr) {
+			if (self::ipInCIDR($ip, $cidr)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    /**
-     * Check if an IP is in any of the given CIDR ranges
-     *
-     * @param string $ip IP address
-     * @param array $cidrs Array of CIDR strings
-     * @return bool
-     */
-    public static function ipInAnyCIDR($ip, array $cidrs) {
-        foreach ($cidrs as $cidr) {
-            if (self::ipInCIDR($ip, $cidr)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Validate an IP address
+	 *
+	 * @param string $ip IP address
+	 * @param bool $allowPrivate Allow private/reserved ranges
+	 * @return bool
+	 */
+	public static function isValidIP(string $ip, bool $allowPrivate = true) {
+		$flags = FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6;
 
-    /**
-     * Validate an IP address
-     *
-     * @param string $ip IP address
-     * @param bool $allowPrivate Allow private/reserved ranges
-     * @return bool
-     */
-    public static function isValidIP($ip, $allowPrivate = true) {
-        $flags = FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6;
+		if (!$allowPrivate) {
+			$flags |= FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
+		}
 
-        if (!$allowPrivate) {
-            $flags |= FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
-        }
+		return filter_var($ip, FILTER_VALIDATE_IP, $flags) !== false;
+	}
 
-        return filter_var($ip, FILTER_VALIDATE_IP, $flags) !== false;
-    }
+	/**
+	 * Check if an IP is a private/reserved address
+	 *
+	 * @param string $ip IP address
+	 * @return bool
+	 */
+	public static function isPrivateIP(string $ip) {
+		return !filter_var(
+			$ip,
+			FILTER_VALIDATE_IP,
+			FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE
+		);
+	}
 
-    /**
-     * Check if an IP is a private/reserved address
-     *
-     * @param string $ip IP address
-     * @return bool
-     */
-    public static function isPrivateIP($ip) {
-        return !filter_var(
-            $ip,
-            FILTER_VALIDATE_IP,
-            FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE
-        );
-    }
+	/**
+	 * Convert a long integer to IP address
+	 *
+	 * @return string
+	 */
+	public static function longToIP(int $long) {
+		return long2ip($long);
+	}
 
-    /**
-     * Convert a long integer to IP address
-     *
-     * @param int $long
-     * @return string
-     */
-    public static function longToIP($long) {
-        return long2ip($long);
-    }
+	/**
+	 * Convert an IP address to long integer
+	 *
+	 * @return int
+	 */
+	public static function ipToLong(string $ip) {
+		return ip2long($ip);
+	}
 
-    /**
-     * Convert an IP address to long integer
-     *
-     * @param string $ip
-     * @return int
-     */
-    public static function ipToLong($ip) {
-        return ip2long($ip);
-    }
+	/**
+	 * Возвращает IP-адрес текущего клиента (REMOTE_ADDR).
+	 *
+	 * @return string
+	 */
+	public static function getUserIP() {
+		return $_SERVER['REMOTE_ADDR'];
+	}
 
-    /**
-     * Возвращает IP-адрес текущего клиента (REMOTE_ADDR).
-     *
-     * @return string
-     */
-    public static function getUserIP() {
-        return $_SERVER['REMOTE_ADDR'];
-    }
+	/**
+	 * Register a download against a user's concurrent-download flood limit.
+	 *
+	 * Prunes finished PIDs and allows the new download only if the limit is not
+	 * reached. Restreamers and a zero limit are always allowed.
+	 *
+	 * @param string $rType        Download type ('epg' or 'playlist').
+	 * @param array  $rUser        User row.
+	 * @param int    $rDownloadPID PID of this download.
+	 * @param int    $rFloodLimit  Max concurrent downloads (0 = unlimited).
+	 * @return bool True if the download is allowed.
+	 */
+	public static function startDownload(string $rType, array $rUser, int $rDownloadPID, int $rFloodLimit) {
+		if ($rFloodLimit != 0) {
+			if (!$rUser['is_restreamer']) {
+				$rFile = FLOOD_TMP_PATH . $rUser['id'] . '_downloads';
+				$rFloodRow = ['epg' => [], 'playlist' => []];
+				if (file_exists($rFile) && time() - filemtime($rFile) < 10) {
+					$rExisting = json_decode(file_get_contents($rFile), true);
+					if (is_array($rExisting)) {
+						$rFloodRow = array_merge($rFloodRow, $rExisting);
+					}
+					$rActive = [];
+					foreach (($rFloodRow[$rType] ?? []) as $rPID) {
+						if (ProcessManager::isRunning($rPID, 'php-fpm') && $rPID != $rDownloadPID) {
+							$rActive[] = $rPID;
+						}
+					}
+					$rFloodRow[$rType] = $rActive;
+				}
+				$rAllow = false;
+				if (count($rFloodRow[$rType]) >= $rFloodLimit) {
+				} else {
+					$rFloodRow[$rType][] = $rDownloadPID;
+					$rAllow = true;
+				}
+				file_put_contents($rFile, json_encode($rFloodRow), LOCK_EX);
+				return $rAllow;
+			} else {
+				return true;
+			}
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Register a download against a user's concurrent-download flood limit.
-     *
-     * Prunes finished PIDs and allows the new download only if the limit is not
-     * reached. Restreamers and a zero limit are always allowed.
-     *
-     * @param string $rType        Download type ('epg' or 'playlist').
-     * @param array  $rUser        User row.
-     * @param int    $rDownloadPID PID of this download.
-     * @param int    $rFloodLimit  Max concurrent downloads (0 = unlimited).
-     * @return bool True if the download is allowed.
-     */
-    public static function startDownload($rType, $rUser, $rDownloadPID, $rFloodLimit) {
-        if ($rFloodLimit != 0) {
-            if (!$rUser['is_restreamer']) {
-                $rFile = FLOOD_TMP_PATH . $rUser['id'] . '_downloads';
-                $rFloodRow = array('epg' => array(), 'playlist' => array());
-                if (file_exists($rFile) && time() - filemtime($rFile) < 10) {
-                    $rExisting = json_decode(file_get_contents($rFile), true);
-                    if (is_array($rExisting)) {
-                        $rFloodRow = array_merge($rFloodRow, $rExisting);
-                    }
-                    $rActive = array();
-                    foreach (($rFloodRow[$rType] ?? []) as $rPID) {
-                        if (ProcessManager::isRunning($rPID, 'php-fpm') && $rPID != $rDownloadPID) {
-                            $rActive[] = $rPID;
-                        }
-                    }
-                    $rFloodRow[$rType] = $rActive;
-                }
-                $rAllow = false;
-                if (count($rFloodRow[$rType]) >= $rFloodLimit) {
-                } else {
-                    $rFloodRow[$rType][] = $rDownloadPID;
-                    $rAllow = true;
-                }
-                file_put_contents($rFile, json_encode($rFloodRow), LOCK_EX);
-                return $rAllow;
-            } else {
-                return true;
-            }
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Remove a finished download from the user's flood-limit tracking file.
-     *
-     * @param string $rType        Download type ('epg' or 'playlist').
-     * @param array  $rUser        User row.
-     * @param int    $rDownloadPID PID of the download to remove.
-     * @param int    $rFloodLimit  Configured flood limit (0 = no tracking).
-     * @return void
-     */
-    public static function stopDownload($rType, $rUser, $rDownloadPID, $rFloodLimit) {
-        if ($rFloodLimit != 0) {
-            if (!$rUser['is_restreamer']) {
-                $rFile = FLOOD_TMP_PATH . $rUser['id'] . '_downloads';
-                if (file_exists($rFile)) {
-                    $rFloodRow[$rType] = array();
-                    foreach (json_decode(file_get_contents($rFile), true)[$rType] as $rPID) {
-                        if (!(ProcessManager::isRunning($rPID, 'php-fpm') && $rPID != $rDownloadPID)) {
-                        } else {
-                            $rFloodRow[$rType][] = $rPID;
-                        }
-                    }
-                } else {
-                    $rFloodRow = array('epg' => array(), 'playlist' => array());
-                }
-                file_put_contents($rFile, json_encode($rFloodRow), LOCK_EX);
-            } else {
-                return;
-            }
-        } else {
-            return;
-        }
-    }
+	/**
+	 * Remove a finished download from the user's flood-limit tracking file.
+	 *
+	 * @param string $rType        Download type ('epg' or 'playlist').
+	 * @param array  $rUser        User row.
+	 * @param int    $rDownloadPID PID of the download to remove.
+	 * @param int    $rFloodLimit  Configured flood limit (0 = no tracking).
+	 * @return void
+	 */
+	public static function stopDownload(string $rType, array $rUser, int $rDownloadPID, int $rFloodLimit) {
+		if ($rFloodLimit != 0) {
+			if (!$rUser['is_restreamer']) {
+				$rFile = FLOOD_TMP_PATH . $rUser['id'] . '_downloads';
+				if (file_exists($rFile)) {
+					$rFloodRow[$rType] = [];
+					foreach (json_decode(file_get_contents($rFile), true)[$rType] as $rPID) {
+						if (!(ProcessManager::isRunning($rPID, 'php-fpm') && $rPID != $rDownloadPID)) {
+						} else {
+							$rFloodRow[$rType][] = $rPID;
+						}
+					}
+				} else {
+					$rFloodRow = ['epg' => [], 'playlist' => []];
+				}
+				file_put_contents($rFile, json_encode($rFloodRow), LOCK_EX);
+			} else {
+				return;
+			}
+		} else {
+			return;
+		}
+	}
 }
diff --git a/src/Core/Util/StreamUtils.php b/src/Core/Util/StreamUtils.php
index e7b90fac..96a40d56 100644
--- a/src/Core/Util/StreamUtils.php
+++ b/src/Core/Util/StreamUtils.php
@@ -21,7 +21,7 @@ class StreamUtils {
 	 * @param string $rCookie Raw cookie string.
 	 * @return string Cookie string with `path=/` and `domain=` appended if missing.
 	 */
-	public static function fixCookie($rCookie) {
+	public static function fixCookie(string $rCookie) {
 		$rPath = false;
 		$rDomain = false;
 		$rSplit = explode(';', $rCookie);
@@ -59,8 +59,8 @@ class StreamUtils {
 	 * @param mixed       $rType      Argument category to include.
 	 * @return string[] Formatted command-line arguments.
 	 */
-	public static function getArguments($rArguments, $rProtocol, $rType) {
-		$rReturn = array();
+	public static function getArguments(array $rArguments, ?string $rProtocol, mixed $rType) {
+		$rReturn = [];
 		if (!empty($rArguments)) {
 			foreach ($rArguments as $rArgument_id => $rArgument) {
 				if ($rArgument['argument_cat'] == $rType && (is_null($rArgument['argument_wprotocol']) || stristr($rProtocol, $rArgument['argument_wprotocol']) || is_null($rProtocol))) {
@@ -87,8 +87,8 @@ class StreamUtils {
 	 * @param array $rArgs Raw transcode argument map.
 	 * @return string[] Ordered, trimmed ffmpeg arguments.
 	 */
-	public static function parseTranscode($rArgs) {
-		$rFitlerComplex = array();
+	public static function parseTranscode(array $rArgs) {
+		$rFitlerComplex = [];
 		foreach ($rArgs as $rKey => $rArgument) {
 			if (!($rKey == 'gpu' || $rKey == 'software_decoding' || $rKey == '16')) {
 				if (isset($rArgument['cmd'])) {
@@ -103,7 +103,7 @@ class StreamUtils {
 		if (!empty($rFitlerComplex)) {
 			$rArgs[] = '-filter_complex "' . implode(',', $rFitlerComplex) . '"';
 		}
-		$rNewArgs = array();
+		$rNewArgs = [];
 		foreach ($rArgs as $rKey => $rArg) {
 			if ($rKey != 'gpu' && $rKey != 'software_decoding') {
 				if (is_numeric($rKey)) {
@@ -114,7 +114,7 @@ class StreamUtils {
 			}
 		}
 		$rNewArgs = array_filter($rNewArgs);
-		uasort($rNewArgs, array(self::class, 'customOrder'));
+		uasort($rNewArgs, [self::class, 'customOrder']);
 		return array_map('trim', array_values(array_filter($rNewArgs)));
 	}
 
@@ -125,7 +125,7 @@ class StreamUtils {
 	 * @param string $b Second argument.
 	 * @return int -1 if $a is an input arg, 1 otherwise.
 	 */
-	public static function customOrder($a, $b) {
+	public static function customOrder(string $a, string $b) {
 		if (substr($a, 0, 3) == '-i ') {
 			return -1;
 		}
@@ -141,7 +141,7 @@ class StreamUtils {
 	 * @param string $rURL Source URL.
 	 * @return string Normalized/resolved URL.
 	 */
-	public static function parseStreamURL($rURL) {
+	public static function parseStreamURL(string $rURL) {
 		$rProtocol = strtolower(substr($rURL, 0, 4));
 		if ($rProtocol == 'rtmp') {
 			if (stristr($rURL, '$OPT')) {
@@ -159,7 +159,7 @@ class StreamUtils {
 	}
 
 	/** Video platforms whose page URLs parseStreamURL() resolves through yt-dlp. */
-	const RESOLVED_PLATFORMS = array('livestream.com', 'ustream.tv', 'twitch.tv', 'vimeo.com', 'facebook.com', 'dailymotion.com', 'cnn.com', 'edition.cnn.com', 'youtube.com', 'youtu.be');
+	const RESOLVED_PLATFORMS = ['livestream.com', 'ustream.tv', 'twitch.tv', 'vimeo.com', 'facebook.com', 'dailymotion.com', 'cnn.com', 'edition.cnn.com', 'youtube.com', 'youtu.be'];
 
 	/**
 	 * Whether a source URL is a platform page parseStreamURL() has to resolve
@@ -168,7 +168,7 @@ class StreamUtils {
 	 * @param string $rURL Source URL.
 	 * @return bool
 	 */
-	public static function needsResolver($rURL) {
+	public static function needsResolver(string $rURL) {
 		if (strtolower(substr((string) $rURL, 0, 4)) !== 'http') {
 			return false;
 		}
@@ -182,10 +182,10 @@ class StreamUtils {
 	 * @param string $rURL URL to inspect.
 	 * @return bool True if the path matches a known XC_VM stream pattern.
 	 */
-	public static function detectXC_VM($rURL) {
+	public static function detectXC_VM(string $rURL) {
 		$rPath = parse_url($rURL)['path'];
 		$rPathSize = count(explode('/', $rPath));
-		$rRegex = array('/\\/auth\\/(.*)$/m' => 3, '/\\/play\\/(.*)$/m' => 3, '/\\/play\\/(.*)\\/(.*)$/m' => 4, '/\\/live\\/(.*)\\/(\\d+)$/m' => 4, '/\\/live\\/(.*)\\/(\\d+)\\.(.*)$/m' => 4, '/\\/(.*)\\/(.*)\\/(\\d+)\\.(.*)$/m' => 4, '/\\/(.*)\\/(.*)\\/(\\d+)$/m' => 4, '/\\/live\\/(.*)\\/(.*)\\/(\\d+)\\.(.*)$/m' => 5, '/\\/live\\/(.*)\\/(.*)\\/(\\d+)$/m' => 5);
+		$rRegex = ['/\\/auth\\/(.*)$/m' => 3, '/\\/play\\/(.*)$/m' => 3, '/\\/play\\/(.*)\\/(.*)$/m' => 4, '/\\/live\\/(.*)\\/(\\d+)$/m' => 4, '/\\/live\\/(.*)\\/(\\d+)\\.(.*)$/m' => 4, '/\\/(.*)\\/(.*)\\/(\\d+)\\.(.*)$/m' => 4, '/\\/(.*)\\/(.*)\\/(\\d+)$/m' => 4, '/\\/live\\/(.*)\\/(.*)\\/(\\d+)\\.(.*)$/m' => 5, '/\\/live\\/(.*)\\/(.*)\\/(\\d+)$/m' => 5];
 		foreach ($rRegex as $rQuery => $rCount) {
 			if ($rPathSize != $rCount) {
 			} else {
@@ -207,7 +207,7 @@ class StreamUtils {
 	 * @param int    $rSegmentDuration Assumed segment duration in seconds.
 	 * @return array|string|null Segment list, current segment id, or null if missing.
 	 */
-	public static function getPlaylistSegments($rPlaylist, $rPrebuffer = 0, $rSegmentDuration = 10) {
+	public static function getPlaylistSegments(string $rPlaylist, int $rPrebuffer = 0, int $rSegmentDuration = 10) {
 		if (!file_exists($rPlaylist)) {
 		} else {
 			$rSource = file_get_contents($rPlaylist);
@@ -236,7 +236,7 @@ class StreamUtils {
 	 * @param string $rUIToken  UI token; preferred auth when present.
 	 * @return string|false Rewritten playlist text, or false if unavailable.
 	 */
-	public static function generateAdminHLS($rM3U8, $rPassword, $rStreamID, $rUIToken) {
+	public static function generateAdminHLS(string $rM3U8, string $rPassword, int $rStreamID, string $rUIToken) {
 		if (!file_exists($rM3U8)) {
 		} else {
 			$rSource = file_get_contents($rM3U8);
@@ -262,7 +262,7 @@ class StreamUtils {
 	 * @param int    $rPID      Process id to check (ffmpeg/php).
 	 * @return bool True if running and the playlist file exists.
 	 */
-	public static function isValidStream($rPlaylist, $rPID) {
+	public static function isValidStream(string $rPlaylist, int $rPID) {
 		return (ProcessManager::isRunning($rPID, 'ffmpeg') || ProcessManager::isRunning($rPID, 'php')) && file_exists($rPlaylist);
 	}
 
@@ -272,7 +272,7 @@ class StreamUtils {
 	 * @param string $rSegment Path to the .ts segment.
 	 * @return int Byte offset of the keyframe (0 if not found).
 	 */
-	public static function findKeyframe($rSegment) {
+	public static function findKeyframe(string $rSegment) {
 		$rPacketSize = 188;
 		$rKeyframe = $rPosition = 0;
 		$rFoundStart = false;
@@ -335,7 +335,7 @@ class StreamUtils {
 	 * @param string|null $rForceDuration Duration "H:M:S" for movies (size-based estimate).
 	 * @return int|false Average bitrate, or false if unavailable.
 	 */
-	public static function getStreamBitrate($rType, $rPath, $rForceDuration = null) {
+	public static function getStreamBitrate(string $rType, string $rPath, ?string $rForceDuration = null) {
 		clearstatcache();
 		if (file_exists($rPath)) {
 			$rBitrate = 0;
@@ -349,7 +349,7 @@ class StreamUtils {
 					break;
 				case 'live':
 					$rFP = fopen($rPath, 'r');
-					$rBitrates = array();
+					$rBitrates = [];
 					while (!feof($rFP)) {
 						$rLine = trim(fgets($rFP));
 						if (stristr($rLine, 'EXTINF')) {
@@ -384,8 +384,8 @@ class StreamUtils {
 	 * @param string $rRawSegment Raw (URL-encoded) segment from the request.
 	 * @return string
 	 */
-	public static function sanitizeSegmentName($rRawSegment) {
-		return str_replace(array('\\', '/'), '', urldecode((string) $rRawSegment));
+	public static function sanitizeSegmentName(string $rRawSegment) {
+		return str_replace(['\\', '/'], '', urldecode((string) $rRawSegment));
 	}
 
 	/**
@@ -395,8 +395,8 @@ class StreamUtils {
 	 * @param string $rContainer Container extension (e.g. "mp4").
 	 * @return string
 	 */
-	public static function containerMimeType($rContainer) {
-		$rMap = array(
+	public static function containerMimeType(string $rContainer) {
+		$rMap = [
 			'mp4' => 'video/mp4',
 			'mkv' => 'video/x-matroska',
 			'avi' => 'video/x-msvideo',
@@ -405,7 +405,7 @@ class StreamUtils {
 			'wmv' => 'video/x-ms-wmv',
 			'mov' => 'video/quicktime',
 			'ts'  => 'video/mp2t',
-		);
+		];
 
 		return $rMap[(string) $rContainer] ?? 'application/octet-stream';
 	}
@@ -414,10 +414,9 @@ class StreamUtils {
 	 * Parse the timeshift `start` parameter into a unix timestamp. Accepts a raw
 	 * timestamp, `YYYYMMDD-H`, or `Y-m-d:H-i`.
 	 *
-	 * @param string|int $rStartDate
 	 * @return int
 	 */
-	public static function timeshiftStartTimestamp($rStartDate) {
+	public static function timeshiftStartTimestamp(string|int $rStartDate) {
 		if (is_numeric($rStartDate)) {
 			return (int) $rStartDate;
 		}
@@ -443,8 +442,7 @@ class StreamUtils {
 	 * @param int $rConfiguredWaitSeconds Configured `segment_wait_time`.
 	 * @return int
 	 */
-	public static function segmentRetryBudget($rSegTimeSeconds, $rConfiguredWaitSeconds) {
+	public static function segmentRetryBudget(int $rSegTimeSeconds, int $rConfiguredWaitSeconds) {
 		return max((int) $rSegTimeSeconds * 2, (int) $rConfiguredWaitSeconds ?: 20);
 	}
-
 }
diff --git a/src/Core/Util/SystemInfo.php b/src/Core/Util/SystemInfo.php
index 1618fe4d..e2241d74 100644
--- a/src/Core/Util/SystemInfo.php
+++ b/src/Core/Util/SystemInfo.php
@@ -18,286 +18,287 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class SystemInfo {
+	/**
+	 * Aggregate server statistics.
+	 *
+	 * Collects CPU, memory, disk, network, GPU, I/O, audio/video devices.
+	 * Requires ServerRepository::getAll()[SERVER_ID] for network interface selection.
+	 *
+	 * @return array<string, mixed>
+	 */
+	public static function getStats() {
+		$rJSON = [];
+		$rJSON['cpu'] = round(self::getTotalCPU(), 2);
+		$rJSON['cpu_cores'] = intval(@shell_exec('cat /proc/cpuinfo | grep "^processor" | wc -l') ?? '0');
+		$rJSON['cpu_avg'] = round((sys_getloadavg()[0] * 100) / (($rJSON['cpu_cores'] ?: 1)), 2);
+		$rJSON['cpu_name'] = trim(@shell_exec("cat /proc/cpuinfo | grep 'model name' | uniq | awk -F: '{print \$2}'") ?? '');
+		if ($rJSON['cpu_avg'] > 100) {
+			$rJSON['cpu_avg'] = 100;
+		}
+		$rMemInfo = self::getMemory();
+		$rJSON['total_mem'] = $rMemInfo['total'];
+		$rJSON['total_mem_free'] = $rMemInfo['free'];
+		$rJSON['total_mem_used'] = $rMemInfo['used'];
+		$rJSON['total_mem_used_percent'] = round(($rJSON['total_mem_used'] / $rJSON['total_mem']) * 100, 2);
+		$rJSON['total_disk_space'] = disk_total_space(MAIN_HOME);
+		$rJSON['free_disk_space'] = disk_free_space(MAIN_HOME);
+		$rJSON['kernel'] = trim(@shell_exec('uname -r') ?? '');
+		$rJSON['uptime'] = self::getUptime();
+		$rJSON['total_running_streams'] = (int) trim(@shell_exec('ps ax | grep -v grep | grep -c ffmpeg') ?? '0');
+		$rJSON['bytes_sent'] = 0;
+		$rJSON['bytes_sent_total'] = 0;
+		$rJSON['bytes_received'] = 0;
+		$rJSON['bytes_received_total'] = 0;
+		$rJSON['network_speed'] = 0;
+		$rJSON['interfaces'] = self::getNetworkInterfaces();
+		$rJSON['network_speed'] = 0;
+		if ($rJSON['cpu'] > 100) {
+			$rJSON['cpu'] = 100;
+		}
+		if ($rJSON['total_mem'] < $rJSON['total_mem_used']) {
+			$rJSON['total_mem_used'] = $rJSON['total_mem'];
+		}
+		if ($rJSON['total_mem_used_percent'] > 100) {
+			$rJSON['total_mem_used_percent'] = 100;
+		}
 
-    /**
-     * Aggregate server statistics.
-     *
-     * Collects CPU, memory, disk, network, GPU, I/O, audio/video devices.
-     * Requires ServerRepository::getAll()[SERVER_ID] for network interface selection.
-     *
-     * @return array<string, mixed>
-     */
-    public static function getStats() {
-        $rJSON = array();
-        $rJSON['cpu'] = round(self::getTotalCPU(), 2);
-        $rJSON['cpu_cores'] = intval(@shell_exec('cat /proc/cpuinfo | grep "^processor" | wc -l') ?? '0');
-        $rJSON['cpu_avg'] = round((sys_getloadavg()[0] * 100) / (($rJSON['cpu_cores'] ?: 1)), 2);
-        $rJSON['cpu_name'] = trim(@shell_exec("cat /proc/cpuinfo | grep 'model name' | uniq | awk -F: '{print \$2}'") ?? '');
-        if ($rJSON['cpu_avg'] > 100) {
-            $rJSON['cpu_avg'] = 100;
-        }
-        $rMemInfo = self::getMemory();
-        $rJSON['total_mem'] = $rMemInfo['total'];
-        $rJSON['total_mem_free'] = $rMemInfo['free'];
-        $rJSON['total_mem_used'] = $rMemInfo['used'];
-        $rJSON['total_mem_used_percent'] = round(($rJSON['total_mem_used'] / $rJSON['total_mem']) * 100, 2);
-        $rJSON['total_disk_space'] = disk_total_space(MAIN_HOME);
-        $rJSON['free_disk_space'] = disk_free_space(MAIN_HOME);
-        $rJSON['kernel'] = trim(@shell_exec('uname -r') ?? '');
-        $rJSON['uptime'] = self::getUptime();
-        $rJSON['total_running_streams'] = (int) trim(@shell_exec('ps ax | grep -v grep | grep -c ffmpeg') ?? '0');
-        $rJSON['bytes_sent'] = 0;
-        $rJSON['bytes_sent_total'] = 0;
-        $rJSON['bytes_received'] = 0;
-        $rJSON['bytes_received_total'] = 0;
-        $rJSON['network_speed'] = 0;
-        $rJSON['interfaces'] = self::getNetworkInterfaces();
-        $rJSON['network_speed'] = 0;
-        if ($rJSON['cpu'] > 100) {
-            $rJSON['cpu'] = 100;
-        }
-        if ($rJSON['total_mem'] < $rJSON['total_mem_used']) {
-            $rJSON['total_mem_used'] = $rJSON['total_mem'];
-        }
-        if ($rJSON['total_mem_used_percent'] > 100) {
-            $rJSON['total_mem_used_percent'] = 100;
-        }
+		// Network interface selection: delegate to ServerRepository for backward compat
+		$rNetworkInterface = null;
+		if (defined('SERVER_ID') && isset(ServerRepository::getAll()[SERVER_ID]['network_interface'])) {
+			$rNetworkInterface = ServerRepository::getAll()[SERVER_ID]['network_interface'] == 'auto'
+				? null
+				: ServerRepository::getAll()[SERVER_ID]['network_interface'];
+		}
+		$rJSON['network_info'] = self::getNetwork($rNetworkInterface);
 
-        // Network interface selection: delegate to ServerRepository for backward compat
-        $rNetworkInterface = null;
-        if (defined('SERVER_ID') && isset(ServerRepository::getAll()[SERVER_ID]['network_interface'])) {
-            $rNetworkInterface = ServerRepository::getAll()[SERVER_ID]['network_interface'] == 'auto'
-                ? null
-                : ServerRepository::getAll()[SERVER_ID]['network_interface'];
-        }
-        $rJSON['network_info'] = self::getNetwork($rNetworkInterface);
+		foreach ($rJSON['network_info'] as $rInterface => $rData) {
+			if (file_exists('/sys/class/net/' . $rInterface . '/speed')) {
+				$NetSpeed = intval(file_get_contents('/sys/class/net/' . $rInterface . '/speed'));
+				if (0 < $NetSpeed && $rJSON['network_speed'] == 0) {
+					$rJSON['network_speed'] = $NetSpeed;
+				}
+			}
+			$rJSON['bytes_sent_total'] = (intval(trim(file_get_contents('/sys/class/net/' . $rInterface . '/statistics/tx_bytes'))) ?: 0);
+			$rJSON['bytes_received_total'] = (intval(trim(file_get_contents('/sys/class/net/' . $rInterface . '/statistics/tx_bytes'))) ?: 0);
+			$rJSON['bytes_sent'] += $rData['out_bytes'];
+			$rJSON['bytes_received'] += $rData['in_bytes'];
+		}
+		$rJSON['audio_devices'] = [];
+		$rJSON['video_devices'] = $rJSON['audio_devices'];
+		$rJSON['gpu_info'] = $rJSON['video_devices'];
+		$rJSON['iostat_info'] = $rJSON['gpu_info'];
+		if (@shell_exec('which iostat')) {
+			$rJSON['iostat_info'] = self::getIO();
+		}
+		if (@shell_exec('which nvidia-smi')) {
+			$rJSON['gpu_info'] = self::getGPUInfo();
+		}
+		if (@shell_exec('which v4l2-ctl')) {
+			$rJSON['video_devices'] = self::getVideoDevices();
+		}
+		if (@shell_exec('which arecord')) {
+			$rJSON['audio_devices'] = self::getAudioDevices();
+		}
+		list($rJSON['cpu_load_average']) = sys_getloadavg();
+		return $rJSON;
+	}
 
-        foreach ($rJSON['network_info'] as $rInterface => $rData) {
-            if (file_exists('/sys/class/net/' . $rInterface . '/speed')) {
-                $NetSpeed = intval(file_get_contents('/sys/class/net/' . $rInterface . '/speed'));
-                if (0 < $NetSpeed && $rJSON['network_speed'] == 0) {
-                    $rJSON['network_speed'] = $NetSpeed;
-                }
-            }
-            $rJSON['bytes_sent_total'] = (intval(trim(file_get_contents('/sys/class/net/' . $rInterface . '/statistics/tx_bytes'))) ?: 0);
-            $rJSON['bytes_received_total'] = (intval(trim(file_get_contents('/sys/class/net/' . $rInterface . '/statistics/tx_bytes'))) ?: 0);
-            $rJSON['bytes_sent'] += $rData['out_bytes'];
-            $rJSON['bytes_received'] += $rData['in_bytes'];
-        }
-        $rJSON['audio_devices'] = array();
-        $rJSON['video_devices'] = $rJSON['audio_devices'];
-        $rJSON['gpu_info'] = $rJSON['video_devices'];
-        $rJSON['iostat_info'] = $rJSON['gpu_info'];
-        if (@shell_exec('which iostat')) {
-            $rJSON['iostat_info'] = self::getIO();
-        }
-        if (@shell_exec('which nvidia-smi')) {
-            $rJSON['gpu_info'] = self::getGPUInfo();
-        }
-        if (@shell_exec('which v4l2-ctl')) {
-            $rJSON['video_devices'] = self::getVideoDevices();
-        }
-        if (@shell_exec('which arecord')) {
-            $rJSON['audio_devices'] = self::getAudioDevices();
-        }
-        list($rJSON['cpu_load_average']) = sys_getloadavg();
-        return $rJSON;
-    }
+	/**
+	 * Get total CPU usage as percentage (sum of all processes / core count).
+	 *
+	 * @return float CPU usage percentage
+	 */
+	public static function getTotalCPU() {
+		$rTotalLoad = 0;
+		$processes = [];
+		@exec('ps -Ao pid,pcpu', $processes);
+		foreach ($processes as $process) {
+			$cols = explode(' ', preg_replace('!\\s+!', ' ', trim($process)));
+			if (count($cols) >= 2 && is_numeric($cols[1])) {
+				$rTotalLoad += floatval($cols[1]);
+			}
+		}
 
-    /**
-     * Get total CPU usage as percentage (sum of all processes / core count).
-     *
-     * @return float CPU usage percentage
-     */
-    public static function getTotalCPU() {
-        $rTotalLoad = 0;
-        $processes = array();
-        @exec('ps -Ao pid,pcpu', $processes);
-        foreach ($processes as $process) {
-            $cols = explode(' ', preg_replace('!\\s+!', ' ', trim($process)));
-            if (count($cols) >= 2 && is_numeric($cols[1])) {
-                $rTotalLoad += floatval($cols[1]);
-            }
-        }
+		$cpuCores = 1;
+		$coreCount = intval(@shell_exec("grep -P '^processor' /proc/cpuinfo|wc -l") ?? '0');
+		if ($coreCount > 0) {
+			$cpuCores = $coreCount;
+		}
 
-        $cpuCores = 1;
-        $coreCount = intval(@shell_exec("grep -P '^processor' /proc/cpuinfo|wc -l") ?? '0');
-        if ($coreCount > 0) {
-            $cpuCores = $coreCount;
-        }
+		return $rTotalLoad / $cpuCores;
+	}
 
-        return $rTotalLoad / $cpuCores;
-    }
+	/**
+	 * Get memory info from /proc/meminfo.
+	 *
+	 * @return array{total: int, free: int, used: int} Memory in kB
+	 */
+	public static function getMemory() {
+		try {
+			$rFree = explode("\n", file_get_contents('/proc/meminfo'));
+			$rMemory = [];
 
-    /**
-     * Get memory info from /proc/meminfo.
-     *
-     * @return array{total: int, free: int, used: int} Memory in kB
-     */
-    public static function getMemory() {
-        try {
-            $rFree = explode("\n", file_get_contents('/proc/meminfo'));
-            $rMemory = array();
+			foreach ($rFree as $rLine) {
+				if (empty($rLine)) {
+					continue;
+				}
 
-            foreach ($rFree as $rLine) {
-                if (empty($rLine)) continue;
+				$rParts = preg_split('/\s+/', trim($rLine));
+				if (count($rParts) >= 2) {
+					$rKey = rtrim($rParts[0], ':');
+					$rValue = intval($rParts[1]);
+					$rMemory[$rKey] = $rValue;
+				}
+			}
 
-                $rParts = preg_split('/\s+/', trim($rLine));
-                if (count($rParts) >= 2) {
-                    $rKey = rtrim($rParts[0], ':');
-                    $rValue = intval($rParts[1]);
-                    $rMemory[$rKey] = $rValue;
-                }
-            }
+			if (isset($rMemory['MemTotal'], $rMemory['MemAvailable'])) {
+				return [
+					'total' => $rMemory['MemTotal'],
+					'free'  => $rMemory['MemAvailable'],
+					'used'  => $rMemory['MemTotal'] - $rMemory['MemAvailable']
+				];
+			}
 
-            if (isset($rMemory['MemTotal'], $rMemory['MemAvailable'])) {
-                return array(
-                    'total' => $rMemory['MemTotal'],
-                    'free'  => $rMemory['MemAvailable'],
-                    'used'  => $rMemory['MemTotal'] - $rMemory['MemAvailable']
-                );
-            }
+			return ['total' => 0, 'free' => 0, 'used' => 0];
+		} catch (\Exception $e) {
+			return ['total' => 0, 'free' => 0, 'used' => 0];
+		}
+	}
 
-            return array('total' => 0, 'free' => 0, 'used' => 0);
-        } catch (\Exception $e) {
-            return array('total' => 0, 'free' => 0, 'used' => 0);
-        }
-    }
+	/**
+	 * Get system uptime as human-readable string.
+	 *
+	 * @return string e.g., "5d 3h 12m 4s"
+	 */
+	public static function getUptime() {
+		if (!(file_exists('/proc/uptime') && is_readable('/proc/uptime'))) {
+			return '';
+		}
+		$tmp = explode(' ', file_get_contents('/proc/uptime'));
+		return TimeUtils::secondsToTime(intval($tmp[0]));
+	}
 
-    /**
-     * Get system uptime as human-readable string.
-     *
-     * @return string e.g., "5d 3h 12m 4s"
-     */
-    public static function getUptime() {
-        if (!(file_exists('/proc/uptime') && is_readable('/proc/uptime'))) {
-            return '';
-        }
-        $tmp = explode(' ', file_get_contents('/proc/uptime'));
-        return TimeUtils::secondsToTime(intval($tmp[0]));
-    }
+	/**
+	 * List network interfaces (excluding lo and bond*).
+	 *
+	 * @return string[]
+	 */
+	public static function getNetworkInterfaces() {
+		$rReturn = [];
+		$rOutput = [];
+		@exec('ls /sys/class/net/', $rOutput, $rReturnVar);
+		foreach ($rOutput as $rInterface) {
+			$rInterface = trim(rtrim($rInterface, ':'));
+			if (!($rInterface != 'lo' && substr($rInterface, 0, 4) != 'bond')) {
+			} else {
+				$rReturn[] = $rInterface;
+			}
+		}
+		return $rReturn;
+	}
 
-    /**
-     * List network interfaces (excluding lo and bond*).
-     *
-     * @return string[]
-     */
-    public static function getNetworkInterfaces() {
-        $rReturn = array();
-        $rOutput = array();
-        @exec('ls /sys/class/net/', $rOutput, $rReturnVar);
-        foreach ($rOutput as $rInterface) {
-            $rInterface = trim(rtrim($rInterface, ':'));
-            if (!($rInterface != 'lo' && substr($rInterface, 0, 4) != 'bond')) {
-            } else {
-                $rReturn[] = $rInterface;
-            }
-        }
-        return $rReturn;
-    }
+	/**
+	 * Read cached network I/O statistics.
+	 *
+	 * @param string|null $rInterface  Specific interface name, or null for all
+	 * @return array<string, array{in_bytes: int, in_packets: int, in_errors: int, out_bytes: int, out_packets: int, out_errors: int}>
+	 */
+	public static function getNetwork(?string $rInterface = null) {
+		$rReturn = [];
+		if (file_exists(LOGS_TMP_PATH . 'network')) {
+			$rNetwork = json_decode(file_get_contents(LOGS_TMP_PATH . 'network'), true);
+			foreach ((is_array($rNetwork) ? $rNetwork : []) as $rLine) {
+				if (!($rInterface && $rLine[0] != $rInterface) && !($rLine[0] == 'lo' || !$rInterface && substr($rLine[0], 0, 4) == 'bond')) {
+					$rReturn[$rLine[0]] = ['in_bytes' => intval($rLine[1] / 2), 'in_packets' => $rLine[2], 'in_errors' => $rLine[3], 'out_bytes' => intval($rLine[4] / 2), 'out_packets' => $rLine[5], 'out_errors' => $rLine[6]];
+				}
+			}
+		}
+		return $rReturn;
+	}
 
-    /**
-     * Read cached network I/O statistics.
-     *
-     * @param string|null $rInterface  Specific interface name, or null for all
-     * @return array<string, array{in_bytes: int, in_packets: int, in_errors: int, out_bytes: int, out_packets: int, out_errors: int}>
-     */
-    public static function getNetwork($rInterface = null) {
-        $rReturn = array();
-        if (file_exists(LOGS_TMP_PATH . 'network')) {
-            $rNetwork = json_decode(file_get_contents(LOGS_TMP_PATH . 'network'), true);
-            foreach ((is_array($rNetwork) ? $rNetwork : array()) as $rLine) {
-                if (!($rInterface && $rLine[0] != $rInterface) && !($rLine[0] == 'lo' || !$rInterface && substr($rLine[0], 0, 4) == 'bond')) {
-                    $rReturn[$rLine[0]] = array('in_bytes' => intval($rLine[1] / 2), 'in_packets' => $rLine[2], 'in_errors' => $rLine[3], 'out_bytes' => intval($rLine[4] / 2), 'out_packets' => $rLine[5], 'out_errors' => $rLine[6]);
-                }
-            }
-        }
-        return $rReturn;
-    }
+	/**
+	 * List V4L2 video capture devices.
+	 *
+	 * @return array<int, array{name: string, video_device: string}>
+	 */
+	public static function getVideoDevices() {
+		$rReturn = [];
+		$rID = 0;
+		try {
+			// 2>/dev/null: with no camera present v4l2-ctl prints
+			// "Cannot open device /dev/video0, exiting." to stderr, polluting
+			// the output of every command that collects stats (watchdog, crons).
+			$rDevices = array_values(array_filter(explode("\n", @shell_exec('v4l2-ctl --list-devices 2>/dev/null') ?? '')));
+			foreach ($rDevices as $rKey => $rValue) {
+				if ($rKey % 2 == 0) {
+					$rReturn[$rID]['name'] = $rValue;
+					list(, $rReturn[$rID]['video_device']) = explode('/dev/', $rDevices[$rKey + 1]);
+					$rID++;
+				}
+			}
+		} catch (\Exception $e) {
+		}
+		return $rReturn;
+	}
 
-    /**
-     * List V4L2 video capture devices.
-     *
-     * @return array<int, array{name: string, video_device: string}>
-     */
-    public static function getVideoDevices() {
-        $rReturn = array();
-        $rID = 0;
-        try {
-            // 2>/dev/null: with no camera present v4l2-ctl prints
-            // "Cannot open device /dev/video0, exiting." to stderr, polluting
-            // the output of every command that collects stats (watchdog, crons).
-            $rDevices = array_values(array_filter(explode("\n", @shell_exec('v4l2-ctl --list-devices 2>/dev/null') ?? '')));
-            foreach ($rDevices as $rKey => $rValue) {
-                if ($rKey % 2 == 0) {
-                    $rReturn[$rID]['name'] = $rValue;
-                    list(, $rReturn[$rID]['video_device']) = explode('/dev/', $rDevices[$rKey + 1]);
-                    $rID++;
-                }
-            }
-        } catch (\Exception $e) {
-        }
-        return $rReturn;
-    }
+	/**
+	 * List ALSA audio recording devices.
+	 *
+	 * @return string[]
+	 */
+	public static function getAudioDevices() {
+		try {
+			return array_filter(explode("\n", @shell_exec('arecord -L | grep "hw:CARD="') ?? ''));
+		} catch (\Exception $e) {
+			return [];
+		}
+	}
 
-    /**
-     * List ALSA audio recording devices.
-     *
-     * @return string[]
-     */
-    public static function getAudioDevices() {
-        try {
-            return array_filter(explode("\n", @shell_exec('arecord -L | grep "hw:CARD="') ?? ''));
-        } catch (\Exception $e) {
-            return array();
-        }
-    }
+	/**
+	 * Get I/O statistics via iostat (JSON mode).
+	 *
+	 * @return array
+	 */
+	public static function getIO() {
+		$rOutput = [];
+		@exec('iostat -o JSON -m', $rOutput, $rReturnVar);
+		$rOutput = implode('', $rOutput);
+		$rJSON = json_decode($rOutput, true);
+		if (isset($rJSON['sysstat'])) {
+			return $rJSON['sysstat']['hosts'][0]['statistics'][0];
+		}
+		return [];
+	}
 
-    /**
-     * Get I/O statistics via iostat (JSON mode).
-     *
-     * @return array
-     */
-    public static function getIO() {
-        $rOutput = array();
-        @exec('iostat -o JSON -m', $rOutput, $rReturnVar);
-        $rOutput = implode('', $rOutput);
-        $rJSON = json_decode($rOutput, true);
-        if (isset($rJSON['sysstat'])) {
-            return $rJSON['sysstat']['hosts'][0]['statistics'][0];
-        }
-        return array();
-    }
-
-    /**
-     * Get GPU information via nvidia-smi (XML mode).
-     *
-     * @return array
-     */
-    public static function getGPUInfo() {
-        $rOutput = array();
-        @exec('nvidia-smi -x -q', $rOutput, $rReturnVar);
-        $rOutput = implode('', $rOutput);
-        if (stripos($rOutput, '<?xml') === false) {
-        } else {
-            $rJSON = json_decode(json_encode(simplexml_load_string($rOutput)), true);
-            if (!isset($rJSON['driver_version'])) {
-            } else {
-                $rGPU = array('attached_gpus' => $rJSON['attached_gpus'], 'driver_version' => $rJSON['driver_version'], 'cuda_version' => $rJSON['cuda_version'], 'gpus' => array());
-                if (!isset($rJSON['gpu']['board_id'])) {
-                } else {
-                    $rJSON['gpu'] = array($rJSON['gpu']);
-                }
-                foreach ($rJSON['gpu'] as $rInstance) {
-                    $rArray = array('name' => $rInstance['product_name'], 'power_readings' => $rInstance['power_readings'], 'utilisation' => $rInstance['utilization'], 'memory_usage' => $rInstance['fb_memory_usage'], 'fan_speed' => $rInstance['fan_speed'], 'temperature' => $rInstance['temperature'], 'clocks' => $rInstance['clocks'], 'uuid' => $rInstance['uuid'], 'id' => intval($rInstance['pci']['pci_device']), 'processes' => array());
-                    foreach ($rInstance['processes']['process_info'] as $rProcess) {
-                        $rArray['processes'][] = array('pid' => intval($rProcess['pid']), 'memory' => $rProcess['used_memory']);
-                    }
-                    $rGPU['gpus'][] = $rArray;
-                }
-                return $rGPU;
-            }
-        }
-        return array();
-    }
+	/**
+	 * Get GPU information via nvidia-smi (XML mode).
+	 *
+	 * @return array
+	 */
+	public static function getGPUInfo() {
+		$rOutput = [];
+		@exec('nvidia-smi -x -q', $rOutput, $rReturnVar);
+		$rOutput = implode('', $rOutput);
+		if (stripos($rOutput, '<?xml') === false) {
+		} else {
+			$rJSON = json_decode(json_encode(simplexml_load_string($rOutput)), true);
+			if (!isset($rJSON['driver_version'])) {
+			} else {
+				$rGPU = ['attached_gpus' => $rJSON['attached_gpus'], 'driver_version' => $rJSON['driver_version'], 'cuda_version' => $rJSON['cuda_version'], 'gpus' => []];
+				if (!isset($rJSON['gpu']['board_id'])) {
+				} else {
+					$rJSON['gpu'] = [$rJSON['gpu']];
+				}
+				foreach ($rJSON['gpu'] as $rInstance) {
+					$rArray = ['name' => $rInstance['product_name'], 'power_readings' => $rInstance['power_readings'], 'utilisation' => $rInstance['utilization'], 'memory_usage' => $rInstance['fb_memory_usage'], 'fan_speed' => $rInstance['fan_speed'], 'temperature' => $rInstance['temperature'], 'clocks' => $rInstance['clocks'], 'uuid' => $rInstance['uuid'], 'id' => intval($rInstance['pci']['pci_device']), 'processes' => []];
+					foreach ($rInstance['processes']['process_info'] as $rProcess) {
+						$rArray['processes'][] = ['pid' => intval($rProcess['pid']), 'memory' => $rProcess['used_memory']];
+					}
+					$rGPU['gpus'][] = $rArray;
+				}
+				return $rGPU;
+			}
+		}
+		return [];
+	}
 }
diff --git a/src/Core/Util/TimeUtils.php b/src/Core/Util/TimeUtils.php
index adba98f8..b1cdf88c 100644
--- a/src/Core/Util/TimeUtils.php
+++ b/src/Core/Util/TimeUtils.php
@@ -15,111 +15,110 @@ namespace XcVm\Core\Util;
  */
 
 class TimeUtils {
+	/**
+	 * Get timezone difference in seconds between server timezone and user timezone
+	 *
+	 * @param string $timezone User timezone identifier (e.g., 'Europe/Moscow')
+	 * @return int Offset in seconds
+	 */
+	public static function getDiffTimezone(string $timezone) {
+		$serverTZ = new \DateTime('UTC', new \DateTimeZone(date_default_timezone_get()));
+		$userTZ = new \DateTime('UTC', new \DateTimeZone($timezone));
+		return $userTZ->getTimestamp() - $serverTZ->getTimestamp();
+	}
 
-    /**
-     * Get timezone difference in seconds between server timezone and user timezone
-     *
-     * @param string $timezone User timezone identifier (e.g., 'Europe/Moscow')
-     * @return int Offset in seconds
-     */
-    public static function getDiffTimezone($timezone) {
-        $serverTZ = new \DateTime('UTC', new \DateTimeZone(date_default_timezone_get()));
-        $userTZ = new \DateTime('UTC', new \DateTimeZone($timezone));
-        return $userTZ->getTimestamp() - $serverTZ->getTimestamp();
-    }
+	/**
+	 * Convert seconds to human-readable time string
+	 *
+	 * Examples:
+	 *   3661  → "1h 1m 1s"
+	 *   86400 → "1d"
+	 *   90    → "1m 30s"
+	 *
+	 * @param int $inputSeconds Total seconds
+	 * @param bool $includeSecs Whether to include seconds in output
+	 * @return string Formatted time string
+	 */
+	public static function secondsToTime(int $inputSeconds, bool $includeSecs = true) {
+		$secondsInMinute = 60;
+		$secondsInHour = 3600;
+		$secondsInDay = 86400;
 
-    /**
-     * Convert seconds to human-readable time string
-     *
-     * Examples:
-     *   3661  → "1h 1m 1s"
-     *   86400 → "1d"
-     *   90    → "1m 30s"
-     *
-     * @param int $inputSeconds Total seconds
-     * @param bool $includeSecs Whether to include seconds in output
-     * @return string Formatted time string
-     */
-    public static function secondsToTime($inputSeconds, $includeSecs = true) {
-        $secondsInMinute = 60;
-        $secondsInHour = 3600;
-        $secondsInDay = 86400;
+		$days = (int) floor($inputSeconds / $secondsInDay);
+		$hourSeconds = $inputSeconds % $secondsInDay;
+		$hours = (int) floor($hourSeconds / $secondsInHour);
+		$minuteSeconds = $hourSeconds % $secondsInHour;
+		$minutes = (int) floor($minuteSeconds / $secondsInMinute);
+		$remaining = $minuteSeconds % $secondsInMinute;
+		$seconds = (int) ceil($remaining);
 
-        $days = (int)floor($inputSeconds / $secondsInDay);
-        $hourSeconds = $inputSeconds % $secondsInDay;
-        $hours = (int)floor($hourSeconds / $secondsInHour);
-        $minuteSeconds = $hourSeconds % $secondsInHour;
-        $minutes = (int)floor($minuteSeconds / $secondsInMinute);
-        $remaining = $minuteSeconds % $secondsInMinute;
-        $seconds = (int)ceil($remaining);
+		$output = '';
 
-        $output = '';
+		if ($days > 0) {
+			$output .= $days . 'd ';
+		}
+		if ($hours > 0) {
+			$output .= $hours . 'h ';
+		}
+		if ($minutes > 0) {
+			$output .= $minutes . 'm ';
+		}
+		if ($includeSecs) {
+			$output .= $seconds . 's';
+		}
 
-        if ($days > 0) {
-            $output .= $days . 'd ';
-        }
-        if ($hours > 0) {
-            $output .= $hours . 'h ';
-        }
-        if ($minutes > 0) {
-            $output .= $minutes . 'm ';
-        }
-        if ($includeSecs) {
-            $output .= $seconds . 's';
-        }
+		return trim($output);
+	}
 
-        return trim($output);
-    }
+	/**
+	 * Parse a duration string "HH:MM:SS" into total seconds
+	 *
+	 * @param string $duration "HH:MM:SS" or "MM:SS"
+	 * @return int Total seconds
+	 */
+	public static function durationToSeconds(string $duration) {
+		$parts = explode(':', $duration);
+		$count = count($parts);
 
-    /**
-     * Parse a duration string "HH:MM:SS" into total seconds
-     *
-     * @param string $duration "HH:MM:SS" or "MM:SS"
-     * @return int Total seconds
-     */
-    public static function durationToSeconds($duration) {
-        $parts = explode(':', $duration);
-        $count = count($parts);
+		if ($count === 3) {
+			return (int) $parts[0] * 3600 + (int) $parts[1] * 60 + (int) $parts[2];
+		}
+		if ($count === 2) {
+			return (int) $parts[0] * 60 + (int) $parts[1];
+		}
 
-        if ($count === 3) {
-            return (int)$parts[0] * 3600 + (int)$parts[1] * 60 + (int)$parts[2];
-        }
-        if ($count === 2) {
-            return (int)$parts[0] * 60 + (int)$parts[1];
-        }
+		return (int) $duration;
+	}
 
-        return (int)$duration;
-    }
+	/**
+	 * Get a human-readable "time ago" string
+	 *
+	 * @param int $timestamp Unix timestamp
+	 * @return string e.g., "5m ago", "2h ago", "1d ago"
+	 */
+	public static function timeAgo(int $timestamp) {
+		$diff = time() - $timestamp;
 
-    /**
-     * Get a human-readable "time ago" string
-     *
-     * @param int $timestamp Unix timestamp
-     * @return string e.g., "5m ago", "2h ago", "1d ago"
-     */
-    public static function timeAgo($timestamp) {
-        $diff = time() - $timestamp;
+		if ($diff < 60) {
+			return $diff . 's ago';
+		}
+		if ($diff < 3600) {
+			return (int) ($diff / 60) . 'm ago';
+		}
+		if ($diff < 86400) {
+			return (int) ($diff / 3600) . 'h ago';
+		}
 
-        if ($diff < 60) {
-            return $diff . 's ago';
-        }
-        if ($diff < 3600) {
-            return (int)($diff / 60) . 'm ago';
-        }
-        if ($diff < 86400) {
-            return (int)($diff / 3600) . 'h ago';
-        }
+		return (int) ($diff / 86400) . 'd ago';
+	}
 
-        return (int)($diff / 86400) . 'd ago';
-    }
-
-    /**
-     * Get current time as formatted string
-     *
-     * @param string $format PHP date format (default: 'Y-m-d H:i:s')
-     * @return string
-     */
-    public static function now($format = 'Y-m-d H:i:s') {
-        return date($format);
-    }
+	/**
+	 * Get current time as formatted string
+	 *
+	 * @param string $format PHP date format (default: 'Y-m-d H:i:s')
+	 * @return string
+	 */
+	public static function now(string $format = 'Y-m-d H:i:s') {
+		return date($format);
+	}
 }
diff --git a/src/Core/Util/Topbar.php b/src/Core/Util/Topbar.php
index e212cd24..83583373 100644
--- a/src/Core/Util/Topbar.php
+++ b/src/Core/Util/Topbar.php
@@ -31,209 +31,209 @@ use XcVm\Core\Module\TopbarRegistry;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class Topbar {
-    /**
-     * `clear_logs` table type per topbar page (BackupAjaxController::clearLogs).
-     */
-    /**
-     * Pages where "Export as CSV/JSON" is offered — log / report screens only.
-     * On content/management tables (streams, lines, movies, users, …) export is
-     * intentionally hidden.
-     */
-    private const EXPORT_PAGES = [
-        'panel_logs',
-        'login_logs',
-        'mysql_syslog',
-        'client_logs',
-        'credit_logs',
-        'user_logs',
-        'stream_errors',
-        'line_activity',
-        'mag_events',
-        'live_connections',
-    ];
+	/**
+	 * `clear_logs` table type per topbar page (BackupAjaxController::clearLogs).
+	 */
+	/**
+	 * Pages where "Export as CSV/JSON" is offered — log / report screens only.
+	 * On content/management tables (streams, lines, movies, users, …) export is
+	 * intentionally hidden.
+	 */
+	private const EXPORT_PAGES = [
+		'panel_logs',
+		'login_logs',
+		'mysql_syslog',
+		'client_logs',
+		'credit_logs',
+		'user_logs',
+		'stream_errors',
+		'line_activity',
+		'mag_events',
+		'live_connections',
+	];
 
-    private const LOG_TYPES = [
-        'client_logs'   => 'lines_logs',
-        'credit_logs'   => 'users_credits_logs',
-        'user_logs'     => 'users_logs',
-        'stream_errors' => 'streams_errors',
-        'line_activity' => 'lines_activity',
-        'panel_logs'    => 'panel_logs',
-    ];
+	private const LOG_TYPES = [
+		'client_logs'   => 'lines_logs',
+		'credit_logs'   => 'users_credits_logs',
+		'user_logs'     => 'users_logs',
+		'stream_errors' => 'streams_errors',
+		'line_activity' => 'lines_activity',
+		'panel_logs'    => 'panel_logs',
+	];
 
-    /**
-     * Per-page dropdown configuration: `page => [label => [url, permission, attr]]`.
-     * Verbatim copy of the legacy topbar.php literal; runtime bits come from $ctx.
-     *
-     * @param array{rID?:int|null,rSID?:int|null,rMobile?:bool,rImport?:bool} $ctx
-     * @return array<string,array<string,array>>
-     */
-    public static function config(array $ctx = []): array {
-        $rID = $ctx['rID'] ?? null;
-        $rSID = $ctx['rSID'] ?? null;
-        $rMobile = (bool) ($ctx['rMobile'] ?? false);
-        $rImport = (bool) ($ctx['rImport'] ?? false);
-        $rMulti = (bool) ($ctx['rMulti'] ?? false);
+	/**
+	 * Per-page dropdown configuration: `page => [label => [url, permission, attr]]`.
+	 * Verbatim copy of the legacy topbar.php literal; runtime bits come from $ctx.
+	 *
+	 * @param array{rID?:int|null,rSID?:int|null,rMobile?:bool,rImport?:bool} $ctx
+	 * @return array<string,array<string,array>>
+	 */
+	public static function config(array $ctx = []): array {
+		$rID = $ctx['rID'] ?? null;
+		$rSID = $ctx['rSID'] ?? null;
+		$rMobile = (bool) ($ctx['rMobile'] ?? false);
+		$rImport = (bool) ($ctx['rImport'] ?? false);
+		$rMulti = (bool) ($ctx['rMulti'] ?? false);
 
-        $rDropdown = array(
-            'ondemand' => array('Manage Streams' => array('streams', 'streams'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('stream_mass', 'mass_edit_streams'), 'Stream Tools' => array('stream_tools', 'stream_tools'), 'Stream Error Logs' => array('stream_errors', 'stream_errors'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'streams' => array('Add Stream' => array('stream', 'add_stream'), 'Import & Review' => ($rMobile ? array() : array('review?type=1', 'import_streams')), 'Categories' => array('stream_categories', 'categories'), 'Channel Order' => ($rMobile ? array() : array('channel_order', 'channel_order')), "EPG's" => array('epgs', 'epg'), 'Fingerprint' => array('fingerprint', 'fingerprint'), 'On-Demand Scanner' => array('ondemand', 'streams'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('stream_mass', 'mass_edit_streams'), 'Mass Edit (Review)' => array('stream_review', 'mass_edit_streams'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Stream Tools' => array('stream_tools', 'stream_tools'), 'Stream Error Logs' => array('stream_errors', 'stream_errors'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'created_channels' => array('Create Channel' => array('created_channel', 'create_channel'), 'Categories' => array('stream_categories', 'categories'), 'Channel Order' => ($rMobile ? array() : array('channel_order', 'channel_order')), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('created_channel_mass', null), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'stream_view' => array('Edit Stream' => array('stream?id=' . $rID, 'edit_stream'), 'Manage Streams' => array('streams', 'streams')),
-            'stream_review' => array(($rImport ? 'Save Changes' : 'Review Streams') => array(null, null, 'id="btn-submit"')),
-            'panel_logs' => array('Download log' => array(null, null, 'id="btn-download-log"'), 'Clear Logs' => array(null, null, 'id="btn-clear-logs"')),
-            'movies' => array('Add Movie' => array('movie', 'add_movie'), 'Import & Review' => ($rMobile ? array() : array('review?type=2', 'import_movies')), 'Categories' => array('stream_categories', 'categories'), 'Channel Order' => ($rMobile ? array() : array('channel_order', 'channel_order')), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('movie_mass', 'mass_sedits_vod'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'series' => array('Add Series' => array('serie', 'add_series'), 'Episodes' => array('episodes', 'episodes'), 'Categories' => array('stream_categories', 'categories'), 'Channel Order' => ($rMobile ? array() : array('channel_order', 'channel_order')), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('series_mass', 'mass_sedits'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'episodes' => array('Add Episode' => array(null, 'add_episode', 'id="add-episode-btn"'), 'TV Series' => array('series', 'series'), 'Categories' => array('stream_categories', 'categories'), 'Channel Order' => ($rMobile ? array() : array('channel_order', 'channel_order')), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('episodes_mass', 'mass_sedits'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'radios' => array('Add Station' => array('radio', 'add_radio'), 'Categories' => array('stream_categories', 'categories'), 'Channel Order' => ($rMobile ? array() : array('channel_order', 'channel_order')), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('radio_mass', 'mass_edit_radio'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'lines' => array('Add Line' => array('line', 'add_user'), "Blocked ASN's" => array('asns', 'block_isps'), "Blocked IP's" => array('ips', 'block_ips'), "Blocked ISP's" => array('isps', 'block_isps'), 'Blocked User-Agents' => array('useragents', 'block_uas'), 'Live Connections' => array('live_connections', 'live_connections'), 'Activity Logs' => array('line_activity', 'connection_logs'), "IP's per Line" => array('line_ips', 'connection_logs'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('line_mass', 'mass_edit_users'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'live_connections' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"'), 'Activity Logs' => array('line_activity', 'connection_logs'), "IP's per Line" => array('line_ips', 'connection_logs')),
-            'mags' => array('Add Device' => array('mag', 'add_mag'), "Blocked IP's" => array('ips', 'block_ips'), "Blocked ISP's" => array('isps', 'block_isps'), 'Live Connections' => array('live_connections', 'connection_logs'), 'Activity Logs' => array('line_activity', 'connection_logs'), 'MAG Event Logs' => array('mag_events', 'manage_events'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('mag_mass', 'mass_edit_mags'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'enigmas' => array('Add Device' => array('enigma', 'add_e2'), "Blocked IP's" => array('ips', 'block_ips'), "Blocked ISP's" => array('isps', 'block_isps'), 'Live Connections' => array('live_connections', 'connection_logs'), 'Activity Logs' => array('line_activity', 'connection_logs'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('enigma_mass', 'mass_edit_enigmas'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'users' => array('Add User' => array('user', 'add_reguser'), 'Groups' => array('groups', 'mng_groups'), 'Packages' => array('packages', 'mng_packages'), 'Subresellers' => array('subresellers', 'subreseller'), 'Client Logs' => array('client_logs', 'client_request_log'), 'Credit Logs' => array('credit_logs', 'credits_log'), 'Reseller Logs' => array('user_logs', 'reg_userlog'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Mass Edit' => array('user_mass', 'mass_edit_reguser'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'bouquet' => array('Manage Bouquets' => array('bouquets', 'bouquets'), 'Sort Bouquet' => array('bouquet_sort?id=' . $rID, 'edit_bouquet')),
-            'bouquet_sort' => array('Manage Bouquets' => array('bouquets', 'bouquets'), 'Edit Bouquet' => array('bouquet?id=' . $rID, 'edit_bouquet')),
-            'bouquet_order' => array('Manage Bouquets' => array('bouquets', 'bouquets'), 'Add Bouquet' => array('bouquet', 'add_bouquet')),
-            'archive' => array('View Stream' => array('stream_view?id=' . $rID, 'streams'), 'Edit Stream' => array('stream?id=' . $rID, 'edit_stream'), 'Create Recording' => array('record', 'add_movie'), 'Manage Streams' => array('streams', 'streams')),
-            'asns' => array('Quick Tools' => array('quick_tools', 'quick_tools')),
-            'backups' => array('General Settings' => array('settings', 'settings'), 'Cache Settings' => array('cache', 'backups'), 'Modules' => array('modules', 'settings')),
-            'cache' => array('General Settings' => array('settings', 'settings'), 'Backup Settings' => array('backups', 'database'), 'Modules' => array('modules', 'settings')),
-            'settings' => array('Backup Settings' => array('backups', 'database'), 'Cache Settings' => array('cache', 'backups'), 'Modules' => array('modules', 'settings')),
-            'modules' => array('General Settings' => array('settings', 'settings'), 'Backup Settings' => array('backups', 'database'), 'Cache Settings' => array('cache', 'backups')),
-            'channel_order' => array('Categories' => array('stream_categories', 'categories'), 'Bouquets' => array('bouquets', 'bouquets')),
-            'bouquets' => array('Add Bouquet' => array('bouquet', 'add_bouquet'), 'Order Bouquets' => ($rMobile ? array() : array('bouquet_order', 'edit_bouquet')), 'Channel Order' => ($rMobile ? array() : array('channel_order', 'channel_order')), 'Categories' => array('stream_categories', 'categories')),
-            'stream_categories' => array('Add Category' => array('stream_category', 'add_cat'), 'Channel Order' => ($rMobile ? array() : array('channel_order', 'channel_order')), 'Bouquets' => array('bouquets', 'bouquets')),
-            'client_logs' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"'), 'Clear Logs' => array(null, null, 'id="btn-clear-logs"')),
-            'credit_logs' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"'), 'Clear Logs' => array(null, null, 'id="btn-clear-logs"')),
-            'user_logs' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"'), 'Clear Logs' => array(null, null, 'id="btn-clear-logs"')),
-            'stream_errors' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"'), 'Clear Logs' => array(null, null, 'id="btn-clear-logs"')),
-            'line_activity' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"'), 'Clear Logs' => array(null, null, 'id="btn-clear-logs"')),
-            'code' => array('Access Codes' => array('codes', 'add_code')),
-            'codes' => array('Add Code' => array('code', 'add_code')),
-            'hmacs' => array('Add HMAC' => array('hmac', 'add_hmac')),
-            'hmac' => array('HMAC Keys' => array('hmacs', 'add_hmac')),
-            'stream' => array('View Stream' => array('stream_view?id=' . $rID, 'streams'), 'Import' => array('stream?import', 'import_streams'), 'Add Single' => array('stream', 'add_stream'), 'Manage Streams' => array('streams', 'streams'), 'Import & Review' => ($rMobile ? array() : array('review?type=1', 'import_streams'))),
-            'movie' => array('View Movie' => array('stream_view?id=' . $rID, 'movies'), 'Import' => array('movie?import', 'import_movies'), 'Add Single' => array('movie', 'add_movie'), 'Manage Movies' => array('movies', 'movies'), 'Import & Review' => ($rMobile ? array() : array('review?type=2', 'import_movies'))),
-            // Primary offers the OPPOSITE mode to the one currently open.
-            'episode' => ($rMulti
-                ? array('Add Single' => array('episode?sid=' . $rSID, 'add_episode'), 'Add Multiple' => array('episode?sid=' . $rSID . '&multi', 'add_episode'), 'View Episodes' => array('episodes?series=' . $rSID, 'episodes'), 'Manage Series' => array('series', 'series'))
-                : array('Add Multiple' => array('episode?sid=' . $rSID . '&multi', 'add_episode'), 'Add Single' => array('episode?sid=' . $rSID, 'add_episode'), 'View Episodes' => array('episodes?series=' . $rSID, 'episodes'), 'Manage Series' => array('series', 'series'))),
-            'serie' => array('Import' => array('serie?import', 'import_streams'), 'Add Single' => array('serie', 'add_series'), 'Manage Series' => array('series', 'series'), 'View Episodes' => array('episodes?series=' . $rID, 'episodes')),
-            'created_channel' => array('View Channel' => array('stream_view?id=' . $rID, 'streams'), 'Manage Channels' => array('created_channels', 'streams')),
-            'epg' => array("Manage EPG's" => array('epgs', 'epg')),
-            'epgs' => array('Add EPG' => array('epg', 'add_epg'), 'Force Reload' => array(null, 'add_epg', 'onClick="forceUpdate();" id="force_update"')),
-            'fingerprint' => array('Manage Streams' => array('streams', 'streams')),
-            'group' => array('Manage Groups' => array('groups', 'mng_groups')),
-            'groups' => array('Add Group' => array('group', 'add_group')),
-            'package' => array('Manage Packages' => array('packages', 'mng_packages')),
-            'packages' => array('Add Package' => array('package', 'add_packages')),
-            'provider' => array('Providers' => array('providers', 'streams')),
-            'providers' => array('Add Provider' => array('provider', 'streams')),
-            'ip' => array('Blocked IPs' => array('ips', 'block_ips')),
-            'ips' => array('Block IP' => array('ip', 'block_ips'), 'Flush Blocks' => array('ips?flush=1', 'block_ips')),
-            'isp' => array('Blocked ISPs' => array('isps', 'block_isps')),
-            'isps' => array('Block ISP' => array('isp', 'block_isps')),
-            'line' => array('Manage Lines' => array('lines', 'users')),
-            'user' => array('Manage Users' => array('users', 'mng_regusers')),
-            'mag' => array('MAG Devices' => array('mags', 'manage_mag')),
-            'enigma' => array('Enigma Devices' => array('enigmas', 'manage_e2')),
-            'line_ips' => array('Manage Lines' => array('lines', 'users')),
-            'line_mass' => array('Manage Lines' => array('lines', 'users'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools')),
-            'user_mass' => array('Manage Users' => array('users', 'mng_regusers'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools')),
-            'mag_mass' => array('Manage Devices' => array('mags', 'manage_mag'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools')),
-            'enigma_mass' => array('Manage Devices' => array('enigmas', 'manage_e2'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools')),
-            'stream_mass' => array('Manage Streams' => array('streams', 'streams'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Stream Tools' => array('stream_tools', 'stream_tools')),
-            'created_channel_mass' => array('Manage Channels' => array('created_channels', 'streams'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Stream Tools' => array('stream_tools', 'stream_tools')),
-            'movie_mass' => array('Manage Movies' => array('movies', 'movies'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Stream Tools' => array('stream_tools', 'stream_tools')),
-            'radio_mass' => array('Manage Stations' => array('radios', 'radio'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Stream Tools' => array('stream_tools', 'stream_tools')),
-            'series_mass' => array('Manage Series' => array('series', 'series'), 'Manage Episodes' => array('episodes', 'episodes'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools')),
-            'episodes_mass' => array('Manage Episodes' => array('episodes', 'episodes'), 'Manage Series' => array('series', 'series'), 'Mass Delete' => array('mass_delete', 'mass_delete'), 'Quick Tools' => array('quick_tools', 'quick_tools'), 'Stream Tools' => array('stream_tools', 'stream_tools')),
-            'mag_events' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"'), 'MAG Devices' => array('mags', 'manage_mag')),
-            'login_logs' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'mysql_syslog' => array('Export as CSV' => array(null, null, 'id="btn-export-csv"'), 'Export as JSON' => array(null, null, 'id="btn-export-json"')),
-            'mass_delete' => array('Manage Streams' => array('streams', 'streams'), 'Manage Channels' => array('created_channels', 'streams'), 'Manage Series' => array('series', 'series'), 'Manage Episodes' => array('episodes', 'episodes'), 'Manage Stations' => array('radios', 'radio'), 'Manage Lines' => array('lines', 'users'), 'Manage Users' => array('users', 'mng_regusers'), 'Manage MAGs' => array('mags', 'manage_mag'), 'Manage Enigmas' => array('enigmas', 'manage_e2')),
-            'quick_tools' => array('Stream Tools' => array('stream_tools', 'stream_tools')),
-            'stream_tools' => array('Quick Tools' => array('quick_tools', 'quick_tools')),
-            'profile' => array('Manage Profiles' => array('profiles', 'tprofiles')),
-            'profiles' => array('Create Profile' => array('profile', 'tprofile')),
-            'rtmp_ips' => array('Add IP' => array('rtmp_ip', 'add_rtmp')),
-            'rtmp_ip' => array('RTMP IPs' => array('rtmp_ips', 'rtmp')),
-            'server' => array('View Server' => array('server_view?id=' . $rID, 'servers'), 'Manage Servers' => array('servers', 'servers')),
-            'proxy' => array('View Proxy' => array('server_view?id=' . $rID, 'servers'), 'Manage Proxies' => array('proxies', 'servers')),
-            'server_install' => array('Manage Servers' => array('servers', 'servers'), 'Manage Proxies' => array('proxies', 'servers')),
-            'servers' => array('Install Server' => array('server_install', 'add_server'), 'Server Order' => array('server_order', 'servers'), 'Proxies' => array('proxies', 'servers'), 'Process Monitor' => array('process_monitor', 'process_monitor'), 'Update All Servers' => array(null, 'servers', 'onClick="updateAll();"'), 'Update All Binaries' => array(null, 'servers', 'onClick="updateBinaries();"'), 'Restart All Services' => array(null, 'servers', 'onClick="restartServices();"')),
-            'server_order' => array('Servers' => array('servers', 'servers'), 'Proxies' => array('proxies', 'servers'), 'Process Monitor' => array('process_monitor', 'process_monitor')),
-            'proxies' => array('Install Proxy' => array('server_install?proxy=1', 'add_server'), 'Servers' => array('servers', 'servers'), 'Process Monitor' => array('process_monitor', 'process_monitor')),
-            'stream_category' => array('Manage Categories' => array('stream_categories', 'categories')),
-            'ticket' => array('View Ticket' => array('ticket_view?id=' . $rID, 'ticket'), 'View Tickets' => array('tickets', 'manage_tickets')),
-            'ticket_view' => array('Add Response' => array('ticket?id=' . $rID, 'ticket'), 'View Tickets' => array('tickets', 'manage_tickets')),
-            'useragent' => array('Blocked User-Agents' => array('useragents', 'block_uas')),
-            'useragents' => array('Block User-Agent' => array('useragent', 'block_uas')),
-        );
+		$rDropdown = [
+			'ondemand' => ['Manage Streams' => ['streams', 'streams'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['stream_mass', 'mass_edit_streams'], 'Stream Tools' => ['stream_tools', 'stream_tools'], 'Stream Error Logs' => ['stream_errors', 'stream_errors'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'streams' => ['Add Stream' => ['stream', 'add_stream'], 'Import & Review' => ($rMobile ? [] : ['review?type=1', 'import_streams']), 'Categories' => ['stream_categories', 'categories'], 'Channel Order' => ($rMobile ? [] : ['channel_order', 'channel_order']), "EPG's" => ['epgs', 'epg'], 'Fingerprint' => ['fingerprint', 'fingerprint'], 'On-Demand Scanner' => ['ondemand', 'streams'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['stream_mass', 'mass_edit_streams'], 'Mass Edit (Review)' => ['stream_review', 'mass_edit_streams'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Stream Tools' => ['stream_tools', 'stream_tools'], 'Stream Error Logs' => ['stream_errors', 'stream_errors'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'created_channels' => ['Create Channel' => ['created_channel', 'create_channel'], 'Categories' => ['stream_categories', 'categories'], 'Channel Order' => ($rMobile ? [] : ['channel_order', 'channel_order']), 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['created_channel_mass', null], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'stream_view' => ['Edit Stream' => ['stream?id=' . $rID, 'edit_stream'], 'Manage Streams' => ['streams', 'streams']],
+			'stream_review' => [($rImport ? 'Save Changes' : 'Review Streams') => [null, null, 'id="btn-submit"']],
+			'panel_logs' => ['Download log' => [null, null, 'id="btn-download-log"'], 'Clear Logs' => [null, null, 'id="btn-clear-logs"']],
+			'movies' => ['Add Movie' => ['movie', 'add_movie'], 'Import & Review' => ($rMobile ? [] : ['review?type=2', 'import_movies']), 'Categories' => ['stream_categories', 'categories'], 'Channel Order' => ($rMobile ? [] : ['channel_order', 'channel_order']), 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['movie_mass', 'mass_sedits_vod'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'series' => ['Add Series' => ['serie', 'add_series'], 'Episodes' => ['episodes', 'episodes'], 'Categories' => ['stream_categories', 'categories'], 'Channel Order' => ($rMobile ? [] : ['channel_order', 'channel_order']), 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['series_mass', 'mass_sedits'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'episodes' => ['Add Episode' => [null, 'add_episode', 'id="add-episode-btn"'], 'TV Series' => ['series', 'series'], 'Categories' => ['stream_categories', 'categories'], 'Channel Order' => ($rMobile ? [] : ['channel_order', 'channel_order']), 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['episodes_mass', 'mass_sedits'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'radios' => ['Add Station' => ['radio', 'add_radio'], 'Categories' => ['stream_categories', 'categories'], 'Channel Order' => ($rMobile ? [] : ['channel_order', 'channel_order']), 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['radio_mass', 'mass_edit_radio'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'lines' => ['Add Line' => ['line', 'add_user'], "Blocked ASN's" => ['asns', 'block_isps'], "Blocked IP's" => ['ips', 'block_ips'], "Blocked ISP's" => ['isps', 'block_isps'], 'Blocked User-Agents' => ['useragents', 'block_uas'], 'Live Connections' => ['live_connections', 'live_connections'], 'Activity Logs' => ['line_activity', 'connection_logs'], "IP's per Line" => ['line_ips', 'connection_logs'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['line_mass', 'mass_edit_users'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'live_connections' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"'], 'Activity Logs' => ['line_activity', 'connection_logs'], "IP's per Line" => ['line_ips', 'connection_logs']],
+			'mags' => ['Add Device' => ['mag', 'add_mag'], "Blocked IP's" => ['ips', 'block_ips'], "Blocked ISP's" => ['isps', 'block_isps'], 'Live Connections' => ['live_connections', 'connection_logs'], 'Activity Logs' => ['line_activity', 'connection_logs'], 'MAG Event Logs' => ['mag_events', 'manage_events'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['mag_mass', 'mass_edit_mags'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'enigmas' => ['Add Device' => ['enigma', 'add_e2'], "Blocked IP's" => ['ips', 'block_ips'], "Blocked ISP's" => ['isps', 'block_isps'], 'Live Connections' => ['live_connections', 'connection_logs'], 'Activity Logs' => ['line_activity', 'connection_logs'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['enigma_mass', 'mass_edit_enigmas'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'users' => ['Add User' => ['user', 'add_reguser'], 'Groups' => ['groups', 'mng_groups'], 'Packages' => ['packages', 'mng_packages'], 'Subresellers' => ['subresellers', 'subreseller'], 'Client Logs' => ['client_logs', 'client_request_log'], 'Credit Logs' => ['credit_logs', 'credits_log'], 'Reseller Logs' => ['user_logs', 'reg_userlog'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Mass Edit' => ['user_mass', 'mass_edit_reguser'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'bouquet' => ['Manage Bouquets' => ['bouquets', 'bouquets'], 'Sort Bouquet' => ['bouquet_sort?id=' . $rID, 'edit_bouquet']],
+			'bouquet_sort' => ['Manage Bouquets' => ['bouquets', 'bouquets'], 'Edit Bouquet' => ['bouquet?id=' . $rID, 'edit_bouquet']],
+			'bouquet_order' => ['Manage Bouquets' => ['bouquets', 'bouquets'], 'Add Bouquet' => ['bouquet', 'add_bouquet']],
+			'archive' => ['View Stream' => ['stream_view?id=' . $rID, 'streams'], 'Edit Stream' => ['stream?id=' . $rID, 'edit_stream'], 'Create Recording' => ['record', 'add_movie'], 'Manage Streams' => ['streams', 'streams']],
+			'asns' => ['Quick Tools' => ['quick_tools', 'quick_tools']],
+			'backups' => ['General Settings' => ['settings', 'settings'], 'Cache Settings' => ['cache', 'backups'], 'Modules' => ['modules', 'settings']],
+			'cache' => ['General Settings' => ['settings', 'settings'], 'Backup Settings' => ['backups', 'database'], 'Modules' => ['modules', 'settings']],
+			'settings' => ['Backup Settings' => ['backups', 'database'], 'Cache Settings' => ['cache', 'backups'], 'Modules' => ['modules', 'settings']],
+			'modules' => ['General Settings' => ['settings', 'settings'], 'Backup Settings' => ['backups', 'database'], 'Cache Settings' => ['cache', 'backups']],
+			'channel_order' => ['Categories' => ['stream_categories', 'categories'], 'Bouquets' => ['bouquets', 'bouquets']],
+			'bouquets' => ['Add Bouquet' => ['bouquet', 'add_bouquet'], 'Order Bouquets' => ($rMobile ? [] : ['bouquet_order', 'edit_bouquet']), 'Channel Order' => ($rMobile ? [] : ['channel_order', 'channel_order']), 'Categories' => ['stream_categories', 'categories']],
+			'stream_categories' => ['Add Category' => ['stream_category', 'add_cat'], 'Channel Order' => ($rMobile ? [] : ['channel_order', 'channel_order']), 'Bouquets' => ['bouquets', 'bouquets']],
+			'client_logs' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"'], 'Clear Logs' => [null, null, 'id="btn-clear-logs"']],
+			'credit_logs' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"'], 'Clear Logs' => [null, null, 'id="btn-clear-logs"']],
+			'user_logs' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"'], 'Clear Logs' => [null, null, 'id="btn-clear-logs"']],
+			'stream_errors' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"'], 'Clear Logs' => [null, null, 'id="btn-clear-logs"']],
+			'line_activity' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"'], 'Clear Logs' => [null, null, 'id="btn-clear-logs"']],
+			'code' => ['Access Codes' => ['codes', 'add_code']],
+			'codes' => ['Add Code' => ['code', 'add_code']],
+			'hmacs' => ['Add HMAC' => ['hmac', 'add_hmac']],
+			'hmac' => ['HMAC Keys' => ['hmacs', 'add_hmac']],
+			'stream' => ['View Stream' => ['stream_view?id=' . $rID, 'streams'], 'Import' => ['stream?import', 'import_streams'], 'Add Single' => ['stream', 'add_stream'], 'Manage Streams' => ['streams', 'streams'], 'Import & Review' => ($rMobile ? [] : ['review?type=1', 'import_streams'])],
+			'movie' => ['View Movie' => ['stream_view?id=' . $rID, 'movies'], 'Import' => ['movie?import', 'import_movies'], 'Add Single' => ['movie', 'add_movie'], 'Manage Movies' => ['movies', 'movies'], 'Import & Review' => ($rMobile ? [] : ['review?type=2', 'import_movies'])],
+			// Primary offers the OPPOSITE mode to the one currently open.
+			'episode' => ($rMulti
+				? ['Add Single' => ['episode?sid=' . $rSID, 'add_episode'], 'Add Multiple' => ['episode?sid=' . $rSID . '&multi', 'add_episode'], 'View Episodes' => ['episodes?series=' . $rSID, 'episodes'], 'Manage Series' => ['series', 'series']]
+				: ['Add Multiple' => ['episode?sid=' . $rSID . '&multi', 'add_episode'], 'Add Single' => ['episode?sid=' . $rSID, 'add_episode'], 'View Episodes' => ['episodes?series=' . $rSID, 'episodes'], 'Manage Series' => ['series', 'series']]),
+			'serie' => ['Import' => ['serie?import', 'import_streams'], 'Add Single' => ['serie', 'add_series'], 'Manage Series' => ['series', 'series'], 'View Episodes' => ['episodes?series=' . $rID, 'episodes']],
+			'created_channel' => ['View Channel' => ['stream_view?id=' . $rID, 'streams'], 'Manage Channels' => ['created_channels', 'streams']],
+			'epg' => ["Manage EPG's" => ['epgs', 'epg']],
+			'epgs' => ['Add EPG' => ['epg', 'add_epg'], 'Force Reload' => [null, 'add_epg', 'onClick="forceUpdate();" id="force_update"']],
+			'fingerprint' => ['Manage Streams' => ['streams', 'streams']],
+			'group' => ['Manage Groups' => ['groups', 'mng_groups']],
+			'groups' => ['Add Group' => ['group', 'add_group']],
+			'package' => ['Manage Packages' => ['packages', 'mng_packages']],
+			'packages' => ['Add Package' => ['package', 'add_packages']],
+			'provider' => ['Providers' => ['providers', 'streams']],
+			'providers' => ['Add Provider' => ['provider', 'streams']],
+			'ip' => ['Blocked IPs' => ['ips', 'block_ips']],
+			'ips' => ['Block IP' => ['ip', 'block_ips'], 'Flush Blocks' => ['ips?flush=1', 'block_ips']],
+			'isp' => ['Blocked ISPs' => ['isps', 'block_isps']],
+			'isps' => ['Block ISP' => ['isp', 'block_isps']],
+			'line' => ['Manage Lines' => ['lines', 'users']],
+			'user' => ['Manage Users' => ['users', 'mng_regusers']],
+			'mag' => ['MAG Devices' => ['mags', 'manage_mag']],
+			'enigma' => ['Enigma Devices' => ['enigmas', 'manage_e2']],
+			'line_ips' => ['Manage Lines' => ['lines', 'users']],
+			'line_mass' => ['Manage Lines' => ['lines', 'users'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools']],
+			'user_mass' => ['Manage Users' => ['users', 'mng_regusers'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools']],
+			'mag_mass' => ['Manage Devices' => ['mags', 'manage_mag'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools']],
+			'enigma_mass' => ['Manage Devices' => ['enigmas', 'manage_e2'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools']],
+			'stream_mass' => ['Manage Streams' => ['streams', 'streams'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Stream Tools' => ['stream_tools', 'stream_tools']],
+			'created_channel_mass' => ['Manage Channels' => ['created_channels', 'streams'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Stream Tools' => ['stream_tools', 'stream_tools']],
+			'movie_mass' => ['Manage Movies' => ['movies', 'movies'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Stream Tools' => ['stream_tools', 'stream_tools']],
+			'radio_mass' => ['Manage Stations' => ['radios', 'radio'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Stream Tools' => ['stream_tools', 'stream_tools']],
+			'series_mass' => ['Manage Series' => ['series', 'series'], 'Manage Episodes' => ['episodes', 'episodes'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools']],
+			'episodes_mass' => ['Manage Episodes' => ['episodes', 'episodes'], 'Manage Series' => ['series', 'series'], 'Mass Delete' => ['mass_delete', 'mass_delete'], 'Quick Tools' => ['quick_tools', 'quick_tools'], 'Stream Tools' => ['stream_tools', 'stream_tools']],
+			'mag_events' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"'], 'MAG Devices' => ['mags', 'manage_mag']],
+			'login_logs' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'mysql_syslog' => ['Export as CSV' => [null, null, 'id="btn-export-csv"'], 'Export as JSON' => [null, null, 'id="btn-export-json"']],
+			'mass_delete' => ['Manage Streams' => ['streams', 'streams'], 'Manage Channels' => ['created_channels', 'streams'], 'Manage Series' => ['series', 'series'], 'Manage Episodes' => ['episodes', 'episodes'], 'Manage Stations' => ['radios', 'radio'], 'Manage Lines' => ['lines', 'users'], 'Manage Users' => ['users', 'mng_regusers'], 'Manage MAGs' => ['mags', 'manage_mag'], 'Manage Enigmas' => ['enigmas', 'manage_e2']],
+			'quick_tools' => ['Stream Tools' => ['stream_tools', 'stream_tools']],
+			'stream_tools' => ['Quick Tools' => ['quick_tools', 'quick_tools']],
+			'profile' => ['Manage Profiles' => ['profiles', 'tprofiles']],
+			'profiles' => ['Create Profile' => ['profile', 'tprofile']],
+			'rtmp_ips' => ['Add IP' => ['rtmp_ip', 'add_rtmp']],
+			'rtmp_ip' => ['RTMP IPs' => ['rtmp_ips', 'rtmp']],
+			'server' => ['View Server' => ['server_view?id=' . $rID, 'servers'], 'Manage Servers' => ['servers', 'servers']],
+			'proxy' => ['View Proxy' => ['server_view?id=' . $rID, 'servers'], 'Manage Proxies' => ['proxies', 'servers']],
+			'server_install' => ['Manage Servers' => ['servers', 'servers'], 'Manage Proxies' => ['proxies', 'servers']],
+			'servers' => ['Install Server' => ['server_install', 'add_server'], 'Server Order' => ['server_order', 'servers'], 'Proxies' => ['proxies', 'servers'], 'Process Monitor' => ['process_monitor', 'process_monitor'], 'Update All Servers' => [null, 'servers', 'onClick="updateAll();"'], 'Update All Binaries' => [null, 'servers', 'onClick="updateBinaries();"'], 'Restart All Services' => [null, 'servers', 'onClick="restartServices();"']],
+			'server_order' => ['Servers' => ['servers', 'servers'], 'Proxies' => ['proxies', 'servers'], 'Process Monitor' => ['process_monitor', 'process_monitor']],
+			'proxies' => ['Install Proxy' => ['server_install?proxy=1', 'add_server'], 'Servers' => ['servers', 'servers'], 'Process Monitor' => ['process_monitor', 'process_monitor']],
+			'stream_category' => ['Manage Categories' => ['stream_categories', 'categories']],
+			'ticket' => ['View Ticket' => ['ticket_view?id=' . $rID, 'ticket'], 'View Tickets' => ['tickets', 'manage_tickets']],
+			'ticket_view' => ['Add Response' => ['ticket?id=' . $rID, 'ticket'], 'View Tickets' => ['tickets', 'manage_tickets']],
+			'useragent' => ['Blocked User-Agents' => ['useragents', 'block_uas']],
+			'useragents' => ['Block User-Agent' => ['useragent', 'block_uas']],
+		];
 
-        $rDropdown['servers'] = array('Proxies' => array('proxies', 'servers'), 'Process Monitor' => array('process_monitor', 'process_monitor'));
+		$rDropdown['servers'] = ['Proxies' => ['proxies', 'servers'], 'Process Monitor' => ['process_monitor', 'process_monitor']];
 
-        // Merge module-contributed buttons (TopbarProviderInterface). Modules can
-        // both inject entries into an existing core page (e.g. 'movies') — appended
-        // after the core entries — and register a brand-new page of their own
-        // (e.g. 'watch'). Populated by ModuleLoader::bootAll before any render.
-        foreach (TopbarRegistry::pages() as $rPage) {
-            foreach (TopbarRegistry::forPage($rPage) as $rLabel => $rSpec) {
-                $rDropdown[$rPage][$rLabel] = $rSpec;
-            }
-        }
+		// Merge module-contributed buttons (TopbarProviderInterface). Modules can
+		// both inject entries into an existing core page (e.g. 'movies') — appended
+		// after the core entries — and register a brand-new page of their own
+		// (e.g. 'watch'). Populated by ModuleLoader::bootAll before any render.
+		foreach (TopbarRegistry::pages() as $rPage) {
+			foreach (TopbarRegistry::forPage($rPage) as $rLabel => $rSpec) {
+				$rDropdown[$rPage][$rLabel] = $rSpec;
+			}
+		}
 
-        return $rDropdown;
-    }
+		return $rDropdown;
+	}
 
-    /**
-     * Ordered, permission-filtered items for one page, ready to render.
-     *
-     * @param array{rID?:int|null,rSID?:int|null,rMobile?:bool,rImport?:bool} $ctx
-     * @return list<array{label:string,url:?string,attr:?string,id:?string,logType:?string,primary:bool}>
-     */
-    public static function items(string $page, array $ctx = []): array {
-        $rConfig = self::config($ctx);
-        if (!isset($rConfig[$page]) || !is_array($rConfig[$page])) {
-            return [];
-        }
+	/**
+	 * Ordered, permission-filtered items for one page, ready to render.
+	 *
+	 * @param array{rID?:int|null,rSID?:int|null,rMobile?:bool,rImport?:bool} $ctx
+	 * @return list<array{label:string,url:?string,attr:?string,id:?string,logType:?string,primary:bool}>
+	 */
+	public static function items(string $page, array $ctx = []): array {
+		$rConfig = self::config($ctx);
+		if (!isset($rConfig[$page]) || !is_array($rConfig[$page])) {
+			return [];
+		}
 
-        $rItems = [];
-        $rFirst = true;
-        foreach ($rConfig[$page] as $rLabel => $rData) {
-            if (!is_string($rLabel) || $rLabel === '' || !is_array($rData)) {
-                continue;
-            }
-            // Export actions: only on log/report pages (core list OR a page a
-            // module marked via TopbarRegistry), and only with backups perm.
-            if (in_array($rLabel, ['Export as CSV', 'Export as JSON'], true)) {
-                $rIsExportPage = in_array($page, self::EXPORT_PAGES, true) || TopbarRegistry::isExportPage($page);
-                if (!$rIsExportPage || !Authorization::check('adv', 'backups')) {
-                    continue;
-                }
-            }
-            // Per-item permission gate.
-            if (!empty($rData[1]) && !Authorization::check('adv', $rData[1])) {
-                continue;
-            }
+		$rItems = [];
+		$rFirst = true;
+		foreach ($rConfig[$page] as $rLabel => $rData) {
+			if (!is_string($rLabel) || $rLabel === '' || !is_array($rData)) {
+				continue;
+			}
+			// Export actions: only on log/report pages (core list OR a page a
+			// module marked via TopbarRegistry), and only with backups perm.
+			if (in_array($rLabel, ['Export as CSV', 'Export as JSON'], true)) {
+				$rIsExportPage = in_array($page, self::EXPORT_PAGES, true) || TopbarRegistry::isExportPage($page);
+				if (!$rIsExportPage || !Authorization::check('adv', 'backups')) {
+					continue;
+				}
+			}
+			// Per-item permission gate.
+			if (!empty($rData[1]) && !Authorization::check('adv', $rData[1])) {
+				continue;
+			}
 
-            $rAttr = (count($rData) === 3 && !empty($rData[2])) ? (string) $rData[2] : null;
-            $rId = null;
-            if ($rAttr !== null && preg_match('/id="([^"]+)"/', $rAttr, $rM)) {
-                $rId = $rM[1];
-            }
+			$rAttr = (count($rData) === 3 && !empty($rData[2])) ? (string) $rData[2] : null;
+			$rId = null;
+			if ($rAttr !== null && preg_match('/id="([^"]+)"/', $rAttr, $rM)) {
+				$rId = $rM[1];
+			}
 
-            $rItems[] = [
-                'label'   => $rLabel,
-                'url'     => (!empty($rData[0]) ? (string) $rData[0] : null),
-                'attr'    => $rAttr,
-                'id'      => $rId,
-                'logType' => ($rId === 'btn-clear-logs' ? (self::LOG_TYPES[$page] ?? TopbarRegistry::logType($page)) : null),
-                'primary' => $rFirst,
-            ];
-            $rFirst = false;
-        }
+			$rItems[] = [
+				'label'   => $rLabel,
+				'url'     => (!empty($rData[0]) ? (string) $rData[0] : null),
+				'attr'    => $rAttr,
+				'id'      => $rId,
+				'logType' => ($rId === 'btn-clear-logs' ? (self::LOG_TYPES[$page] ?? TopbarRegistry::logType($page)) : null),
+				'primary' => $rFirst,
+			];
+			$rFirst = false;
+		}
 
-        return $rItems;
-    }
+		return $rItems;
+	}
 }
diff --git a/src/Core/Validation/InputValidator.php b/src/Core/Validation/InputValidator.php
index 5764f3b3..203715a5 100644
--- a/src/Core/Validation/InputValidator.php
+++ b/src/Core/Validation/InputValidator.php
@@ -167,13 +167,11 @@ class InputValidator {
 	/**
 	 * Проверяет и возвращает STATUS_INVALID_INPUT если данные невалидны.
 	 *
-	 * @param string $rAction
-	 * @param array  $rData
 	 * @return array|null null если валидно, иначе массив с ошибкой
 	 */
 	public static function validateOrFail(string $rAction, array $rData): ?array {
 		if (!self::validate($rAction, $rData)) {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 		return null;
 	}
@@ -184,8 +182,8 @@ class InputValidator {
 	 * @param array $ids Input array of IDs
 	 * @return array Filtered array with only positive integer IDs
 	 */
-	public static function confirmIDs($ids) {
-		$result = array();
+	public static function confirmIDs(array $ids) {
+		$result = [];
 		foreach ($ids as $id) {
 			if (intval($id) > 0) {
 				$result[] = $id;
@@ -216,13 +214,13 @@ class InputValidator {
 	/**
 	 * Рекурсивный парсинг входных данных.
 	 */
-	public static function parseIncomingRecursively(&$rData, $rInput = array(), $rIteration = 0) {
+	public static function parseIncomingRecursively(&$rData, $rInput = [], $rIteration = 0) {
 		if ($rIteration >= 20 || !is_array($rData)) {
 			return $rInput;
 		}
 		foreach ($rData as $rKey => $rValue) {
 			if (is_array($rValue)) {
-				$rInput[$rKey] = self::parseIncomingRecursively($rData[$rKey], array(), $rIteration + 1);
+				$rInput[$rKey] = self::parseIncomingRecursively($rData[$rKey], [], $rIteration + 1);
 			} else {
 				$rInput[self::parseCleanKey($rKey)] = self::parseCleanValue($rValue);
 			}
@@ -251,7 +249,7 @@ class InputValidator {
 			return '';
 		}
 		$rValue = str_replace('&#032;', ' ', stripslashes($rValue));
-		$rValue = str_replace(array("\r\n", "\n\r", "\r"), "\n", $rValue);
+		$rValue = str_replace(["\r\n", "\n\r", "\r"], "\n", $rValue);
 		$rValue = str_replace('<!--', '&#60;&#33;--', $rValue);
 		$rValue = str_replace('-->', '--&#62;', $rValue);
 		$rValue = str_ireplace('<script', '&#60;script', $rValue);
diff --git a/src/Domain/Bouquet/BouquetService.php b/src/Domain/Bouquet/BouquetService.php
index a6326a04..9c226447 100644
--- a/src/Domain/Bouquet/BouquetService.php
+++ b/src/Domain/Bouquet/BouquetService.php
@@ -24,20 +24,21 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class BouquetService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a bouquet from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (isset($rData['edit'])) {
 			if (!Authorization::check('adv', 'edit_bouquet')) {
 				exit();
 			}
 
-			$rArray = AdminHelpers::overwriteData(BouquetService::getById($rData['edit']), $rData);
+			$rArray = AdminHelpers::overwriteData(self::getById($rData['edit']), $rData);
 		} else {
 			if (!Authorization::check('adv', 'add_bouquet')) {
 				exit();
@@ -54,7 +55,7 @@ class BouquetService {
 			$rBouquetRadios = $rBouquetData['radios'];
 			$rBouquetSeries = $rBouquetData['series'];
 			$rRequiredIDs = AdminHelpers::confirmIDs(array_merge($rBouquetStreams, $rBouquetMovies, $rBouquetRadios));
-			$rStreams = array();
+			$rStreams = [];
 
 			if (count($rRequiredIDs) > 0) {
 				$db->query('SELECT `id`, `type` FROM `streams` WHERE `id` IN (' . implode(',', $rRequiredIDs) . ');');
@@ -80,8 +81,8 @@ class BouquetService {
 			$rArray['bouquet_movies'] = array_intersect(array_map('intval', array_values($rBouquetMovies)), $rStreams[2] ?? []);
 			$rArray['bouquet_radios'] = array_intersect(array_map('intval', array_values($rBouquetRadios)), $rStreams[4] ?? []);
 			$rArray['bouquet_series'] = array_intersect(array_map('intval', array_values($rBouquetSeries)), $rStreams[5] ?? []);
-		} else if (isset($rData['edit'])) {
-			return array('status' => STATUS_FAILURE, 'data' => $rData);
+		} elseif (isset($rData['edit'])) {
+			return ['status' => STATUS_FAILURE, 'data' => $rData];
 		}
 
 		if (!isset($rData['edit'])) {
@@ -96,10 +97,10 @@ class BouquetService {
 			$rInsertID = $db->last_insert_id();
 			self::scan();
 
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -108,7 +109,7 @@ class BouquetService {
 	 * @param array $rData Ordered bouquet ids.
 	 * @return array ['status' => STATUS_* constant].
 	 */
-	public static function reorder($rData) {
+	public static function reorder(array $rData) {
 		$db = self::db();
 		$rOrder = json_decode($rData['stream_order_array'], true);
 		$rOrder['stream'] = AdminHelpers::confirmIDs($rOrder['stream']);
@@ -117,7 +118,7 @@ class BouquetService {
 		$rOrder['radio'] = AdminHelpers::confirmIDs($rOrder['radio']);
 		$db->query('UPDATE `bouquets` SET `bouquet_channels` = ?, `bouquet_series` = ?, `bouquet_movies` = ?, `bouquet_radios` = ? WHERE `id` = ?;', '[' . implode(',', array_map('intval', $rOrder['stream'])) . ']', '[' . implode(',', array_map('intval', $rOrder['series'])) . ']', '[' . implode(',', array_map('intval', $rOrder['movie'])) . ']', '[' . implode(',', array_map('intval', $rOrder['radio'])) . ']', $rData['reorder']);
 
-		return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rData['reorder']));
+		return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rData['reorder']]];
 	}
 
 	/**
@@ -126,7 +127,7 @@ class BouquetService {
 	 * @param array $rData Bouquet id and desired item order.
 	 * @return array ['status' => STATUS_* constant].
 	 */
-	public static function sort($rData) {
+	public static function sort(array $rData) {
 		$db = self::db();
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
@@ -157,10 +158,10 @@ class BouquetService {
 				$db->query('UPDATE `users_packages` SET `bouquets` = ? WHERE `id` = ?;', '[' . implode(',', $rBouquet) . ']', $rPackage['id']);
 			}
 
-			return array('status' => STATUS_SUCCESS_REPLACE);
+			return ['status' => STATUS_SUCCESS_REPLACE];
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -178,9 +179,9 @@ class BouquetService {
 	 * @param int $rID Bouquet id.
 	 * @return void
 	 */
-	public static function scanOne($rID) {
+	public static function scanOne(int $rID) {
 		$db = self::db();
-		$rBouquet = BouquetService::getById($rID);
+		$rBouquet = self::getById($rID);
 		if (!$rBouquet) {
 			return;
 		}
@@ -189,7 +190,7 @@ class BouquetService {
 		$db->query('SELECT `id` FROM `streams`;');
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rRow) {
-				$availableStreams[] = (int)$rRow['id'];
+				$availableStreams[] = (int) $rRow['id'];
 			}
 		}
 
@@ -197,7 +198,7 @@ class BouquetService {
 		$db->query('SELECT `id` FROM `streams_series`;');
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rRow) {
-				$availableSeries[] = (int)$rRow['id'];
+				$availableSeries[] = (int) $rRow['id'];
 			}
 		}
 
@@ -229,8 +230,8 @@ class BouquetService {
 	 * @param int $rStreamID Stream id.
 	 * @return mixed Map entry (bouquets containing the stream).
 	 */
-	public static function getMapEntry($rStreamID) {
-		$rBouquetMap = array();
+	public static function getMapEntry(int $rStreamID) {
+		$rBouquetMap = [];
 		$rMapPath = CACHE_TMP_PATH . 'bouquet_map';
 
 		if (file_exists($rMapPath) && 0 < filesize($rMapPath)) {
@@ -240,7 +241,7 @@ class BouquetService {
 			}
 		}
 
-		$rReturn = ($rBouquetMap[$rStreamID] ?? array());
+		$rReturn = ($rBouquetMap[$rStreamID] ?? []);
 		unset($rBouquetMap);
 		return $rReturn;
 	}
@@ -251,7 +252,7 @@ class BouquetService {
 	 * @param bool $rForce Bypass the cache.
 	 * @return array Bouquet rows.
 	 */
-	public static function getAll($rForce = false) {
+	public static function getAll(bool $rForce = false) {
 		$db = self::db();
 		if (!$rForce) {
 			$rCache = FileCache::getCache('bouquets', 60);
@@ -260,18 +261,18 @@ class BouquetService {
 			}
 		}
 
-		$rOutput = array();
+		$rOutput = [];
 		$db->query('SELECT *, IF(`bouquet_order` > 0, `bouquet_order`, 999) AS `order` FROM `bouquets` ORDER BY `order` ASC;');
-		foreach ($db->get_rows(true, 'id') ?: array() as $rID => $rChannels) {
+		foreach ($db->get_rows(true, 'id') ?: [] as $rID => $rChannels) {
 			$rChannelsList = json_decode($rChannels['bouquet_channels'], true);
 			$rMoviesList = json_decode($rChannels['bouquet_movies'], true);
 			$rRadiosList = json_decode($rChannels['bouquet_radios'], true);
 			$rSeriesList = json_decode($rChannels['bouquet_series'], true);
 
-			$rChannelsList = is_array($rChannelsList) ? $rChannelsList : array();
-			$rMoviesList = is_array($rMoviesList) ? $rMoviesList : array();
-			$rRadiosList = is_array($rRadiosList) ? $rRadiosList : array();
-			$rSeriesList = is_array($rSeriesList) ? $rSeriesList : array();
+			$rChannelsList = is_array($rChannelsList) ? $rChannelsList : [];
+			$rMoviesList = is_array($rMoviesList) ? $rMoviesList : [];
+			$rRadiosList = is_array($rRadiosList) ? $rRadiosList : [];
+			$rSeriesList = is_array($rSeriesList) ? $rSeriesList : [];
 
 			$rOutput[$rID]['streams'] = array_merge($rChannelsList, $rMoviesList, $rRadiosList);
 			$rOutput[$rID]['series'] = $rSeriesList;
@@ -292,7 +293,7 @@ class BouquetService {
 	 */
 	public static function getUserBouquets() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `id`, `bouquet` FROM `lines` ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -311,7 +312,7 @@ class BouquetService {
 	 */
 	public static function getAllSimple() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `bouquets` ORDER BY `bouquet_order` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -338,7 +339,7 @@ class BouquetService {
 	 * @param int $rID Bouquet id.
 	 * @return array|null The bouquet row, or null if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rID);
 
@@ -355,7 +356,7 @@ class BouquetService {
 	 * @param int $rID Bouquet id.
 	 * @return bool True on deletion, false if not found.
 	 */
-	public static function deleteById($rID) {
+	public static function deleteById(int $rID) {
 		$db = self::db();
 		$rBouquet = self::getById($rID);
 
@@ -406,11 +407,11 @@ class BouquetService {
 	 * @param int[]  $rIDs       Item ids to add.
 	 * @return mixed Result.
 	 */
-	public static function addItems($rType, $rBouquetID, $rIDs) {
+	public static function addItems(string $rType, int $rBouquetID, array $rIDs) {
 		$db = self::db();
 
 		if (!is_array($rIDs)) {
-			$rIDs = array($rIDs);
+			$rIDs = [$rIDs];
 		}
 
 		$rBouquet = self::getById($rBouquetID);
@@ -453,11 +454,11 @@ class BouquetService {
 	 * @param int[]  $rIDs       Item ids to remove.
 	 * @return mixed Result.
 	 */
-	public static function removeItems($rType, $rBouquetID, $rIDs) {
+	public static function removeItems(string $rType, int $rBouquetID, array $rIDs) {
 		$db = self::db();
 
 		if (!is_array($rIDs)) {
-			$rIDs = array($rIDs);
+			$rIDs = [$rIDs];
 		}
 
 		$rBouquet = self::getById($rBouquetID);
diff --git a/src/Domain/Device/EnigmaService.php b/src/Domain/Device/EnigmaService.php
index 5d8c6b12..c0c3faba 100644
--- a/src/Domain/Device/EnigmaService.php
+++ b/src/Domain/Device/EnigmaService.php
@@ -24,22 +24,23 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class EnigmaService {
 	use DatabaseAware;
+
 	/**
 	 * Bulk delete selected Enigma2 devices.
 	 *
 	 * @param array $rData Selected device ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
 		ini_set('default_socket_timeout', 0);
 
 		$rEnigmas = json_decode($rData['enigmas'], true);
-		EnigmaService::deleteDevices($rEnigmas);
+		self::deleteDevices($rEnigmas);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -48,13 +49,13 @@ class EnigmaService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('massEditEnigmas', $rData)) {
-			$rArray = array();
-			$rUserArray = array();
+			$rArray = [];
+			$rUserArray = [];
 
-			foreach (array('is_isplock', 'is_trial') as $rItem) {
+			foreach (['is_isplock', 'is_trial'] as $rItem) {
 				if (!isset($rData['c_' . $rItem])) {
 				} else {
 					if (isset($rData[$rItem])) {
@@ -105,7 +106,7 @@ class EnigmaService {
 
 			if (!isset($rData['c_bouquets'])) {
 			} else {
-				$rUserArray['bouquet'] = array();
+				$rUserArray['bouquet'] = [];
 
 				foreach (json_decode($rData['bouquets_selected'], true) as $rBouquet) {
 					if (!is_numeric($rBouquet)) {
@@ -136,7 +137,7 @@ class EnigmaService {
 			$rDevices = json_decode($rData['devices_selected'], true);
 
 			foreach ($rDevices as $rDevice) {
-				$rDeviceInfo = EnigmaService::getById($rDevice);
+				$rDeviceInfo = self::getById($rDevice);
 
 				if (!$rDeviceInfo) {
 				} else {
@@ -154,7 +155,7 @@ class EnigmaService {
 
 					if (0 >= count($rUserArray)) {
 					} else {
-						$rUserIDs = array();
+						$rUserIDs = [];
 
 						if (!isset($rDeviceInfo['user']['id'])) {
 						} else {
@@ -175,15 +176,15 @@ class EnigmaService {
 								$rQuery = 'UPDATE `lines` SET ' . $rPrepare['update'] . ' WHERE `id` = ?;';
 								$db->query($rQuery, ...$rPrepare['data']);
 											LineService::updateLineSignal($rUserID);
-										}
-									}
-								}
 							}
 						}
+					}
+				}
+			}
 
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -193,12 +194,12 @@ class EnigmaService {
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processEnigma', $rData)) {
 			if (isset($rData['edit'])) {
 				if (Authorization::check('adv', 'edit_e2')) {
-					$rArray = AdminHelpers::overwriteData(EnigmaService::getById($rData['edit']), $rData);
+					$rArray = AdminHelpers::overwriteData(self::getById($rData['edit']), $rData);
 					$rUser = UserRepository::getLineById($rArray['user_id']);
 
 					if ($rUser) {
@@ -271,7 +272,7 @@ class EnigmaService {
 						$rDate = new \DateTime($rData['exp_date']);
 						$rUserArray['exp_date'] = $rDate->format('U');
 					} catch (\Exception $e) {
-						return array('status' => STATUS_INVALID_DATE, 'data' => $rData);
+						return ['status' => STATUS_INVALID_DATE, 'data' => $rData];
 					}
 				}
 			} else {
@@ -286,7 +287,7 @@ class EnigmaService {
 			if (isset($rData['allowed_ips'])) {
 				if (is_array($rData['allowed_ips'])) {
 				} else {
-					$rData['allowed_ips'] = array($rData['allowed_ips']);
+					$rData['allowed_ips'] = [$rData['allowed_ips']];
 				}
 
 				$rUserArray['allowed_ips'] = json_encode($rData['allowed_ips']);
@@ -300,7 +301,7 @@ class EnigmaService {
 				$rUserArray['pair_id'] = null;
 			}
 
-			$rUserArray['allowed_outputs'] = '[' . implode(',', array(1, 2)) . ']';
+			$rUserArray['allowed_outputs'] = '[' . implode(',', [1, 2]) . ']';
 			$rDevice = $rArray;
 			$rDevice['user'] = $rUserArray;
 
@@ -310,7 +311,7 @@ class EnigmaService {
 
 				if ($rUserCheck) {
 				} else {
-					return array('status' => STATUS_INVALID_USER, 'data' => $rData);
+					return ['status' => STATUS_INVALID_USER, 'data' => $rData];
 				}
 			}
 
@@ -330,7 +331,7 @@ class EnigmaService {
 					} else {
 						$rInsertID = $db->last_insert_id();
 						$rArray['user_id'] = $rInsertID;
-					LineService::updateLineSignal($rArray['user_id']);
+						LineService::updateLineSignal($rArray['user_id']);
 						if (isset($rData['edit'])) {
 						} else {
 							$rArray['token'] = '';
@@ -353,7 +354,7 @@ class EnigmaService {
 										LineService::updateLineSignal($rDevice['user']['pair_id']);
 							}
 
-							return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+							return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 						}
 
 						if (isset($rData['edit'])) {
@@ -362,16 +363,16 @@ class EnigmaService {
 						}
 					}
 
-					return array('status' => STATUS_FAILURE, 'data' => $rData);
+					return ['status' => STATUS_FAILURE, 'data' => $rData];
 				}
 
-				return array('status' => STATUS_EXISTS_MAC, 'data' => $rData);
+				return ['status' => STATUS_EXISTS_MAC, 'data' => $rData];
 			}
 
-			return array('status' => STATUS_INVALID_MAC, 'data' => $rData);
+			return ['status' => STATUS_INVALID_MAC, 'data' => $rData];
 		}
 
-		return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+		return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 	}
 
 	/**
@@ -380,12 +381,12 @@ class EnigmaService {
 	 * @param int $rID Device id.
 	 * @return array|null The device row, or null if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `enigma2_devices` WHERE `device_id` = ?;', $rID);
 
 		if ($db->num_rows() != 1) {
-			return array();
+			return [];
 		}
 
 		$rRow = $db->get_row();
@@ -407,12 +408,12 @@ class EnigmaService {
 	 * @param int $rID Owner/line id.
 	 * @return array Device row(s).
 	 */
-	public static function getByUserId($rID) {
+	public static function getByUserId(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `enigma2_devices` WHERE `user_id` = ?;', $rID);
 
 		if ($db->num_rows() != 1) {
-			return array();
+			return [];
 		}
 
 		return $db->get_row();
@@ -427,7 +428,7 @@ class EnigmaService {
 	 * @param bool $rConvert      Convert (rather than delete) the paired line.
 	 * @return bool True on success.
 	 */
-	public static function deleteDevice($rID, $rDeletePaired = false, $rCloseCons = true, $rConvert = false) {
+	public static function deleteDevice(int $rID, bool $rDeletePaired = false, bool $rCloseCons = true, bool $rConvert = false) {
 		$db = self::db();
 		$rEnigma = self::getById($rID);
 
@@ -466,7 +467,7 @@ class EnigmaService {
 	 * @param int[] $rIDs Device ids.
 	 * @return bool True on success.
 	 */
-	public static function deleteDevices($rIDs) {
+	public static function deleteDevices(array $rIDs) {
 		$db = self::db();
 		$rIDs = AdminHelpers::confirmIDs($rIDs);
 
@@ -474,7 +475,7 @@ class EnigmaService {
 			return false;
 		}
 
-		$rUserIDs = array();
+		$rUserIDs = [];
 		$db->query('SELECT `user_id` FROM `enigma2_devices` WHERE `device_id` IN (' . implode(',', $rIDs) . ');');
 
 		foreach ($db->get_rows() as $rRow) {
diff --git a/src/Domain/Device/MagService.php b/src/Domain/Device/MagService.php
index e2f087df..9caa218f 100644
--- a/src/Domain/Device/MagService.php
+++ b/src/Domain/Device/MagService.php
@@ -25,13 +25,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class MagService {
 	use DatabaseAware;
+
 	/**
 	 * Bulk delete selected MAG devices.
 	 *
 	 * @param array $rData Selected device ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
@@ -40,7 +41,7 @@ class MagService {
 		$rMags = json_decode($rData['mags'], true);
 		self::deleteDevices($rMags);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -49,14 +50,14 @@ class MagService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('massEditMags', $rData)) {
-			$rArray = array();
-			$rUserArray = array();
-			$rEvent = array('event' => '', 'need_confirm' => 0, 'msg' => '', 'reboot_after_ok' => 0);
+			$rArray = [];
+			$rUserArray = [];
+			$rEvent = ['event' => '', 'need_confirm' => 0, 'msg' => '', 'reboot_after_ok' => 0];
 
-			foreach (array('lock_device') as $rItem) {
+			foreach (['lock_device'] as $rItem) {
 				if (isset($rData['c_' . $rItem])) {
 					if (isset($rData[$rItem])) {
 						$rArray[$rItem] = 1;
@@ -66,7 +67,7 @@ class MagService {
 				}
 			}
 
-			foreach (array('is_isplock', 'is_trial') as $rItem) {
+			foreach (['is_isplock', 'is_trial'] as $rItem) {
 				if (isset($rData['c_' . $rItem])) {
 					if (isset($rData[$rItem])) {
 						$rUserArray[$rItem] = 1;
@@ -121,7 +122,7 @@ class MagService {
 			}
 
 			if (isset($rData['c_bouquets'])) {
-				$rUserArray['bouquet'] = array();
+				$rUserArray['bouquet'] = [];
 
 				foreach (json_decode($rData['bouquets_selected'], true) as $rBouquet) {
 					if (is_numeric($rBouquet)) {
@@ -148,7 +149,7 @@ class MagService {
 			}
 
 			if (!empty($rData['message_type'])) {
-				$rEvent = array('event' => $rData['message_type'], 'need_confirm' => 0, 'msg' => '', 'reboot_after_ok' => intval(isset($rData['reboot_portal'])));
+				$rEvent = ['event' => $rData['message_type'], 'need_confirm' => 0, 'msg' => '', 'reboot_after_ok' => intval(isset($rData['reboot_portal']))];
 
 				if ($rData['message_type'] == 'send_msg') {
 					$rEvent['need_confirm'] = 1;
@@ -167,7 +168,7 @@ class MagService {
 			$rDevices = json_decode($rData['devices_selected'], true);
 
 			foreach ($rDevices as $rDevice) {
-				$rDeviceInfo = MagService::getById($rDevice);
+				$rDeviceInfo = self::getById($rDevice);
 
 				if ($rDeviceInfo) {
 					if (!empty($rData['message_type'])) {
@@ -185,7 +186,7 @@ class MagService {
 					}
 
 					if (count($rUserArray) > 0) {
-						$rUserIDs = array();
+						$rUserIDs = [];
 
 						if (isset($rDeviceInfo['user']['id'])) {
 							$rUserIDs[] = $rDeviceInfo['user']['id'];
@@ -209,9 +210,9 @@ class MagService {
 				}
 			}
 
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -221,12 +222,12 @@ class MagService {
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processMAG', $rData)) {
 			if (isset($rData['edit'])) {
 				if (Authorization::check('adv', 'edit_mag')) {
-					$rArray = AdminHelpers::overwriteData(MagService::getById($rData['edit']), $rData);
+					$rArray = AdminHelpers::overwriteData(self::getById($rData['edit']), $rData);
 					$rUser = UserRepository::getLineById($rArray['user_id']);
 
 					if ($rUser) {
@@ -296,7 +297,7 @@ class MagService {
 						$rDate = new \DateTime($rData['exp_date']);
 						$rUserArray['exp_date'] = $rDate->format('U');
 					} catch (\Exception $e) {
-						return array('status' => STATUS_INVALID_DATE, 'data' => $rData);
+						return ['status' => STATUS_INVALID_DATE, 'data' => $rData];
 					}
 				}
 			} else {
@@ -309,7 +310,7 @@ class MagService {
 
 			if (isset($rData['allowed_ips'])) {
 				if (!is_array($rData['allowed_ips'])) {
-					$rData['allowed_ips'] = array($rData['allowed_ips']);
+					$rData['allowed_ips'] = [$rData['allowed_ips']];
 				}
 
 				$rUserArray['allowed_ips'] = json_encode($rData['allowed_ips']);
@@ -323,7 +324,7 @@ class MagService {
 				$rUserArray['pair_id'] = null;
 			}
 
-			$rUserArray['allowed_outputs'] = '[' . implode(',', array(1, 2)) . ']';
+			$rUserArray['allowed_outputs'] = '[' . implode(',', [1, 2]) . ']';
 			$rDevice = $rArray;
 			$rDevice['user'] = $rUserArray;
 
@@ -331,7 +332,7 @@ class MagService {
 				$rUserCheck = UserRepository::getLineById($rDevice['user']['pair_id']);
 
 				if (!$rUserCheck) {
-					return array('status' => STATUS_INVALID_USER, 'data' => $rData);
+					return ['status' => STATUS_INVALID_USER, 'data' => $rData];
 				}
 			}
 
@@ -369,11 +370,11 @@ class MagService {
 							$rInsertID = $db->last_insert_id();
 
 							if ($rDevice['user']['pair_id'] > 0) {
-								MagService::syncLineDevices($rDevice['user']['pair_id'], $rInsertID);
+								self::syncLineDevices($rDevice['user']['pair_id'], $rInsertID);
 								LineService::updateLineSignal($rDevice['user']['pair_id']);
 							}
 
-							return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+							return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 						}
 
 						if (!isset($rData['edit'])) {
@@ -381,16 +382,16 @@ class MagService {
 						}
 					}
 
-					return array('status' => STATUS_FAILURE, 'data' => $rData);
+					return ['status' => STATUS_FAILURE, 'data' => $rData];
 				}
 
-				return array('status' => STATUS_EXISTS_MAC, 'data' => $rData);
+				return ['status' => STATUS_EXISTS_MAC, 'data' => $rData];
 			}
 
-			return array('status' => STATUS_INVALID_MAC, 'data' => $rData);
+			return ['status' => STATUS_INVALID_MAC, 'data' => $rData];
 		}
 
-		return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+		return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 	}
 
 	/**
@@ -400,7 +401,7 @@ class MagService {
 	 * @param int|null $rDeviceID Limit to a single device, or null for all.
 	 * @return void
 	 */
-	public static function syncLineDevices($rUserID, $rDeviceID = null) {
+	public static function syncLineDevices(int $rUserID, ?int $rDeviceID = null) {
 		$db = self::db();
 		$rUser = UserRepository::getLineById($rUserID);
 
@@ -418,7 +419,7 @@ class MagService {
 				$rUpdateDevice['pair_id'] = intval($rUserID);
 				$rUpdateDevice['play_token'] = '';
 
-				foreach (array('id', 'is_mag', 'is_e2', 'is_restreamer', 'max_connections', 'created_at', 'username', 'password', 'admin_notes', 'reseller_notes') as $rKey) {
+				foreach (['id', 'is_mag', 'is_e2', 'is_restreamer', 'max_connections', 'created_at', 'username', 'password', 'admin_notes', 'reseller_notes'] as $rKey) {
 					$rUpdateDevice[$rKey] = $rDevice[$rKey];
 				}
 
@@ -438,12 +439,12 @@ class MagService {
 	 * @param int $rID Device id.
 	 * @return array|null The device row, or null if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `mag_devices` WHERE `mag_id` = ?;', $rID);
 
 		if ($db->num_rows() != 1) {
-			return array();
+			return [];
 		}
 
 		$rRow = $db->get_row();
@@ -467,7 +468,7 @@ class MagService {
 	 * @param bool $rConvert      Convert (rather than delete) the paired line.
 	 * @return bool True on success.
 	 */
-	public static function deleteDevice($rID, $rDeletePaired = false, $rCloseCons = true, $rConvert = false) {
+	public static function deleteDevice(int $rID, bool $rDeletePaired = false, bool $rCloseCons = true, bool $rConvert = false) {
 		$db = self::db();
 		$rMag = self::getById($rID);
 
@@ -508,7 +509,7 @@ class MagService {
 	 * @param int[] $rIDs Device ids.
 	 * @return bool True on success.
 	 */
-	public static function deleteDevices($rIDs) {
+	public static function deleteDevices(array $rIDs) {
 		$db = self::db();
 		$rIDs = AdminHelpers::confirmIDs($rIDs);
 
@@ -516,7 +517,7 @@ class MagService {
 			return false;
 		}
 
-		$rUserIDs = array();
+		$rUserIDs = [];
 		$db->query('SELECT `user_id` FROM `mag_devices` WHERE `mag_id` IN (' . implode(',', $rIDs) . ');');
 
 		foreach ($db->get_rows() as $rRow) {
@@ -541,7 +542,7 @@ class MagService {
 	 * @param int $rID Device id.
 	 * @return bool True on success.
 	 */
-	public static function resetSTB($rID) {
+	public static function resetSTB(int $rID) {
 		$db = self::db();
 		return $db->query("UPDATE `mag_devices` SET `ip` = '', `ver` = '', `image_version` = '', `stb_type` = '', `sn` = '', `device_id` = '', `device_id2` = '', `hw_version` = '', `token` = '' WHERE `mag_id` = ?;", $rID);
 	}
diff --git a/src/Domain/Epg/EPG.php b/src/Domain/Epg/EPG.php
index 8d757ccc..a4c4f032 100644
--- a/src/Domain/Epg/EPG.php
+++ b/src/Domain/Epg/EPG.php
@@ -18,8 +18,11 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class EPG {
 	use DatabaseAware;
+
 	public $rValid = false;
+
 	public $rEPGSource;
+
 	public $rFilename;
 
 	/**
@@ -28,7 +31,7 @@ class EPG {
 	 * @param string $rSource EPG source URL/path.
 	 * @param bool   $rCache  Use a cached copy when available.
 	 */
-	public function __construct($rSource, $rCache = false) {
+	public function __construct(string $rSource, bool $rCache = false) {
 		$this->loadEPG($rSource, $rCache);
 	}
 
@@ -38,7 +41,7 @@ class EPG {
 	 * @param string $rMessage Message to log.
 	 * @return void
 	 */
-	private function log($rMessage) {
+	private function log(string $rMessage) {
 		echo '[' . date('Y-m-d H:i:s') . '] ' . $rMessage . "\n";
 	}
 
@@ -55,7 +58,9 @@ class EPG {
 
 		while ($rNode = $this->rEPGSource->getNode()) {
 			$rData = simplexml_load_string($rNode);
-			if (!$rData) continue;
+			if (!$rData) {
+				continue;
+			}
 
 			$rNodeName = $rData->getName();
 
@@ -108,7 +113,7 @@ class EPG {
 	 * @param int    $rOffset      Time offset (seconds) to apply.
 	 * @return array Parsed programmes.
 	 */
-	public function parseEPG($rEPGID, $rChannelInfo, $rOffset = 0) {
+	public function parseEPG(string $rEPGID, array $rChannelInfo, int $rOffset = 0) {
 		$db = self::db();
 
 		$rInsertQuery = [];
@@ -145,7 +150,7 @@ class EPG {
 			}
 
 			$rStart = $rStartRaw + ($rOffset * 60);
-			$rStop  = $rStopRaw  + ($rOffset * 60);
+			$rStop  = $rStopRaw + ($rOffset * 60);
 
 			$rLangTitle = '';
 			$rLangDesc  = '';
@@ -196,15 +201,7 @@ class EPG {
 				}
 			}
 
-			$rInsertQuery[] = '(' .
-				$db->escape($rEPGID) . ', ' .
-				$db->escape($rChannelID) . ', ' .
-				intval($rStart) . ', ' .
-				intval($rStop) . ', ' .
-				$db->escape($rChannelInfo[$rChannelID]['epg_lang']) . ', ' .
-				$db->escape($rLangTitle) . ', ' .
-				$db->escape($rLangDesc) .
-				')';
+			$rInsertQuery[] = '(' . $db->escape($rEPGID) . ', ' . $db->escape($rChannelID) . ', ' . intval($rStart) . ', ' . intval($rStop) . ', ' . $db->escape($rChannelInfo[$rChannelID]['epg_lang']) . ', ' . $db->escape($rLangTitle) . ', ' . $db->escape($rLangDesc) . ')';
 
 			$programCount++;
 			if ($programCount % 1000 === 0) {
@@ -223,7 +220,7 @@ class EPG {
 	 * @param string $rFilename Local destination path.
 	 * @return bool True on success.
 	 */
-	public function downloadFile($rSource, $rFilename) {
+	public function downloadFile(string $rSource, string $rFilename) {
 		$this->log("[EPG] Downloading EPG file: $rSource");
 
 		$rExtension = pathinfo($rSource, PATHINFO_EXTENSION);
@@ -254,7 +251,7 @@ class EPG {
 	 * @param bool   $rCache  Use a cached copy when available.
 	 * @return void
 	 */
-	public function loadEPG($rSource, $rCache) {
+	public function loadEPG(string $rSource, bool $rCache) {
 		try {
 			$this->rFilename = TMP_PATH . md5($rSource) . '.xml';
 
diff --git a/src/Domain/Epg/EpgService.php b/src/Domain/Epg/EpgService.php
index 9936239e..7d4e6228 100644
--- a/src/Domain/Epg/EpgService.php
+++ b/src/Domain/Epg/EpgService.php
@@ -19,13 +19,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class EpgService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update an EPG source from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (isset($rData['edit'])) {
 			if (!Authorization::check('adv', 'epg_edit')) {
@@ -45,10 +46,10 @@ class EpgService {
 
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -58,16 +59,16 @@ class EpgService {
 	 * @param bool  $rArchive Include archive/catch-up programmes.
 	 * @return array EPG programmes.
 	 */
-	public static function getChannelEpg($rStream, $rArchive = false) {
+	public static function getChannelEpg(array $rStream, bool $rArchive = false) {
 		if (!$rStream || !$rStream['channel_id']) {
-			return array();
+			return [];
 		}
 
 		if ($rArchive) {
-			return EpgService::getStreamEpg($rStream['id'], time() - $rStream['tv_archive_duration'] * 86400, time());
+			return self::getStreamEpg($rStream['id'], time() - $rStream['tv_archive_duration'] * 86400, time());
 		}
 
-		return EpgService::getStreamEpg($rStream['id'], time(), time() + 1209600);
+		return self::getStreamEpg($rStream['id'], time(), time() + 1209600);
 	}
 
 	// ──────────── Из EpgRepository ────────────
@@ -78,7 +79,7 @@ class EpgService {
 	 * @param string $rEPGName EPG channel name.
 	 * @return mixed Matching EPG channel, or null/false if not found.
 	 */
-	public static function findByName($rEPGName) {
+	public static function findByName(string $rEPGName) {
 		$db = self::db();
 		$db->query('SELECT `id`, `data` FROM `epg`;');
 
@@ -92,7 +93,7 @@ class EpgService {
 							$rEPGLang = '';
 						}
 
-						return array('channel_id' => $rChannelID, 'epg_lang' => $rEPGLang, 'epg_id' => intval($rRow['id']));
+						return ['channel_id' => $rChannelID, 'epg_lang' => $rEPGLang, 'epg_id' => intval($rRow['id'])];
 					}
 				}
 			}
@@ -105,7 +106,7 @@ class EpgService {
 	 * @param int $rID EPG source id.
 	 * @return array|null The EPG source row, or null if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `epg` WHERE `id` = ?;', $rID);
 
@@ -123,8 +124,8 @@ class EpgService {
 	 * @param mixed  $rValue Value to match.
 	 * @return array Matching entries.
 	 */
-	public static function search($rArray, $rKey, $rValue) {
-		$rResults = array();
+	public static function search(array $rArray, string $rKey, mixed $rValue) {
+		$rResults = [];
 		self::searchRecursive($rArray, $rKey, $rValue, $rResults);
 		return $rResults;
 	}
@@ -138,7 +139,7 @@ class EpgService {
 	 * @param array  $rResults Accumulator (by reference).
 	 * @return void
 	 */
-	private static function searchRecursive($rArray, $rKey, $rValue, &$rResults) {
+	private static function searchRecursive(array $rArray, string $rKey, mixed $rValue, array &$rResults) {
 		if (is_array($rArray)) {
 			if (isset($rArray[$rKey]) && $rArray[$rKey] == $rValue) {
 				$rResults[] = $rArray;
@@ -158,9 +159,9 @@ class EpgService {
 	 * @param bool      $rByID      Key results by programme id.
 	 * @return array EPG programmes.
 	 */
-	public static function getStreamEpg($rStreamID, $rStartDate = null, $rFinishDate = null, $rByID = false) {
-		$rReturn = array();
-		$rData = (file_exists(EPG_PATH . 'stream_' . $rStreamID) ? igbinary_unserialize(file_get_contents(EPG_PATH . 'stream_' . $rStreamID)) : array());
+	public static function getStreamEpg(int $rStreamID, ?int $rStartDate = null, ?int $rFinishDate = null, bool $rByID = false) {
+		$rReturn = [];
+		$rData = (file_exists(EPG_PATH . 'stream_' . $rStreamID) ? igbinary_unserialize(file_get_contents(EPG_PATH . 'stream_' . $rStreamID)) : []);
 
 		foreach ($rData as $rItem) {
 			if (!$rStartDate || ($rStartDate < $rItem['end'] && $rItem['start'] < $rFinishDate)) {
@@ -183,8 +184,8 @@ class EpgService {
 	 * @param int|null   $rFinishDate Range end as a unix timestamp (or null).
 	 * @return array EPG programmes keyed by stream.
 	 */
-	public static function getStreamsEpg($rStreamIDs, $rStartDate = null, $rFinishDate = null) {
-		$rReturn = array();
+	public static function getStreamsEpg(array $rStreamIDs, ?int $rStartDate = null, ?int $rFinishDate = null) {
+		$rReturn = [];
 		foreach ($rStreamIDs as $rStreamID) {
 			$rReturn[$rStreamID] = self::getStreamEpg($rStreamID, $rStartDate, $rFinishDate);
 		}
@@ -198,7 +199,7 @@ class EpgService {
 	 * @param int $rProgrammeID Programme id.
 	 * @return array|null The programme, or null if not found.
 	 */
-	public static function getProgramme($rStreamID, $rProgrammeID) {
+	public static function getProgramme(int $rStreamID, int $rProgrammeID) {
 		$rData = self::getStreamEpg($rStreamID, null, null, true);
 		if (isset($rData[$rProgrammeID])) {
 			return $rData[$rProgrammeID];
@@ -213,7 +214,7 @@ class EpgService {
 	 */
 	public static function getAll() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `epg` ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -231,7 +232,7 @@ class EpgService {
 	 * @param int $rID EPG source id.
 	 * @return bool True on success.
 	 */
-	public static function deleteEpgById($rID) {
+	public static function deleteEpgById(int $rID) {
 		$db = self::db();
 		$rEPG = self::getById($rID);
 
diff --git a/src/Domain/Line/ActiveCodeService.php b/src/Domain/Line/ActiveCodeService.php
index 2875d6dc..24161d5d 100644
--- a/src/Domain/Line/ActiveCodeService.php
+++ b/src/Domain/Line/ActiveCodeService.php
@@ -18,576 +18,576 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ActiveCodeService {
-    use DatabaseAware;
+	use DatabaseAware;
 
-    /**
-     * Generate unique collision-free code string.
-     */
-    public static function generateCodeString(int $length = 10, string $type = 'alphanumeric'): string {
-        $db = self::db();
-        $chars = ($type === 'numeric')
-            ? '0123456789'
-            : '23456789ABCDEFGHJKLMNPQRSTUVWXYZ'; // Exclude visually ambiguous characters (0, O, 1, I)
+	/**
+	 * Generate unique collision-free code string.
+	 */
+	public static function generateCodeString(int $length = 10, string $type = 'alphanumeric'): string {
+		$db = self::db();
+		$chars = ($type === 'numeric')
+			? '0123456789'
+			: '23456789ABCDEFGHJKLMNPQRSTUVWXYZ'; // Exclude visually ambiguous characters (0, O, 1, I)
 
-        $charsLen = strlen($chars);
-        do {
-            $code = '';
-            for ($i = 0; $i < $length; $i++) {
-                $code .= $chars[random_int(0, $charsLen - 1)];
-            }
-            $db->query('SELECT `id` FROM `activation_codes` WHERE `activation_code` = ? LIMIT 1;', $code);
-        } while ($db->num_rows() > 0);
+		$charsLen = strlen($chars);
+		do {
+			$code = '';
+			for ($i = 0; $i < $length; $i++) {
+				$code .= $chars[random_int(0, $charsLen - 1)];
+			}
+			$db->query('SELECT `id` FROM `activation_codes` WHERE `activation_code` = ? LIMIT 1;', $code);
+		} while ($db->num_rows() > 0);
 
-        return $code;
-    }
+		return $code;
+	}
 
-    /**
-     * Generate unique batch name.
-     */
-    public static function generateBatchName(): string {
-        return 'BATCH-' . date('Ymd') . '-' . strtoupper(substr(bin2hex(random_bytes(3)), 0, 5));
-    }
+	/**
+	 * Generate unique batch name.
+	 */
+	public static function generateBatchName(): string {
+		return 'BATCH-' . date('Ymd') . '-' . strtoupper(substr(bin2hex(random_bytes(3)), 0, 5));
+	}
 
-    /**
-     * Generate single or bulk active codes with transaction safety.
-     *
-     * @param array $data Input form parameters
-     * @param array $user Authenticated user
-     * @param bool  $isAdmin Is administrator
-     * @return array Result array with status, message, count, and codes
-     */
-    public static function generateCodes(array $data, array $user, bool $isAdmin): array {
-        $db = self::db();
+	/**
+	 * Generate single or bulk active codes with transaction safety.
+	 *
+	 * @param array $data Input form parameters
+	 * @param array $user Authenticated user
+	 * @param bool  $isAdmin Is administrator
+	 * @return array Result array with status, message, count, and codes
+	 */
+	public static function generateCodes(array $data, array $user, bool $isAdmin): array {
+		$db = self::db();
 
-        $qty = max(1, min(500, intval($data['num_codes'] ?? 1)));
-        $length = max(6, min(24, intval($data['code_length'] ?? 10)));
-        $format = ($data['code_format'] ?? 'alphanumeric') === 'numeric' ? 'numeric' : 'alphanumeric';
+		$qty = max(1, min(500, intval($data['num_codes'] ?? 1)));
+		$length = max(6, min(24, intval($data['code_length'] ?? 10)));
+		$format = ($data['code_format'] ?? 'alphanumeric') === 'numeric' ? 'numeric' : 'alphanumeric';
 
-        $packageId = intval($data['package_id'] ?? 0);
-        $package = PackageService::getById($packageId);
-        if (!$package) {
-            return ['status' => 'ERROR', 'message' => 'Invalid package selected.'];
-        }
+		$packageId = intval($data['package_id'] ?? 0);
+		$package = PackageService::getById($packageId);
+		if (!$package) {
+			return ['status' => 'ERROR', 'message' => 'Invalid package selected.'];
+		}
 
-        // Calculate credit cost per code
-        $isTrial = !empty($package['is_trial']) || !empty($data['is_trial']);
-        if ($isTrial) {
-            $costPerCode = floatval($package['trial_credits'] ?? 0);
-        } else {
-            // Check for reseller custom package override
-            $override = json_decode($user['override_packages'] ?? '', true) ?: [];
-            if (isset($override[$packageId]['official_credits']) && strlen((string)$override[$packageId]['official_credits']) > 0) {
-                $costPerCode = floatval($override[$packageId]['official_credits']);
-            } else {
-                $costPerCode = floatval($package['official_credits'] ?? 0);
-            }
-        }
+		// Calculate credit cost per code
+		$isTrial = !empty($package['is_trial']) || !empty($data['is_trial']);
+		if ($isTrial) {
+			$costPerCode = floatval($package['trial_credits'] ?? 0);
+		} else {
+			// Check for reseller custom package override
+			$override = json_decode($user['override_packages'] ?? '', true) ?: [];
+			if (isset($override[$packageId]['official_credits']) && strlen((string) $override[$packageId]['official_credits']) > 0) {
+				$costPerCode = floatval($override[$packageId]['official_credits']);
+			} else {
+				$costPerCode = floatval($package['official_credits'] ?? 0);
+			}
+		}
 
-        $totalCost = $qty * $costPerCode;
+		$totalCost = $qty * $costPerCode;
 
-        // Balance check for non-admin
-        if (!$isAdmin) {
-            $currentCredits = floatval($user['credits'] ?? 0);
-            if ($totalCost > $currentCredits) {
-                return [
-                    'status' => 'INSUFFICIENT_CREDITS',
-                    'message' => "Insufficient balance. Required: {$totalCost} credits, Available: {$currentCredits} credits."
-                ];
-            }
-        }
+		// Balance check for non-admin
+		if (!$isAdmin) {
+			$currentCredits = floatval($user['credits'] ?? 0);
+			if ($totalCost > $currentCredits) {
+				return [
+					'status' => 'INSUFFICIENT_CREDITS',
+					'message' => "Insufficient balance. Required: {$totalCost} credits, Available: {$currentCredits} credits."
+				];
+			}
+		}
 
-        // Target owner for codes
-        $targetOwnerId = $user['id'];
-        if ($isAdmin && !empty($data['created_by'])) {
-            $targetOwnerId = intval($data['created_by']);
-        }
+		// Target owner for codes
+		$targetOwnerId = $user['id'];
+		if ($isAdmin && !empty($data['created_by'])) {
+			$targetOwnerId = intval($data['created_by']);
+		}
 
-        $batchName = trim($data['batch_name'] ?? '');
-        if (empty($batchName)) {
-            $batchName = self::generateBatchName();
-        }
+		$batchName = trim($data['batch_name'] ?? '');
+		if (empty($batchName)) {
+			$batchName = self::generateBatchName();
+		}
 
-        // Bouquets determination
-        if (!empty($data['bouquets_selected']) && is_array($data['bouquets_selected'])) {
-            $selectedBouquets = array_map('intval', $data['bouquets_selected']);
-        } else {
-            $selectedBouquets = json_decode((string)($package['bouquets'] ?? '[]'), true) ?: [];
-        }
-        $bouquetsJson = '[' . implode(',', array_map('intval', $selectedBouquets)) . ']';
+		// Bouquets determination
+		if (!empty($data['bouquets_selected']) && is_array($data['bouquets_selected'])) {
+			$selectedBouquets = array_map('intval', $data['bouquets_selected']);
+		} else {
+			$selectedBouquets = json_decode((string) ($package['bouquets'] ?? '[]'), true) ?: [];
+		}
+		$bouquetsJson = '[' . implode(',', array_map('intval', $selectedBouquets)) . ']';
 
-        $dnsBase = trim($data['dns_base'] ?? '') ?: null;
-        $forcedCountry = trim($data['forced_country'] ?? '') ?: ($package['forced_country'] ?? null);
-        $maxConnections = intval($data['max_connections'] ?? ($package['max_connections'] ?: 1));
-        $isAdult = !empty($data['is_adult']) ? 1 : 0;
-        $outputFormats = $package['output_formats'] ?? '[]';
+		$dnsBase = trim($data['dns_base'] ?? '') ?: null;
+		$forcedCountry = trim($data['forced_country'] ?? '') ?: ($package['forced_country'] ?? null);
+		$maxConnections = intval($data['max_connections'] ?? ($package['max_connections'] ?: 1));
+		$isAdult = !empty($data['is_adult']) ? 1 : 0;
+		$outputFormats = $package['output_formats'] ?? '[]';
 
-        $generatedCodes = [];
+		$generatedCodes = [];
 
-        $db->beginTransaction();
-        try {
-            // 1. Deduct reseller credits if non-admin
-            if (!$isAdmin && $totalCost > 0) {
-                $newCredits = floatval($user['credits']) - $totalCost;
-                $db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $newCredits, $user['id']);
+		$db->beginTransaction();
+		try {
+			// 1. Deduct reseller credits if non-admin
+			if (!$isAdmin && $totalCost > 0) {
+				$newCredits = floatval($user['credits']) - $totalCost;
+				$db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $newCredits, $user['id']);
 
-                // Audit logging
-                $db->query(
-                    "INSERT INTO `users_credits_logs` (`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES (?, ?, ?, ?, ?);",
-                    $user['id'],
-                    $user['id'],
-                    -$totalCost,
-                    time(),
-                    "Generated {$qty} active codes for package: {$package['package_name']} (Batch: {$batchName})"
-                );
+				// Audit logging
+				$db->query(
+					"INSERT INTO `users_credits_logs` (`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES (?, ?, ?, ?, ?);",
+					$user['id'],
+					$user['id'],
+					-$totalCost,
+					time(),
+					"Generated {$qty} active codes for package: {$package['package_name']} (Batch: {$batchName})"
+				);
 
-                $db->query(
-                    "INSERT INTO `users_logs` (`owner`, `type`, `action`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES (?, 'active_code', 'generate', ?, ?, ?, ?, ?);",
-                    $user['id'],
-                    $packageId,
-                    $totalCost,
-                    $newCredits,
-                    time(),
-                    json_encode(['qty' => $qty, 'batch_name' => $batchName, 'package' => $package['package_name']])
-                );
-            }
+				$db->query(
+					"INSERT INTO `users_logs` (`owner`, `type`, `action`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES (?, 'active_code', 'generate', ?, ?, ?, ?, ?);",
+					$user['id'],
+					$packageId,
+					$totalCost,
+					$newCredits,
+					time(),
+					json_encode(['qty' => $qty, 'batch_name' => $batchName, 'package' => $package['package_name']])
+				);
+			}
 
-            // 2. Generate subscriber lines & activation codes
-            for ($i = 0; $i < $qty; $i++) {
-                $code = self::generateCodeString($length, $format);
+			// 2. Generate subscriber lines & activation codes
+			for ($i = 0; $i < $qty; $i++) {
+				$code = self::generateCodeString($length, $format);
 
-                // Auto-create companion line with frozen countdown (exp_date = NULL)
-                $lineUsername = 'ac_' . strtolower(substr(bin2hex(random_bytes(5)), 0, 9));
-                $linePassword = substr(bin2hex(random_bytes(6)), 0, 10);
+				// Auto-create companion line with frozen countdown (exp_date = NULL)
+				$lineUsername = 'ac_' . strtolower(substr(bin2hex(random_bytes(5)), 0, 9));
+				$linePassword = substr(bin2hex(random_bytes(6)), 0, 10);
 
-                // Ensure username collision-free
-                while (UserRepository::getLineByUsername($lineUsername)) {
-                    $lineUsername = 'ac_' . strtolower(substr(bin2hex(random_bytes(5)), 0, 9));
-                }
+				// Ensure username collision-free
+				while (UserRepository::getLineByUsername($lineUsername)) {
+					$lineUsername = 'ac_' . strtolower(substr(bin2hex(random_bytes(5)), 0, 9));
+				}
 
-                $db->query(
-                    "INSERT INTO `lines` (
+				$db->query(
+					"INSERT INTO `lines` (
                         `member_id`, `username`, `password`, `exp_date`, `admin_enabled`, `enabled`,
                         `bouquet`, `allowed_outputs`, `max_connections`, `is_restreamer`, `is_trial`,
                         `is_mag`, `is_e2`, `forced_country`, `package_id`, `is_activecode`, `created_at`,
                         `reseller_notes`
                     ) VALUES (?, ?, ?, NULL, 1, 1, ?, ?, ?, 0, ?, 0, 0, ?, ?, 1, ?, ?);",
-                    $targetOwnerId,
-                    $lineUsername,
-                    $linePassword,
-                    $bouquetsJson,
-                    $outputFormats,
-                    $maxConnections,
-                    $isTrial ? 1 : 0,
-                    $forcedCountry,
-                    $packageId,
-                    time(),
-                    "Active Code: {$code} (Batch: {$batchName})"
-                );
+					$targetOwnerId,
+					$lineUsername,
+					$linePassword,
+					$bouquetsJson,
+					$outputFormats,
+					$maxConnections,
+					$isTrial ? 1 : 0,
+					$forcedCountry,
+					$packageId,
+					time(),
+					"Active Code: {$code} (Batch: {$batchName})"
+				);
 
-                $lineId = (int)$db->last_insert_id();
+				$lineId = (int) $db->last_insert_id();
 
-                // Insert into activation_codes table
-                $db->query(
-                    "INSERT INTO `activation_codes` (
+				// Insert into activation_codes table
+				$db->query(
+					"INSERT INTO `activation_codes` (
                         `activation_code`, `batch_name`, `subscriber_id`, `status`, `created_by`,
                         `package_id`, `bouquets`, `is_adult`, `is_trial`, `purchase_cost`,
                         `dns_base`, `forced_country`, `max_connections`, `created_at`
                     ) VALUES (?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);",
-                    $code,
-                    $batchName,
-                    $lineId,
-                    $targetOwnerId,
-                    $packageId,
-                    $bouquetsJson,
-                    $isAdult,
-                    $isTrial ? 1 : 0,
-                    $costPerCode,
-                    $dnsBase,
-                    $forcedCountry,
-                    $maxConnections,
-                    time()
-                );
+					$code,
+					$batchName,
+					$lineId,
+					$targetOwnerId,
+					$packageId,
+					$bouquetsJson,
+					$isAdult,
+					$isTrial ? 1 : 0,
+					$costPerCode,
+					$dnsBase,
+					$forcedCountry,
+					$maxConnections,
+					time()
+				);
 
-                $generatedCodes[] = [
-                    'code' => $code,
-                    'line_id' => $lineId,
-                    'username' => $lineUsername,
-                    'password' => $linePassword,
-                    'batch_name' => $batchName,
-                ];
-            }
+				$generatedCodes[] = [
+					'code' => $code,
+					'line_id' => $lineId,
+					'username' => $lineUsername,
+					'password' => $linePassword,
+					'batch_name' => $batchName,
+				];
+			}
 
-            $db->commit();
+			$db->commit();
 
-            return [
-                'status' => 'SUCCESS',
-                'message' => "Successfully generated {$qty} active codes.",
-                'batch_name' => $batchName,
-                'qty' => $qty,
-                'total_cost' => $totalCost,
-                'codes' => $generatedCodes,
-            ];
-        } catch (\Throwable $e) {
-            $db->rollback();
-            return [
-                'status' => 'ERROR',
-                'message' => 'Failed to generate codes: ' . $e->getMessage()
-            ];
-        }
-    }
+			return [
+				'status' => 'SUCCESS',
+				'message' => "Successfully generated {$qty} active codes.",
+				'batch_name' => $batchName,
+				'qty' => $qty,
+				'total_cost' => $totalCost,
+				'codes' => $generatedCodes,
+			];
+		} catch (\Throwable $e) {
+			$db->rollback();
+			return [
+				'status' => 'ERROR',
+				'message' => 'Failed to generate codes: ' . $e->getMessage()
+			];
+		}
+	}
 
-    /**
-     * Activate a code or verify an existing active code.
-     * Starts the subscription timer countdown on first access (Stock Mode -> Active).
-     *
-     * @param string $code Activation code
-     * @param array $deviceInfo Client device details (mac, device_id, ip, user_agent)
-     * @return array Result with status, line info, M3U playlists, XC credentials
-     */
-    public static function activateCode(string $code, array $deviceInfo = []): array {
-        $db = self::db();
-        $cleanCode = strtoupper(trim($code));
+	/**
+	 * Activate a code or verify an existing active code.
+	 * Starts the subscription timer countdown on first access (Stock Mode -> Active).
+	 *
+	 * @param string $code Activation code
+	 * @param array $deviceInfo Client device details (mac, device_id, ip, user_agent)
+	 * @return array Result with status, line info, M3U playlists, XC credentials
+	 */
+	public static function activateCode(string $code, array $deviceInfo = []): array {
+		$db = self::db();
+		$cleanCode = strtoupper(trim($code));
 
-        $codeRow = self::getByCode($cleanCode);
-        if (!$codeRow) {
-            return ['status' => 'INVALID_CODE', 'message' => 'Invalid or unknown activation code.'];
-        }
+		$codeRow = self::getByCode($cleanCode);
+		if (!$codeRow) {
+			return ['status' => 'INVALID_CODE', 'message' => 'Invalid or unknown activation code.'];
+		}
 
-        // Revoked or disabled
-        if ($codeRow['status'] == 0) {
-            return ['status' => 'DISABLED', 'message' => 'This activation code has been suspended or revoked.'];
-        }
+		// Revoked or disabled
+		if ($codeRow['status'] == 0) {
+			return ['status' => 'DISABLED', 'message' => 'This activation code has been suspended or revoked.'];
+		}
 
-        $line = UserRepository::getLineById($codeRow['subscriber_id']);
-        if (!$line) {
-            return ['status' => 'LINE_NOT_FOUND', 'message' => 'Underlying subscription line not found.'];
-        }
+		$line = UserRepository::getLineById($codeRow['subscriber_id']);
+		if (!$line) {
+			return ['status' => 'LINE_NOT_FOUND', 'message' => 'Underlying subscription line not found.'];
+		}
 
-        $package = PackageService::getById($codeRow['package_id']);
-        $now = time();
+		$package = PackageService::getById($codeRow['package_id']);
+		$now = time();
 
-        // ─── First-Time Activation (Countdown starts now) ───
-        $claimed = false;
-        if ($codeRow['status'] == 1 || empty($codeRow['activated_at'])) {
-            $duration = intval($codeRow['is_trial'] ? ($package['trial_duration'] ?? 1) : ($package['official_duration'] ?? 1));
-            $unit = (string)($codeRow['is_trial'] ? ($package['trial_duration_in'] ?? 'days') : ($package['official_duration_in'] ?? 'months'));
+		// ─── First-Time Activation (Countdown starts now) ───
+		$claimed = false;
+		if ($codeRow['status'] == 1 || empty($codeRow['activated_at'])) {
+			$duration = intval($codeRow['is_trial'] ? ($package['trial_duration'] ?? 1) : ($package['official_duration'] ?? 1));
+			$unit = (string) ($codeRow['is_trial'] ? ($package['trial_duration_in'] ?? 'days') : ($package['official_duration_in'] ?? 'months'));
 
-            if (!in_array($unit, ['hours', 'days', 'months', 'years'], true)) {
-                $unit = 'months';
-            }
+			if (!in_array($unit, ['hours', 'days', 'months', 'years'], true)) {
+				$unit = 'months';
+			}
 
-            $expDate = strtotime("+{$duration} {$unit}", $now);
-            $mac = !empty($deviceInfo['mac']) ? trim($deviceInfo['mac']) : null;
-            $deviceId = !empty($deviceInfo['device_id']) ? trim($deviceInfo['device_id']) : null;
-            $clientIp = $deviceInfo['ip'] ?? ($_SERVER['REMOTE_ADDR'] ?? null);
+			$expDate = strtotime("+{$duration} {$unit}", $now);
+			$mac = !empty($deviceInfo['mac']) ? trim($deviceInfo['mac']) : null;
+			$deviceId = !empty($deviceInfo['device_id']) ? trim($deviceInfo['device_id']) : null;
+			$clientIp = $deviceInfo['ip'] ?? ($_SERVER['REMOTE_ADDR'] ?? null);
 
-            // Claim the code. The WHERE repeats the check above in SQL, so of two
-            // requests that read the code while it was still fresh only one binds
-            // its device and starts the countdown; the other finds it taken.
-            $db->query(
-                "UPDATE `activation_codes` SET
+			// Claim the code. The WHERE repeats the check above in SQL, so of two
+			// requests that read the code while it was still fresh only one binds
+			// its device and starts the countdown; the other finds it taken.
+			$db->query(
+				"UPDATE `activation_codes` SET
                     `status` = 2,
                     `activated_at` = ?,
                     `mac` = COALESCE(?, `mac`),
                     `device_id` = COALESCE(?, `device_id`)
                 WHERE `id` = ? AND (`status` = 1 OR `activated_at` IS NULL);",
-                $now,
-                $mac,
-                $deviceId,
-                $codeRow['id']
-            );
-            $claimed = $db->num_rows() > 0;
+				$now,
+				$mac,
+				$deviceId,
+				$codeRow['id']
+			);
+			$claimed = $db->num_rows() > 0;
 
-            if ($claimed) {
-                // Update companion line
-                $db->query(
-                    "UPDATE `lines` SET
+			if ($claimed) {
+				// Update companion line
+				$db->query(
+					"UPDATE `lines` SET
                         `exp_date` = ?,
                         `last_ip` = ?,
                         `last_activity` = ?
                     WHERE `id` = ?;",
-                    $expDate,
-                    $clientIp,
-                    $now,
-                    $line['id']
-                );
+					$expDate,
+					$clientIp,
+					$now,
+					$line['id']
+				);
 
-                $line['exp_date'] = $expDate;
-                $codeRow['status'] = 2;
-                $codeRow['activated_at'] = $now;
-            } else {
-                // Another request activated it first: from here it is an activated
-                // code like any other, device lock included.
-                $codeRow = self::getByCode($cleanCode);
-                $line = $codeRow ? UserRepository::getLineById($codeRow['subscriber_id']) : null;
-                if (!$codeRow || !$line) {
-                    return ['status' => 'INVALID_CODE', 'message' => 'Invalid or unknown activation code.'];
-                }
-                if ($codeRow['status'] == 0) {
-                    return ['status' => 'DISABLED', 'message' => 'This activation code has been suspended or revoked.'];
-                }
-            }
-        }
+				$line['exp_date'] = $expDate;
+				$codeRow['status'] = 2;
+				$codeRow['activated_at'] = $now;
+			} else {
+				// Another request activated it first: from here it is an activated
+				// code like any other, device lock included.
+				$codeRow = self::getByCode($cleanCode);
+				$line = $codeRow ? UserRepository::getLineById($codeRow['subscriber_id']) : null;
+				if (!$codeRow || !$line) {
+					return ['status' => 'INVALID_CODE', 'message' => 'Invalid or unknown activation code.'];
+				}
+				if ($codeRow['status'] == 0) {
+					return ['status' => 'DISABLED', 'message' => 'This activation code has been suspended or revoked.'];
+				}
+			}
+		}
 
-        if (!$claimed) {
-            // Already activated: check if expired
-            if (!empty($line['exp_date']) && $line['exp_date'] < $now) {
-                return [
-                    'status' => 'EXPIRED',
-                    'message' => 'Subscription has expired.',
-                    'exp_date' => $line['exp_date'],
-                    'code' => $cleanCode,
-                ];
-            }
+		if (!$claimed) {
+			// Already activated: check if expired
+			if (!empty($line['exp_date']) && $line['exp_date'] < $now) {
+				return [
+					'status' => 'EXPIRED',
+					'message' => 'Subscription has expired.',
+					'exp_date' => $line['exp_date'],
+					'code' => $cleanCode,
+				];
+			}
 
-            // A code bound to a device answers that device only. A request naming
-            // no device is not that device: skipping the check when `mac` was absent
-            // let any client read a locked code's credentials by leaving it out.
-            if (!empty($codeRow['mac']) && strcasecmp($codeRow['mac'], trim((string) ($deviceInfo['mac'] ?? ''))) !== 0) {
-                return ['status' => 'DEVICE_MISMATCH', 'message' => 'Code is locked to another hardware device.'];
-            }
-        }
+			// A code bound to a device answers that device only. A request naming
+			// no device is not that device: skipping the check when `mac` was absent
+			// let any client read a locked code's credentials by leaving it out.
+			if (!empty($codeRow['mac']) && strcasecmp($codeRow['mac'], trim((string) ($deviceInfo['mac'] ?? ''))) !== 0) {
+				return ['status' => 'DEVICE_MISMATCH', 'message' => 'Code is locked to another hardware device.'];
+			}
+		}
 
-        // Resolve Portal and M3U URLs
-        $portalHost = DomainResolver::resolve(SERVER_ID);
-        if (!empty($codeRow['dns_base'])) {
-            $portalHost = rtrim($codeRow['dns_base'], '/');
-        }
-        $portalParsed = parse_url($portalHost);
-        $serverDomain = $portalParsed['host'] ?? $_SERVER['HTTP_HOST'] ?? 'localhost';
-        $serverPort = $portalParsed['port'] ?? (isset($_SERVER['SERVER_PORT']) ? (int)$_SERVER['SERVER_PORT'] : 80);
+		// Resolve Portal and M3U URLs
+		$portalHost = DomainResolver::resolve(SERVER_ID);
+		if (!empty($codeRow['dns_base'])) {
+			$portalHost = rtrim($codeRow['dns_base'], '/');
+		}
+		$portalParsed = parse_url($portalHost);
+		$serverDomain = $portalParsed['host'] ?? $_SERVER['HTTP_HOST'] ?? 'localhost';
+		$serverPort = $portalParsed['port'] ?? (isset($_SERVER['SERVER_PORT']) ? (int) $_SERVER['SERVER_PORT'] : 80);
 
-        $m3uHls = "{$portalHost}/get.php?username={$line['username']}&password={$line['password']}&type=m3u_plus&output=hls";
-        $m3uTs  = "{$portalHost}/get.php?username={$line['username']}&password={$line['password']}&type=m3u_plus&output=ts";
+		$m3uHls = "{$portalHost}/get.php?username={$line['username']}&password={$line['password']}&type=m3u_plus&output=hls";
+		$m3uTs  = "{$portalHost}/get.php?username={$line['username']}&password={$line['password']}&type=m3u_plus&output=ts";
 
-        $webPlayerUrl = null;
-        $db->query("SELECT `code` FROM `access_codes` WHERE `type` = 6 AND `enabled` = 1 LIMIT 1;");
-        if ($db->num_rows() > 0) {
-            $wpRow = $db->get_row();
-            $webPlayerUrl = "{$portalHost}/{$wpRow['code']}/";
-        }
+		$webPlayerUrl = null;
+		$db->query("SELECT `code` FROM `access_codes` WHERE `type` = 6 AND `enabled` = 1 LIMIT 1;");
+		if ($db->num_rows() > 0) {
+			$wpRow = $db->get_row();
+			$webPlayerUrl = "{$portalHost}/{$wpRow['code']}/";
+		}
 
-        return [
-            'status' => 'SUCCESS',
-            'code' => $cleanCode,
-            'is_new_activation' => $claimed,
-            'package_name' => $package['package_name'] ?? 'Premium IPTV',
-            'exp_date' => (int)$line['exp_date'],
-            'exp_date_formatted' => date('Y-m-d H:i:s', (int)$line['exp_date']),
-            'max_connections' => (int)($line['max_connections'] ?? 1),
-            'line' => $line,
-            'web_player_url' => $webPlayerUrl,
-            'credentials' => [
-                'server'   => $serverDomain,
-                'port'     => $serverPort,
-                'host'     => $portalHost,
-                'username' => $line['username'],
-                'password' => $line['password'],
-            ],
-            'playlists' => [
-                'm3u_hls' => $m3uHls,
-                'm3u_ts'  => $m3uTs,
-            ],
-            'device' => [
-                'mac'       => $codeRow['mac'],
-                'device_id' => $codeRow['device_id'],
-            ],
-            'code_details' => $codeRow,
-        ];
-    }
+		return [
+			'status' => 'SUCCESS',
+			'code' => $cleanCode,
+			'is_new_activation' => $claimed,
+			'package_name' => $package['package_name'] ?? 'Premium IPTV',
+			'exp_date' => (int) $line['exp_date'],
+			'exp_date_formatted' => date('Y-m-d H:i:s', (int) $line['exp_date']),
+			'max_connections' => (int) ($line['max_connections'] ?? 1),
+			'line' => $line,
+			'web_player_url' => $webPlayerUrl,
+			'credentials' => [
+				'server'   => $serverDomain,
+				'port'     => $serverPort,
+				'host'     => $portalHost,
+				'username' => $line['username'],
+				'password' => $line['password'],
+			],
+			'playlists' => [
+				'm3u_hls' => $m3uHls,
+				'm3u_ts'  => $m3uTs,
+			],
+			'device' => [
+				'mac'       => $codeRow['mac'],
+				'device_id' => $codeRow['device_id'],
+			],
+			'code_details' => $codeRow,
+		];
+	}
 
-    /**
-     * Look up activation code record by code string.
-     */
-    public static function getByCode(string $code): ?array {
-        $db = self::db();
-        $db->query('SELECT * FROM `activation_codes` WHERE `activation_code` = ? LIMIT 1;', strtoupper(trim($code)));
-        return $db->num_rows() > 0 ? $db->get_row() : null;
-    }
+	/**
+	 * Look up activation code record by code string.
+	 */
+	public static function getByCode(string $code): ?array {
+		$db = self::db();
+		$db->query('SELECT * FROM `activation_codes` WHERE `activation_code` = ? LIMIT 1;', strtoupper(trim($code)));
+		return $db->num_rows() > 0 ? $db->get_row() : null;
+	}
 
-    /**
-     * Look up activation code record by ID.
-     */
-    public static function getById(int $id): ?array {
-        $db = self::db();
-        $db->query('SELECT * FROM `activation_codes` WHERE `id` = ? LIMIT 1;', $id);
-        return $db->num_rows() > 0 ? $db->get_row() : null;
-    }
+	/**
+	 * Look up activation code record by ID.
+	 */
+	public static function getById(int $id): ?array {
+		$db = self::db();
+		$db->query('SELECT * FROM `activation_codes` WHERE `id` = ? LIMIT 1;', $id);
+		return $db->num_rows() > 0 ? $db->get_row() : null;
+	}
 
-    /**
-     * Distinct resellers who have created activation codes (reseller filter).
-     */
-    public static function getResellersWithCodes(): array {
-        $db = self::db();
-        return $db->fetchAll(
-            'SELECT DISTINCT `users`.`id`, `users`.`username`
+	/**
+	 * Distinct resellers who have created activation codes (reseller filter).
+	 */
+	public static function getResellersWithCodes(): array {
+		$db = self::db();
+		return $db->fetchAll(
+			'SELECT DISTINCT `users`.`id`, `users`.`username`
              FROM `activation_codes`
              INNER JOIN `users` ON `users`.`id` = `activation_codes`.`created_by`
              ORDER BY `users`.`username` ASC;'
-        );
-    }
+		);
+	}
 
-    /**
-     * Recent distinct batch names (batch filter). Pass a list of creator ids to
-     * scope it (reseller view); empty = all batches (admin view).
-     */
-    public static function getRecentBatchNames(array $createdBy = [], int $limit = 100): array {
-        $db = self::db();
-        $where = '`batch_name` IS NOT NULL';
-        if (!empty($createdBy)) {
-            $where = '`created_by` IN (' . implode(',', array_map('intval', $createdBy)) . ') AND ' . $where;
-        }
-        return $db->fetchAll(
-            'SELECT DISTINCT `batch_name` FROM `activation_codes`
+	/**
+	 * Recent distinct batch names (batch filter). Pass a list of creator ids to
+	 * scope it (reseller view); empty = all batches (admin view).
+	 */
+	public static function getRecentBatchNames(array $createdBy = [], int $limit = 100): array {
+		$db = self::db();
+		$where = '`batch_name` IS NOT NULL';
+		if (!empty($createdBy)) {
+			$where = '`created_by` IN (' . implode(',', array_map('intval', $createdBy)) . ') AND ' . $where;
+		}
+		return $db->fetchAll(
+			'SELECT DISTINCT `batch_name` FROM `activation_codes`
              WHERE ' . $where . '
              ORDER BY `created_at` DESC LIMIT ' . (int) $limit . ';'
-        );
-    }
+		);
+	}
 
-    /**
-     * All resellers with their credit balance, for the creator-assignment
-     * dropdown on the admin generate-codes wizard.
-     */
-    public static function getResellersForAssignment(): array {
-        $db = self::db();
-        return $db->fetchAll('SELECT `id`, `username`, `credits` FROM `users` ORDER BY `username` ASC;') ?: [];
-    }
+	/**
+	 * All resellers with their credit balance, for the creator-assignment
+	 * dropdown on the admin generate-codes wizard.
+	 */
+	public static function getResellersForAssignment(): array {
+		$db = self::db();
+		return $db->fetchAll('SELECT `id`, `username`, `credits` FROM `users` ORDER BY `username` ASC;') ?: [];
+	}
 
-    /**
-     * Multi-action / Mass edit engine.
-     */
-    public static function massAction(string $action, array $codeIds, array $user, bool $isAdmin, array $extra = []): array {
-        $db = self::db();
-        if (empty($codeIds)) {
-            return ['status' => 'ERROR', 'message' => 'No codes selected.'];
-        }
+	/**
+	 * Multi-action / Mass edit engine.
+	 */
+	public static function massAction(string $action, array $codeIds, array $user, bool $isAdmin, array $extra = []): array {
+		$db = self::db();
+		if (empty($codeIds)) {
+			return ['status' => 'ERROR', 'message' => 'No codes selected.'];
+		}
 
-        $cleanIds = array_map('intval', $codeIds);
-        $idList = implode(',', $cleanIds);
+		$cleanIds = array_map('intval', $codeIds);
+		$idList = implode(',', $cleanIds);
 
-        // Security check: restrict non-admins to their report tree
-        $whereScope = '';
-        if (!$isAdmin) {
-            $allowedReports = (array)($user['reports'] ?? [$user['id']]);
-            $reportsList = implode(',', array_map('intval', $allowedReports));
-            $whereScope = " AND `created_by` IN ({$reportsList})";
-        }
+		// Security check: restrict non-admins to their report tree
+		$whereScope = '';
+		if (!$isAdmin) {
+			$allowedReports = (array) ($user['reports'] ?? [$user['id']]);
+			$reportsList = implode(',', array_map('intval', $allowedReports));
+			$whereScope = " AND `created_by` IN ({$reportsList})";
+		}
 
-        // Fetch targets
-        $codes = $db->fetchAll("SELECT * FROM `activation_codes` WHERE `id` IN ({$idList}) {$whereScope};");
-        if (empty($codes)) {
-            return ['status' => 'ERROR', 'message' => 'No accessible codes found for mass action.'];
-        }
+		// Fetch targets
+		$codes = $db->fetchAll("SELECT * FROM `activation_codes` WHERE `id` IN ({$idList}) {$whereScope};");
+		if (empty($codes)) {
+			return ['status' => 'ERROR', 'message' => 'No accessible codes found for mass action.'];
+		}
 
-        $targetIds = array_column($codes, 'id');
-        $targetIdList = implode(',', $targetIds);
-        $subscriberIds = array_filter(array_column($codes, 'subscriber_id'));
-        $subIdList = !empty($subscriberIds) ? implode(',', $subscriberIds) : '0';
+		$targetIds = array_column($codes, 'id');
+		$targetIdList = implode(',', $targetIds);
+		$subscriberIds = array_filter(array_column($codes, 'subscriber_id'));
+		$subIdList = !empty($subscriberIds) ? implode(',', $subscriberIds) : '0';
 
-        switch ($action) {
-            case 'mass_enable':
-                // Set status: 1 if never activated, 2 if activated
-                $db->query("UPDATE `activation_codes` SET `status` = IF(`activated_at` IS NULL, 1, 2) WHERE `id` IN ({$targetIdList});");
-                $db->query("UPDATE `lines` SET `enabled` = 1, `admin_enabled` = 1 WHERE `id` IN ({$subIdList});");
-                return ['status' => 'SUCCESS', 'message' => count($targetIds) . ' codes successfully enabled.'];
+		switch ($action) {
+			case 'mass_enable':
+				// Set status: 1 if never activated, 2 if activated
+				$db->query("UPDATE `activation_codes` SET `status` = IF(`activated_at` IS NULL, 1, 2) WHERE `id` IN ({$targetIdList});");
+				$db->query("UPDATE `lines` SET `enabled` = 1, `admin_enabled` = 1 WHERE `id` IN ({$subIdList});");
+				return ['status' => 'SUCCESS', 'message' => count($targetIds) . ' codes successfully enabled.'];
 
-            case 'mass_disable':
-                $db->query("UPDATE `activation_codes` SET `status` = 0 WHERE `id` IN ({$targetIdList});");
-                $db->query("UPDATE `lines` SET `enabled` = 0 WHERE `id` IN ({$subIdList});");
-                return ['status' => 'SUCCESS', 'message' => count($targetIds) . ' codes suspended.'];
+			case 'mass_disable':
+				$db->query("UPDATE `activation_codes` SET `status` = 0 WHERE `id` IN ({$targetIdList});");
+				$db->query("UPDATE `lines` SET `enabled` = 0 WHERE `id` IN ({$subIdList});");
+				return ['status' => 'SUCCESS', 'message' => count($targetIds) . ' codes suspended.'];
 
-            case 'mass_extend':
-                $days = max(1, intval($extra['days'] ?? 30));
-                $seconds = $days * 86400;
-                $db->query(
-                    "UPDATE `lines` SET `exp_date` = IF(`exp_date` IS NOT NULL AND `exp_date` > UNIX_TIMESTAMP(), `exp_date` + ?, UNIX_TIMESTAMP() + ?) WHERE `id` IN ({$subIdList}) AND `exp_date` IS NOT NULL;",
-                    $seconds,
-                    $seconds
-                );
-                return ['status' => 'SUCCESS', 'message' => "Extended expiration of selected active codes by {$days} days."];
+			case 'mass_extend':
+				$days = max(1, intval($extra['days'] ?? 30));
+				$seconds = $days * 86400;
+				$db->query(
+					"UPDATE `lines` SET `exp_date` = IF(`exp_date` IS NOT NULL AND `exp_date` > UNIX_TIMESTAMP(), `exp_date` + ?, UNIX_TIMESTAMP() + ?) WHERE `id` IN ({$subIdList}) AND `exp_date` IS NOT NULL;",
+					$seconds,
+					$seconds
+				);
+				return ['status' => 'SUCCESS', 'message' => "Extended expiration of selected active codes by {$days} days."];
 
-            case 'mass_reset_device':
-                $db->query("UPDATE `activation_codes` SET `mac` = NULL, `device_id` = NULL WHERE `id` IN ({$targetIdList});");
-                return ['status' => 'SUCCESS', 'message' => 'Hardware/Device lock reset on selected codes.'];
+			case 'mass_reset_device':
+				$db->query("UPDATE `activation_codes` SET `mac` = NULL, `device_id` = NULL WHERE `id` IN ({$targetIdList});");
+				return ['status' => 'SUCCESS', 'message' => 'Hardware/Device lock reset on selected codes.'];
 
-            case 'mass_change_package':
-                $newPackageId = intval($extra['package_id'] ?? 0);
-                $newPackage = PackageService::getById($newPackageId);
-                if (!$newPackage) {
-                    return ['status' => 'ERROR', 'message' => 'Invalid package.'];
-                }
-                $newBouquets = $newPackage['bouquets'];
-                $db->query("UPDATE `activation_codes` SET `package_id` = ?, `bouquets` = ? WHERE `id` IN ({$targetIdList});", $newPackageId, $newBouquets);
-                $db->query("UPDATE `lines` SET `package_id` = ?, `bouquet` = ? WHERE `id` IN ({$subIdList});", $newPackageId, $newBouquets);
-                return ['status' => 'SUCCESS', 'message' => 'Updated package on selected codes.'];
+			case 'mass_change_package':
+				$newPackageId = intval($extra['package_id'] ?? 0);
+				$newPackage = PackageService::getById($newPackageId);
+				if (!$newPackage) {
+					return ['status' => 'ERROR', 'message' => 'Invalid package.'];
+				}
+				$newBouquets = $newPackage['bouquets'];
+				$db->query("UPDATE `activation_codes` SET `package_id` = ?, `bouquets` = ? WHERE `id` IN ({$targetIdList});", $newPackageId, $newBouquets);
+				$db->query("UPDATE `lines` SET `package_id` = ?, `bouquet` = ? WHERE `id` IN ({$subIdList});", $newPackageId, $newBouquets);
+				return ['status' => 'SUCCESS', 'message' => 'Updated package on selected codes.'];
 
-            case 'mass_delete':
-                $refund = !empty($extra['refund_credits']) || !empty($extra['refund']);
-                $totalRefunded = 0;
+			case 'mass_delete':
+				$refund = !empty($extra['refund_credits']) || !empty($extra['refund']);
+				$totalRefunded = 0;
 
-                $db->beginTransaction();
-                try {
-                    if ($refund && !$isAdmin) {
-                        // Calculate refund only on stock/unactivated codes (status = 1)
-                        foreach ($codes as $c) {
-                            if ($c['status'] == 1 && $c['purchase_cost'] > 0 && $c['created_by'] == $user['id']) {
-                                $totalRefunded += floatval($c['purchase_cost']);
-                            }
-                        }
+				$db->beginTransaction();
+				try {
+					if ($refund && !$isAdmin) {
+						// Calculate refund only on stock/unactivated codes (status = 1)
+						foreach ($codes as $c) {
+							if ($c['status'] == 1 && $c['purchase_cost'] > 0 && $c['created_by'] == $user['id']) {
+								$totalRefunded += floatval($c['purchase_cost']);
+							}
+						}
 
-                        if ($totalRefunded > 0) {
-                            $db->query("UPDATE `users` SET `credits` = `credits` + ? WHERE `id` = ?;", $totalRefunded, $user['id']);
-                            $db->query(
-                                "INSERT INTO `users_credits_logs` (`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES (?, ?, ?, ?, ?);",
-                                $user['id'],
-                                $user['id'],
-                                $totalRefunded,
-                                time(),
-                                "Refund for deleted unused active codes (" . count($targetIds) . " codes)"
-                            );
-                        }
-                    }
+						if ($totalRefunded > 0) {
+							$db->query("UPDATE `users` SET `credits` = `credits` + ? WHERE `id` = ?;", $totalRefunded, $user['id']);
+							$db->query(
+								"INSERT INTO `users_credits_logs` (`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES (?, ?, ?, ?, ?);",
+								$user['id'],
+								$user['id'],
+								$totalRefunded,
+								time(),
+								"Refund for deleted unused active codes (" . count($targetIds) . " codes)"
+							);
+						}
+					}
 
-                    $db->query("DELETE FROM `activation_codes` WHERE `id` IN ({$targetIdList});");
-                    $db->query("DELETE FROM `lines` WHERE `id` IN ({$subIdList});");
-                    $db->commit();
+					$db->query("DELETE FROM `activation_codes` WHERE `id` IN ({$targetIdList});");
+					$db->query("DELETE FROM `lines` WHERE `id` IN ({$subIdList});");
+					$db->commit();
 
-                    $msg = count($targetIds) . ' codes deleted successfully.';
-                    if ($totalRefunded > 0) {
-                        $msg .= " Refunded {$totalRefunded} credits for unused stock.";
-                    }
-                    return ['status' => 'SUCCESS', 'message' => $msg];
-                } catch (\Throwable $e) {
-                    $db->rollback();
-                    return ['status' => 'ERROR', 'message' => 'Failed to delete codes: ' . $e->getMessage()];
-                }
+					$msg = count($targetIds) . ' codes deleted successfully.';
+					if ($totalRefunded > 0) {
+						$msg .= " Refunded {$totalRefunded} credits for unused stock.";
+					}
+					return ['status' => 'SUCCESS', 'message' => $msg];
+				} catch (\Throwable $e) {
+					$db->rollback();
+					return ['status' => 'ERROR', 'message' => 'Failed to delete codes: ' . $e->getMessage()];
+				}
 
-            default:
-                return ['status' => 'ERROR', 'message' => 'Unknown mass action.'];
-        }
-    }
+			default:
+				return ['status' => 'ERROR', 'message' => 'Unknown mass action.'];
+		}
+	}
 
-    /**
-     * Get grouped summary metrics by batch.
-     */
-    public static function getBatchSummary(array $user, bool $isAdmin, ?string $batchName = null): array {
-        $db = self::db();
-        $where = [];
-        $params = [];
+	/**
+	 * Get grouped summary metrics by batch.
+	 */
+	public static function getBatchSummary(array $user, bool $isAdmin, ?string $batchName = null): array {
+		$db = self::db();
+		$where = [];
+		$params = [];
 
-        if (!$isAdmin) {
-            $allowedReports = (array)($user['reports'] ?? [$user['id']]);
-            $where[] = "`created_by` IN (" . implode(',', array_map('intval', $allowedReports)) . ")";
-        }
+		if (!$isAdmin) {
+			$allowedReports = (array) ($user['reports'] ?? [$user['id']]);
+			$where[] = "`created_by` IN (" . implode(',', array_map('intval', $allowedReports)) . ")";
+		}
 
-        if ($batchName) {
-            $where[] = "`batch_name` = ?";
-            $params[] = $batchName;
-        }
+		if ($batchName) {
+			$where[] = "`batch_name` = ?";
+			$params[] = $batchName;
+		}
 
-        $whereClause = !empty($where) ? ('WHERE ' . implode(' AND ', $where)) : '';
+		$whereClause = !empty($where) ? ('WHERE ' . implode(' AND ', $where)) : '';
 
-        $sql = "SELECT 
+		$sql = "SELECT 
                     `batch_name`,
                     `created_by`,
                     `package_id`,
@@ -602,78 +602,78 @@ class ActiveCodeService {
                 GROUP BY `batch_name`, `created_by`, `package_id`, `is_trial`
                 ORDER BY `created_at` DESC;";
 
-        $rows = $db->fetchAll($sql, ...$params);
-        $packages = [];
-        $resellers = [];
+		$rows = $db->fetchAll($sql, ...$params);
+		$packages = [];
+		$resellers = [];
 
-        foreach ($rows as &$row) {
-            $pkgId = $row['package_id'];
-            if (!isset($packages[$pkgId])) {
-                $p = PackageService::getById($pkgId);
-                $packages[$pkgId] = $p['package_name'] ?? 'Custom Package';
-            }
-            $row['package_name'] = $packages[$pkgId];
+		foreach ($rows as &$row) {
+			$pkgId = $row['package_id'];
+			if (!isset($packages[$pkgId])) {
+				$p = PackageService::getById($pkgId);
+				$packages[$pkgId] = $p['package_name'] ?? 'Custom Package';
+			}
+			$row['package_name'] = $packages[$pkgId];
 
-            $resellerId = $row['created_by'];
-            if (!isset($resellers[$resellerId])) {
-                $u = UserRepository::getUserById($resellerId);
-                $resellers[$resellerId] = $u['username'] ?? "User #{$resellerId}";
-            }
-            $row['creator_name'] = $resellers[$resellerId];
-            $row['ready_codes'] = $row['stock_count'];
-            $row['active_codes'] = $row['active_count'];
-        }
+			$resellerId = $row['created_by'];
+			if (!isset($resellers[$resellerId])) {
+				$u = UserRepository::getUserById($resellerId);
+				$resellers[$resellerId] = $u['username'] ?? "User #{$resellerId}";
+			}
+			$row['creator_name'] = $resellers[$resellerId];
+			$row['ready_codes'] = $row['stock_count'];
+			$row['active_codes'] = $row['active_count'];
+		}
 
-        return $rows;
-    }
+		return $rows;
+	}
 
-    /**
-     * Export scratch-card formatted text for printing.
-     */
-    public static function exportBatchTxt(string $batchName, array $user, bool $isAdmin): string {
-        $db = self::db();
-        $where = ["`batch_name` = ?"];
-        $params = [$batchName];
+	/**
+	 * Export scratch-card formatted text for printing.
+	 */
+	public static function exportBatchTxt(string $batchName, array $user, bool $isAdmin): string {
+		$db = self::db();
+		$where = ["`batch_name` = ?"];
+		$params = [$batchName];
 
-        if (!$isAdmin) {
-            $allowedReports = (array)($user['reports'] ?? [$user['id']]);
-            $where[] = "`created_by` IN (" . implode(',', array_map('intval', $allowedReports)) . ")";
-        }
+		if (!$isAdmin) {
+			$allowedReports = (array) ($user['reports'] ?? [$user['id']]);
+			$where[] = "`created_by` IN (" . implode(',', array_map('intval', $allowedReports)) . ")";
+		}
 
-        $whereClause = 'WHERE ' . implode(' AND ', $where);
-        $codes = $db->fetchAll("SELECT * FROM `activation_codes` {$whereClause} ORDER BY `id` ASC;", ...$params);
+		$whereClause = 'WHERE ' . implode(' AND ', $where);
+		$codes = $db->fetchAll("SELECT * FROM `activation_codes` {$whereClause} ORDER BY `id` ASC;", ...$params);
 
-        if (empty($codes)) {
-            return "No codes found for batch {$batchName}.\n";
-        }
+		if (empty($codes)) {
+			return "No codes found for batch {$batchName}.\n";
+		}
 
-        $first = $codes[0];
-        $pkg = PackageService::getById($first['package_id']);
-        $pkgName = $pkg['package_name'] ?? 'IPTV Subscription';
-        $portalUrl = DomainResolver::resolve(SERVER_ID);
-        if (!empty($first['dns_base'])) {
-            $portalUrl = rtrim($first['dns_base'], '/');
-        }
+		$first = $codes[0];
+		$pkg = PackageService::getById($first['package_id']);
+		$pkgName = $pkg['package_name'] ?? 'IPTV Subscription';
+		$portalUrl = DomainResolver::resolve(SERVER_ID);
+		if (!empty($first['dns_base'])) {
+			$portalUrl = rtrim($first['dns_base'], '/');
+		}
 
-        $out = "========================================================================\n";
-        $out .= "                   ACTIVATION CODES VOUCHER BATCH                      \n";
-        $out .= "========================================================================\n";
-        $out .= "Batch Name : {$batchName}\n";
-        $out .= "Package    : {$pkgName}\n";
-        $out .= "Generated  : " . date('Y-m-d H:i:s', (int)$first['created_at']) . "\n";
-        $out .= "Total Vouchers: " . count($codes) . "\n";
-        $out .= "Activation Portal: {$portalUrl}/portal\n";
-        $out .= "========================================================================\n\n";
+		$out = "========================================================================\n";
+		$out .= "                   ACTIVATION CODES VOUCHER BATCH                      \n";
+		$out .= "========================================================================\n";
+		$out .= "Batch Name : {$batchName}\n";
+		$out .= "Package    : {$pkgName}\n";
+		$out .= "Generated  : " . date('Y-m-d H:i:s', (int) $first['created_at']) . "\n";
+		$out .= "Total Vouchers: " . count($codes) . "\n";
+		$out .= "Activation Portal: {$portalUrl}/portal\n";
+		$out .= "========================================================================\n\n";
 
-        $i = 1;
-        foreach ($codes as $c) {
-            $statusText = ($c['status'] == 1) ? 'READY / UNUSED' : (($c['status'] == 2) ? 'ACTIVE' : 'REVOKED');
-            $out .= "+----------------------------------------------------------------------+\n";
-            $out .= sprintf("| CARD #%03d  |  CODE: %-25s | %-16s |\n", $i++, $c['activation_code'], $statusText);
-            $out .= sprintf("| Portal: %-42s  Max Conn: %-2d |\n", "{$portalUrl}/portal", (int)$c['max_connections']);
-            $out .= "+----------------------------------------------------------------------+\n\n";
-        }
+		$i = 1;
+		foreach ($codes as $c) {
+			$statusText = ($c['status'] == 1) ? 'READY / UNUSED' : (($c['status'] == 2) ? 'ACTIVE' : 'REVOKED');
+			$out .= "+----------------------------------------------------------------------+\n";
+			$out .= sprintf("| CARD #%03d  |  CODE: %-25s | %-16s |\n", $i++, $c['activation_code'], $statusText);
+			$out .= sprintf("| Portal: %-42s  Max Conn: %-2d |\n", "{$portalUrl}/portal", (int) $c['max_connections']);
+			$out .= "+----------------------------------------------------------------------+\n\n";
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 }
diff --git a/src/Domain/Line/LineRepository.php b/src/Domain/Line/LineRepository.php
index d1f8e414..6a76adf6 100644
--- a/src/Domain/Line/LineRepository.php
+++ b/src/Domain/Line/LineRepository.php
@@ -17,13 +17,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class LineRepository {
 	use DatabaseAware;
+
 	/**
 	 * Bulk delete lines by id.
 	 *
 	 * @param int[] $rIDs Line ids.
 	 * @return bool True on success.
 	 */
-	public static function deleteMany($rIDs) {
+	public static function deleteMany(array $rIDs) {
 		$db = self::db();
 		$rIDs = AdminHelpers::confirmIDs($rIDs);
 
@@ -35,7 +36,7 @@ class LineRepository {
 		$db->query('DELETE FROM `lines` WHERE `id` IN (' . implode(',', $rIDs) . ');');
 		$db->query('DELETE FROM `lines_logs` WHERE `user_id` IN (' . implode(',', $rIDs) . ');');
 		$db->query('UPDATE `lines_activity` SET `user_id` = 0 WHERE `user_id` IN (' . implode(',', $rIDs) . ');');
-		$rPairIDs = array();
+		$rPairIDs = [];
 		$db->query('SELECT `id` FROM `lines` WHERE `pair_id` IN (' . implode(',', $rIDs) . ');');
 
 		foreach ($db->get_rows() as $rRow) {
@@ -60,6 +61,6 @@ class LineRepository {
 	public static function getOutputFormats() {
 		$db = self::db();
 		$db->query('SELECT * FROM `output_formats` ORDER BY `access_output_id` ASC;');
-		return (0 < $db->num_rows() ? $db->get_rows() : array());
+		return (0 < $db->num_rows() ? $db->get_rows() : []);
 	}
 }
diff --git a/src/Domain/Line/LineService.php b/src/Domain/Line/LineService.php
index f0dd2eae..a433fb9c 100644
--- a/src/Domain/Line/LineService.php
+++ b/src/Domain/Line/LineService.php
@@ -26,13 +26,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class LineService {
 	use DatabaseAware;
+
 	/**
 	 * Bulk delete selected lines.
 	 *
 	 * @param array $rData Selected line ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
@@ -41,7 +42,7 @@ class LineService {
 		$rLines = json_decode($rData['lines'], true);
 		LineRepository::deleteMany($rLines);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -50,12 +51,12 @@ class LineService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('massEditLines', $rData)) {
-			$rArray = array();
+			$rArray = [];
 
-			foreach (array('is_stalker', 'is_isplock', 'is_restreamer', 'is_trial') as $rItem) {
+			foreach (['is_stalker', 'is_isplock', 'is_restreamer', 'is_trial'] as $rItem) {
 				if (!isset($rData['c_' . $rItem])) {
 				} else {
 					if (isset($rData[$rItem])) {
@@ -111,7 +112,7 @@ class LineService {
 
 			if (!isset($rData['c_access_output'])) {
 			} else {
-				$rOutputs = array();
+				$rOutputs = [];
 
 				foreach ($rData['access_output'] as $rOutputID) {
 					$rOutputs[] = $rOutputID;
@@ -121,7 +122,7 @@ class LineService {
 
 			if (!isset($rData['c_bouquets'])) {
 			} else {
-				$rArray['bouquet'] = array();
+				$rArray['bouquet'] = [];
 
 				foreach (json_decode($rData['bouquets_selected'], true) as $rBouquet) {
 					if (!is_numeric($rBouquet)) {
@@ -156,12 +157,12 @@ class LineService {
 				foreach ($db->get_rows() as $rRow) {
 					MagService::syncLineDevices($rRow['pair_id']);
 				}
-				LineService::updateLinesSignal($rUsers);
+				self::updateLinesSignal($rUsers);
 			}
 
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -171,7 +172,7 @@ class LineService {
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processLine', $rData)) {
 			if (isset($rData['edit'])) {
@@ -200,7 +201,7 @@ class LineService {
 				$rArray['password'] = AdminHelpers::generateString(10);
 			}
 
-			foreach (array('max_connections', 'enabled', 'admin_enabled') as $rSelection) {
+			foreach (['max_connections', 'enabled', 'admin_enabled'] as $rSelection) {
 				if (isset($rData[$rSelection])) {
 					$rArray[$rSelection] = intval($rData[$rSelection]);
 				} else {
@@ -208,7 +209,7 @@ class LineService {
 				}
 			}
 
-			foreach (array('is_stalker', 'is_restreamer', 'is_trial', 'is_isplock', 'bypass_ua') as $rSelection) {
+			foreach (['is_stalker', 'is_restreamer', 'is_trial', 'is_isplock', 'bypass_ua'] as $rSelection) {
 				if (isset($rData[$rSelection])) {
 					$rArray[$rSelection] = 1;
 				} else {
@@ -232,7 +233,7 @@ class LineService {
 						$rDate = new \DateTime($rData['exp_date']);
 						$rArray['exp_date'] = $rDate->format('U');
 					} catch (\Exception $e) {
-						return array('status' => STATUS_INVALID_DATE, 'data' => $rData);
+						return ['status' => STATUS_INVALID_DATE, 'data' => $rData];
 					}
 				}
 			} else {
@@ -247,7 +248,7 @@ class LineService {
 			if (isset($rData['allowed_ips'])) {
 				if (is_array($rData['allowed_ips'])) {
 				} else {
-					$rData['allowed_ips'] = array($rData['allowed_ips']);
+					$rData['allowed_ips'] = [$rData['allowed_ips']];
 				}
 
 				$rArray['allowed_ips'] = json_encode($rData['allowed_ips']);
@@ -258,7 +259,7 @@ class LineService {
 			if (isset($rData['allowed_ua'])) {
 				if (is_array($rData['allowed_ua'])) {
 				} else {
-					$rData['allowed_ua'] = array($rData['allowed_ua']);
+					$rData['allowed_ua'] = [$rData['allowed_ua']];
 				}
 
 				$rArray['allowed_ua'] = json_encode($rData['allowed_ua']);
@@ -266,7 +267,7 @@ class LineService {
 				$rArray['allowed_ua'] = '[]';
 			}
 
-			$rOutputs = array();
+			$rOutputs = [];
 
 			if (!isset($rData['access_output'])) {
 			} else {
@@ -287,17 +288,17 @@ class LineService {
 				if ($db->query($rQuery, ...$rPrepare['data'])) {
 					$rInsertID = $db->last_insert_id();
 					MagService::syncLineDevices($rInsertID);
-					LineService::updateLineSignal($rInsertID);
+					self::updateLineSignal($rInsertID);
 
-					return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+					return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 				}
 
-				return array('status' => STATUS_FAILURE, 'data' => $rData);
+				return ['status' => STATUS_FAILURE, 'data' => $rData];
 			}
 
-			return array('status' => STATUS_EXISTS_USERNAME, 'data' => $rData);
+			return ['status' => STATUS_EXISTS_USERNAME, 'data' => $rData];
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -308,7 +309,7 @@ class LineService {
 	 * @param bool $rForce  Force the signal even if recently sent.
 	 * @return void
 	 */
-	public static function deleteLineSignal($rUserID, $rForce = false) {
+	public static function deleteLineSignal(int $rUserID, bool $rForce = false) {
 		self::updateLineSignal($rUserID, $rForce);
 	}
 
@@ -319,7 +320,7 @@ class LineService {
 	 * @param bool  $rForce   Force the signal even if recently sent.
 	 * @return void
 	 */
-	public static function deleteLinesSignal($rUserIDs, $rForce = false) {
+	public static function deleteLinesSignal(array $rUserIDs, bool $rForce = false) {
 		self::updateLinesSignal($rUserIDs);
 	}
 
@@ -330,15 +331,15 @@ class LineService {
 	 * @param bool $rForce  Force the signal even if recently sent.
 	 * @return void
 	 */
-	public static function updateLineSignal($rUserID, $rForce = false) {
+	public static function updateLineSignal(int $rUserID, bool $rForce = false) {
 		$db = self::db();
 		$rCached = SettingsManager::get('enable_cache');
 		$rMainID = ConnectionTracker::getMainID();
 		if ($rCached) {
-			$db->query('SELECT COUNT(*) AS `count` FROM `signals` WHERE `server_id` = ? AND `cache` = 1 AND `custom_data` = ?;', $rMainID, json_encode(array('type' => 'update_line', 'id' => $rUserID)));
+			$db->query('SELECT COUNT(*) AS `count` FROM `signals` WHERE `server_id` = ? AND `cache` = 1 AND `custom_data` = ?;', $rMainID, json_encode(['type' => 'update_line', 'id' => $rUserID]));
 			if ($db->get_row()['count'] != 0) {
 			} else {
-				$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', $rMainID, time(), json_encode(array('type' => 'update_line', 'id' => $rUserID)));
+				$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', $rMainID, time(), json_encode(['type' => 'update_line', 'id' => $rUserID]));
 			}
 			return;
 		}
@@ -351,15 +352,15 @@ class LineService {
 	 * @param int[] $rUserIDs Line/user ids.
 	 * @return void
 	 */
-	public static function updateLinesSignal($rUserIDs) {
+	public static function updateLinesSignal(array $rUserIDs) {
 		$db = self::db();
 		$rCached = SettingsManager::get('enable_cache');
 		$rMainID = ConnectionTracker::getMainID();
 		if ($rCached) {
-			$db->query('SELECT COUNT(*) AS `count` FROM `signals` WHERE `server_id` = ? AND `cache` = 1 AND `custom_data` = ?;', $rMainID, json_encode(array('type' => 'update_lines', 'id' => $rUserIDs)));
+			$db->query('SELECT COUNT(*) AS `count` FROM `signals` WHERE `server_id` = ? AND `cache` = 1 AND `custom_data` = ?;', $rMainID, json_encode(['type' => 'update_lines', 'id' => $rUserIDs]));
 			if ($db->get_row()['count'] != 0) {
 			} else {
-				$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', $rMainID, time(), json_encode(array('type' => 'update_lines', 'id' => $rUserIDs)));
+				$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', $rMainID, time(), json_encode(['type' => 'update_lines', 'id' => $rUserIDs]));
 			}
 			return;
 		}
@@ -374,7 +375,7 @@ class LineService {
 	 * @param bool $rCloseCons    Close active connections first.
 	 * @return bool True on success.
 	 */
-	public static function deleteLineById($rID, $rDeletePaired = false, $rCloseCons = true) {
+	public static function deleteLineById(int $rID, bool $rDeletePaired = false, bool $rCloseCons = true) {
 		$db = self::db();
 		$rLine = UserRepository::getLineById($rID);
 
@@ -422,12 +423,12 @@ class LineService {
 	 * @param int $rLimit Window in seconds (default ~28 days).
 	 * @return array Expiring line rows.
 	 */
-	public static function getExpiring($rLimit = 2419200) {
+	public static function getExpiring(int $rLimit = 2419200) {
 		$db = self::db();
 		global $rUserInfo;
 		global $rPermissions;
-		$rReturn = array();
-		$rReports = array_map('intval', array_merge(array($rUserInfo['id']), $rPermissions['all_reports']));
+		$rReturn = [];
+		$rReports = array_map('intval', array_merge([$rUserInfo['id']], $rPermissions['all_reports']));
 
 		if (0 >= count($rReports)) {
 		} else {
@@ -447,7 +448,7 @@ class LineService {
 	 * @param int $rUserID User id.
 	 * @return bool True if trial generation is allowed.
 	 */
-	public static function canGenerateTrials($rUserID) {
+	public static function canGenerateTrials(int $rUserID) {
 		$db = self::db();
 		global $rSettings;
 		$rUser = UserRepository::getRegisteredUserById($rUserID);
diff --git a/src/Domain/Line/PackageService.php b/src/Domain/Line/PackageService.php
index eeed456d..f522021e 100644
--- a/src/Domain/Line/PackageService.php
+++ b/src/Domain/Line/PackageService.php
@@ -20,19 +20,20 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class PackageService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a package from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (isset($rData['edit'])) {
 			if (!Authorization::check('adv', 'edit_package')) {
 				exit();
 			}
-			$rArray = AdminHelpers::overwriteData(PackageService::getById($rData['edit']), $rData);
+			$rArray = AdminHelpers::overwriteData(self::getById($rData['edit']), $rData);
 		} else {
 			if (!Authorization::check('adv', 'add_packages')) {
 				exit();
@@ -42,10 +43,10 @@ class PackageService {
 		}
 
 		if (strlen($rData['package_name']) == 0) {
-			return array('status' => STATUS_INVALID_NAME, 'data' => $rData);
+			return ['status' => STATUS_INVALID_NAME, 'data' => $rData];
 		}
 
-		foreach (array('is_trial', 'is_official', 'is_mag', 'is_e2', 'is_line', 'lock_device', 'is_restreamer', 'is_isplock', 'check_compatible') as $rSelection) {
+		foreach (['is_trial', 'is_official', 'is_mag', 'is_e2', 'is_line', 'lock_device', 'is_restreamer', 'is_isplock', 'check_compatible'] as $rSelection) {
 			if (isset($rData[$rSelection])) {
 				$rArray[$rSelection] = 1;
 			} else {
@@ -58,7 +59,7 @@ class PackageService {
 		$rArray['bouquets'] = '[' . implode(',', array_map('intval', $rArray['bouquets'])) . ']';
 
 		if (isset($rData['output_formats'])) {
-			$rArray['output_formats'] = array();
+			$rArray['output_formats'] = [];
 			foreach ($rData['output_formats'] as $rOutput) {
 				$rArray['output_formats'][] = $rOutput;
 			}
@@ -70,10 +71,10 @@ class PackageService {
 
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -82,7 +83,7 @@ class PackageService {
 	 * @param int $rID Package id.
 	 * @return bool True on deletion, false if not found.
 	 */
-	public static function deleteById($rID) {
+	public static function deleteById(int $rID) {
 		$db = self::db();
 		$rPackage = self::getById($rID);
 
@@ -103,9 +104,9 @@ class PackageService {
 	 * @param string|null $rType  Package type filter, or null for all.
 	 * @return array Package rows.
 	 */
-	public static function getAll($rGroup = null, $rType = null) {
+	public static function getAll(?int $rGroup = null, ?string $rType = null) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `users_packages` ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -129,7 +130,7 @@ class PackageService {
 	 * @param int $rID Package id.
 	 * @return array|null The package row, or null if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `users_packages` WHERE `id` = ?;', $rID);
 
@@ -147,21 +148,21 @@ class PackageService {
 	 * @param int $rIDB Second package id.
 	 * @return bool True if compatible.
 	 */
-	public static function checkCompatible($rIDA, $rIDB) {
+	public static function checkCompatible(int $rIDA, int $rIDB) {
 		$rPackageA = self::getById($rIDA);
 		$rPackageB = self::getById($rIDB);
 		$rCompatible = true;
 
 		if (!($rPackageA && $rPackageB)) {
 		} else {
-			foreach (array('bouquets', 'output_formats') as $rKey) {
+			foreach (['bouquets', 'output_formats'] as $rKey) {
 				if (json_decode($rPackageA[$rKey], true) == json_decode($rPackageB[$rKey], true)) {
 				} else {
 					$rCompatible = false;
 				}
 			}
 
-			foreach (array('is_restreamer', 'is_isplock', 'max_connections', 'force_server_id', 'forced_country', 'lock_device') as $rKey) {
+			foreach (['is_restreamer', 'is_isplock', 'max_connections', 'force_server_id', 'forced_country', 'lock_device'] as $rKey) {
 				if ($rPackageA[$rKey] == $rPackageB[$rKey]) {
 				} else {
 					$rCompatible = false;
diff --git a/src/Domain/Security/BlocklistService.php b/src/Domain/Security/BlocklistService.php
index 0f341676..e8f43636 100644
--- a/src/Domain/Security/BlocklistService.php
+++ b/src/Domain/Security/BlocklistService.php
@@ -20,29 +20,30 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class BlocklistService {
 	use DatabaseAware;
+
 	/**
 	 * Add an IP (or CIDR) to the blocklist.
 	 *
 	 * @param array $rData Submitted IP/notes data.
 	 * @return array Result status payload.
 	 */
-	public static function blockIP($rData) {
+	public static function blockIP(array $rData) {
 		$db = self::db();
 		if (!AdminHelpers::validateCIDR($rData['ip'])) {
-			return array('status' => STATUS_INVALID_IP, 'data' => $rData);
+			return ['status' => STATUS_INVALID_IP, 'data' => $rData];
 		}
 
-		$rArray = array('ip' => $rData['ip'], 'notes' => $rData['notes'], 'date' => time());
+		$rArray = ['ip' => $rData['ip'], 'notes' => $rData['notes'], 'date' => time()];
 		touch(FLOOD_TMP_PATH . 'block_' . $rData['ip']);
 		$rPrepare = QueryHelper::prepareArray($rArray);
 		$rQuery = 'REPLACE INTO `blocked_ips`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -51,13 +52,13 @@ class BlocklistService {
 	 * @param array $rData Submitted ISP data (includes `edit` id when updating).
 	 * @return array Result status payload.
 	 */
-	public static function processISP($rData) {
+	public static function processISP(array $rData) {
 		$db = self::db();
 		if (isset($rData['edit'])) {
 			if (!Authorization::check('adv', 'block_isps')) {
 				exit();
 			}
-			$rArray = AdminHelpers::overwriteData(BlocklistService::getISPById($rData['edit']), $rData);
+			$rArray = AdminHelpers::overwriteData(self::getISPById($rData['edit']), $rData);
 		} else {
 			if (!Authorization::check('adv', 'block_isps')) {
 				exit();
@@ -73,7 +74,7 @@ class BlocklistService {
 		}
 
 		if (strlen($rArray['isp']) == 0) {
-			return array('status' => STATUS_INVALID_NAME, 'data' => $rData);
+			return ['status' => STATUS_INVALID_NAME, 'data' => $rData];
 		}
 
 		$rPrepare = QueryHelper::prepareArray($rArray);
@@ -81,10 +82,10 @@ class BlocklistService {
 
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -93,16 +94,16 @@ class BlocklistService {
 	 * @param array $rData Submitted RTMP IP data (includes `edit` id when updating).
 	 * @return array Result status payload.
 	 */
-	public static function processRTMPIP($rData) {
+	public static function processRTMPIP(array $rData) {
 		$db = self::db();
 		if (isset($rData['edit'])) {
-			$rArray = AdminHelpers::overwriteData(BlocklistService::getRTMPIPById($rData['edit']), $rData);
+			$rArray = AdminHelpers::overwriteData(self::getRTMPIPById($rData['edit']), $rData);
 		} else {
 			$rArray = QueryHelper::verifyPostTable('rtmp_ips', $rData);
 			unset($rArray['id']);
 		}
 
-		foreach (array('push', 'pull') as $rSelection) {
+		foreach (['push', 'pull'] as $rSelection) {
 			if (isset($rData[$rSelection])) {
 				$rArray[$rSelection] = 1;
 			} else {
@@ -111,11 +112,11 @@ class BlocklistService {
 		}
 
 		if (!filter_var($rData['ip'], FILTER_VALIDATE_IP)) {
-			return array('status' => STATUS_INVALID_IP, 'data' => $rData);
+			return ['status' => STATUS_INVALID_IP, 'data' => $rData];
 		}
 
 		if (QueryHelper::checkExists('rtmp_ips', 'ip', $rData['ip'], 'id', $rArray['id'])) {
-			return array('status' => STATUS_EXISTS_IP, 'data' => $rData);
+			return ['status' => STATUS_EXISTS_IP, 'data' => $rData];
 		}
 
 		if (strlen($rData['password']) == 0) {
@@ -127,10 +128,10 @@ class BlocklistService {
 
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -139,10 +140,10 @@ class BlocklistService {
 	 * @param array $rData Submitted user-agent data (includes `edit` id when updating).
 	 * @return array Result status payload.
 	 */
-	public static function processUA($rData) {
+	public static function processUA(array $rData) {
 		$db = self::db();
 		if (isset($rData['edit'])) {
-			$rArray = AdminHelpers::overwriteData(BlocklistService::getUserAgentById($rData['edit']), $rData);
+			$rArray = AdminHelpers::overwriteData(self::getUserAgentById($rData['edit']), $rData);
 		} else {
 			$rArray = QueryHelper::verifyPostTable('blocked_uas', $rData);
 			unset($rArray['id']);
@@ -159,10 +160,10 @@ class BlocklistService {
 
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -173,7 +174,7 @@ class BlocklistService {
 	 * @param bool   $rReturn    Return the matched entry instead of a boolean.
 	 * @return bool|mixed True/match if blocked, false otherwise.
 	 */
-	public static function checkBlockedUAs($rBlockedUA, $rUserAgent, $rReturn = false) {
+	public static function checkBlockedUAs(array $rBlockedUA, string $rUserAgent, bool $rReturn = false) {
 		$rUserAgent = strtolower($rUserAgent);
 		foreach ($rBlockedUA as $rBlocked) {
 			if ($rBlocked['exact_match'] == 1) {
@@ -197,7 +198,7 @@ class BlocklistService {
 	 * @param bool   $rReturn    Return the matched entry instead of acting.
 	 * @return bool|mixed True/match if blocked, false otherwise.
 	 */
-	public static function checkAndBlockUA($rBlockedUA, $rUserAgent, $rReturn = false) {
+	public static function checkAndBlockUA(array $rBlockedUA, string $rUserAgent, bool $rReturn = false) {
 		$db = self::db();
 		$rUserAgent = strtolower($rUserAgent);
 		$rFoundID = false;
@@ -231,7 +232,7 @@ class BlocklistService {
 	 * @param string $rConISP     Connection ISP to test.
 	 * @return bool True if blocked.
 	 */
-	public static function checkISP($rBlockedISP, $rConISP) {
+	public static function checkISP(array $rBlockedISP, string $rConISP) {
 		foreach ($rBlockedISP as $rISP) {
 			if (strtolower($rConISP) == strtolower($rISP['isp'])) {
 				return (bool) intval($rISP['blocked']);
@@ -247,7 +248,7 @@ class BlocklistService {
 	 * @param int|string $rASN            ASN to test.
 	 * @return bool True if blocked.
 	 */
-	public static function checkServer($rBlockedServers, $rASN) {
+	public static function checkServer(array $rBlockedServers, int|string $rASN) {
 		return in_array($rASN, $rBlockedServers);
 	}
 
@@ -259,7 +260,7 @@ class BlocklistService {
 	 * @param string $rIP IP address.
 	 * @return bool True if the IP is a known proxy.
 	 */
-	public static function isProxy($rIP) {
+	public static function isProxy(string $rIP) {
 		$rProxies = self::getProxyIPs();
 		if (isset($rProxies[$rIP])) {
 			return (bool) $rProxies[$rIP];
@@ -273,7 +274,7 @@ class BlocklistService {
 	 * @param bool $rForce Bypass the cache.
 	 * @return array Proxy IPs.
 	 */
-	public static function getProxyIPs($rForce = false) {
+	public static function getProxyIPs(bool $rForce = false) {
 		global $rServers;
 		if (!$rForce) {
 			$rCache = FileCache::getCache('proxy_servers', 20);
@@ -282,7 +283,7 @@ class BlocklistService {
 			}
 		}
 
-		$rOutput = array();
+		$rOutput = [];
 		foreach ($rServers as $rServer) {
 			if ($rServer['server_type'] == 1) {
 				$rOutput[$rServer['server_ip']] = $rServer;
@@ -303,7 +304,7 @@ class BlocklistService {
 	 * @param bool $rForce Bypass the cache.
 	 * @return array Blocked user agents.
 	 */
-	public static function getBlockedUA($rForce = false) {
+	public static function getBlockedUA(bool $rForce = false) {
 		$db = self::db();
 		if (!$rForce) {
 			$rCache = FileCache::getCache('blocked_ua', 20);
@@ -326,7 +327,7 @@ class BlocklistService {
 	 * @param bool $rForce Bypass the cache.
 	 * @return array Blocked IPs.
 	 */
-	public static function getBlockedIPs($rForce = false) {
+	public static function getBlockedIPs(bool $rForce = false) {
 		$db = self::db();
 		if (!$rForce) {
 			$rCache = FileCache::getCache('blocked_ips', 20);
@@ -335,9 +336,9 @@ class BlocklistService {
 			}
 		}
 
-		$rOutput = array();
+		$rOutput = [];
 		$db->query('SELECT `ip` FROM `blocked_ips`');
-		foreach ($db->get_rows() ?: array() as $rRow) {
+		foreach ($db->get_rows() ?: [] as $rRow) {
 			$rOutput[] = $rRow['ip'];
 		}
 
@@ -352,7 +353,7 @@ class BlocklistService {
 	 * @param bool $rForce Bypass the cache.
 	 * @return array Blocked ISPs.
 	 */
-	public static function getBlockedISP($rForce = false) {
+	public static function getBlockedISP(bool $rForce = false) {
 		$db = self::db();
 		if (!$rForce) {
 			$rCache = FileCache::getCache('blocked_isp', 20);
@@ -375,7 +376,7 @@ class BlocklistService {
 	 * @param bool $rForce Bypass the cache.
 	 * @return array Blocked servers/ASNs.
 	 */
-	public static function getBlockedServers($rForce = false) {
+	public static function getBlockedServers(bool $rForce = false) {
 		$db = self::db();
 		if (!$rForce) {
 			$rCache = FileCache::getCache('blocked_servers', 20);
@@ -384,9 +385,9 @@ class BlocklistService {
 			}
 		}
 
-		$rOutput = array();
+		$rOutput = [];
 		$db->query('SELECT `asn` FROM `blocked_asns` WHERE `blocked` = 1;');
-		foreach ($db->get_rows() ?: array() as $rRow) {
+		foreach ($db->get_rows() ?: [] as $rRow) {
 			$rOutput[] = $rRow['asn'];
 		}
 
@@ -402,11 +403,11 @@ class BlocklistService {
 	 */
 	public static function getBlockedIPsSimple() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `blocked_ips` ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
-			foreach ($db->get_rows() ?: array() as $rRow) {
+			foreach ($db->get_rows() ?: [] as $rRow) {
 				$rReturn[] = $rRow;
 			}
 		}
@@ -421,11 +422,11 @@ class BlocklistService {
 	 */
 	public static function getRTMPIPsSimple() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `rtmp_ips` ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
-			foreach ($db->get_rows() ?: array() as $rRow) {
+			foreach ($db->get_rows() ?: [] as $rRow) {
 				$rReturn[] = $rRow;
 			}
 		}
@@ -440,10 +441,10 @@ class BlocklistService {
 	 */
 	public static function getAllowedRTMP() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `ip`, `password`, `push`, `pull` FROM `rtmp_ips`');
-		foreach ($db->get_rows() ?: array() as $rRow) {
-			$rReturn[gethostbyname($rRow['ip'])] = array('password' => $rRow['password'], 'push' => boolval($rRow['push']), 'pull' => boolval($rRow['pull']));
+		foreach ($db->get_rows() ?: [] as $rRow) {
+			$rReturn[gethostbyname($rRow['ip'])] = ['password' => $rRow['password'], 'push' => boolval($rRow['push']), 'pull' => boolval($rRow['pull'])];
 		}
 		return $rReturn;
 	}
@@ -454,7 +455,7 @@ class BlocklistService {
 	 * @param int $rID Entry id.
 	 * @return bool True on success.
 	 */
-	public static function deleteBlockedIP($rID) {
+	public static function deleteBlockedIP(int $rID) {
 		$db = self::db();
 		$db->query('SELECT `id`, `ip` FROM `blocked_ips` WHERE `id` = ?;', $rID);
 
@@ -479,7 +480,7 @@ class BlocklistService {
 	 * @param int $rID Entry id.
 	 * @return bool True on success.
 	 */
-	public static function deleteBlockedISP($rID) {
+	public static function deleteBlockedISP(int $rID) {
 		$db = self::db();
 		$db->query('SELECT `id` FROM `blocked_isps` WHERE `id` = ?;', $rID);
 
@@ -498,7 +499,7 @@ class BlocklistService {
 	 * @param int $rID Entry id.
 	 * @return bool True on success.
 	 */
-	public static function deleteBlockedUA($rID) {
+	public static function deleteBlockedUA(int $rID) {
 		$db = self::db();
 		$db->query('SELECT `id` FROM `blocked_uas` WHERE `id` = ?;', $rID);
 
@@ -524,11 +525,11 @@ class BlocklistService {
 		shell_exec('rm ' . FLOOD_TMP_PATH . 'block_*');
 
 		foreach ($rServers as $rServer) {
-			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(array('action' => 'flush')));
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(['action' => 'flush']));
 		}
 
 		foreach ($rProxyServers as $rServer) {
-			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(array('action' => 'flush')));
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(['action' => 'flush']));
 		}
 
 		return true;
@@ -541,12 +542,12 @@ class BlocklistService {
 	 */
 	public static function getAllUserAgents() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `blocked_uas` ORDER BY `id` ASC;');
 
 		if (0 >= $db->num_rows()) {
 		} else {
-			foreach ($db->get_rows() ?: array() as $rRow) {
+			foreach ($db->get_rows() ?: [] as $rRow) {
 				$rReturn[] = $rRow;
 			}
 		}
@@ -561,12 +562,12 @@ class BlocklistService {
 	 */
 	public static function getAllISPs() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `blocked_isps` ORDER BY `id` ASC;');
 
 		if (0 >= $db->num_rows()) {
 		} else {
-			foreach ($db->get_rows() ?: array() as $rRow) {
+			foreach ($db->get_rows() ?: [] as $rRow) {
 				$rReturn[] = $rRow;
 			}
 		}
@@ -580,7 +581,7 @@ class BlocklistService {
 	 * @param int $rID Entry id.
 	 * @return array|null The row, or null if not found.
 	 */
-	public static function getUserAgentById($rID) {
+	public static function getUserAgentById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `blocked_uas` WHERE `id` = ?;', $rID);
 
@@ -597,7 +598,7 @@ class BlocklistService {
 	 * @param int $rID Entry id.
 	 * @return array|null The row, or null if not found.
 	 */
-	public static function getISPById($rID) {
+	public static function getISPById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `blocked_isps` WHERE `id` = ?;', $rID);
 
@@ -614,7 +615,7 @@ class BlocklistService {
 	 * @param int $rID Entry id.
 	 * @return bool True on success.
 	 */
-	public static function deleteRTMPIP($rID) {
+	public static function deleteRTMPIP(int $rID) {
 		$db = self::db();
 		$db->query('SELECT `id` FROM `rtmp_ips` WHERE `id` = ?;', $rID);
 
@@ -633,7 +634,7 @@ class BlocklistService {
 	 * @param int $rID Entry id.
 	 * @return array|null The row, or null if not found.
 	 */
-	public static function getRTMPIPById($rID) {
+	public static function getRTMPIPById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `rtmp_ips` WHERE `id` = ?;', $rID);
 
diff --git a/src/Domain/Server/ServerRepository.php b/src/Domain/Server/ServerRepository.php
index e5aee842..9543655a 100644
--- a/src/Domain/Server/ServerRepository.php
+++ b/src/Domain/Server/ServerRepository.php
@@ -21,13 +21,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class ServerRepository {
 	use DatabaseAware;
+
 	/**
 	 * Fetch all servers (cached unless forced).
 	 *
 	 * @param bool $rForce Bypass the cache and re-read from the database.
 	 * @return array Server rows keyed by id.
 	 */
-	public static function getAll($rForce = false) {
+	public static function getAll(bool $rForce = false) {
 		global $rSettings;
 		$db = self::db();
 		if (!$rSettings) {
@@ -45,14 +46,14 @@ class ServerRepository {
 		}
 
 		$db->query('SELECT * FROM `servers`');
-		$rServers = array();
-		$rOnlineStatus = array(1);
+		$rServers = [];
+		$rOnlineStatus = [1];
 
-		foreach ($db->get_rows() ?: array() as $rRow) {
+		foreach ($db->get_rows() ?: [] as $rRow) {
 			if (empty($rRow['domain_name'])) {
 				$rURL = escapeshellcmd($rRow['server_ip']);
 			} else {
-				$rURL = str_replace(array('http://', '/', 'https://'), '', escapeshellcmd(explode(',', $rRow['domain_name'])[0]));
+				$rURL = str_replace(['http://', '/', 'https://'], '', escapeshellcmd(explode(',', $rRow['domain_name'])[0]));
 			}
 
 			if ($rRow['enable_https'] == 1) {
@@ -68,18 +69,18 @@ class ServerRepository {
 			$rRow['http_url'] = 'http://' . $rURL . ':' . intval($rRow['http_broadcast_port']) . '/';
 			$rRow['https_url'] = 'https://' . $rURL . ':' . intval($rRow['https_broadcast_port']) . '/';
 			$rRow['rtmp_server'] = 'rtmp://' . $rURL . ':' . intval($rRow['rtmp_port']) . '/live/';
-			$rRow['domains'] = array('protocol' => $rProtocol, 'port' => $rPort, 'urls' => array_filter(array_map('escapeshellcmd', explode(',', $rRow['domain_name'] ?? ''))));
+			$rRow['domains'] = ['protocol' => $rProtocol, 'port' => $rPort, 'urls' => array_filter(array_map('escapeshellcmd', explode(',', $rRow['domain_name'] ?? '')))];
 			$rRow['rtmp_mport_url'] = 'http://127.0.0.1:31210/';
 			$rRow['api_url_ip'] = 'http://' . escapeshellcmd($rRow['server_ip']) . ':' . intval($rRow['http_broadcast_port']) . '/api?password=' . urlencode($rSettings['live_streaming_pass']);
 			$rRow['api_url'] = $rRow['api_url_ip'];
 			$rRow['site_url_ip'] = $rProtocol . '://' . escapeshellcmd($rRow['server_ip']) . ':' . $rPort . '/';
 			$rRow['private_url_ip'] = (!empty($rRow['private_ip']) ? 'http://' . escapeshellcmd($rRow['private_ip']) . ':' . intval($rRow['http_broadcast_port']) . '/' : null);
 			$rRow['public_url_ip'] = 'http://' . escapeshellcmd($rRow['server_ip']) . ':' . intval($rRow['http_broadcast_port']) . '/';
-			$rRow['geoip_countries'] = (empty($rRow['geoip_countries']) ? array() : json_decode($rRow['geoip_countries'], true));
-			$rRow['isp_names'] = (empty($rRow['isp_names']) ? array() : json_decode($rRow['isp_names'], true));
+			$rRow['geoip_countries'] = (empty($rRow['geoip_countries']) ? [] : json_decode($rRow['geoip_countries'], true));
+			$rRow['isp_names'] = (empty($rRow['isp_names']) ? [] : json_decode($rRow['isp_names'], true));
 
 			if (is_numeric($rRow['parent_id'])) {
-				$rRow['parent_id'] = array(intval($rRow['parent_id']));
+				$rRow['parent_id'] = [intval($rRow['parent_id'])];
 			} else {
 				$decoded = json_decode($rRow['parent_id'] ?? '', true);
 				$rRow['parent_id'] = is_array($decoded) ? array_map('intval', $decoded) : [];
@@ -117,12 +118,12 @@ class ServerRepository {
 	 */
 	public static function getAllSimple() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `servers` ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rRow) {
-				$rRow['server_online'] = in_array($rRow['status'], array(1, 3)) && time() - $rRow['last_check_ago'] <= 90 || $rRow['is_main'];
+				$rRow['server_online'] = in_array($rRow['status'], [1, 3]) && time() - $rRow['last_check_ago'] <= 90 || $rRow['is_main'];
 				$rReturn[$rRow['id']] = $rRow;
 			}
 		}
@@ -137,9 +138,9 @@ class ServerRepository {
 	 * @param string $type         State filter (e.g. 'online').
 	 * @return array Streaming server rows.
 	 */
-	public static function getStreamingSimple($rPermissions, $type = 'online') {
+	public static function getStreamingSimple(array $rPermissions, string $type = 'online') {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `servers` WHERE `server_type` = 0 ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -148,7 +149,7 @@ class ServerRepository {
 					$rRow['server_name'] = 'Server #' . ($rRow['id'] ?? 'unknown');
 				}
 
-				$rRow['server_online'] = in_array($rRow['status'], array(1, 3)) && time() - $rRow['last_check_ago'] <= 90 || $rRow['is_main'];
+				$rRow['server_online'] = in_array($rRow['status'], [1, 3]) && time() - $rRow['last_check_ago'] <= 90 || $rRow['is_main'];
 				if (!isset($rRow['order'])) {
 					$rRow['order'] = 0;
 				}
@@ -168,9 +169,9 @@ class ServerRepository {
 	 * @param bool  $rOnline      Restrict to online proxies.
 	 * @return array Proxy server rows.
 	 */
-	public static function getProxySimple($rPermissions, $rOnline = false) {
+	public static function getProxySimple(array $rPermissions, bool $rOnline = false) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `servers` WHERE `server_type` = 1 ORDER BY `id` ASC;');
 
 		if (0 >= $db->num_rows()) {
@@ -180,7 +181,7 @@ class ServerRepository {
 					$rRow['server_name'] = 'Proxy #' . $rRow['id'];
 				}
 
-				$rRow['server_online'] = in_array($rRow['status'], array(1, 3)) && time() - $rRow['last_check_ago'] <= 90 || $rRow['is_main'];
+				$rRow['server_online'] = in_array($rRow['status'], [1, 3]) && time() - $rRow['last_check_ago'] <= 90 || $rRow['is_main'];
 				if (!($rRow['server_online'] == 0 && $rOnline)) {
 					$rReturn[$rRow['id']] = $rRow;
 				}
@@ -196,9 +197,9 @@ class ServerRepository {
 	 * @param int $rServerID Server id.
 	 * @return mixed Free-space information.
 	 */
-	public static function getFreeSpace($rServerID) {
-		$rReturn = array();
-		$rLines = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'get_free_space')), true);
+	public static function getFreeSpace(int $rServerID) {
+		$rReturn = [];
+		$rLines = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'get_free_space']), true);
 
 		if (!is_array($rLines)) {
 			return $rReturn;
@@ -211,7 +212,7 @@ class ServerRepository {
 		foreach ($rLines as $rLine) {
 			$rSplit = explode(' ', preg_replace('!\s+!', ' ', trim($rLine)));
 			if (0 < strlen($rSplit[0]) && strpos($rSplit[5], 'xc_vm') !== false || $rSplit[5] == '/') {
-				$rReturn[] = array('filesystem' => $rSplit[0], 'size' => $rSplit[1], 'used' => $rSplit[2], 'avail' => $rSplit[3], 'percentage' => $rSplit[4], 'mount' => implode(' ', array_slice($rSplit, 5, count($rSplit) - 5)));
+				$rReturn[] = ['filesystem' => $rSplit[0], 'size' => $rSplit[1], 'used' => $rSplit[2], 'avail' => $rSplit[3], 'percentage' => $rSplit[4], 'mount' => implode(' ', array_slice($rSplit, 5, count($rSplit) - 5))];
 			}
 		}
 
@@ -224,19 +225,19 @@ class ServerRepository {
 	 * @param int $rServerID Server id.
 	 * @return mixed Ramdisk information.
 	 */
-	public static function getStreamsRamdisk($rServerID) {
-		$response = ApiClient::systemRequest($rServerID, array('action' => 'streams_ramdisk'));
+	public static function getStreamsRamdisk(int $rServerID) {
+		$response = ApiClient::systemRequest($rServerID, ['action' => 'streams_ramdisk']);
 		$rReturn = json_decode($response, true);
 
 		if (!is_array($rReturn)) {
-			return array();
+			return [];
 		}
 
 		if (empty($rReturn['result'])) {
-			return array();
+			return [];
 		}
 
-		return ($rReturn['streams'] ?? array());
+		return ($rReturn['streams'] ?? []);
 	}
 
 	/**
@@ -246,8 +247,8 @@ class ServerRepository {
 	 * @param int $rPID      Process id to kill.
 	 * @return mixed Result of the kill request.
 	 */
-	public static function killPID($rServerID, $rPID) {
-		ApiClient::systemRequest($rServerID, array('action' => 'kill_pid', 'pid' => $rPID));
+	public static function killPID(int $rServerID, int $rPID) {
+		ApiClient::systemRequest($rServerID, ['action' => 'kill_pid', 'pid' => $rPID]);
 	}
 
 	/**
@@ -256,8 +257,8 @@ class ServerRepository {
 	 * @param int $rServerID Server id.
 	 * @return mixed RTMP stats.
 	 */
-	public static function getRTMPStats($rServerID) {
-		return json_decode(ApiClient::systemRequest($rServerID, array('action' => 'rtmp_stats')), true);
+	public static function getRTMPStats(int $rServerID) {
+		return json_decode(ApiClient::systemRequest($rServerID, ['action' => 'rtmp_stats']), true);
 	}
 
 	/**
@@ -269,7 +270,7 @@ class ServerRepository {
 	 * @param string $rFilename Source file/path.
 	 * @return mixed Probe result.
 	 */
-	public static function checkSource($rServers, $rFFProbe, $rServerID, $rFilename) {
+	public static function checkSource(array $rServers, mixed $rFFProbe, int $rServerID, string $rFilename) {
 		$rAPI = $rServers[intval($rServerID)]['api_url_ip'] . '&action=getFile&filename=' . urlencode($rFilename);
 		$rCommand = 'timeout 10 ' . $rFFProbe . ' -user_agent "Mozilla/5.0" -show_streams -v quiet "' . $rAPI . '" -of json';
 		return json_decode(shell_exec($rCommand), true);
@@ -281,7 +282,7 @@ class ServerRepository {
 	 * @param int $rServerID Server id.
 	 * @return mixed SSL log contents.
 	 */
-	public static function getSSLLog($rServerID) {
+	public static function getSSLLog(int $rServerID) {
 		global $rServers;
 		$rServer = $rServers[intval($rServerID)] ?? null;
 		if (!$rServer || empty($rServer['api_url_ip'])) {
@@ -301,8 +302,8 @@ class ServerRepository {
 	 * @param int $rServerID Server id.
 	 * @return mixed Result of the request.
 	 */
-	public static function freeTemp($rServerID) {
-		ApiClient::systemRequest($rServerID, array('action' => 'free_temp'));
+	public static function freeTemp(int $rServerID) {
+		ApiClient::systemRequest($rServerID, ['action' => 'free_temp']);
 	}
 
 	/**
@@ -311,8 +312,8 @@ class ServerRepository {
 	 * @param int $rServerID Server id.
 	 * @return mixed Result of the request.
 	 */
-	public static function freeStreams($rServerID) {
-		ApiClient::systemRequest($rServerID, array('action' => 'free_streams'));
+	public static function freeStreams(int $rServerID) {
+		ApiClient::systemRequest($rServerID, ['action' => 'free_streams']);
 	}
 
 	/**
@@ -326,8 +327,8 @@ class ServerRepository {
 	 * @param mixed       $rHeaders   Optional extra headers.
 	 * @return mixed Probe result.
 	 */
-	public static function probeSource($rServerID, $rURL, $rUserAgent = null, $rProxy = null, $rCookies = null, $rHeaders = null) {
-		return json_decode(ApiClient::systemRequest($rServerID, array('action' => 'probe', 'url' => $rURL, 'user_agent' => $rUserAgent, 'http_proxy' => $rProxy, 'cookies' => $rCookies, 'headers' => $rHeaders), 30), true);
+	public static function probeSource(int $rServerID, string $rURL, ?string $rUserAgent = null, mixed $rProxy = null, ?string $rCookies = null, mixed $rHeaders = null) {
+		return json_decode(ApiClient::systemRequest($rServerID, ['action' => 'probe', 'url' => $rURL, 'user_agent' => $rUserAgent, 'http_proxy' => $rProxy, 'cookies' => $rCookies, 'headers' => $rHeaders], 30), true);
 	}
 
 	/**
@@ -337,10 +338,10 @@ class ServerRepository {
 	 * @param int|null $rReplaceWith Replacement server id for reassignment.
 	 * @return bool True on success.
 	 */
-	public static function deleteById($rID, $rReplaceWith = null) {
+	public static function deleteById(int $rID, ?int $rReplaceWith = null) {
 		global $rSettings;
 		$db = self::db();
-		$rServer = ServerRepository::getById($rID);
+		$rServer = self::getById($rID);
 
 		if (!$rServer || $rServer['is_main']) {
 			return false;
@@ -377,7 +378,7 @@ class ServerRepository {
 	 * @param bool $rForce Bypass the cache.
 	 * @return array Allowed domains.
 	 */
-	public static function getAllowedDomains($rForce = false) {
+	public static function getAllowedDomains(bool $rForce = false) {
 		$db = self::db();
 		if (!$rForce) {
 			$rCache = FileCache::getCache('allowed_domains', 20);
@@ -385,7 +386,7 @@ class ServerRepository {
 				return $rCache;
 			}
 		}
-		$rDomains = array('127.0.0.1', 'localhost');
+		$rDomains = ['127.0.0.1', 'localhost'];
 		$db->query('SELECT `server_ip`, `private_ip`, `domain_name` FROM `servers` WHERE `enabled` = 1;');
 		foreach ($db->get_rows() as $rRow) {
 			foreach (explode(',', $rRow['domain_name']) as $rDomain) {
@@ -415,7 +416,7 @@ class ServerRepository {
 	 * @param bool $rForce Bypass the cache.
 	 * @return array Allowed IPs.
 	 */
-	public static function getAllowedIPs($rForce = false) {
+	public static function getAllowedIPs(bool $rForce = false) {
 		global $rServers, $rSettings;
 		if ($rForce) {
 		} else {
@@ -425,7 +426,7 @@ class ServerRepository {
 				return $rCache;
 			}
 		}
-		$rIPs = array('127.0.0.1');
+		$rIPs = ['127.0.0.1'];
 		$rServerAddr = ($_SERVER['SERVER_ADDR'] ?? null);
 		if (!empty($rServerAddr)) {
 			$rIPs[] = $rServerAddr;
@@ -464,7 +465,7 @@ class ServerRepository {
 	public static function getLocalRTMPStats() {
 		global $rServers;
 		$rURL = $rServers[SERVER_ID]['rtmp_mport_url'] . 'stat';
-		$rContext = stream_context_create(array('http' => array('timeout' => 1)));
+		$rContext = stream_context_create(['http' => ['timeout' => 1]]);
 		$rXML = file_get_contents($rURL, false, $rContext);
 		return json_decode(json_encode(simplexml_load_string($rXML, 'SimpleXMLElement', LIBXML_NOCDATA)), true);
 	}
@@ -476,7 +477,7 @@ class ServerRepository {
 	 * @param string|null $rForceProtocol Force http/https.
 	 * @return string Public URL.
 	 */
-	public static function getPublicURL($rServerID = null, $rForceProtocol = null) {
+	public static function getPublicURL(?int $rServerID = null, ?string $rForceProtocol = null) {
 		global $rSettings, $rServers;
 		$rOriginatorID = null;
 		if (isset($rServerID)) {
@@ -533,7 +534,7 @@ class ServerRepository {
 	 * @param int $rID Server id.
 	 * @return array|null The server row, or null if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `servers` WHERE `id` = ?;', $rID);
 
diff --git a/src/Domain/Server/ServerService.php b/src/Domain/Server/ServerService.php
index ecee8d1e..be05626d 100644
--- a/src/Domain/Server/ServerService.php
+++ b/src/Domain/Server/ServerService.php
@@ -21,13 +21,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class ServerService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a server from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (!Authorization::check('adv', 'edit_server')) {
 			exit();
@@ -35,24 +36,24 @@ class ServerService {
 
 		$rServer = ServerRepository::getById($rData['edit']);
 		if (!$rServer) {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 
 		$rArray = QueryHelper::verifyPostTable('servers', $rData, true);
-		$rPorts = array('http' => array(), 'https' => array());
+		$rPorts = ['http' => [], 'https' => []];
 
 		if (!isset($rData['http_broadcast_ports']) || !is_array($rData['http_broadcast_ports'])) {
-			$rData['http_broadcast_ports'] = array();
+			$rData['http_broadcast_ports'] = [];
 		}
 		if (!isset($rData['https_broadcast_ports']) || !is_array($rData['https_broadcast_ports'])) {
-			$rData['https_broadcast_ports'] = array();
+			$rData['https_broadcast_ports'] = [];
 		}
 		if (!isset($rData['rtmp_port']) || !is_numeric($rData['rtmp_port'])) {
 			$rData['rtmp_port'] = $rServer['rtmp_port'] ?? 8880;
 		}
 
 		foreach ($rData['http_broadcast_ports'] as $rPort) {
-			if (is_numeric($rPort) && 80 <= $rPort && $rPort <= 65535 && !in_array($rPort, ($rPorts['http'] ?: array())) && $rPort != $rData['rtmp_port']) {
+			if (is_numeric($rPort) && 80 <= $rPort && $rPort <= 65535 && !in_array($rPort, ($rPorts['http'] ?: [])) && $rPort != $rData['rtmp_port']) {
 				$rPorts['http'][] = $rPort;
 			}
 		}
@@ -60,7 +61,7 @@ class ServerService {
 		unset($rData['http_broadcast_ports']);
 
 		foreach ($rData['https_broadcast_ports'] as $rPort) {
-			if (is_numeric($rPort) && 80 <= $rPort && $rPort <= 65535 && !in_array($rPort, ($rPorts['http'] ?: array())) && !in_array($rPort, ($rPorts['https'] ?: array())) && $rPort != $rData['rtmp_port']) {
+			if (is_numeric($rPort) && 80 <= $rPort && $rPort <= 65535 && !in_array($rPort, ($rPorts['http'] ?: [])) && !in_array($rPort, ($rPorts['https'] ?: [])) && $rPort != $rData['rtmp_port']) {
 				$rPorts['https'][] = $rPort;
 			}
 		}
@@ -85,7 +86,7 @@ class ServerService {
 			}
 		}
 
-		foreach (array('enable_gzip', 'timeshift_only', 'enable_https', 'random_ip', 'enable_geoip', 'enable_isp', 'enabled', 'enable_proxy') as $rKey) {
+		foreach (['enable_gzip', 'timeshift_only', 'enable_https', 'random_ip', 'enable_geoip', 'enable_isp', 'enabled', 'enable_proxy'] as $rKey) {
 			$rArray[$rKey] = isset($rData[$rKey]) ? 1 : 0;
 		}
 
@@ -99,21 +100,21 @@ class ServerService {
 		}
 
 		if (isset($rData['geoip_countries'])) {
-			$rArray['geoip_countries'] = array();
+			$rArray['geoip_countries'] = [];
 			foreach ($rData['geoip_countries'] as $rCountry) {
 				$rArray['geoip_countries'][] = $rCountry;
 			}
 		} else {
-			$rArray['geoip_countries'] = array();
+			$rArray['geoip_countries'] = [];
 		}
 
 		if (isset($rData['isp_names'])) {
-			$rArray['isp_names'] = array();
+			$rArray['isp_names'] = [];
 			foreach ($rData['isp_names'] as $rISP) {
 				$rArray['isp_names'][] = strtolower(trim(preg_replace('/[^A-Za-z0-9 ]/', '', $rISP)));
 			}
 		} else {
-			$rArray['isp_names'] = array();
+			$rArray['isp_names'] = [];
 		}
 
 		if (isset($rData['domain_name'])) {
@@ -123,10 +124,10 @@ class ServerService {
 		}
 
 		if (strlen($rData['server_ip']) == 0 || !filter_var($rData['server_ip'], FILTER_VALIDATE_IP)) {
-			return array('status' => STATUS_INVALID_IP, 'data' => $rData);
+			return ['status' => STATUS_INVALID_IP, 'data' => $rData];
 		}
 		if (0 < strlen($rData['private_ip']) && !filter_var($rData['private_ip'], FILTER_VALIDATE_IP)) {
-			return array('status' => STATUS_INVALID_IP, 'data' => $rData);
+			return ['status' => STATUS_INVALID_IP, 'data' => $rData];
 		}
 
 		$rArray['total_services'] = $rData['total_services'];
@@ -135,31 +136,31 @@ class ServerService {
 		$rQuery = 'UPDATE `servers` SET ' . $rPrepare['update'] . ' WHERE `id` = ?;';
 
 		if (!$db->query($rQuery, ...$rPrepare['data'])) {
-			return array('status' => STATUS_FAILURE, 'data' => $rData);
+			return ['status' => STATUS_FAILURE, 'data' => $rData];
 		}
 
 		$rInsertID = $rData['edit'];
-		$rPorts = array('http' => array(), 'https' => array());
-		foreach (array_merge(array(intval($rArray['http_broadcast_port'])), explode(',', $rArray['http_ports_add'])) as $rPort) {
+		$rPorts = ['http' => [], 'https' => []];
+		foreach (array_merge([intval($rArray['http_broadcast_port'])], explode(',', $rArray['http_ports_add'])) as $rPort) {
 			if (is_numeric($rPort) && 0 < $rPort && $rPort <= 65535) {
 				$rPorts['http'][] = intval($rPort);
 			}
 		}
-		foreach (array_merge(array(intval($rArray['https_broadcast_port'])), explode(',', $rArray['https_ports_add'])) as $rPort) {
+		foreach (array_merge([intval($rArray['https_broadcast_port'])], explode(',', $rArray['https_ports_add'])) as $rPort) {
 			if (is_numeric($rPort) && 0 < $rPort && $rPort <= 65535) {
 				$rPorts['https'][] = intval($rPort);
 			}
 		}
-		ServerService::changePort($rInsertID, 0, $rPorts['http'], false);
-		ServerService::changePort($rInsertID, 1, $rPorts['https'], false);
-		ServerService::changePort($rInsertID, 2, array($rArray['rtmp_port']), false);
-		ServerService::setServices($rInsertID, intval($rArray['total_services']), true);
+		self::changePort($rInsertID, 0, $rPorts['http'], false);
+		self::changePort($rInsertID, 1, $rPorts['https'], false);
+		self::changePort($rInsertID, 2, [$rArray['rtmp_port']], false);
+		self::setServices($rInsertID, intval($rArray['total_services']), true);
 
 		if (!empty($rArray['governor'])) {
-			ServerService::setGovernor($rInsertID, $rArray['governor']);
+			self::setGovernor($rInsertID, $rArray['governor']);
 		}
 		if (!empty($rArray['sysctl'])) {
-			ServerService::setSysctl($rInsertID, $rArray['sysctl']);
+			self::setSysctl($rInsertID, $rArray['sysctl']);
 		}
 		if (file_exists(CACHE_TMP_PATH . 'servers')) {
 			unlink(CACHE_TMP_PATH . 'servers');
@@ -176,12 +177,12 @@ class ServerService {
 
 		$rDisableRamdisk = !empty($rData['disable_ramdisk']);
 		if ($rDisableRamdisk && $rMounted) {
-			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rInsertID, time(), json_encode(array('action' => 'disable_ramdisk')));
-		} else if (!$rDisableRamdisk && !$rMounted) {
-			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rInsertID, time(), json_encode(array('action' => 'enable_ramdisk')));
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rInsertID, time(), json_encode(['action' => 'disable_ramdisk']));
+		} elseif (!$rDisableRamdisk && !$rMounted) {
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rInsertID, time(), json_encode(['action' => 'enable_ramdisk']));
 		}
 
-		return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+		return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 	}
 
 	/**
@@ -190,24 +191,24 @@ class ServerService {
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function processProxy($rData) {
+	public static function processProxy(array $rData) {
 		$db = self::db();
 		if (!Authorization::check('adv', 'edit_server')) {
 			exit();
 		}
 
 		$rArray = AdminHelpers::overwriteData(ServerRepository::getById($rData['edit']), $rData);
-		foreach (array('enable_https', 'random_ip', 'enable_geoip', 'enabled') as $rKey) {
+		foreach (['enable_https', 'random_ip', 'enable_geoip', 'enabled'] as $rKey) {
 			$rArray[$rKey] = isset($rData[$rKey]);
 		}
 
 		if (isset($rData['geoip_countries'])) {
-			$rArray['geoip_countries'] = array();
+			$rArray['geoip_countries'] = [];
 			foreach ($rData['geoip_countries'] as $rCountry) {
 				$rArray['geoip_countries'][] = $rCountry;
 			}
 		} else {
-			$rArray['geoip_countries'] = array();
+			$rArray['geoip_countries'] = [];
 		}
 
 		if (isset($rData['domain_name'])) {
@@ -217,10 +218,10 @@ class ServerService {
 		}
 
 		if (strlen($rData['server_ip']) == 0 || !filter_var($rData['server_ip'], FILTER_VALIDATE_IP)) {
-			return array('status' => STATUS_INVALID_IP, 'data' => $rData);
+			return ['status' => STATUS_INVALID_IP, 'data' => $rData];
 		}
 		if (QueryHelper::checkExists('servers', 'server_ip', $rData['server_ip'], 'id', $rArray['id'])) {
-			return array('status' => STATUS_EXISTS_IP, 'data' => $rData);
+			return ['status' => STATUS_EXISTS_IP, 'data' => $rData];
 		}
 
 		$rArray['server_type'] = 1;
@@ -235,10 +236,10 @@ class ServerService {
 			if (file_exists(CACHE_TMP_PATH . 'proxy_servers')) {
 				unlink(CACHE_TMP_PATH . 'proxy_servers');
 			}
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -249,13 +250,13 @@ class ServerService {
 	 * @param array $rProxyServers Existing proxy servers configuration.
 	 * @return array Result status payload.
 	 */
-	public static function install($rData, $rServers, $rProxyServers) {
+	public static function install(array $rData, array $rServers, array $rProxyServers) {
 		$db = self::db();
 		if (!Authorization::check('adv', 'add_server')) {
 			exit();
 		}
 
-		$rParentIDs = array();
+		$rParentIDs = [];
 		$rUpdateSysctl = isset($rData['update_sysctl']) ? 1 : 0;
 		$rPrivateIP = isset($rData['use_private_ip']) ? 1 : 0;
 
@@ -274,7 +275,7 @@ class ServerService {
 				$rServer = $rServers[$rData['edit']];
 			}
 			if (!$rServer) {
-				return array('status' => STATUS_FAILURE, 'data' => $rData);
+				return ['status' => STATUS_FAILURE, 'data' => $rData];
 			}
 
 			$db->query('UPDATE `servers` SET `status` = 3, `parent_id` = ? WHERE `id` = ?;', '[' . implode(',', $rParentIDs) . ']', $rServer['id']);
@@ -284,7 +285,7 @@ class ServerService {
 				$rCommand = PHP_BIN . ' ' . MAIN_HOME . 'console.php server:install ' . intval($rData['type']) . ' ' . intval($rServer['id']) . ' ' . intval($rData['ssh_port']) . ' ' . escapeshellarg($rData['root_username']) . ' ' . escapeshellarg($rData['root_password']) . ' 80 443 ' . intval($rUpdateSysctl) . ' > "' . BIN_PATH . 'install/' . intval($rServer['id']) . '.install" 2>/dev/null &';
 			}
 			shell_exec($rCommand);
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rServer['id']));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rServer['id']]];
 		}
 
 		$rArray = QueryHelper::verifyPostTable('servers', $rData);
@@ -292,7 +293,7 @@ class ServerService {
 		unset($rArray['id']);
 
 		if (strlen($rArray['server_ip']) == 0 || !filter_var($rArray['server_ip'], FILTER_VALIDATE_IP)) {
-			return array('status' => STATUS_INVALID_IP, 'data' => $rData);
+			return ['status' => STATUS_INVALID_IP, 'data' => $rData];
 		}
 
 		if ($rData['type'] == 1) {
@@ -307,7 +308,7 @@ class ServerService {
 		$rQuery = 'INSERT INTO `servers`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 		if (!$db->query($rQuery, ...$rPrepare['data'])) {
-			return array('status' => STATUS_FAILURE, 'data' => $rData);
+			return ['status' => STATUS_FAILURE, 'data' => $rData];
 		}
 
 		$rInsertID = $db->last_insert_id();
@@ -322,7 +323,7 @@ class ServerService {
 		}
 
 		shell_exec($rCommand);
-		return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+		return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 	}
 
 	/**
@@ -331,7 +332,7 @@ class ServerService {
 	 * @param array $rData Ordered server ids.
 	 * @return array ['status' => STATUS_* constant].
 	 */
-	public static function reorder($rData) {
+	public static function reorder(array $rData) {
 		$db = self::db();
 		$rPostServers = json_decode($rData['server_order'], true);
 		if (count($rPostServers) > 0) {
@@ -340,7 +341,7 @@ class ServerService {
 			}
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -352,9 +353,9 @@ class ServerService {
 	 * @param bool  $rReload   Reload services after the change.
 	 * @return mixed Result.
 	 */
-	public static function changePort($rServerID, $rType, $rPorts, $rReload = false) {
+	public static function changePort(int $rServerID, int $rType, mixed $rPorts, bool $rReload = false) {
 		$db = self::db();
-		$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(array('action' => 'set_port', 'type' => intval($rType), 'ports' => $rPorts, 'reload' => $rReload)));
+		$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(['action' => 'set_port', 'type' => intval($rType), 'ports' => $rPorts, 'reload' => $rReload]));
 	}
 
 	/**
@@ -365,9 +366,9 @@ class ServerService {
 	 * @param bool $rReload      Reload services after the change.
 	 * @return mixed Result.
 	 */
-	public static function setServices($rServerID, $rNumServices, $rReload = true) {
+	public static function setServices(int $rServerID, int $rNumServices, bool $rReload = true) {
 		$db = self::db();
-		$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(array('action' => 'set_services', 'count' => intval($rNumServices), 'reload' => $rReload)));
+		$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(['action' => 'set_services', 'count' => intval($rNumServices), 'reload' => $rReload]));
 	}
 
 	/**
@@ -377,9 +378,9 @@ class ServerService {
 	 * @param string $rGovernor Governor name (e.g. performance).
 	 * @return mixed Result.
 	 */
-	public static function setGovernor($rServerID, $rGovernor) {
+	public static function setGovernor(int $rServerID, string $rGovernor) {
 		$db = self::db();
-		$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(array('action' => 'set_governor', 'data' => $rGovernor)));
+		$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(['action' => 'set_governor', 'data' => $rGovernor]));
 	}
 
 	/**
@@ -389,9 +390,9 @@ class ServerService {
 	 * @param mixed $rSysCtl   Sysctl key/values to apply.
 	 * @return mixed Result.
 	 */
-	public static function setSysctl($rServerID, $rSysCtl) {
+	public static function setSysctl(int $rServerID, mixed $rSysCtl) {
 		$db = self::db();
-		$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(array('action' => 'set_sysctl', 'data' => $rSysCtl)));
+		$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServerID, time(), json_encode(['action' => 'set_sysctl', 'data' => $rSysCtl]));
 	}
 
 	/**
@@ -403,7 +404,7 @@ class ServerService {
 		global $rServers;
 		foreach (array_keys($rServers) as $rServerID) {
 			if ($rServers[$rServerID]['server_online']) {
-				ApiClient::systemRequest($rServerID, array('action' => 'restore_images'));
+				ApiClient::systemRequest($rServerID, ['action' => 'restore_images']);
 			}
 		}
 
@@ -423,7 +424,7 @@ class ServerService {
 		foreach ($db->get_rows() as $rRow) {
 			if (!$rServers[$rRow['server_id']]['server_online']) {
 			} else {
-				ApiClient::systemRequest($rRow['server_id'], array('action' => 'kill_plex'));
+				ApiClient::systemRequest($rRow['server_id'], ['action' => 'kill_plex']);
 			}
 		}
 
diff --git a/src/Domain/Server/SettingsService.php b/src/Domain/Server/SettingsService.php
index 4d064455..042707b8 100644
--- a/src/Domain/Server/SettingsService.php
+++ b/src/Domain/Server/SettingsService.php
@@ -20,6 +20,7 @@ use XcVm\Streaming\Fanout\FanoutConfig;
 
 class SettingsService {
 	use DatabaseAware;
+
 	/**
 	 * The fanout idle buffer ratio as the daemon takes it (0.1-1, two decimals),
 	 * or null when the submitted value is not a number.
@@ -31,7 +32,7 @@ class SettingsService {
 	 * @param mixed $rValue The submitted value.
 	 * @return float|null
 	 */
-	public static function normalizeIdleBufferRatio($rValue): ?float {
+	public static function normalizeIdleBufferRatio(mixed $rValue): ?float {
 		$rValue = str_replace(',', '.', trim((string) $rValue));
 		if ($rValue === '' || !is_numeric($rValue)) {
 			return null;
@@ -45,16 +46,16 @@ class SettingsService {
 	 * @param array $rData Submitted settings.
 	 * @return array Result status payload.
 	 */
-	public static function edit($rData) {
+	public static function edit(array $rData) {
 		$db = self::db();
-		foreach (array('user_agent', 'http_proxy', 'cookie', 'headers') as $rKey) {
+		foreach (['user_agent', 'http_proxy', 'cookie', 'headers'] as $rKey) {
 			$db->query('UPDATE `streams_arguments` SET `argument_default_value` = ? WHERE `argument_key` = ?;', ($rData[$rKey] ?: null), $rKey);
 			unset($rData[$rKey]);
 		}
 
 		$rArray = QueryHelper::verifyPostTable('settings', $rData, true);
 
-		foreach (array('php_loopback', 'restreamer_bypass_proxy', 'request_prebuffer', 'modal_edit', 'group_buttons', 'enable_search', 'on_demand_checker', 'ondemand_balance_equal', 'disable_mag_token', 'allow_cdn_access', 'dts_legacy_ffmpeg', 'mag_load_all_channels', 'disable_xmltv_restreamer', 'disable_playlist_restreamer', 'ffmpeg_warnings', 'reseller_ssl_domain', 'extract_subtitles', 'show_category_duplicates', 'vod_sort_newest', 'header_stats', 'mag_keep_extension', 'keep_protocol', 'read_native_hls', 'player_allow_playlist', 'player_allow_bouquet', 'player_hide_incompatible', 'player_allow_hevc', 'force_epg_timezone', 'check_vod', 'ignore_keyframes', 'save_login_logs', 'save_restart_logs', 'mag_legacy_redirect', 'restrict_playlists', 'monitor_connection_status', 'kill_rogue_ffmpeg', 'show_images', 'on_demand_instant_off', 'on_demand_failure_exit', 'playlist_from_mysql', 'ignore_invalid_users', 'legacy_mag_auth', 'ministra_allow_blank', 'block_proxies', 'block_streaming_servers', 'ip_subnet_match', 'auto_unban_ip', 'debug_show_errors', 'enable_debug_stalker', 'restart_php_fpm', 'restream_deny_unauthorised', 'api_probe', 'legacy_panel_api', 'hide_failures', 'verify_host', 'encrypt_playlist', 'encrypt_playlist_restreamer', 'mag_disable_ssl', 'legacy_get', 'legacy_xmltv', 'save_closed_connection', 'show_tickets', 'stream_logs_save', 'client_logs_save', 'streams_grouped', 'cloudflare', 'cleanup', 'dashboard_stats', 'dashboard_status', 'dashboard_map', 'dashboard_display_alt', 'recaptcha_enable', 'ip_logout', 'disable_player_api', 'disable_playlist', 'disable_xmltv', 'disable_enigma2', 'disable_ministra', 'enable_isp_lock', 'block_svp', 'disable_ts', 'disable_ts_allow_restream', 'disable_hls', 'disable_hls_allow_restream', 'disable_rtmp', 'disable_rtmp_allow_restream', 'case_sensitive_line', 'county_override_1st', 'disallow_2nd_ip_con', 'use_mdomain_in_lists', 'encrypt_hls', 'disallow_empty_user_agents', 'detect_restream_block_user', 'download_images', 'api_redirect', 'use_buffer', 'audio_restart_loss', 'show_isps', 'priority_backup', 'rtmp_random', 'show_connected_video', 'show_not_on_air_video', 'show_banned_video', 'show_expired_video', 'show_expiring_video', 'show_all_category_mag', 'always_enabled_subtitles', 'enable_connection_problem_indication', 'show_tv_channel_logo', 'show_channel_logo_in_preview', 'disable_trial', 'restrict_same_ip', 'fanout_source_insecure', 'fanout_supervise', 'secure_stream_tokens', 'js_navigate') as $rSetting) {
+		foreach (['php_loopback', 'restreamer_bypass_proxy', 'request_prebuffer', 'modal_edit', 'group_buttons', 'enable_search', 'on_demand_checker', 'ondemand_balance_equal', 'disable_mag_token', 'allow_cdn_access', 'dts_legacy_ffmpeg', 'mag_load_all_channels', 'disable_xmltv_restreamer', 'disable_playlist_restreamer', 'ffmpeg_warnings', 'reseller_ssl_domain', 'extract_subtitles', 'show_category_duplicates', 'vod_sort_newest', 'header_stats', 'mag_keep_extension', 'keep_protocol', 'read_native_hls', 'player_allow_playlist', 'player_allow_bouquet', 'player_hide_incompatible', 'player_allow_hevc', 'force_epg_timezone', 'check_vod', 'ignore_keyframes', 'save_login_logs', 'save_restart_logs', 'mag_legacy_redirect', 'restrict_playlists', 'monitor_connection_status', 'kill_rogue_ffmpeg', 'show_images', 'on_demand_instant_off', 'on_demand_failure_exit', 'playlist_from_mysql', 'ignore_invalid_users', 'legacy_mag_auth', 'ministra_allow_blank', 'block_proxies', 'block_streaming_servers', 'ip_subnet_match', 'auto_unban_ip', 'debug_show_errors', 'enable_debug_stalker', 'restart_php_fpm', 'restream_deny_unauthorised', 'api_probe', 'legacy_panel_api', 'hide_failures', 'verify_host', 'encrypt_playlist', 'encrypt_playlist_restreamer', 'mag_disable_ssl', 'legacy_get', 'legacy_xmltv', 'save_closed_connection', 'show_tickets', 'stream_logs_save', 'client_logs_save', 'streams_grouped', 'cloudflare', 'cleanup', 'dashboard_stats', 'dashboard_status', 'dashboard_map', 'dashboard_display_alt', 'recaptcha_enable', 'ip_logout', 'disable_player_api', 'disable_playlist', 'disable_xmltv', 'disable_enigma2', 'disable_ministra', 'enable_isp_lock', 'block_svp', 'disable_ts', 'disable_ts_allow_restream', 'disable_hls', 'disable_hls_allow_restream', 'disable_rtmp', 'disable_rtmp_allow_restream', 'case_sensitive_line', 'county_override_1st', 'disallow_2nd_ip_con', 'use_mdomain_in_lists', 'encrypt_hls', 'disallow_empty_user_agents', 'detect_restream_block_user', 'download_images', 'api_redirect', 'use_buffer', 'audio_restart_loss', 'show_isps', 'priority_backup', 'rtmp_random', 'show_connected_video', 'show_not_on_air_video', 'show_banned_video', 'show_expired_video', 'show_expiring_video', 'show_all_category_mag', 'always_enabled_subtitles', 'enable_connection_problem_indication', 'show_tv_channel_logo', 'show_channel_logo_in_preview', 'disable_trial', 'restrict_same_ip', 'fanout_source_insecure', 'fanout_supervise', 'secure_stream_tokens', 'js_navigate'] as $rSetting) {
 			if (isset($rData[$rSetting])) {
 				$rArray[$rSetting] = 1;
 			} else {
@@ -77,23 +78,23 @@ class SettingsService {
 		}
 
 		if (!isset($rData['allowed_stb_types_for_local_recording'])) {
-			$rArray['allowed_stb_types_for_local_recording'] = array();
+			$rArray['allowed_stb_types_for_local_recording'] = [];
 		}
 
 		if (!isset($rData['allowed_stb_types'])) {
-			$rArray['allowed_stb_types'] = array();
+			$rArray['allowed_stb_types'] = [];
 		}
 
 		if (!isset($rData['maxmind_editions'])) {
-			$rArray['maxmind_editions'] = array();
+			$rArray['maxmind_editions'] = [];
 		}
 
 		if (!isset($rData['shared_mount_prefixes'])) {
-			$rArray['shared_mount_prefixes'] = array();
+			$rArray['shared_mount_prefixes'] = [];
 		}
 
 		if (!isset($rData['allow_countries'])) {
-			$rArray['allow_countries'] = array('ALL');
+			$rArray['allow_countries'] = ['ALL'];
 		}
 
 		if (100 < $rArray['search_items']) {
@@ -112,17 +113,17 @@ class SettingsService {
 
 		$rPrepare = QueryHelper::prepareArray($rArray);
 		if (count($rPrepare['data']) <= 0) {
-			return array('status' => STATUS_FAILURE);
+			return ['status' => STATUS_FAILURE];
 		}
 
 		$rQuery = 'UPDATE `settings` SET ' . $rPrepare['update'] . ';';
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			SettingsManager::clearCache();
 			FanoutConfig::sync($rArray);
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		}
 
-		return array('status' => STATUS_FAILURE);
+		return ['status' => STATUS_FAILURE];
 	}
 
 	/**
@@ -131,11 +132,11 @@ class SettingsService {
 	 * @param array $rData Submitted backup settings.
 	 * @return array Result status payload.
 	 */
-	public static function editBackup($rData) {
+	public static function editBackup(array $rData) {
 		$db = self::db();
 		$rArray = QueryHelper::verifyPostTable('settings', $rData, true);
 
-		foreach (array('dropbox_remote') as $rSetting) {
+		foreach (['dropbox_remote'] as $rSetting) {
 			if (isset($rData[$rSetting])) {
 				$rArray[$rSetting] = 1;
 			} else {
@@ -144,25 +145,25 @@ class SettingsService {
 		}
 
 		if (!isset($rData['allowed_stb_types_for_local_recording'])) {
-			$rArray['allowed_stb_types_for_local_recording'] = array();
+			$rArray['allowed_stb_types_for_local_recording'] = [];
 		}
 
 		if (!isset($rData['allowed_stb_types'])) {
-			$rArray['allowed_stb_types'] = array();
+			$rArray['allowed_stb_types'] = [];
 		}
 
 		$rPrepare = QueryHelper::prepareArray($rArray);
 		if (count($rPrepare['data']) <= 0) {
-			return array('status' => STATUS_FAILURE);
+			return ['status' => STATUS_FAILURE];
 		}
 
 		$rQuery = 'UPDATE `settings` SET ' . $rPrepare['update'] . ';';
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			SettingsManager::clearCache();
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		}
 
-		return array('status' => STATUS_FAILURE);
+		return ['status' => STATUS_FAILURE];
 	}
 
 	/**
@@ -171,10 +172,10 @@ class SettingsService {
 	 * @param array $rData Submitted cache/cron settings.
 	 * @return array Result status payload.
 	 */
-	public static function editCacheCron($rData) {
+	public static function editCacheCron(array $rData) {
 		$db = self::db();
-		$rCheck = array(false, false);
-		$rCron = array('*', '*', '*', '*', '*');
+		$rCheck = [false, false];
+		$rCron = ['*', '*', '*', '*', '*'];
 		$rPattern = '/^[0-9\/*,-]+$/';
 		$rCron[0] = $rData['minute'];
 		preg_match($rPattern, $rCron[0], $rMatches);
@@ -199,9 +200,9 @@ class SettingsService {
 			}
 
 			SettingsManager::clearCache();
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		}
 
-		return array('status' => STATUS_FAILURE);
+		return ['status' => STATUS_FAILURE];
 	}
 }
diff --git a/src/Domain/Stream/AdminStreamToken.php b/src/Domain/Stream/AdminStreamToken.php
index 576d6ad6..5c58839c 100644
--- a/src/Domain/Stream/AdminStreamToken.php
+++ b/src/Domain/Stream/AdminStreamToken.php
@@ -21,72 +21,71 @@ use XcVm\Core\Util\NetworkUtils;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class AdminStreamToken {
+	/**
+	 * @param int         $streamId  Target stream id.
+	 * @param string      $ip        Client IP the token was issued to.
+	 * @param int         $expires   Expiry as a unix timestamp.
+	 * @param string|null $container VOD container (vod.php only), else null.
+	 * @param mixed       $start     Timeshift start (raw — may be a date string), else null.
+	 * @param mixed       $duration  Timeshift duration (raw), else null.
+	 */
+	private function __construct(
+		public readonly int $streamId,
+		public readonly string $ip,
+		public readonly int $expires,
+		public readonly ?string $container = null,
+		public readonly mixed $start = null,
+		public readonly mixed $duration = null,
+	) {
+	}
 
-    /**
-     * @param int         $streamId  Target stream id.
-     * @param string      $ip        Client IP the token was issued to.
-     * @param int         $expires   Expiry as a unix timestamp.
-     * @param string|null $container VOD container (vod.php only), else null.
-     * @param mixed       $start     Timeshift start (raw — may be a date string), else null.
-     * @param mixed       $duration  Timeshift duration (raw), else null.
-     */
-    private function __construct(
-        public readonly int $streamId,
-        public readonly string $ip,
-        public readonly int $expires,
-        public readonly ?string $container = null,
-        public readonly mixed $start = null,
-        public readonly mixed $duration = null,
-    ) {
-    }
+	/**
+	 * Decrypt + decode a raw uitoken. Returns null on any decrypt/JSON failure
+	 * or a missing required field — callers treat null exactly like an invalid
+	 * token (404), matching the previous inline code where a missing field
+	 * failed the expiry/IP check and fell through to the same 404.
+	 *
+	 * `start`/`duration` are kept raw (NOT cast) because timeshift accepts a
+	 * non-numeric date string there.
+	 *
+	 * @param string $rawToken Encrypted token from the request.
+	 * @param string $key      Decryption key (live_streaming_pass).
+	 * @return self|null
+	 */
+	public static function decode(string $rawToken, string $key, bool $rAcceptLegacy): ?self {
+		$rDecrypted = Encryption::readToken($rawToken, $key, OPENSSL_EXTRA, $rAcceptLegacy);
 
-    /**
-     * Decrypt + decode a raw uitoken. Returns null on any decrypt/JSON failure
-     * or a missing required field — callers treat null exactly like an invalid
-     * token (404), matching the previous inline code where a missing field
-     * failed the expiry/IP check and fell through to the same 404.
-     *
-     * `start`/`duration` are kept raw (NOT cast) because timeshift accepts a
-     * non-numeric date string there.
-     *
-     * @param string $rawToken Encrypted token from the request.
-     * @param string $key      Decryption key (live_streaming_pass).
-     * @return self|null
-     */
-    public static function decode(string $rawToken, string $key, bool $rAcceptLegacy): ?self {
-        $rDecrypted = Encryption::readToken($rawToken, $key, OPENSSL_EXTRA, $rAcceptLegacy);
+		if (!is_string($rDecrypted)) {
+			return null;
+		}
 
-        if (!is_string($rDecrypted)) {
-            return null;
-        }
+		$rData = json_decode($rDecrypted, true);
 
-        $rData = json_decode($rDecrypted, true);
+		if (!is_array($rData) || !isset($rData['stream_id'], $rData['ip'], $rData['expires'])) {
+			return null;
+		}
 
-        if (!is_array($rData) || !isset($rData['stream_id'], $rData['ip'], $rData['expires'])) {
-            return null;
-        }
+		return new self(
+			(int) $rData['stream_id'],
+			(string) $rData['ip'],
+			(int) $rData['expires'],
+			isset($rData['container']) ? (string) $rData['container'] : null,
+			$rData['start'] ?? null,
+			$rData['duration'] ?? null,
+		);
+	}
 
-        return new self(
-            (int) $rData['stream_id'],
-            (string) $rData['ip'],
-            (int) $rData['expires'],
-            isset($rData['container']) ? (string) $rData['container'] : null,
-            $rData['start'] ?? null,
-            $rData['duration'] ?? null,
-        );
-    }
-
-    /**
-     * Not expired and the caller IP matches (subnet-aware per
-     * {@see NetworkUtils::ipMatches()}).
-     *
-     * @param bool        $rSubnetMatch Compare only the leading three octets.
-     * @param string|null $rClientIp    Current client IP.
-     * @param int|null    $rNow         Reference time (defaults to time()).
-     * @return bool
-     */
-    public function isValid(bool $rSubnetMatch, ?string $rClientIp, ?int $rNow = null): bool {
-        return $this->expires >= ($rNow ?? time())
-            && NetworkUtils::ipMatches($rSubnetMatch, $this->ip, $rClientIp);
-    }
+	/**
+	 * Not expired and the caller IP matches (subnet-aware per
+	 * {@see NetworkUtils::ipMatches()}).
+	 *
+	 * @param bool        $rSubnetMatch Compare only the leading three octets.
+	 * @param string|null $rClientIp    Current client IP.
+	 * @param int|null    $rNow         Reference time (defaults to time()).
+	 * @return bool
+	 */
+	public function isValid(bool $rSubnetMatch, ?string $rClientIp, ?int $rNow = null): bool {
+		return $this->expires >= ($rNow ?? time())
+			&& NetworkUtils::ipMatches($rSubnetMatch, $this->ip, $rClientIp);
+	}
 }
diff --git a/src/Domain/Stream/CategoryService.php b/src/Domain/Stream/CategoryService.php
index bb010985..ae2092d1 100644
--- a/src/Domain/Stream/CategoryService.php
+++ b/src/Domain/Stream/CategoryService.php
@@ -19,13 +19,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class CategoryService {
 	use DatabaseAware;
+
 	/**
 	 * Persist the display order of categories from posted data.
 	 *
 	 * @param array $rData Form data with a JSON `categories` list (id + order).
 	 * @return array ['status' => STATUS_SUCCESS].
 	 */
-	public static function reorder($rData) {
+	public static function reorder(array $rData) {
 		$db = self::db();
 		$rPostCategories = json_decode($rData['categories'], true);
 
@@ -36,7 +37,7 @@ class CategoryService {
 			}
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -45,10 +46,10 @@ class CategoryService {
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (isset($rData['edit'])) {
-			$rArray = AdminHelpers::overwriteData(CategoryService::getById($rData['edit']), $rData);
+			$rArray = AdminHelpers::overwriteData(self::getById($rData['edit']), $rData);
 		} else {
 			$rArray = QueryHelper::verifyPostTable('streams_categories', $rData);
 			$rArray['cat_order'] = 99;
@@ -66,10 +67,10 @@ class CategoryService {
 
 		if ($db->query($rQuery, ...$rPrepare['data'])) {
 			$rInsertID = $db->last_insert_id();
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		}
 
-		return array('status' => STATUS_FAILURE, 'data' => $rData);
+		return ['status' => STATUS_FAILURE, 'data' => $rData];
 	}
 
 	/**
@@ -79,9 +80,9 @@ class CategoryService {
 	 * @param string $rType 'live'|'movie'|'series'|'radio'|null
 	 * @return array<int, array>
 	 */
-	public static function getAllByType($rType = 'live') {
+	public static function getAllByType(string $rType = 'live') {
 		$rCategories = self::getFromDatabase(($rType ?: null), true);
-		$rReturn = array();
+		$rReturn = [];
 		foreach ($rCategories as $rID => $rRow) {
 			$rReturn[intval($rID)] = $rRow;
 		}
@@ -97,11 +98,11 @@ class CategoryService {
 	 * @param bool        $rForce Bypass the file cache when loading all.
 	 * @return array Categories keyed by id.
 	 */
-	public static function getFromDatabase($rType = null, $rForce = false) {
+	public static function getFromDatabase(?string $rType = null, bool $rForce = false) {
 		$db = self::db();
 		if (is_string($rType)) {
 			$db->query('SELECT t1.* FROM `streams_categories` t1 WHERE t1.category_type = ? GROUP BY t1.id ORDER BY t1.cat_order ASC', $rType);
-			return (0 < $db->num_rows() ? $db->get_rows(true, 'id') : array());
+			return (0 < $db->num_rows() ? $db->get_rows(true, 'id') : []);
 		}
 
 		if (!$rForce) {
@@ -112,7 +113,7 @@ class CategoryService {
 		}
 
 		$db->query('SELECT t1.* FROM `streams_categories` t1 ORDER BY t1.cat_order ASC');
-		$rCategories = (0 < $db->num_rows() ? $db->get_rows(true, 'id') : array());
+		$rCategories = (0 < $db->num_rows() ? $db->get_rows(true, 'id') : []);
 
 		FileCache::setCache('categories', $rCategories);
 
@@ -126,8 +127,8 @@ class CategoryService {
 	 * @param string|null $rType       Type to keep, or null for all.
 	 * @return array Filtered categories.
 	 */
-	public static function filterLoaded($rCategories, $rType = null) {
-		$rReturn = array();
+	public static function filterLoaded(array $rCategories, ?string $rType = null) {
+		$rReturn = [];
 		foreach ($rCategories as $rCategory) {
 			if ($rCategory['category_type'] != $rType && $rType) {
 			} else {
@@ -143,8 +144,8 @@ class CategoryService {
 	 * @param array $rCategories Массив загруженных категорий
 	 * @return int[]
 	 */
-	public static function getAdultIDs($rCategories) {
-		$rReturn = array();
+	public static function getAdultIDs(array $rCategories) {
+		$rReturn = [];
 		foreach ($rCategories as $rCategory) {
 			if ($rCategory['is_adult']) {
 				$rReturn[] = intval($rCategory['id']);
@@ -159,7 +160,7 @@ class CategoryService {
 	 * @param int $rID Category id.
 	 * @return array|false The category row, or false if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `streams_categories` WHERE `id` = ?;', $rID);
 
@@ -176,7 +177,7 @@ class CategoryService {
 	 * @param int $rID Category id.
 	 * @return bool True on deletion, false if the category does not exist.
 	 */
-	public static function deleteById($rID) {
+	public static function deleteById(int $rID) {
 		$db = self::db();
 		$rCategory = self::getById($rID);
 
diff --git a/src/Domain/Stream/ChannelService.php b/src/Domain/Stream/ChannelService.php
index e2792ea9..6b9d6c2b 100644
--- a/src/Domain/Stream/ChannelService.php
+++ b/src/Domain/Stream/ChannelService.php
@@ -23,13 +23,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class ChannelService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a live channel from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		global $rSettings;
 		$db = self::db();
 		if (isset($rData['edit'])) {
@@ -61,14 +62,14 @@ class ChannelService {
 			$rReencode = false;
 		}
 
-		foreach (array('allow_record', 'rtmp_output') as $rKey) {
+		foreach (['allow_record', 'rtmp_output'] as $rKey) {
 			if (isset($rData[$rKey])) {
 				$rArray[$rKey] = 1;
 			} else {
 				$rArray[$rKey] = 0;
 			}
 		}
-		$rArray['movie_properties'] = array('type' => intval($rData['channel_type']));
+		$rArray['movie_properties'] = ['type' => intval($rData['channel_type'])];
 
 		if (intval($rData['channel_type']) == 0) {
 			$rPlaylist = SeriesService::generatePlaylist($rData['series_no']);
@@ -79,7 +80,7 @@ class ChannelService {
 			if (is_string($rVideoFiles)) {
 				$rVideoFiles = json_decode($rVideoFiles, true);
 			}
-			$rArray['stream_source'] = is_array($rVideoFiles) ? $rVideoFiles : array();
+			$rArray['stream_source'] = is_array($rVideoFiles) ? $rVideoFiles : [];
 			$rArray['series_no'] = 0;
 		}
 
@@ -90,10 +91,10 @@ class ChannelService {
 		}
 
 		if (0 < count($rArray['stream_source'])) {
-			$rBouquetCreate = array();
+			$rBouquetCreate = [];
 
 			foreach (json_decode($rData['bouquet_create_list'], true) as $rBouquet) {
-				$rPrepare = QueryHelper::prepareArray(array('bouquet_name' => $rBouquet, 'bouquet_channels' => array(), 'bouquet_movies' => array(), 'bouquet_series' => array(), 'bouquet_radios' => array()));
+				$rPrepare = QueryHelper::prepareArray(['bouquet_name' => $rBouquet, 'bouquet_channels' => [], 'bouquet_movies' => [], 'bouquet_series' => [], 'bouquet_radios' => []]);
 				$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 				if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -102,10 +103,10 @@ class ChannelService {
 					$rBouquetCreate[$rBouquet] = $rBouquetID;
 				}
 			}
-			$rCategoryCreate = array();
+			$rCategoryCreate = [];
 
 			foreach (json_decode($rData['category_create_list'], true) as $rCategory) {
-				$rPrepare = QueryHelper::prepareArray(array('category_type' => 'live', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0));
+				$rPrepare = QueryHelper::prepareArray(['category_type' => 'live', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0]);
 				$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 				if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -114,7 +115,7 @@ class ChannelService {
 					$rCategoryCreate[$rCategory] = $rCategoryID;
 				}
 			}
-			$rBouquets = array();
+			$rBouquets = [];
 
 			foreach ($rData['bouquets'] as $rBouquet) {
 				if (isset($rBouquetCreate[$rBouquet])) {
@@ -126,7 +127,7 @@ class ChannelService {
 					}
 				}
 			}
-			$rCategories = array();
+			$rCategories = [];
 
 			foreach ($rData['category_id'] as $rCategory) {
 				if (isset($rCategoryCreate[$rCategory])) {
@@ -154,7 +155,7 @@ class ChannelService {
 
 			if ($db->query($rQuery, ...$rPrepare['data'])) {
 				$rInsertID = $db->last_insert_id();
-				$rStreamExists = array();
+				$rStreamExists = [];
 
 				if (!isset($rData['edit'])) {
 				} else {
@@ -165,7 +166,7 @@ class ChannelService {
 					}
 				}
 
-				$rStreamsAdded = array();
+				$rStreamsAdded = [];
 				$rServerTree = json_decode($rData['server_tree_data'], true);
 
 				foreach ($rServerTree as $rServer) {
@@ -173,7 +174,7 @@ class ChannelService {
 					} else {
 						$rServerID = intval($rServer['id']);
 						$rStreamsAdded[] = $rServerID;
-						$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?? array())));
+						$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?? [])));
 
 						if ($rServer['parent'] == 'source') {
 							$rParent = null;
@@ -197,13 +198,13 @@ class ChannelService {
 				}
 
 				if ($rReencode) {
-					ApiClient::request(array('action' => 'stream', 'sub' => 'stop', 'stream_ids' => array($rInsertID)));
+					ApiClient::request(['action' => 'stream', 'sub' => 'stop', 'stream_ids' => [$rInsertID]]);
 					$db->query("UPDATE `streams_servers` SET `pids_create_channel` = '[]', `cchannel_rsources` = '[]' WHERE `stream_id` = ?;", $rInsertID);
 					StreamProcess::queueChannel($rInsertID);
 				}
 
 				if ($rRestart) {
-					ApiClient::request(array('action' => 'stream', 'sub' => 'start', 'stream_ids' => array($rInsertID)));
+					ApiClient::request(['action' => 'stream', 'sub' => 'start', 'stream_ids' => [$rInsertID]]);
 				}
 
 				foreach ($rBouquets as $rBouquet) {
@@ -222,12 +223,12 @@ class ChannelService {
 
 				StreamProcess::updateStream($rInsertID);
 
-				return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+				return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 			} else {
-				return array('status' => STATUS_FAILURE, 'data' => $rData);
+				return ['status' => STATUS_FAILURE, 'data' => $rData];
 			}
 		} else {
-			return array('status' => STATUS_NO_SOURCES, 'data' => $rData);
+			return ['status' => STATUS_NO_SOURCES, 'data' => $rData];
 		}
 	}
 
@@ -237,16 +238,16 @@ class ChannelService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
 		ini_set('default_socket_timeout', 0);
 
-		$rArray = array();
+		$rArray = [];
 
-		foreach (array('allow_record', 'rtmp_output') as $rKey) {
+		foreach (['allow_record', 'rtmp_output'] as $rKey) {
 			if (!isset($rData['c_' . $rKey])) {
 			} else {
 				if (isset($rData[$rKey])) {
@@ -272,18 +273,18 @@ class ChannelService {
 
 		if (0 >= count($rStreamIDs)) {
 		} else {
-			$rCategoryMap = array();
+			$rCategoryMap = [];
 
-			if (!(isset($rData['c_category_id']) && in_array($rData['category_id_type'], array('ADD', 'DEL')))) {
+			if (!(isset($rData['c_category_id']) && in_array($rData['category_id_type'], ['ADD', 'DEL']))) {
 			} else {
 				$db->query('SELECT `id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 				foreach ($db->get_rows() as $rRow) {
-					$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: array());
+					$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: []);
 				}
 			}
 
-			$rDeleteServers = $rProcessServers = $rStreamExists = array();
+			$rDeleteServers = $rProcessServers = $rStreamExists = [];
 			$db->query('SELECT `stream_id`, `server_stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 			foreach ($db->get_rows() as $rRow) {
@@ -291,7 +292,7 @@ class ChannelService {
 				$rProcessServers[intval($rRow['stream_id'])][] = intval($rRow['server_id']);
 			}
 			$rBouquets = BouquetService::getAllSimple();
-			$rAddBouquet = $rDelBouquet = array();
+			$rAddBouquet = $rDelBouquet = [];
 			$rEncQuery = $rAddQuery = '';
 
 			foreach ($rStreamIDs as $rStreamID) {
@@ -300,7 +301,7 @@ class ChannelService {
 					$rCategories = array_map('intval', $rData['category_id']);
 
 					if ($rData['category_id_type'] == 'ADD') {
-						foreach (($rCategoryMap[$rStreamID] ?: array()) as $rCategoryID) {
+						foreach (($rCategoryMap[$rStreamID] ?: []) as $rCategoryID) {
 							if (in_array($rCategoryID, $rCategories)) {
 							} else {
 								$rCategories[] = $rCategoryID;
@@ -335,7 +336,7 @@ class ChannelService {
 
 				if (!isset($rData['c_server_tree'])) {
 				} else {
-					$rStreamsAdded = array();
+					$rStreamsAdded = [];
 					$rServerTree = json_decode($rData['server_tree_data'], true);
 
 					foreach ($rServerTree as $rServer) {
@@ -343,9 +344,9 @@ class ChannelService {
 						} else {
 							$rServerID = intval($rServer['id']);
 
-							if (in_array($rData['server_type'], array('ADD', 'SET'))) {
+							if (in_array($rData['server_type'], ['ADD', 'SET'])) {
 								$rStreamsAdded[] = $rServerID;
-								$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?? array())));
+								$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?? [])));
 
 								if ($rServer['parent'] == 'source') {
 									$rParent = null;
@@ -451,16 +452,16 @@ class ChannelService {
 					$db->query('INSERT INTO `queue`(`type`, `stream_id`, `server_id`, `added`) VALUES ' . $rEncQuery . ';');
 				}
 
-				ApiClient::request(array('action' => 'stream', 'sub' => 'stop', 'stream_ids' => array_values($rStreamIDs)));
+				ApiClient::request(['action' => 'stream', 'sub' => 'stop', 'stream_ids' => array_values($rStreamIDs)]);
 			} else {
 				if (!isset($rData['restart_on_edit'])) {
 				} else {
-					ApiClient::request(array('action' => 'stream', 'sub' => 'start', 'stream_ids' => array_values($rStreamIDs)));
+					ApiClient::request(['action' => 'stream', 'sub' => 'start', 'stream_ids' => array_values($rStreamIDs)]);
 				}
 			}
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -469,7 +470,7 @@ class ChannelService {
 	 * @param array $rData Ordered channel ids.
 	 * @return array ['status' => STATUS_* constant].
 	 */
-	public static function setOrder($rData) {
+	public static function setOrder(array $rData) {
 		$db = self::db();
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
@@ -483,6 +484,6 @@ class ChannelService {
 			$rSort++;
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 }
diff --git a/src/Domain/Stream/ConnectionTracker.php b/src/Domain/Stream/ConnectionTracker.php
index b2200b64..5e9161e9 100644
--- a/src/Domain/Stream/ConnectionTracker.php
+++ b/src/Domain/Stream/ConnectionTracker.php
@@ -26,6 +26,7 @@ use XcVm\Streaming\Fanout\FanoutClient;
 
 class ConnectionTracker {
 	use DatabaseAware;
+
 	/**
 	 * Calculate server/proxy load capacity.
 	 *
@@ -46,7 +47,7 @@ class ConnectionTracker {
 		}
 
 		if ($rSettings['redis_handler'] && $rRedis) {
-			$rRows = array();
+			$rRows = [];
 			$rResults = null;
 			// One reconnect+retry: phpredis may silently reconnect a broken
 			// socket without replaying AUTH, so a healthy-looking connection
@@ -77,7 +78,7 @@ class ConnectionTracker {
 			$i = 0;
 			foreach (array_keys($rServers) as $rServerID) {
 				if ($rServers[$rServerID]['server_online']) {
-					$rRows[$rServerID] = array('online_clients' => ($rResults[$i] ?? 0));
+					$rRows[$rServerID] = ['online_clients' => ($rResults[$i] ?? 0)];
 					$i++;
 				}
 			}
@@ -92,7 +93,7 @@ class ConnectionTracker {
 		}
 
 		if ($rSettings['split_by'] == 'band') {
-			$rServerSpeed = array();
+			$rServerSpeed = [];
 			foreach (array_keys($rServers) as $rServerID) {
 				$rServerHardware = json_decode($rServers[$rServerID]['server_hardware'], true);
 				if (!empty($rServerHardware['network_speed'])) {
@@ -165,15 +166,16 @@ class ConnectionTracker {
 			if (is_array($rKeys) && count($rKeys) > 0) {
 				$rData = $rRedis->mGet($rKeys);
 				if (is_array($rData)) {
-					return array($rKeys, array_map(static function ($rItem) {
+					return [$rKeys, array_map(static function ($rItem) {
 						return is_string($rItem) ? igbinary_unserialize($rItem) : false;
-					}, $rData));
+					}, $rData)
+					];
 				}
 			}
-			return array([], []);
+			return [[], []];
 		}
 
-		$rWhere = array();
+		$rWhere = [];
 		if (!empty($rServerID)) {
 			$rWhere[] = 't1.server_id = ' . intval($rServerID);
 		}
@@ -218,7 +220,7 @@ class ConnectionTracker {
 	 * @return void
 	 */
 	public static function addToQueue(int $rStreamID, int $rAddPID): void {
-		$rActivePIDs = $rPIDs = array();
+		$rActivePIDs = $rPIDs = [];
 		if (file_exists(SIGNALS_TMP_PATH . 'queue_' . intval($rStreamID))) {
 			$rPIDs = igbinary_unserialize(file_get_contents(SIGNALS_TMP_PATH . 'queue_' . intval($rStreamID)));
 		}
@@ -247,8 +249,8 @@ class ConnectionTracker {
 		if (!file_exists($rQueueFile)) {
 			return;
 		}
-		$rActivePIDs = array();
-		foreach ((igbinary_unserialize(file_get_contents($rQueueFile)) ?: array()) as $rActivePID) {
+		$rActivePIDs = [];
+		foreach ((igbinary_unserialize(file_get_contents($rQueueFile)) ?: []) as $rActivePID) {
 			if (ProcessManager::isRunning($rActivePID, 'php-fpm') && $rPID != $rActivePID) {
 				$rActivePIDs[] = $rActivePID;
 			}
@@ -334,7 +336,7 @@ class ConnectionTracker {
 	 * @param mixed|null $rCustomData Additional signal data.
 	 * @return array|false MULTI/EXEC result.
 	 */
-	public static function redisSignal(int $rPID, int $rServerID, int $rRTMP, $rCustomData = null) {
+	public static function redisSignal(int $rPID, int $rServerID, int $rRTMP, mixed $rCustomData = null) {
 		$rRedis = RedisManager::instance();
 		if (!$rRedis) {
 			return false;
@@ -343,7 +345,7 @@ class ConnectionTracker {
 		// (a daemon viewer's drop_con) would otherwise all share one key per server
 		// and overwrite each other before the target's signals daemon read them.
 		$rKey = 'SIGNAL#' . md5($rServerID . '#' . $rPID . '#' . $rRTMP . (is_null($rCustomData) ? '' : '#' . json_encode($rCustomData)));
-		$rData = array('pid' => $rPID, 'server_id' => $rServerID, 'rtmp' => $rRTMP, 'time' => time(), 'custom_data' => $rCustomData, 'key' => $rKey);
+		$rData = ['pid' => $rPID, 'server_id' => $rServerID, 'rtmp' => $rRTMP, 'time' => time(), 'custom_data' => $rCustomData, 'key' => $rKey];
 		return $rRedis->multi()->sAdd('SIGNALS#' . $rServerID, $rKey)->set($rKey, igbinary_serialize($rData))->exec();
 	}
 
@@ -367,7 +369,7 @@ class ConnectionTracker {
 			$rMulti->zRevRangeByScore('LINE#' . $rUserID, '+inf', '-inf');
 		}
 		$rGroups = $rMulti->exec();
-		$rConnectionMap = $rRedisKeys = array();
+		$rConnectionMap = $rRedisKeys = [];
 		if (!is_array($rGroups)) {
 			return ($rKeysOnly ? $rRedisKeys : $rConnectionMap);
 		}
@@ -414,7 +416,7 @@ class ConnectionTracker {
 			$rMulti->zRevRangeByScore(($rProxy ? 'PROXY#' . $rServerID : 'SERVER#' . $rServerID), '+inf', '-inf');
 		}
 		$rGroups = $rMulti->exec();
-		$rConnectionMap = $rRedisKeys = array();
+		$rConnectionMap = $rRedisKeys = [];
 		if (!is_array($rGroups)) {
 			return ($rKeysOnly ? $rRedisKeys : $rConnectionMap);
 		}
@@ -455,10 +457,10 @@ class ConnectionTracker {
 		}
 		$rMulti = $rRedis->multi();
 		foreach ($rUserIDs as $rUserID) {
-			$rMulti->zRevRangeByScore('LINE#' . $rUserID, '+inf', '-inf', array('limit' => array(0, 1)));
+			$rMulti->zRevRangeByScore('LINE#' . $rUserID, '+inf', '-inf', ['limit' => [0, 1]]);
 		}
 		$rGroups = $rMulti->exec();
-		$rConnectionMap = $rRedisKeys = array();
+		$rConnectionMap = $rRedisKeys = [];
 		if (!is_array($rGroups)) {
 			return $rConnectionMap;
 		}
@@ -497,7 +499,7 @@ class ConnectionTracker {
 			$rMulti->zRevRangeByScore('STREAM#' . $rStreamID, '+inf', '-inf');
 		}
 		$rGroups = $rMulti->exec();
-		$rConnectionMap = $rRedisKeys = array();
+		$rConnectionMap = $rRedisKeys = [];
 		if (!is_array($rGroups)) {
 			return $rConnectionMap;
 		}
@@ -601,10 +603,10 @@ class ConnectionTracker {
 	public static function getRedisConnections(?int $rUserID = null, ?int $rServerID = null, ?int $rStreamID = null, bool $rOpenOnly = false, bool $rCountOnly = false, bool $rGroup = true, bool $rHLSOnly = false): array {
 		$rRedis = RedisManager::instance();
 		if (!$rRedis) {
-			return ($rCountOnly ? array(0, 0) : array());
+			return ($rCountOnly ? [0, 0] : []);
 		}
-		$rReturn = ($rCountOnly ? array(0, 0) : array());
-		$rUniqueUsers = array();
+		$rReturn = ($rCountOnly ? [0, 0] : []);
+		$rUniqueUsers = [];
 		$rUserID = (0 < intval($rUserID) ? intval($rUserID) : null);
 		$rServerID = (0 < intval($rServerID) ? intval($rServerID) : null);
 		$rStreamID = (0 < intval($rStreamID) ? intval($rStreamID) : null);
@@ -634,7 +636,7 @@ class ConnectionTracker {
 					} else {
 						if ($rGroup) {
 							if (!isset($rReturn[$rUUID])) {
-								$rReturn[$rUUID] = array();
+								$rReturn[$rUUID] = [];
 							}
 							$rReturn[$rUUID][] = $rRow;
 						} else {
@@ -689,7 +691,7 @@ class ConnectionTracker {
 	 * @param string     $rUserAgent  Client user-agent ('' when absent).
 	 * @return string 32-char hex connection id.
 	 */
-	public static function hlsConnectionKey($rIsHMAC, $rIdentifier, $rUserId, $rStreamId, $rIp, $rUserAgent): string {
+	public static function hlsConnectionKey(?int $rIsHMAC, string $rIdentifier, int|string $rUserId, int $rStreamId, string $rIp, string $rUserAgent): string {
 		$rIdentity = is_null($rIsHMAC) ? ('u' . intval($rUserId)) : ('h' . $rIsHMAC . '_' . (string) $rIdentifier);
 
 		return md5('hls#' . $rIdentity . '#' . intval($rStreamId) . '#' . (string) $rIp . '#' . (string) $rUserAgent);
@@ -747,8 +749,8 @@ class ConnectionTracker {
 	 * @param int|null $rPid       Owning pid (NULL for HLS).
 	 * @return mixed Truthy on success (Redis MULTI result or DB write result).
 	 */
-	public static function createLive(array $rSettings, array $rCtx, string $rContainer, $rPid) {
-		$rConn = array(
+	public static function createLive(array $rSettings, array $rCtx, string $rContainer, ?int $rPid) {
+		$rConn = [
 			"stream_id" => $rCtx["stream_id"],
 			"server_id" => $rCtx["server_id"],
 			"proxy_id" => $rCtx["proxy_id"],
@@ -764,7 +766,7 @@ class ConnectionTracker {
 			"hls_last_read" => time() - $rCtx["time_offset"],
 			"on_demand" => $rCtx["on_demand"],
 			"uuid" => $rCtx["uuid"],
-		);
+		];
 
 		if (is_null($rCtx["is_hmac"])) {
 			$rConn["user_id"] = $rCtx["user_id"];
@@ -861,8 +863,8 @@ class ConnectionTracker {
 		}
 
 		$db = self::db();
-		$rSet = array();
-		$rParams = array();
+		$rSet = [];
+		$rParams = [];
 		foreach ($rChanges as $rColumn => $rValue) {
 			$rSet[] = "`" . $rColumn . "` = ?";
 			$rParams[] = $rValue;
@@ -890,7 +892,7 @@ class ConnectionTracker {
 		if (is_array($rKeys) && count($rKeys) > 0) {
 			return $rKeys;
 		}
-		return array();
+		return [];
 	}
 
 	/**
@@ -908,11 +910,11 @@ class ConnectionTracker {
 		// sMembers/mGet return false on a failed connection — degrade to empty.
 		$rKeys = $rRedis->sMembers('ENDED');
 		if (!is_array($rKeys) || 0 >= count($rKeys)) {
-			return array();
+			return [];
 		}
 		$rData = $rRedis->mGet($rKeys);
 		if (!is_array($rData)) {
-			return array();
+			return [];
 		}
 		return array_map(static function ($rItem) {
 			return is_string($rItem) ? igbinary_unserialize($rItem) : false;
@@ -928,7 +930,7 @@ class ConnectionTracker {
 	 */
 	public static function getProxies(int $rServerID, bool $rOnline = true): array {
 		global $rServers;
-		$rReturn = array();
+		$rReturn = [];
 		foreach ($rServers as $rProxyID => $rServerInfo) {
 			if ($rServerInfo['server_type'] == 1 && in_array($rServerID, $rServerInfo['parent_id']) && ($rServerInfo['server_online'] || !$rOnline)) {
 				$rReturn[$rProxyID] = $rServerInfo;
@@ -958,7 +960,7 @@ class ConnectionTracker {
 			FanoutClient::dropConnection($rUUID);
 			return;
 		}
-		$rSignal = array('type' => 'drop_con', 'uuid' => $rUUID);
+		$rSignal = ['type' => 'drop_con', 'uuid' => $rUUID];
 		if (!empty($rSettings['redis_handler'])) {
 			self::redisSignal(0, $rServerID, 0, $rSignal);
 		} else {
@@ -978,7 +980,7 @@ class ConnectionTracker {
 	 * @param bool         $rEnd          Mark HLS connection as ended.
 	 * @return bool True on successful close, false otherwise.
 	 */
-	public static function closeConnection($rActivityInfo, bool $rRemove = true, bool $rEnd = true): bool {
+	public static function closeConnection(array|string $rActivityInfo, bool $rRemove = true, bool $rEnd = true): bool {
 		if (!empty($rActivityInfo)) {
 			global $rSettings, $rServers;
 			$db = self::db();
@@ -1005,7 +1007,7 @@ class ConnectionTracker {
 				}
 			}
 			if (is_array($rActivityInfo)) {
-				$rActivityInfo += array('server_id' => 0, 'pid' => 0, 'activity_id' => null, 'stream_id' => 0, 'uuid' => '', 'hls_end' => 1);
+				$rActivityInfo += ['server_id' => 0, 'pid' => 0, 'activity_id' => null, 'stream_id' => 0, 'uuid' => '', 'hls_end' => 1];
 				if (($rActivityInfo['container'] ?? '') == 'rtmp') {
 					if ($rActivityInfo['server_id'] == SERVER_ID) {
 						shell_exec('wget --timeout=2 -O /dev/null -o /dev/null "' . $rServers[SERVER_ID]['rtmp_mport_url'] . 'control/drop/client?clientid=' . intval($rActivityInfo['pid']) . '" >/dev/null 2>/dev/null &');
@@ -1021,7 +1023,7 @@ class ConnectionTracker {
 						if (!(!$rRemove && $rEnd && $rActivityInfo['hls_end'] == 0)) {
 						} else {
 							if ($rSettings['redis_handler']) {
-								self::updateConnection($rActivityInfo, array(), 'close');
+								self::updateConnection($rActivityInfo, [], 'close');
 							} else {
 								$db->query('UPDATE `lines_live` SET `hls_end` = 1 WHERE `activity_id` = ?', $rActivityInfo['activity_id']);
 							}
@@ -1106,7 +1108,7 @@ class ConnectionTracker {
 	public static function writeOfflineActivity(array $rSettings, int $rServerID, int $rProxyID, int $rUserID, int $rStreamID, int $rStart, string $rUserAgent, string $rIP, string $rExtension, string $rGeoIP, string $rISP, string $rExternalDevice = '', int $rDivergence = 0, ?int $rIsHMAC = null, string $rIdentifier = ''): void {
 		if ($rSettings['save_closed_connection'] != 0) {
 			if ($rServerID && $rUserID && $rStreamID) {
-				$rActivityInfo = array('user_id' => intval($rUserID), 'stream_id' => intval($rStreamID), 'server_id' => intval($rServerID), 'proxy_id' => intval($rProxyID), 'date_start' => intval($rStart), 'user_agent' => $rUserAgent, 'user_ip' => htmlentities($rIP), 'date_end' => time(), 'container' => $rExtension, 'geoip_country_code' => $rGeoIP, 'isp' => $rISP, 'external_device' => htmlentities($rExternalDevice), 'divergence' => intval($rDivergence), 'hmac_id' => $rIsHMAC, 'hmac_identifier' => $rIdentifier);
+				$rActivityInfo = ['user_id' => intval($rUserID), 'stream_id' => intval($rStreamID), 'server_id' => intval($rServerID), 'proxy_id' => intval($rProxyID), 'date_start' => intval($rStart), 'user_agent' => $rUserAgent, 'user_ip' => htmlentities($rIP), 'date_end' => time(), 'container' => $rExtension, 'geoip_country_code' => $rGeoIP, 'isp' => $rISP, 'external_device' => htmlentities($rExternalDevice), 'divergence' => intval($rDivergence), 'hmac_id' => $rIsHMAC, 'hmac_identifier' => $rIdentifier];
 				file_put_contents(LOGS_TMP_PATH . 'activity', base64_encode(json_encode($rActivityInfo)) . "\n", FILE_APPEND | LOCK_EX);
 			}
 		} else {
diff --git a/src/Domain/Stream/PlaylistGenerator.php b/src/Domain/Stream/PlaylistGenerator.php
index 38f8e99f..582c56d8 100644
--- a/src/Domain/Stream/PlaylistGenerator.php
+++ b/src/Domain/Stream/PlaylistGenerator.php
@@ -19,6 +19,7 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class PlaylistGenerator {
 	use DatabaseAware;
+
 	/**
 	 * Generate a playlist (M3U) for a user/device.
 	 *
@@ -33,7 +34,7 @@ class PlaylistGenerator {
 	 * @param bool        $rProxy     Generate proxied URLs.
 	 * @return string|false The generated playlist contents, or false on failure.
 	 */
-	public static function generate($rUserInfo, $rDeviceKey, $rOutputKey = 'ts', $rTypeKey = null, $rNoCache = false, $rProxy = false) {
+	public static function generate(array $rUserInfo, string $rDeviceKey, string $rOutputKey = 'ts', ?array $rTypeKey = null, bool $rNoCache = false, bool $rProxy = false) {
 		global $rSettings, $rServers;
 		$db = self::db();
 		$rCategories = CategoryService::getFromDatabase();
@@ -59,7 +60,7 @@ class PlaylistGenerator {
 			return false;
 		}
 
-		$rCacheName = $rUserInfo['id'] . '_' . $rDeviceKey . '_' . $rOutputKey . '_' . implode('_', ($rTypeKey ?: array()));
+		$rCacheName = $rUserInfo['id'] . '_' . $rDeviceKey . '_' . $rOutputKey . '_' . implode('_', ($rTypeKey ?: []));
 		$rOutputExt = $db->get_col();
 		$rEncryptPlaylist = ($rUserInfo['is_restreamer'] ? $rSettings['encrypt_playlist_restreamer'] : $rSettings['encrypt_playlist']);
 		if ($rUserInfo['is_stalker']) {
@@ -72,7 +73,7 @@ class PlaylistGenerator {
 		}
 
 		if (!$rProxy) {
-			$rRTMPRows = array();
+			$rRTMPRows = [];
 			if ($rOutputKey == 'rtmp') {
 				$db->query('SELECT t1.id,t2.server_id FROM `streams` t1 INNER JOIN `streams_servers` t2 ON t2.stream_id = t1.id WHERE t1.rtmp_output = 1');
 				$rRTMPRows = $db->get_rows(true, 'id', false, 'server_id');
@@ -81,7 +82,7 @@ class PlaylistGenerator {
 			if ($rOutputKey == 'rtmp') {
 				$rOutputKey = 'ts';
 			}
-			$rRTMPRows = array();
+			$rRTMPRows = [];
 		}
 
 		if (empty($rOutputExt)) {
@@ -112,21 +113,21 @@ class PlaylistGenerator {
 		}
 
 		$rData = '';
-		$rSeriesAllocation = $rSeriesEpisodes = $rSeriesInfo = array();
-		$rUserInfo['episode_ids'] = array();
+		$rSeriesAllocation = $rSeriesEpisodes = $rSeriesInfo = [];
+		$rUserInfo['episode_ids'] = [];
 		if (count($rUserInfo['series_ids']) > 0) {
 			if ($rCached) {
 				foreach ($rUserInfo['series_ids'] as $rSeriesID) {
 					$__raw_series = @file_get_contents(SERIES_TMP_PATH . 'series_' . intval($rSeriesID));
-					$rSeriesInfo[$rSeriesID] = ($__raw_series !== false ? igbinary_unserialize($__raw_series) : array());
+					$rSeriesInfo[$rSeriesID] = ($__raw_series !== false ? igbinary_unserialize($__raw_series) : []);
 					$__raw_episodes = @file_get_contents(SERIES_TMP_PATH . 'episodes_' . intval($rSeriesID));
-					$rSeriesData = ($__raw_episodes !== false ? igbinary_unserialize($__raw_episodes) : array());
+					$rSeriesData = ($__raw_episodes !== false ? igbinary_unserialize($__raw_episodes) : []);
 					if (!is_array($rSeriesData)) {
-						$rSeriesData = array();
+						$rSeriesData = [];
 					}
 					foreach ($rSeriesData as $rSeasonID => $rEpisodes) {
 						foreach ($rEpisodes as $rEpisode) {
-							$rSeriesEpisodes[$rEpisode['stream_id']] = array($rSeasonID, $rEpisode['episode_num']);
+							$rSeriesEpisodes[$rEpisode['stream_id']] = [$rSeasonID, $rEpisode['episode_num']];
 							$rSeriesAllocation[$rEpisode['stream_id']] = $rSeriesID;
 							$rUserInfo['episode_ids'][] = $rEpisode['stream_id'];
 						}
@@ -138,7 +139,7 @@ class PlaylistGenerator {
 				$db->query('SELECT stream_id, series_id, season_num, episode_num FROM `streams_episodes` WHERE series_id IN (' . implode(',', $rUserInfo['series_ids']) . ') ORDER BY FIELD(series_id,' . implode(',', $rUserInfo['series_ids']) . '), season_num ASC, episode_num ASC');
 				foreach ($db->get_rows(true, 'series_id', false) as $rSeriesID => $rEpisodes) {
 					foreach ($rEpisodes as $rEpisode) {
-						$rSeriesEpisodes[$rEpisode['stream_id']] = array($rEpisode['season_num'], $rEpisode['episode_num']);
+						$rSeriesEpisodes[$rEpisode['stream_id']] = [$rEpisode['season_num'], $rEpisode['episode_num']];
 						$rSeriesAllocation[$rEpisode['stream_id']] = $rSeriesID;
 						$rUserInfo['episode_ids'][] = $rEpisode['stream_id'];
 					}
@@ -150,7 +151,7 @@ class PlaylistGenerator {
 			$rUserInfo['channel_ids'] = array_merge($rUserInfo['channel_ids'], $rUserInfo['episode_ids']);
 		}
 
-		$rChannelIDs = array();
+		$rChannelIDs = [];
 		$rAdded = false;
 		if ($rTypeKey) {
 			foreach ($rTypeKey as $rType) {
@@ -177,7 +178,7 @@ class PlaylistGenerator {
 			$rChannelIDs = $rUserInfo['channel_ids'];
 		}
 
-		if (in_array($rSettings['channel_number_type'], array('bouquet_new', 'manual'))) {
+		if (in_array($rSettings['channel_number_type'], ['bouquet_new', 'manual'])) {
 			$rChannelIDs = StreamSorter::sortChannels($rChannelIDs);
 		}
 
@@ -201,22 +202,22 @@ class PlaylistGenerator {
 		}
 
 		if ($rDeviceKey == 'starlivev5') {
-			$rOutput = array();
-			$rOutput['iptvstreams_list'] = array('@version' => 1, 'group' => array('name' => 'IPTV', 'channel' => array()));
+			$rOutput = [];
+			$rOutput['iptvstreams_list'] = ['@version' => 1, 'group' => ['name' => 'IPTV', 'channel' => []]];
 			foreach (array_chunk($rChannelIDs, 1000) as $rBlockIDs) {
 				if ($rSettings['playlist_from_mysql'] || !$rCached) {
 					$rOrder = 'FIELD(`t1`.`id`,' . implode(',', $rBlockIDs) . ')';
 					$db->query('SELECT t1.id,t1.channel_id,t1.year,t1.movie_properties,t1.stream_icon,t1.custom_sid,t1.category_id,t1.stream_display_name,t2.type_output,t2.type_key,t1.target_container,t2.live FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type WHERE `t1`.`id` IN (' . implode(',', array_map('intval', $rBlockIDs)) . ') ORDER BY ' . $rOrder . ';');
 					$rRows = $db->get_rows();
 				} else {
-					$rRows = array();
-						foreach ($rBlockIDs as $rID) {
-							$__raw_s = @file_get_contents(STREAMS_TMP_PATH . 'stream_' . intval($rID));
-							$__tmp_s = ($__raw_s !== false ? igbinary_unserialize($__raw_s) : null);
-							if (is_array($__tmp_s) && isset($__tmp_s['info'])) {
-								$rRows[] = $__tmp_s['info'];
-							}
+					$rRows = [];
+					foreach ($rBlockIDs as $rID) {
+						$__raw_s = @file_get_contents(STREAMS_TMP_PATH . 'stream_' . intval($rID));
+						$__tmp_s = ($__raw_s !== false ? igbinary_unserialize($__raw_s) : null);
+						if (is_array($__tmp_s) && isset($__tmp_s['info'])) {
+							$rRows[] = $__tmp_s['info'];
 						}
+					}
 				}
 				foreach ($rRows as $rChannelInfo) {
 					// normalize keys to avoid undefined index warnings
@@ -241,7 +242,7 @@ class PlaylistGenerator {
 							$__season = $rSeriesEpisodes[$rChannelInfo['id']][0] ?? 0;
 							$__episode = $rSeriesEpisodes[$rChannelInfo['id']][1] ?? 0;
 							$rChannelInfo['stream_display_name'] = ($rSeriesInfo[$rSeriesID]['title'] ?? '') . ' S' . sprintf('%02d', $__season) . 'E' . sprintf('%02d', $__episode);
-							$rChannelInfo['movie_properties'] = array('movie_image' => (!empty($rProperties['movie_image']) ? $rProperties['movie_image'] : ($rSeriesInfo[$rSeriesID]['cover'] ?? null)));
+							$rChannelInfo['movie_properties'] = ['movie_image' => (!empty($rProperties['movie_image']) ? $rProperties['movie_image'] : ($rSeriesInfo[$rSeriesID]['cover'] ?? null))];
 							$rChannelInfo['type_output'] = 'series';
 							$rChannelInfo['category_id'] = $rSeriesInfo[$rSeriesID]['category_id'] ?? null;
 						} else {
@@ -277,7 +278,7 @@ class PlaylistGenerator {
 							}
 						}
 						$rIcon = ($rChannelInfo['live'] == 0 ? (!empty($rProperties['movie_image']) ? $rProperties['movie_image'] : null) : $rChannelInfo['stream_icon']);
-						$rOutput['iptvstreams_list']['group']['channel'][] = array('name' => $rChannelInfo['stream_display_name'], 'icon' => ImageUtils::validateURL($rIcon), 'stream_url' => $rURL, 'stream_type' => 0);
+						$rOutput['iptvstreams_list']['group']['channel'][] = ['name' => $rChannelInfo['stream_display_name'], 'icon' => ImageUtils::validateURL($rIcon), 'stream_url' => $rURL, 'stream_type' => 0];
 					}
 				}
 			}
@@ -294,7 +295,7 @@ class PlaylistGenerator {
 					$rDeviceInfo['device_header'] = str_replace('#EXTM3U', '#EXTM3U x-tvg-url="' . $epgUrl . '"', $rDeviceInfo['device_header']);
 				}
 				$rAppend = ($isM3UFormat ? "\n" . '#EXT-X-SESSION-DATA:DATA-ID="com.xc_vm.' . str_replace('.', '_', XC_VM_VERSION) . '"' : '');
-				$rData = str_replace(array('&lt;', '&gt;'), array('<', '>'), str_replace(array('{BOUQUET_NAME}', '{USERNAME}', '{PASSWORD}', '{SERVER_URL}', '{OUTPUT_KEY}'), array($rSettings['server_name'], $rUserInfo['username'], $rUserInfo['password'], $rDomainName, $rOutputKey), $rDeviceInfo['device_header'] . $rAppend)) . "\n";
+				$rData = str_replace(['&lt;', '&gt;'], ['<', '>'], str_replace(['{BOUQUET_NAME}', '{USERNAME}', '{PASSWORD}', '{SERVER_URL}', '{OUTPUT_KEY}'], [$rSettings['server_name'], $rUserInfo['username'], $rUserInfo['password'], $rDomainName, $rOutputKey], $rDeviceInfo['device_header'] . $rAppend)) . "\n";
 				if ($rOutputFile) {
 					fwrite($rOutputFile, $rData);
 				}
@@ -306,7 +307,7 @@ class PlaylistGenerator {
 					$rCharts = str_split($rMatches[1]);
 					$rPattern = $rMatches[0];
 				} else {
-					$rCharts = array();
+					$rCharts = [];
 					$rPattern = '{URL}';
 				}
 
@@ -316,14 +317,14 @@ class PlaylistGenerator {
 						$db->query('SELECT t1.id,t1.channel_id,t1.year,t1.movie_properties,t1.stream_icon,t1.custom_sid,t1.category_id,t1.stream_display_name,t2.type_output,t2.type_key,t1.target_container,t2.live,t1.tv_archive_duration,t1.tv_archive_server_id FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type WHERE `t1`.`id` IN (' . implode(',', array_map('intval', $rBlockIDs)) . ') ORDER BY ' . $rOrder . ';');
 						$rRows = $db->get_rows();
 					} else {
-						$rRows = array();
-							foreach ($rBlockIDs as $rID) {
-								$__raw_s = @file_get_contents(STREAMS_TMP_PATH . 'stream_' . intval($rID));
-								$__tmp_s = ($__raw_s !== false ? igbinary_unserialize($__raw_s) : null);
-								if (is_array($__tmp_s) && isset($__tmp_s['info'])) {
-									$rRows[] = $__tmp_s['info'];
-								}
+						$rRows = [];
+						foreach ($rBlockIDs as $rID) {
+							$__raw_s = @file_get_contents(STREAMS_TMP_PATH . 'stream_' . intval($rID));
+							$__tmp_s = ($__raw_s !== false ? igbinary_unserialize($__raw_s) : null);
+							if (is_array($__tmp_s) && isset($__tmp_s['info'])) {
+								$rRows[] = $__tmp_s['info'];
 							}
+						}
 					}
 
 					foreach ($rRows as $rChannel) {
@@ -364,7 +365,7 @@ class PlaylistGenerator {
 							$__season = $rSeriesEpisodes[$rChannel['id']][0] ?? 0;
 							$__episode = $rSeriesEpisodes[$rChannel['id']][1] ?? 0;
 							$rChannel['stream_display_name'] = ($rSeriesInfo[$rSeriesID]['title'] ?? '') . ' S' . sprintf('%02d', $__season) . 'E' . sprintf('%02d', $__episode);
-							$rChannel['movie_properties'] = array('movie_image' => (!empty($rProperties['movie_image']) ? $rProperties['movie_image'] : ($rSeriesInfo[$rSeriesID]['cover'] ?? null)));
+							$rChannel['movie_properties'] = ['movie_image' => (!empty($rProperties['movie_image']) ? $rProperties['movie_image'] : ($rSeriesInfo[$rSeriesID]['cover'] ?? null))];
 							$rChannel['type_output'] = 'series';
 							$rChannel['category_id'] = $rSeriesInfo[$rSeriesID]['category_id'] ?? null;
 						} else {
@@ -375,7 +376,7 @@ class PlaylistGenerator {
 						if ($rChannel['live'] == 0) {
 							if (strlen($rUserInfo['access_token']) == 32) {
 								$rURL = $rDomainName . $rChannel['type_output'] . '/' . $rUserInfo['access_token'] . '/' . $rChannel['id'] . '.' . $rChannel['target_container'];
-							} else if ($rEncryptPlaylist) {
+							} elseif ($rEncryptPlaylist) {
 								$rEncData = $rChannel['type_output'] . '/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rChannel['id'] . '/' . $rChannel['target_container'];
 								$rToken = Encryption::mintToken($rEncData, $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
 								$rURL = $rDomainName . 'play/' . $rToken . '#.' . $rChannel['target_container'];
@@ -393,7 +394,7 @@ class PlaylistGenerator {
 									} else {
 										$rURL = $rDomainName . $rChannel['type_output'] . '/' . $rUserInfo['access_token'] . '/' . $rChannel['id'] . '.' . $rOutputExt;
 									}
-								} else if ($rEncryptPlaylist) {
+								} elseif ($rEncryptPlaylist) {
 									$rEncData = $rChannel['type_output'] . '/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rChannel['id'];
 									$rToken = Encryption::mintToken($rEncData, $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
 									if ($rSettings['cloudflare'] && $rOutputExt == 'ts') {
@@ -417,7 +418,7 @@ class PlaylistGenerator {
 								}
 								if (strlen($rUserInfo['access_token']) == 32) {
 									$rURL = $rServers[$rServerID]['rtmp_server'] . $rChannel['id'] . '?token=' . $rUserInfo['access_token'];
-								} else if ($rEncryptPlaylist) {
+								} elseif ($rEncryptPlaylist) {
 									$rEncData = $rUserInfo['username'] . '/' . $rUserInfo['password'];
 									$rToken = Encryption::mintToken($rEncData, $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
 									$rURL = $rServers[$rServerID]['rtmp_server'] . $rChannel['id'] . '?token=' . $rToken;
@@ -436,9 +437,9 @@ class PlaylistGenerator {
 						}
 						foreach ($rCategoryIDs as $rCategoryID) {
 							if (isset($rCategories[$rCategoryID])) {
-								$rData = str_replace(array('&lt;', '&gt;'), array('<', '>'), str_replace(array($rPattern, '{ESR_ID}', '{SID}', '{CHANNEL_NAME}', '{CHANNEL_ID}', '{XC_VM_ID}', '{CATEGORY}', '{CHANNEL_ICON}'), array_map('strval', array(str_replace($rCharts, array_map('urlencode', $rCharts), $rURL), $rESRID, $rSID, $rChannel['stream_display_name'], $rChannel['channel_id'], $rChannel['id'], $rCategories[$rCategoryID]['category_name'], ImageUtils::validateURL($rIcon))), $rConfig)) . "\r\n";
+								$rData = str_replace(['&lt;', '&gt;'], ['<', '>'], str_replace([$rPattern, '{ESR_ID}', '{SID}', '{CHANNEL_NAME}', '{CHANNEL_ID}', '{XC_VM_ID}', '{CATEGORY}', '{CHANNEL_ICON}'], array_map('strval', [str_replace($rCharts, array_map('urlencode', $rCharts), $rURL), $rESRID, $rSID, $rChannel['stream_display_name'], $rChannel['channel_id'], $rChannel['id'], $rCategories[$rCategoryID]['category_name'], ImageUtils::validateURL($rIcon)]), $rConfig)) . "\r\n";
 							} else {
-								$rData = str_replace(array('&lt;', '&gt;'), array('<', '>'), str_replace(array($rPattern, '{ESR_ID}', '{SID}', '{CHANNEL_NAME}', '{CHANNEL_ID}', '{XC_VM_ID}', '{CHANNEL_ICON}'), array_map('strval', array(str_replace($rCharts, array_map('urlencode', $rCharts), $rURL), $rESRID, $rSID, $rChannel['stream_display_name'], $rChannel['channel_id'], $rChannel['id'], $rIcon)), $rConfig)) . "\r\n";
+								$rData = str_replace(['&lt;', '&gt;'], ['<', '>'], str_replace([$rPattern, '{ESR_ID}', '{SID}', '{CHANNEL_NAME}', '{CHANNEL_ID}', '{XC_VM_ID}', '{CHANNEL_ICON}'], array_map('strval', [str_replace($rCharts, array_map('urlencode', $rCharts), $rURL), $rESRID, $rSID, $rChannel['stream_display_name'], $rChannel['channel_id'], $rChannel['id'], $rIcon]), $rConfig)) . "\r\n";
 								$rData = str_replace(' group-title="{CATEGORY}"', '', $rData);
 							}
 							if ($rOutputFile) {
@@ -452,7 +453,7 @@ class PlaylistGenerator {
 					}
 				}
 
-				$rData = trim(str_replace(array('&lt;', '&gt;'), array('<', '>'), $rDeviceInfo['device_footer']));
+				$rData = trim(str_replace(['&lt;', '&gt;'], ['<', '>'], $rDeviceInfo['device_footer']));
 				if ($rOutputFile) {
 					fwrite($rOutputFile, $rData);
 				}
diff --git a/src/Domain/Stream/ProfileService.php b/src/Domain/Stream/ProfileService.php
index 4327e866..a59a7749 100644
--- a/src/Domain/Stream/ProfileService.php
+++ b/src/Domain/Stream/ProfileService.php
@@ -18,25 +18,26 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class ProfileService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a transcode profile from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processProfile', $rData)) {
-			$rArray = array('profile_name' => $rData['profile_name'], 'profile_options' => null);
-			$rProfileOptions = array();
+			$rArray = ['profile_name' => $rData['profile_name'], 'profile_options' => null];
+			$rProfileOptions = [];
 
 			if ($rData['gpu_device'] != 0) {
 				$rProfileOptions['software_decoding'] = (intval($rData['software_decoding']) ?: 0);
-				$rProfileOptions['gpu'] = array('val' => $rData['gpu_device'], 'cmd' => '');
+				$rProfileOptions['gpu'] = ['val' => $rData['gpu_device'], 'cmd' => ''];
 				$rProfileOptions['gpu']['device'] = intval(explode('_', $rData['gpu_device'])[1]);
 
 				if (!$rData['software_decoding']) {
-					$rCommand = array();
+					$rCommand = [];
 					$rCommand[] = '-hwaccel cuvid';
 					$rCommand[] = '-hwaccel_device ' . $rProfileOptions['gpu']['device'];
 
@@ -131,57 +132,57 @@ class ProfileService {
 
 			if (0 >= strlen($rData['video_bitrate'])) {
 			} else {
-				$rProfileOptions[3] = array('cmd' => '-b:v ' . intval($rData['video_bitrate']) . 'k', 'val' => intval($rData['video_bitrate']));
+				$rProfileOptions[3] = ['cmd' => '-b:v ' . intval($rData['video_bitrate']) . 'k', 'val' => intval($rData['video_bitrate'])];
 			}
 
 			if (0 >= strlen($rData['audio_bitrate'])) {
 			} else {
-				$rProfileOptions[4] = array('cmd' => '-b:a ' . intval($rData['audio_bitrate']) . 'k', 'val' => intval($rData['audio_bitrate']));
+				$rProfileOptions[4] = ['cmd' => '-b:a ' . intval($rData['audio_bitrate']) . 'k', 'val' => intval($rData['audio_bitrate'])];
 			}
 
 			if (0 >= strlen($rData['min_tolerance'])) {
 			} else {
-				$rProfileOptions[5] = array('cmd' => '-minrate ' . intval($rData['min_tolerance']) . 'k', 'val' => intval($rData['min_tolerance']));
+				$rProfileOptions[5] = ['cmd' => '-minrate ' . intval($rData['min_tolerance']) . 'k', 'val' => intval($rData['min_tolerance'])];
 			}
 
 			if (0 >= strlen($rData['max_tolerance'])) {
 			} else {
-				$rProfileOptions[6] = array('cmd' => '-maxrate ' . intval($rData['max_tolerance']) . 'k', 'val' => intval($rData['max_tolerance']));
+				$rProfileOptions[6] = ['cmd' => '-maxrate ' . intval($rData['max_tolerance']) . 'k', 'val' => intval($rData['max_tolerance'])];
 			}
 
 			if (0 >= strlen($rData['buffer_size'])) {
 			} else {
-				$rProfileOptions[7] = array('cmd' => '-bufsize ' . intval($rData['buffer_size']) . 'k', 'val' => intval($rData['buffer_size']));
+				$rProfileOptions[7] = ['cmd' => '-bufsize ' . intval($rData['buffer_size']) . 'k', 'val' => intval($rData['buffer_size'])];
 			}
 
 			if (0 >= strlen($rData['crf_value'])) {
 			} else {
-				$rProfileOptions[8] = array('cmd' => '-crf ' . intval($rData['crf_value']), 'val' => $rData['crf_value']);
+				$rProfileOptions[8] = ['cmd' => '-crf ' . intval($rData['crf_value']), 'val' => $rData['crf_value']];
 			}
 
 			if (0 >= strlen($rData['aspect_ratio'])) {
 			} else {
-				$rProfileOptions[10] = array('cmd' => '-aspect ' . escapeshellcmd($rData['aspect_ratio']), 'val' => $rData['aspect_ratio']);
+				$rProfileOptions[10] = ['cmd' => '-aspect ' . escapeshellcmd($rData['aspect_ratio']), 'val' => $rData['aspect_ratio']];
 			}
 
 			if (0 >= strlen($rData['framerate'])) {
 			} else {
-				$rProfileOptions[11] = array('cmd' => '-r ' . intval($rData['framerate']), 'val' => intval($rData['framerate']));
+				$rProfileOptions[11] = ['cmd' => '-r ' . intval($rData['framerate']), 'val' => intval($rData['framerate'])];
 			}
 
 			if (0 >= strlen($rData['samplerate'])) {
 			} else {
-				$rProfileOptions[12] = array('cmd' => '-ar ' . intval($rData['samplerate']), 'val' => intval($rData['samplerate']));
+				$rProfileOptions[12] = ['cmd' => '-ar ' . intval($rData['samplerate']), 'val' => intval($rData['samplerate'])];
 			}
 
 			if (0 >= strlen($rData['audio_channels'])) {
 			} else {
-				$rProfileOptions[13] = array('cmd' => '-ac ' . intval($rData['audio_channels']), 'val' => intval($rData['audio_channels']));
+				$rProfileOptions[13] = ['cmd' => '-ac ' . intval($rData['audio_channels']), 'val' => intval($rData['audio_channels'])];
 			}
 
 			if (0 >= strlen($rData['threads'])) {
 			} else {
-				$rProfileOptions[15] = array('cmd' => '-threads ' . intval($rData['threads']), 'val' => intval($rData['threads']));
+				$rProfileOptions[15] = ['cmd' => '-threads ' . intval($rData['threads']), 'val' => intval($rData['threads'])];
 			}
 
 			$rComplex = false;
@@ -194,11 +195,11 @@ class ProfileService {
 
 				if (count($rPos) == 2) {
 				} else {
-					$rPos = array(10, 10);
+					$rPos = [10, 10];
 				}
 
 				$rLogoInput = '-i ' . escapeshellarg($rData['logo_path']);
-				$rProfileOptions[16] = array('cmd' => '', 'val' => $rData['logo_path'], 'pos' => implode(':', $rPos));
+				$rProfileOptions[16] = ['cmd' => '', 'val' => $rData['logo_path'], 'pos' => implode(':', $rPos)];
 
 				if ($rData['gpu_device'] != 0 && !$rData['software_decoding']) {
 					$rOverlay = '[0:v]hwdownload,format=nv12 [base]; [base][1:v] overlay=' . $rPos[0] . ':' . $rPos[1];
@@ -221,12 +222,12 @@ class ProfileService {
 							$rScale = 'yadif,scale=' . escapeshellcmd($rData['scaling']);
 						}
 
-						$rProfileOptions[9] = array('cmd' => '', 'val' => $rData['scaling']);
-						$rProfileOptions[17] = array('cmd' => '', 'val' => 1);
+						$rProfileOptions[9] = ['cmd' => '', 'val' => $rData['scaling']];
+						$rProfileOptions[17] = ['cmd' => '', 'val' => 1];
 					} else {
 						if (0 < strlen($rData['scaling'])) {
 							$rScale = 'scale=' . escapeshellcmd($rData['scaling']);
-							$rProfileOptions[9] = array('cmd' => '', 'val' => $rData['scaling']);
+							$rProfileOptions[9] = ['cmd' => '', 'val' => $rData['scaling']];
 						} else {
 							if (!isset($rData['yadif_filter'])) {
 							} else {
@@ -236,19 +237,19 @@ class ProfileService {
 									$rScale = 'yadif';
 								}
 
-								$rProfileOptions[17] = array('cmd' => '', 'val' => 1);
+								$rProfileOptions[17] = ['cmd' => '', 'val' => 1];
 							}
 						}
 					}
 				} else {
 					if (0 >= strlen($rData['scaling'])) {
 					} else {
-						$rProfileOptions[9] = array('cmd' => '-vf scale=' . escapeshellcmd($rData['scaling']), 'val' => $rData['scaling']);
+						$rProfileOptions[9] = ['cmd' => '-vf scale=' . escapeshellcmd($rData['scaling']), 'val' => $rData['scaling']];
 					}
 
 					if (!isset($rData['yadif_filter'])) {
 					} else {
-						$rProfileOptions[17] = array('cmd' => '-vf yadif', 'val' => 1);
+						$rProfileOptions[17] = ['cmd' => '-vf yadif', 'val' => 1];
 					}
 				}
 			} else {
@@ -265,8 +266,8 @@ class ProfileService {
 							$rScale = 'yadif,scale=' . escapeshellcmd($rData['resize']);
 						}
 
-						$rProfileOptions[9] = array('cmd' => '', 'val' => $rData['resize']);
-						$rProfileOptions[17] = array('cmd' => '', 'val' => 1);
+						$rProfileOptions[9] = ['cmd' => '', 'val' => $rData['resize']];
+						$rProfileOptions[17] = ['cmd' => '', 'val' => 1];
 					} else {
 						if (0 < strlen($rData['resize'])) {
 							if (!$rData['software_decoding']) {
@@ -275,7 +276,7 @@ class ProfileService {
 								$rScale = 'scale=' . escapeshellcmd($rData['resize']);
 							}
 
-							$rProfileOptions[9] = array('cmd' => '', 'val' => $rData['resize']);
+							$rProfileOptions[9] = ['cmd' => '', 'val' => $rData['resize']];
 						} else {
 							if (0 >= intval($rData['deint'])) {
 							} else {
@@ -285,19 +286,19 @@ class ProfileService {
 									$rScale = 'yadif';
 								}
 
-								$rProfileOptions[17] = array('cmd' => '', 'val' => 1);
+								$rProfileOptions[17] = ['cmd' => '', 'val' => 1];
 							}
 						}
 					}
 				} else {
 					if (0 >= strlen($rData['resize'])) {
 					} else {
-						$rProfileOptions[9] = array('cmd' => '-vf scale=' . escapeshellcmd($rData['resize']), 'val' => $rData['resize']);
+						$rProfileOptions[9] = ['cmd' => '-vf scale=' . escapeshellcmd($rData['resize']), 'val' => $rData['resize']];
 					}
 
 					if (0 >= intval($rData['deint'])) {
 					} else {
-						$rProfileOptions[17] = array('cmd' => '-vf yadif', 'val' => 1);
+						$rProfileOptions[17] = ['cmd' => '-vf yadif', 'val' => 1];
 					}
 				}
 			}
@@ -313,7 +314,7 @@ class ProfileService {
 					}
 				}
 
-				$rProfileOptions[16]['cmd'] = str_replace(array('{SCALE}', '{OVERLAY}', '{LOGO}'), array($rScale, $rOverlay, $rLogoInput), '{LOGO} -filter_complex "{SCALE}{OVERLAY}"');
+				$rProfileOptions[16]['cmd'] = str_replace(['{SCALE}', '{OVERLAY}', '{LOGO}'], [$rScale, $rOverlay, $rLogoInput], '{LOGO} -filter_complex "{SCALE}{OVERLAY}"');
 			}
 
 			$rArray['profile_options'] = json_encode($rProfileOptions, JSON_UNESCAPED_UNICODE);
@@ -328,12 +329,12 @@ class ProfileService {
 
 			if ($db->query($rQuery, ...$rPrepare['data'])) {
 				$rInsertID = $db->last_insert_id();
-				return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+				return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 			}
 
-			return array('status' => STATUS_FAILURE, 'data' => $rData);
+			return ['status' => STATUS_FAILURE, 'data' => $rData];
 		}
 
-		return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+		return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 	}
 }
diff --git a/src/Domain/Stream/ProviderService.php b/src/Domain/Stream/ProviderService.php
index 4f18dd73..f6b76c46 100644
--- a/src/Domain/Stream/ProviderService.php
+++ b/src/Domain/Stream/ProviderService.php
@@ -20,6 +20,7 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class ProviderService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a provider from admin form data.
 	 *
@@ -28,12 +29,12 @@ class ProviderService {
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processProvider', $rData)) {
 			if (isset($rData['edit'])) {
 				if (Authorization::check('adv', 'streams')) {
-					$rArray = AdminHelpers::overwriteData(ProviderService::getById($rData['edit']), $rData);
+					$rArray = AdminHelpers::overwriteData(self::getById($rData['edit']), $rData);
 				} else {
 					exit();
 				}
@@ -46,7 +47,7 @@ class ProviderService {
 				}
 			}
 
-			foreach (array('enabled', 'ssl', 'hls', 'legacy') as $rKey) {
+			foreach (['enabled', 'ssl', 'hls', 'legacy'] as $rKey) {
 				if (isset($rData[$rKey])) {
 					$rArray[$rKey] = 1;
 				} else {
@@ -66,15 +67,15 @@ class ProviderService {
 
 				if ($db->query($rQuery, ...$rPrepare['data'])) {
 					$rInsertID = $db->last_insert_id();
-					return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+					return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 				}
 
-				return array('status' => STATUS_FAILURE, 'data' => $rData);
+				return ['status' => STATUS_FAILURE, 'data' => $rData];
 			}
 
-			return array('status' => STATUS_EXISTS_IP, 'data' => $rData);
+			return ['status' => STATUS_EXISTS_IP, 'data' => $rData];
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -84,7 +85,7 @@ class ProviderService {
 	 * @param int $rID Provider id.
 	 * @return array|null The provider row, or null if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `providers` WHERE `id` = ?;', $rID);
 
@@ -102,7 +103,7 @@ class ProviderService {
 	 */
 	public static function getAll() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `providers` ORDER BY `last_changed` DESC;');
 
 		if ($db->num_rows() > 0) {
@@ -120,7 +121,7 @@ class ProviderService {
 	 * @param int $rID Provider id.
 	 * @return bool True on deletion, false if the provider does not exist.
 	 */
-	public static function deleteById($rID) {
+	public static function deleteById(int $rID) {
 		$db = self::db();
 		$rProvider = self::getById($rID);
 
diff --git a/src/Domain/Stream/RadioService.php b/src/Domain/Stream/RadioService.php
index 19e7233e..7f6b8691 100644
--- a/src/Domain/Stream/RadioService.php
+++ b/src/Domain/Stream/RadioService.php
@@ -24,13 +24,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class RadioService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a radio stream from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processRadio', $rData)) {
 			if (isset($rData['edit'])) {
@@ -51,7 +52,7 @@ class RadioService {
 			}
 
 			if (isset($rData['days_to_restart']) && preg_match('/^(?:2[0-3]|[01][0-9]):[0-5][0-9]$/', $rData['time_to_restart'])) {
-				$rTimeArray = array('days' => array(), 'at' => $rData['time_to_restart']);
+				$rTimeArray = ['days' => [], 'at' => $rData['time_to_restart']];
 
 				foreach ($rData['days_to_restart'] as $rID => $rDay) {
 					$rTimeArray['days'][] = $rDay;
@@ -79,17 +80,17 @@ class RadioService {
 				$rRestart = false;
 			}
 
-			$rImportStreams = array();
+			$rImportStreams = [];
 
 			if (0 < strlen($rData['stream_source'][0])) {
-				$rImportArray = array('stream_source' => $rData['stream_source'], 'stream_icon' => $rArray['stream_icon'], 'stream_display_name' => $rArray['stream_display_name']);
+				$rImportArray = ['stream_source' => $rData['stream_source'], 'stream_icon' => $rArray['stream_icon'], 'stream_display_name' => $rArray['stream_display_name']];
 				$rImportStreams[] = $rImportArray;
 
 				if (0 < count($rImportStreams)) {
-					$rBouquetCreate = array();
+					$rBouquetCreate = [];
 
 					foreach (json_decode($rData['bouquet_create_list'] ?? '[]', true) ?: [] as $rBouquet) {
-						$rPrepare = QueryHelper::prepareArray(array('bouquet_name' => $rBouquet, 'bouquet_channels' => array(), 'bouquet_movies' => array(), 'bouquet_series' => array(), 'bouquet_radios' => array()));
+						$rPrepare = QueryHelper::prepareArray(['bouquet_name' => $rBouquet, 'bouquet_channels' => [], 'bouquet_movies' => [], 'bouquet_series' => [], 'bouquet_radios' => []]);
 						$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 						if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -98,10 +99,10 @@ class RadioService {
 							$rBouquetCreate[$rBouquet] = $rBouquetID;
 						}
 					}
-					$rCategoryCreate = array();
+					$rCategoryCreate = [];
 
 					foreach (json_decode($rData['category_create_list'] ?? '[]', true) ?: [] as $rCategory) {
-						$rPrepare = QueryHelper::prepareArray(array('category_type' => 'radio', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0));
+						$rPrepare = QueryHelper::prepareArray(['category_type' => 'radio', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0]);
 						$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 						if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -112,7 +113,7 @@ class RadioService {
 					}
 
 					foreach ($rImportStreams as $rImportStream) {
-						$rBouquets = array();
+						$rBouquets = [];
 
 						foreach ($rData['bouquets'] as $rBouquet) {
 							if (isset($rBouquetCreate[$rBouquet])) {
@@ -124,7 +125,7 @@ class RadioService {
 								}
 							}
 						}
-						$rCategories = array();
+						$rCategories = [];
 
 						foreach ($rData['category_id'] ?? [] as $rCategory) {
 							if (isset($rCategoryCreate[$rCategory])) {
@@ -158,7 +159,7 @@ class RadioService {
 
 						if ($db->query($rQuery, ...$rPrepare['data'])) {
 							$rInsertID = $db->last_insert_id();
-							$rStationExists = array();
+							$rStationExists = [];
 
 							if (!isset($rData['edit'])) {
 							} else {
@@ -169,7 +170,7 @@ class RadioService {
 								}
 							}
 
-							$rStreamsAdded = array();
+							$rStreamsAdded = [];
 							$rServerTree = json_decode($rData['server_tree_data'], true);
 
 							foreach ($rServerTree as $rServer) {
@@ -231,7 +232,7 @@ class RadioService {
 
 							if (!$rRestart) {
 							} else {
-								ApiClient::request(array('action' => 'stream', 'sub' => 'start', 'stream_ids' => array($rInsertID)));
+								ApiClient::request(['action' => 'stream', 'sub' => 'start', 'stream_ids' => [$rInsertID]]);
 							}
 
 							foreach ($rBouquets as $rBouquet) {
@@ -250,7 +251,7 @@ class RadioService {
 
 							StreamProcess::updateStream($rInsertID);
 
-							return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+							return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 						} else {
 							foreach ($rBouquetCreate as $rBouquet => $rID) {
 								$db->query('DELETE FROM `bouquets` WHERE `id` = ?;', $rID);
@@ -260,17 +261,17 @@ class RadioService {
 								$db->query('DELETE FROM `streams_categories` WHERE `id` = ?;', $rID);
 							}
 
-							return array('status' => STATUS_FAILURE, 'data' => $rData);
+							return ['status' => STATUS_FAILURE, 'data' => $rData];
 						}
 					}
 				} else {
-					return array('status' => STATUS_NO_SOURCES, 'data' => $rData);
+					return ['status' => STATUS_NO_SOURCES, 'data' => $rData];
 				}
 			} else {
-				return array('status' => STATUS_NO_SOURCES, 'data' => $rData);
+				return ['status' => STATUS_NO_SOURCES, 'data' => $rData];
 			}
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -280,7 +281,7 @@ class RadioService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
@@ -288,7 +289,7 @@ class RadioService {
 		ini_set('default_socket_timeout', 0);
 
 		if (InputValidator::validate('massEditRadios', $rData)) {
-			$rArray = array();
+			$rArray = [];
 
 			if (!isset($rData['c_direct_source'])) {
 			} else {
@@ -308,25 +309,25 @@ class RadioService {
 
 			if (0 >= count($rStreamIDs)) {
 			} else {
-				$rCategoryMap = array();
+				$rCategoryMap = [];
 
-				if (!(isset($rData['c_category_id']) && in_array($rData['category_id_type'], array('ADD', 'DEL')))) {
+				if (!(isset($rData['c_category_id']) && in_array($rData['category_id_type'], ['ADD', 'DEL']))) {
 				} else {
 					$db->query('SELECT `id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 					foreach ($db->get_rows() as $rRow) {
-						$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: array());
+						$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: []);
 					}
 				}
 
-				$rDeleteServers = $rStreamExists = array();
+				$rDeleteServers = $rStreamExists = [];
 				$db->query('SELECT `stream_id`, `server_stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 				foreach ($db->get_rows() as $rRow) {
 					$rStreamExists[intval($rRow['stream_id'])][intval($rRow['server_id'])] = intval($rRow['server_stream_id']);
 				}
 				$rBouquets = BouquetService::getAllSimple();
-				$rAddBouquet = $rDelBouquet = array();
+				$rAddBouquet = $rDelBouquet = [];
 				$rAddQuery = '';
 
 				foreach ($rStreamIDs as $rStreamID) {
@@ -335,7 +336,7 @@ class RadioService {
 						$rCategories = array_map('intval', $rData['category_id']);
 
 						if ($rData['category_id_type'] == 'ADD') {
-							foreach (($rCategoryMap[$rStreamID] ?: array()) as $rCategoryID) {
+							foreach (($rCategoryMap[$rStreamID] ?: []) as $rCategoryID) {
 								if (in_array($rCategoryID, $rCategories)) {
 								} else {
 									$rCategories[] = $rCategoryID;
@@ -370,7 +371,7 @@ class RadioService {
 
 					if (!isset($rData['c_server_tree'])) {
 					} else {
-						$rStreamsAdded = array();
+						$rStreamsAdded = [];
 						$rServerTree = json_decode($rData['server_tree_data'], true);
 
 						foreach ($rServerTree as $rServer) {
@@ -378,8 +379,8 @@ class RadioService {
 							} else {
 								$rServerID = intval($rServer['id']);
 
-								if (in_array($rData['server_type'], array('ADD', 'SET'))) {
-									$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?: array())));
+								if (in_array($rData['server_type'], ['ADD', 'SET'])) {
+									$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?: [])));
 
 									if ($rServer['parent'] == 'source') {
 										$rParent = null;
@@ -466,14 +467,14 @@ class RadioService {
 
 				if (!isset($rData['restart_on_edit'])) {
 				} else {
-					ApiClient::request(array('action' => 'stream', 'sub' => 'start', 'stream_ids' => array_values($rStreamIDs)));
+					ApiClient::request(['action' => 'stream', 'sub' => 'start', 'stream_ids' => array_values($rStreamIDs)]);
 				}
 			}
 
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		}
 
-		return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+		return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 	}
 
 	/**
@@ -482,7 +483,7 @@ class RadioService {
 	 * @param array $rData Selected radio ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
@@ -491,9 +492,9 @@ class RadioService {
 		if (InputValidator::validate('massDeleteStations', $rData)) {
 			$rStreams = json_decode($rData['radios'], true);
 			StreamRepository::deleteStreams($rStreams, false);
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		}
 
-		return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+		return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 	}
 }
diff --git a/src/Domain/Stream/StreamConfigRepository.php b/src/Domain/Stream/StreamConfigRepository.php
index 886ad8d7..041373df 100644
--- a/src/Domain/Stream/StreamConfigRepository.php
+++ b/src/Domain/Stream/StreamConfigRepository.php
@@ -16,12 +16,13 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class StreamConfigRepository {
 	use DatabaseAware;
+
 	/**
 	 * Получить все аргументы потоков (streams_arguments), индексированные по argument_key.
 	 */
 	public static function getStreamArguments() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `streams_arguments` ORDER BY `id` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -38,7 +39,7 @@ class StreamConfigRepository {
 	 */
 	public static function getTranscodeProfiles() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `profiles` ORDER BY `profile_id` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -56,7 +57,7 @@ class StreamConfigRepository {
 	 * @param int $rID Profile id.
 	 * @return array|null The profile row, or null if not found.
 	 */
-	public static function getTranscodeProfile($rID) {
+	public static function getTranscodeProfile(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `profiles` WHERE `profile_id` = ?;', $rID);
 
@@ -73,7 +74,7 @@ class StreamConfigRepository {
 	 * @param int $rID Profile id.
 	 * @return bool True on deletion, false if the profile does not exist.
 	 */
-	public static function deleteProfile($rID) {
+	public static function deleteProfile(int $rID) {
 		$db = self::db();
 		$rProfile = self::getTranscodeProfile($rID);
 
diff --git a/src/Domain/Stream/StreamProcess.php b/src/Domain/Stream/StreamProcess.php
index 04df0438..a4a07290 100644
--- a/src/Domain/Stream/StreamProcess.php
+++ b/src/Domain/Stream/StreamProcess.php
@@ -26,19 +26,16 @@ use XcVm\Streaming\Health\ProcessChecker;
 
 class StreamProcess {
 	use DatabaseAware;
+
 	/**
 	 * Write stream action log to file
 	 *
 	 * Migrated from CoreUtilities::streamLog()
 	 *
-	 * @param int $rStreamID
-	 * @param int $rServerID
-	 * @param string $rAction
-	 * @param string $rSource
 	 */
-	public static function streamLog($rStreamID, $rServerID, $rAction, $rSource = '') {
+	public static function streamLog(int $rStreamID, int $rServerID, string $rAction, string $rSource = '') {
 		if (SettingsManager::get('save_restart_logs') != 0) {
-			$rData = array('server_id' => $rServerID, 'stream_id' => $rStreamID, 'action' => $rAction, 'source' => $rSource, 'time' => time());
+			$rData = ['server_id' => $rServerID, 'stream_id' => $rStreamID, 'action' => $rAction, 'source' => $rSource, 'time' => time()];
 			file_put_contents(LOGS_TMP_PATH . 'stream_log.log', base64_encode(json_encode($rData)) . "\n", FILE_APPEND);
 		}
 	}
@@ -49,7 +46,7 @@ class StreamProcess {
 	 * @param array $rSources Source identifiers.
 	 * @return void
 	 */
-	public static function deleteCache($rSources) {
+	public static function deleteCache(array $rSources) {
 		if (empty($rSources)) {
 			return;
 		}
@@ -67,7 +64,7 @@ class StreamProcess {
 	 * @param int|null $rServerID Target server id, or null for the default.
 	 * @return mixed Queue result.
 	 */
-	public static function queueChannel($rStreamID, $rServerID = null) {
+	public static function queueChannel(int $rStreamID, ?int $rServerID = null) {
 		$db = self::db();
 		if (!$rServerID) {
 			$rServerID = SERVER_ID;
@@ -84,7 +81,7 @@ class StreamProcess {
 	 * @param int $rStreamID Stream id.
 	 * @return mixed Creation result.
 	 */
-	public static function createChannel($rStreamID) {
+	public static function createChannel(int $rStreamID) {
 		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php created ' . intval($rStreamID) . ' >/dev/null 2>/dev/null &');
 		return true;
 	}
@@ -100,7 +97,7 @@ class StreamProcess {
 	 * @param mixed $rMonitorPID The stream's recorded monitor pid.
 	 * @return bool
 	 */
-	public static function isWatched($rStreamID, $rMonitorPID): bool {
+	public static function isWatched(int $rStreamID, mixed $rMonitorPID): bool {
 		if (ProcessManager::isMonitorAlive($rMonitorPID, $rStreamID)) {
 			return true;
 		}
@@ -122,7 +119,7 @@ class StreamProcess {
 	 * @return resource|null The held lock, for unlockOnDemandStart(); null when
 	 *                       it cannot be taken (the caller goes on unserialised).
 	 */
-	public static function lockOnDemandStart($rStreamID) {
+	public static function lockOnDemandStart(int $rStreamID) {
 		$rLock = @fopen(STREAMS_PATH . intval($rStreamID) . '_.start', 'c');
 		if ($rLock === false) {
 			return null;
@@ -161,7 +158,7 @@ class StreamProcess {
 	 * @param int $rRestart  Truthy to restart what is running rather than take it as it is.
 	 * @return string MONITOR_FANOUT or MONITOR_PHP — which one now watches it.
 	 */
-	public static function startMonitor($rStreamID, $rRestart = 0) {
+	public static function startMonitor(int $rStreamID, int $rRestart = 0) {
 		if (self::superviseStream(intval($rStreamID), (bool) $rRestart)) {
 			return self::MONITOR_FANOUT;
 		}
@@ -175,14 +172,13 @@ class StreamProcess {
 		return self::MONITOR_PHP;
 	}
 
-
 	/**
 	 * Start thumbnail generation for a stream.
 	 *
 	 * @param int $rStreamID Stream id.
 	 * @return mixed Start result.
 	 */
-	public static function startThumbnail($rStreamID) {
+	public static function startThumbnail(int $rStreamID) {
 		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php thumbnail ' . intval($rStreamID) . ' >/dev/null 2>/dev/null &');
 		return true;
 	}
@@ -212,11 +208,11 @@ class StreamProcess {
 	 * @param bool $rForce    Force the update even if unchanged.
 	 * @return mixed Update result.
 	 */
-	public static function updateStream($rStreamID, $rForce = false) {
+	public static function updateStream(int $rStreamID, bool $rForce = false) {
 		if (!SettingsManager::get('enable_cache')) {
 			return false;
 		}
-		self::insertCacheSignalOnce(array('type' => 'update_stream', 'id' => $rStreamID));
+		self::insertCacheSignalOnce(['type' => 'update_stream', 'id' => $rStreamID]);
 		return true;
 	}
 
@@ -226,11 +222,11 @@ class StreamProcess {
 	 * @param int[] $rStreamIDs Stream ids.
 	 * @return void
 	 */
-	public static function updateStreams($rStreamIDs) {
+	public static function updateStreams(array $rStreamIDs) {
 		if (!SettingsManager::get('enable_cache')) {
 			return;
 		}
-		self::insertCacheSignalOnce(array('type' => 'update_streams', 'id' => $rStreamIDs));
+		self::insertCacheSignalOnce(['type' => 'update_streams', 'id' => $rStreamIDs]);
 	}
 
 	/**
@@ -245,7 +241,7 @@ class StreamProcess {
 	 * @param bool  $rLoopback            Loopback streams never overlay a logo.
 	 * @return string `-i <logo> -filter_complex "..."`, or '' when no logo applies.
 	 */
-	private static function buildLogoFilterOptions(array &$rTranscodeAttributes, $rLoopback) {
+	private static function buildLogoFilterOptions(array &$rTranscodeAttributes, bool $rLoopback) {
 		if (!isset($rTranscodeAttributes[16]) || $rLoopback) {
 			return '';
 		}
@@ -253,9 +249,9 @@ class StreamProcess {
 		$rLogoPath = $rAttr[16]['val'];
 		$rPos = (isset($rAttr[16]['pos']) && $rAttr[16]['pos'] !== '10:10') ? $rAttr[16]['pos'] : '10:main_h-overlay_h-10';
 
-		$rChain = array();
+		$rChain = [];
 		$rBase = '[0:v]';
-		$rVideoFilters = array();
+		$rVideoFilters = [];
 		if (isset($rAttr[17])) {
 			$rVideoFilters[] = 'yadif';
 		}
@@ -285,12 +281,12 @@ class StreamProcess {
 	 * @param string $rSourcePath Source URL/path to probe.
 	 * @return string CUVID input-codec flag, or ''.
 	 */
-	private static function resolveGpuInputCodec($rGpuOptions, $rSourcePath) {
+	private static function resolveGpuInputCodec(string $rGpuOptions, string $rSourcePath) {
 		if (empty($rGpuOptions)) {
 			return '';
 		}
 		$rFFProbeOutput = FFprobeRunner::probeStream($rSourcePath);
-		if (in_array($rFFProbeOutput['codecs']['video']['codec_name'], array('h264', 'hevc', 'mjpeg', 'mpeg1', 'mpeg2', 'mpeg4', 'vc1', 'vp8', 'vp9'))) {
+		if (in_array($rFFProbeOutput['codecs']['video']['codec_name'], ['h264', 'hevc', 'mjpeg', 'mpeg1', 'mpeg2', 'mpeg4', 'vc1', 'vp8', 'vp9'])) {
 			return '-c:v ' . $rFFProbeOutput['codecs']['video']['codec_name'] . '_cuvid';
 		}
 		return '';
@@ -327,7 +323,7 @@ class StreamProcess {
 	 * @param array  $rServers       Server registry (for remote subtitle fetch).
 	 * @return array{0:string,1:string} [$rSubtitlesImport, $rSubtitlesMetadata].
 	 */
-	private static function buildSubtitleImport($rSubtitlesJson, $rServers) {
+	private static function buildSubtitleImport(string $rSubtitlesJson, array $rServers) {
 		$rSubtitles = json_decode($rSubtitlesJson, true);
 		$rSubtitlesImport = '';
 		$rSubtitlesMetadata = '';
@@ -348,7 +344,7 @@ class StreamProcess {
 				$rSubtitlesMetadata .= '-map ' . ($i + 1) . ' -metadata:s:s:' . $i . ' title=' . escapeshellcmd($rSubtitles['names'][$i]) . ' -metadata:s:s:' . $i . ' language=' . escapeshellcmd($rSubtitles['names'][$i]) . ' ';
 			}
 		}
-		return array($rSubtitlesImport, $rSubtitlesMetadata);
+		return [$rSubtitlesImport, $rSubtitlesMetadata];
 	}
 
 	/**
@@ -361,7 +357,7 @@ class StreamProcess {
 	 * @param mixed       $rRemoveSubtitles Truthy (== 1) to drop subtitle streams.
 	 * @return string The `-map ...` fragment.
 	 */
-	private static function resolveOutputMap($rCustomMap, $rRemoveSubtitles) {
+	private static function resolveOutputMap(?string $rCustomMap, mixed $rRemoveSubtitles) {
 		if (!empty($rCustomMap)) {
 			return escapeshellcmd($rCustomMap) . ' -copy_unknown ';
 		}
@@ -377,7 +373,7 @@ class StreamProcess {
 	 * @param string $rContainer Target container (mp4/mkv/…).
 	 * @return string ffmpeg subtitle codec: mov_text (mp4), srt (mkv), else copy.
 	 */
-	private static function subtitleCodecForContainer($rContainer) {
+	private static function subtitleCodecForContainer(string $rContainer) {
 		if ($rContainer == 'mp4') {
 			return 'mov_text';
 		}
@@ -404,11 +400,11 @@ class StreamProcess {
 	 * @param string $rPath Absolute filesystem path recorded in stream_source.
 	 * @return bool
 	 */
-	private static function isLocallyMountedPath($rPath) {
+	private static function isLocallyMountedPath(string $rPath) {
 		if (!is_string($rPath) || $rPath === '') {
 			return false;
 		}
-		$rSharedPrefixes = SettingsManager::get('shared_mount_prefixes', array());
+		$rSharedPrefixes = SettingsManager::get('shared_mount_prefixes', []);
 		foreach ($rSharedPrefixes as $rPrefix) {
 			if ($rPrefix !== '' && strncmp($rPath, $rPrefix, strlen($rPrefix)) === 0) {
 				return file_exists($rPath);
@@ -431,7 +427,7 @@ class StreamProcess {
 	 * @param mixed  $rServers Server registry (array keyed by server id).
 	 * @return array{0:int,1:string} [serverId, sourcePath]
 	 */
-	private static function resolveChannelSource($rSource, $rServers) {
+	private static function resolveChannelSource(string $rSource, mixed $rServers) {
 		if (substr($rSource, 0, 2) == 's:') {
 			$rSplit = explode(':', $rSource, 3);
 			$rServerID = intval($rSplit[1]);
@@ -453,7 +449,7 @@ class StreamProcess {
 			$rServerID = SERVER_ID;
 			$rSourcePath = $rSource;
 		}
-		return array($rServerID, $rSourcePath);
+		return [$rServerID, $rSourcePath];
 	}
 
 	/**
@@ -470,7 +466,7 @@ class StreamProcess {
 	 * @param int    $rStreamID        Stream id (segment/playlist filenames).
 	 * @return string The `-f hls …` output fragment.
 	 */
-	private static function buildHlsMpegtsOutput($rOptions, $rSegmentSettings, $rKeyFrames, $rInitTime, $rStreamID) {
+	private static function buildHlsMpegtsOutput(string $rOptions, array $rSegmentSettings, string $rKeyFrames, int $rInitTime, int $rStreamID) {
 		return $rOptions . ' -individual_header_trailer 0 -f hls -hls_init_time ' . $rInitTime
 			. ' -hls_time ' . intval($rSegmentSettings['seg_time'])
 			. ' -hls_list_size ' . intval($rSegmentSettings['seg_list_size'])
@@ -496,7 +492,7 @@ class StreamProcess {
 	 * @param string $rIngestSock Daemon ingest socket (from FanoutClient::registerIngest()).
 	 * @return string The `-f tee …` output fragment.
 	 */
-	private static function buildHlsTeeOutput($rOptions, $rSegmentSettings, $rKeyFrames, $rInitTime, $rStreamID, $rIngestSock) {
+	private static function buildHlsTeeOutput($rOptions, $rSegmentSettings, $rKeyFrames, $rInitTime, $rStreamID, string $rIngestSock) {
 		$rHls = '[f=hls'
 			. ':hls_init_time=' . $rInitTime
 			. ':hls_time=' . intval($rSegmentSettings['seg_time'])
@@ -531,7 +527,7 @@ class StreamProcess {
 		}
 		$rCodec = strtolower(trim((string) $rCodec));
 		$rTune = '';
-		if (in_array($rCodec, array('libx264', 'libx265'), true)) {
+		if (in_array($rCodec, ['libx264', 'libx265'], true)) {
 			$rTune = '-tune zerolatency ';
 		} elseif (substr($rCodec, -6) === '_nvenc') {
 			$rTune = '-zerolatency 1 ';
@@ -548,7 +544,7 @@ class StreamProcess {
 	 * @param string $rTarget     The rtmp:// URL or escaped push URL.
 	 * @return string The `… -f flv … <target> ` output fragment.
 	 */
-	private static function buildFlvOutput($rFLVOptions, $rTarget) {
+	private static function buildFlvOutput(string $rFLVOptions, string $rTarget) {
 		return $rFLVOptions . ' -f flv -flvflags no_duration_filesize ' . $rTarget . ' ';
 	}
 
@@ -566,7 +562,7 @@ class StreamProcess {
 	 * @param array $rSettings          Global settings (analyze/probesize/slack).
 	 * @return array{0:int,1:int|string,2:int} [probesize, analyzeDuration, timeout]
 	 */
-	private static function resolveProbeSettings($rOnDemand, $rProbesizeOndemand, $rLLOD, $rSettings) {
+	private static function resolveProbeSettings(mixed $rOnDemand, mixed $rProbesizeOndemand, bool $rLLOD, array $rSettings) {
 		if ($rOnDemand == 1) {
 			$rProbesize = intval($rProbesizeOndemand) ?: 1000000;
 			$rAnalyseDuration = ($rLLOD ? '500000' : '10000000');
@@ -575,7 +571,7 @@ class StreamProcess {
 			$rProbesize = abs(intval($rSettings['probesize']));
 		}
 		$rTimeout = intval($rAnalyseDuration / 1000000) + $rSettings['probe_extra_wait'];
-		return array($rProbesize, $rAnalyseDuration, $rTimeout);
+		return [$rProbesize, $rAnalyseDuration, $rTimeout];
 	}
 
 	/**
@@ -591,7 +587,7 @@ class StreamProcess {
 	 * @param mixed  $rCurrentSource  Last-used source, or empty.
 	 * @return array The (possibly) reordered source list, re-indexed.
 	 */
-	private static function rotateSourcesPastCurrent($rSources, $rPriorityBackup, $rCurrentSource) {
+	private static function rotateSourcesPastCurrent(array $rSources, mixed $rPriorityBackup, mixed $rCurrentSource) {
 		if ($rPriorityBackup == 1 || empty($rCurrentSource)) {
 			return $rSources;
 		}
@@ -620,7 +616,7 @@ class StreamProcess {
 	 * @param string $rHeaderLine e.g. 'X-XC_VM-Detect:1'.
 	 * @return array The argument list with the header applied.
 	 */
-	private static function appendHeaderArgument($rArguments, $rHeaderLine) {
+	private static function appendHeaderArgument(array $rArguments, string $rHeaderLine) {
 		$rApplied = false;
 		foreach (array_keys($rArguments) as $rID) {
 			if ($rArguments[$rID]['argument_key'] == 'headers') {
@@ -629,7 +625,7 @@ class StreamProcess {
 			}
 		}
 		if (!$rApplied) {
-			$rArguments[] = array('value' => $rHeaderLine, 'argument_key' => 'headers', 'argument_cat' => 'fetch', 'argument_wprotocol' => 'http', 'argument_type' => 'text', 'argument_cmd' => "-headers '%s" . "\r\n" . "'");
+			$rArguments[] = ['value' => $rHeaderLine, 'argument_key' => 'headers', 'argument_cat' => 'fetch', 'argument_wprotocol' => 'http', 'argument_type' => 'text', 'argument_cmd' => "-headers '%s" . "\r\n" . "'"];
 		}
 		return $rArguments;
 	}
@@ -643,7 +639,7 @@ class StreamProcess {
 	 * @param mixed $rAllowHevc     player_allow_hevc setting, passed to the compatibility check.
 	 * @return array{0:int,1:?string,2:?string,3:mixed} [compatible, audioCodec, videoCodec, resolution]
 	 */
-	private static function resolveStreamCodecMeta($rFFProbeOutput, $rAllowHevc) {
+	private static function resolveStreamCodecMeta(mixed $rFFProbeOutput, mixed $rAllowHevc) {
 		$rCompatible = 0;
 		$rAudioCodec = $rVideoCodec = $rResolution = null;
 
@@ -654,11 +650,11 @@ class StreamProcess {
 			$rResolution = isset($rFFProbeOutput['codecs']['video']['height']) ? $rFFProbeOutput['codecs']['video']['height'] : null;
 
 			if ($rResolution) {
-				$rResolution = StreamSorter::getNearest(array(240, 360, 480, 576, 720, 1080, 1440, 2160), $rResolution);
+				$rResolution = StreamSorter::getNearest([240, 360, 480, 576, 720, 1080, 1440, 2160], $rResolution);
 			}
 		}
 
-		return array($rCompatible, $rAudioCodec, $rVideoCodec, $rResolution);
+		return [$rCompatible, $rAudioCodec, $rVideoCodec, $rResolution];
 	}
 
 	/**
@@ -670,7 +666,7 @@ class StreamProcess {
 	 * @param mixed $rACodec     resolved output -acodec ('' when absent).
 	 * @return string '-bsf:a aac_adtstoasc' when applicable, otherwise ''.
 	 */
-	private static function aacBitstreamFilter($rContainer, $rAudioCodec, $rACodec) {
+	private static function aacBitstreamFilter(mixed $rContainer, mixed $rAudioCodec, mixed $rACodec) {
 		return (!stristr($rContainer, 'flv') && $rAudioCodec === 'aac' && $rACodec === 'copy') ? '-bsf:a aac_adtstoasc' : '';
 	}
 
@@ -681,7 +677,7 @@ class StreamProcess {
 	 * @param array $rArguments Stream arguments (each an assoc array).
 	 * @return bool
 	 */
-	private static function hasSkipFFProbe($rArguments) {
+	private static function hasSkipFFProbe(array $rArguments) {
 		foreach ($rArguments as $rArg) {
 			if ($rArg['argument_key'] == 'skip_ffprobe' && $rArg['value'] == 1) {
 				return true;
@@ -697,13 +693,13 @@ class StreamProcess {
 	 * @return array
 	 */
 	private static function skipFFProbeOutput() {
-		return array(
-			'codecs' => array(
-				'video' => array('codec_name' => 'h264', 'codec_type' => 'video', 'height' => 1080),
-				'audio' => array('codec_name' => 'aac', 'codec_type' => 'audio')
-			),
+		return [
+			'codecs' => [
+				'video' => ['codec_name' => 'h264', 'codec_type' => 'video', 'height' => 1080],
+				'audio' => ['codec_name' => 'aac', 'codec_type' => 'audio']
+			],
 			'container' => 'mpegts'
-		);
+		];
 	}
 
 	/**
@@ -715,7 +711,7 @@ class StreamProcess {
 	 * @param mixed $rStreamID Stream id; its "<id>_" marks the stream's own segment line.
 	 * @return int Next segment number, or 0.
 	 */
-	private static function resolveDelaySegmentStart($rLines, $rStreamID) {
+	private static function resolveDelaySegmentStart(array $rLines, mixed $rStreamID) {
 		$rLast = $rLines[count($rLines) - 1];
 		$rPrev = $rLines[count($rLines) - 2];
 		$rTarget = stristr($rLast, $rStreamID . '_') ? $rLast : $rPrev;
@@ -733,7 +729,7 @@ class StreamProcess {
 	 * @param int   $rSegmentStart Resume segment number (0 = fresh).
 	 * @return int Seconds to sleep.
 	 */
-	private static function resolveDelaySleepTime($rDelayMinutes, $rSegmentStart) {
+	private static function resolveDelaySleepTime(mixed $rDelayMinutes, int $rSegmentStart) {
 		$rSleepTime = $rDelayMinutes * 60;
 		if ($rSegmentStart > 0) {
 			$rSleepTime -= ($rSegmentStart - 1) * 10;
@@ -752,7 +748,7 @@ class StreamProcess {
 	 * @param int $rStreamID Stream id.
 	 * @return void
 	 */
-	private static function writeStreamKeyIv($rStreamID) {
+	private static function writeStreamKeyIv(int $rStreamID) {
 		$rKey = openssl_random_pseudo_bytes(16);
 		file_put_contents(STREAMS_PATH . $rStreamID . '_.key', $rKey);
 		$rIVSize = openssl_cipher_iv_length('AES-128-CBC');
@@ -767,7 +763,7 @@ class StreamProcess {
 	 * @param int $rStreamID Stream id.
 	 * @return void
 	 */
-	private static function clearStreamPidSegments($rStreamID) {
+	private static function clearStreamPidSegments(int $rStreamID) {
 		shell_exec('rm -f ' . STREAMS_PATH . intval($rStreamID) . '_*.ts');
 		if (file_exists(STREAMS_PATH . $rStreamID . '_.pid')) {
 			unlink(STREAMS_PATH . $rStreamID . '_.pid');
@@ -784,7 +780,7 @@ class StreamProcess {
 	 * @param string $rSuffix   Sidecar suffix ('_.pid' or '_.monitor').
 	 * @return int PID, or 0 if none.
 	 */
-	private static function pidFromFileOrColumn($rStreamID, $rColumn, $rSuffix) {
+	private static function pidFromFileOrColumn(int $rStreamID, string $rColumn, string $rSuffix) {
 		if (file_exists(STREAMS_PATH . $rStreamID . $rSuffix)) {
 			return intval(file_get_contents(STREAMS_PATH . $rStreamID . $rSuffix));
 		}
@@ -802,7 +798,7 @@ class StreamProcess {
 	 * @param bool $rWithMonitor Also clear monitor_pid (full stop vs. movie stop).
 	 * @return void
 	 */
-	private static function resetStreamServerRow($rStreamID, $rWithMonitor = false) {
+	private static function resetStreamServerRow(int $rStreamID, bool $rWithMonitor = false) {
 		$rMonitor = $rWithMonitor ? ',`monitor_pid` = NULL' : '';
 		self::db()->query('UPDATE `streams_servers` SET `bitrate` = NULL,`current_source` = NULL,`to_analyze` = 0,`pid` = NULL,`stream_started` = NULL,`stream_info` = NULL,`audio_codec` = NULL,`video_codec` = NULL,`resolution` = NULL,`compatible` = 0,`stream_status` = 0' . $rMonitor . ' WHERE `stream_id` = ? AND `server_id` = ?', $rStreamID, SERVER_ID);
 	}
@@ -893,7 +889,7 @@ class StreamProcess {
 			if (($rStream['stream_info']['gen_timestamps'] == 1 || empty($rProtocol)) && $rStream['stream_info']['type_key'] != 'created_live') {
 				$rGenPTS = '-fflags +genpts -async 1';
 			} else {
-				if (is_array($rFFProbeOutput) && isset($rFFProbeOutput['codecs']['audio']['codec_name']) && in_array($rFFProbeOutput['codecs']['audio']['codec_name'], array('ac3', 'eac3')) && $rSettings['dts_legacy_ffmpeg']) {
+				if (is_array($rFFProbeOutput) && isset($rFFProbeOutput['codecs']['audio']['codec_name']) && in_array($rFFProbeOutput['codecs']['audio']['codec_name'], ['ac3', 'eac3']) && $rSettings['dts_legacy_ffmpeg']) {
 					$rFFMPEG_CPU = FFMPEG_BIN_40;
 				}
 
@@ -910,12 +906,12 @@ class StreamProcess {
 
 			if (!$rStream['server_info']['parent_id'] && $rStream['stream_info']['enable_transcode'] == 1 && $rStream['stream_info']['type_key'] != 'created_live') {
 				if ($rStream['stream_info']['transcode_profile_id'] == -1) {
-					$rStream['stream_info']['transcode_attributes'] = array_merge(StreamUtils::getArguments($rStream['stream_arguments'], $rProtocol, 'transcode'), json_decode((string) $rStream['stream_info']['transcode_attributes'], true) ?: array());
+					$rStream['stream_info']['transcode_attributes'] = array_merge(StreamUtils::getArguments($rStream['stream_arguments'], $rProtocol, 'transcode'), json_decode((string) $rStream['stream_info']['transcode_attributes'], true) ?: []);
 				} else {
-					$rStream['stream_info']['transcode_attributes'] = json_decode((string) $rStream['stream_info']['profile_options'], true) ?: array();
+					$rStream['stream_info']['transcode_attributes'] = json_decode((string) $rStream['stream_info']['profile_options'], true) ?: [];
 				}
 			} else {
-				$rStream['stream_info']['transcode_attributes'] = array();
+				$rStream['stream_info']['transcode_attributes'] = [];
 			}
 
 			$rFFMPEG = ((isset($rStream['stream_info']['transcode_attributes']['gpu']) ? $rFFMPEG_GPU : $rFFMPEG_CPU)) . ' -y -nostdin -hide_banner -loglevel ' . (($rSettings['ffmpeg_warnings'] ? 'warning' : 'error')) . ' -err_detect ignore_err -thread_queue_size 1024 ' . $rOptions . ' {GEN_PTS} {READ_NATIVE} ' . $rLLODInputFlags . '-probesize ' . $rProbesize . ' -analyzeduration ' . $rAnalyseDuration . ' -progress "' . $rProgressFile . '" {CONCAT} -i {STREAM_SOURCE} {LOGO} -max_muxing_queue_size 1024 ';
@@ -926,12 +922,12 @@ class StreamProcess {
 				$rStream['stream_info']['transcode_attributes']['-sn'] = '';
 			}
 		} else {
-			$rStream['stream_info']['transcode_attributes'] = array();
+			$rStream['stream_info']['transcode_attributes'] = [];
 			$rFFMPEG = ((stripos($rStream['stream_info']['custom_ffmpeg'], 'nvenc') !== false ? $rFFMPEG_GPU : $rFFMPEG_CPU)) . ' -y -nostdin -hide_banner -loglevel ' . (($rSettings['ffmpeg_warnings'] ? 'warning' : 'error')) . ' -progress "' . $rProgressFile . '" ' . $rStream['stream_info']['custom_ffmpeg'];
 		}
 
 		$rLLODOptions = ($rLLOD && !$rLoopback ? self::llodOutputOptions($rStream['stream_info']['transcode_attributes']) : '');
-		$rOutputs = array();
+		$rOutputs = [];
 
 		if ($rLoopback) {
 			$rOptions = '{MAP}';
@@ -1082,13 +1078,13 @@ class StreamProcess {
 
 		// The fetch identity the daemon's own puller uses for this stream
 		// (user_agent / proxy / cookie resolution is shared, not re-derived).
-		$rSource = FanoutClient::buildSource(array('stream_source' => json_encode(array($data['source']))), $rArgs);
+		$rSource = FanoutClient::buildSource(['stream_source' => json_encode([$data['source']])], $rArgs);
 
-		$rCmd = array(
+		$rCmd = [
 			$data['binary'], 'remux',
 			'-loglevel', (!empty($rSettings['ffmpeg_warnings']) ? 'warning' : 'error'),
 			'-i', escapeshellarg($data['source']),
-		);
+		];
 		if ($rSource['ua'] !== '') {
 			$rCmd[] = '-user_agent ' . escapeshellarg($rSource['ua']);
 		}
@@ -1178,7 +1174,7 @@ class StreamProcess {
 	 */
 	private static function isNativeSource(string $rURL): bool {
 		$rScheme = strtolower((string) parse_url($rURL, PHP_URL_SCHEME));
-		return in_array($rScheme, array('http', 'https', 'udp', 'rtp'), true) && !StreamUtils::needsResolver($rURL);
+		return in_array($rScheme, ['http', 'https', 'udp', 'rtp'], true) && !StreamUtils::needsResolver($rURL);
 	}
 
 	/**
@@ -1193,14 +1189,14 @@ class StreamProcess {
 		// waited for the playlist; the daemon confirms a start by bytes arriving,
 		// which for ffmpeg comes after its own probe. Same budget.
 		$rStartTimeout = $rProbeSeconds + max(20, min($rSegTime * 3, 30));
-		return array(
+		return [
 			'stop_failures'          => max(0, intval($rSettings['stop_failures'] ?? 0)),
 			'stream_fail_sleep'      => max(1, intval($rSettings['stream_fail_sleep'] ?? 10)),
 			'on_demand'              => !empty($rServerInfo['on_demand']),
 			'on_demand_failure_exit' => !empty($rSettings['on_demand_failure_exit']),
 			'start_timeout_sec'      => $rStartTimeout,
 			'priority_backup_sec'    => (!empty($rSettings['priority_backup']) && $rSourceCount > 1 && empty($rServerInfo['parent_id'])) ? 300 : 0,
-		);
+		];
 	}
 
 	/**
@@ -1211,12 +1207,12 @@ class StreamProcess {
 	 */
 	private static function supervisorHealth(array $rStreamInfo, array $rSettings): array {
 		$rSegTime = max(1, intval($rSettings['seg_time'] ?? 10));
-		$rHealth = array(
+		$rHealth = [
 			'stall_sec'      => $rSegTime * 6, // the monitor's "playlist unchanged for seg_time × 6"
 			'audio_loss_sec' => !empty($rSettings['audio_restart_loss']) ? 30 : 0,
 			'fps_threshold'  => 0,
 			'fps_grace_sec'  => max(0, intval($rSettings['fps_delay'] ?? 0)),
-		);
+		];
 		if (intval($rStreamInfo['fps_restart'] ?? 0) === 1) {
 			// "FPS Threshold %": restart below this share of the stream's own rate.
 			$rPercent = intval($rStreamInfo['fps_threshold'] ?? 0) ?: 90;
@@ -1224,7 +1220,7 @@ class StreamProcess {
 		}
 		$rAuto = json_decode((string) ($rStreamInfo['auto_restart'] ?? ''), true);
 		if (is_array($rAuto) && !empty($rAuto['days']) && !empty($rAuto['at'])) {
-			$rHealth['auto_restart'] = array('days' => array_values((array) $rAuto['days']), 'at' => (string) $rAuto['at']);
+			$rHealth['auto_restart'] = ['days' => array_values((array) $rAuto['days']), 'at' => (string) $rAuto['at']];
 		}
 		return $rHealth;
 	}
@@ -1258,7 +1254,7 @@ class StreamProcess {
 		if ($db->num_rows() <= 0) {
 			return null;
 		}
-		$rStream = array('stream_info' => $db->get_row());
+		$rStream = ['stream_info' => $db->get_row()];
 		$db->query('SELECT * FROM `streams_servers` WHERE stream_id = ? AND `server_id` = ?', $rStreamID, SERVER_ID);
 		if ($db->num_rows() <= 0) {
 			return null;
@@ -1278,8 +1274,8 @@ class StreamProcess {
 
 		if ($rParentID > 0) {
 			$rLoopURL = (!is_null($rServers[SERVER_ID]['private_url_ip']) && !is_null($rServers[$rParentID]['private_url_ip']) ? $rServers[$rParentID]['private_url_ip'] : $rServers[$rParentID]['public_url_ip']);
-			$rSources = array($rLoopURL . 'admin/live?stream=' . intval($rStreamID) . '&password=' . urlencode($rSettings['live_streaming_pass']) . '&extension=ts');
-			$rLabels = array('Loopback: #' . $rParentID);
+			$rSources = [$rLoopURL . 'admin/live?stream=' . intval($rStreamID) . '&password=' . urlencode($rSettings['live_streaming_pass']) . '&extension=ts'];
+			$rLabels = ['Loopback: #' . $rParentID];
 		} else {
 			$rSources = array_values(array_filter(array_map('trim', (array) json_decode((string) $rInfo['stream_source'], true)), static fn(string $source): bool => $source !== ''));
 			$rLabels = $rSources;
@@ -1297,20 +1293,20 @@ class StreamProcess {
 
 		$rLoopback = $rParentID > 0;
 		$rLLOD = !empty($rStream['server_info']['on_demand']) && ($rLoopback || intval($rInfo['llod']) > 0);
-		$rSegmentSettings = array('seg_time' => intval($rSettings['seg_time']), 'seg_list_size' => intval($rSettings['seg_list_size']), 'seg_delete_threshold' => intval($rSettings['seg_delete_threshold']));
+		$rSegmentSettings = ['seg_time' => intval($rSettings['seg_time']), 'seg_list_size' => intval($rSettings['seg_list_size']), 'seg_delete_threshold' => intval($rSettings['seg_delete_threshold'])];
 		list($rProbesize, $rAnalyseDuration, $rTimeout) = self::resolveProbeSettings($rStream['server_info']['on_demand'], $rInfo['probesize_ondemand'], $rLLOD, $rSettings);
 
 		self::writeStreamKeyIv($rStreamID);
 		// Loopback included: the playlist declares AES-128 whenever encrypt_hls is
 		// on (HLSGenerator::tokenizeDaemonPlaylist), so a daemon fed without the
 		// key served plain segments no player could decrypt.
-		[$rEncKey, $rEncIV] = !empty($rSettings['encrypt_hls']) ? IngestFeeder::streamKey($rStreamID) : array(null, null);
+		[$rEncKey, $rEncIV] = !empty($rSettings['encrypt_hls']) ? IngestFeeder::streamKey($rStreamID) : [null, null];
 		$rIngestSock = FanoutClient::registerIngest($rStreamID, $rEncKey, $rEncIV);
 		if ($rIngestSock === null) {
 			return null; // no daemon to feed: the stream runs the legacy way
 		}
 
-		$rArgsByKey = array();
+		$rArgsByKey = [];
 		foreach ($rStream['stream_arguments'] as $rArg) {
 			$rArgsByKey[$rArg['argument_key']] = $rArg;
 		}
@@ -1332,7 +1328,7 @@ class StreamProcess {
 		}
 		$rPriority = !empty($rSettings['priority_backup']) && count($rSources) > 1 && !$rLoopback;
 
-		$rSpecSources = array();
+		$rSpecSources = [];
 		foreach ($rSources as $i => $rSource) {
 			$rStreamSource = StreamUtils::parseStreamURL($rSource);
 			$rProtocol = strtolower(substr($rStreamSource, 0, (int) strpos($rStreamSource, '://')));
@@ -1347,33 +1343,33 @@ class StreamProcess {
 			}
 			$rFetchOptions = implode(' ', StreamUtils::getArguments($rArguments, $rProtocol, 'fetch'));
 
-			$rFFMPEG = self::buildLive(array(
+			$rFFMPEG = self::buildLive([
 				'stream' => $rStream, 'settings' => $rSettings, 'servers' => $rServers,
 				'streamID' => $rStreamID, 'streamSource' => $rStreamSource,
 				'fetchOptions' => $rFetchOptions, 'ffprobe' => self::cachedProbe($rSource, $rStreamSource),
 				'protocol' => $rProtocol, 'source' => $rSource,
-				'segmentSettings' => $rSegmentSettings, 'externalPush' => array(),
+				'segmentSettings' => $rSegmentSettings, 'externalPush' => [],
 				'probesize' => $rProbesize, 'analyseDuration' => $rAnalyseDuration,
 				'llod' => $rLLOD, 'loopback' => $rLoopback,
 				'segmentStart' => 0, 'delayActive' => false,
 				'ffmpegCpu' => $rFFMPEGCpu, 'ffmpegGpu' => $rFFMPEGGpu,
 				'ingestSock' => $rIngestSock, 'supervised' => true,
-			));
+			]);
 
-			$rEntry = array('label' => $rLabels[$i], 'cmd' => $rFFMPEG);
+			$rEntry = ['label' => $rLabels[$i], 'cmd' => $rFFMPEG];
 			if ($rNativeStream && !self::isNativeSource($rStreamSource)) {
 				self::noteProducer($rStreamID, 'ffmpeg runs source #' . $i . ': ' . strtolower((string) parse_url($rStreamSource, PHP_URL_SCHEME)) . ':// is not a scheme the remuxer reads');
 			}
 			if ($rNativeStream && self::isNativeSource($rStreamSource)) {
-				$rNativeArgs = array();
+				$rNativeArgs = [];
 				foreach ($rArguments as $rArg) {
 					$rNativeArgs[$rArg['argument_key']] = $rArg;
 				}
-				$rEntry['cmd'] = self::buildNativeLive(array(
+				$rEntry['cmd'] = self::buildNativeLive([
 					'streamID' => $rStreamID, 'source' => $rStreamSource, 'arguments' => $rNativeArgs,
 					'segmentSettings' => $rSegmentSettings, 'ingestSock' => $rIngestSock,
 					'settings' => $rSettings, 'binary' => FanoutClient::binaryPath(),
-				));
+				]);
 				if ($rBackend === 'auto') {
 					$rEntry['fallback_cmd'] = $rFFMPEG;
 				}
@@ -1385,7 +1381,7 @@ class StreamProcess {
 			$rSpecSources[] = $rEntry;
 		}
 
-		return array(
+		return [
 			'sources'     => $rSpecSources,
 			'policy'      => self::supervisorPolicy($rStream['server_info'], $rSettings, count($rSpecSources), intval($rTimeout)),
 			'health'      => self::supervisorHealth($rInfo, $rSettings),
@@ -1396,7 +1392,7 @@ class StreamProcess {
 			// Both producers name this stream's playlist, and nothing else does:
 			// an encoder that outlived a daemon restart is recognised by it.
 			'adopt_match' => STREAMS_PATH . $rStreamID . '_.m3u8',
-		);
+		];
 	}
 
 	/**
@@ -1417,7 +1413,7 @@ class StreamProcess {
 			}
 		}
 		$rPath = strtolower((string) parse_url($rStreamSource, PHP_URL_PATH));
-		return array('container' => (substr($rPath, -5) === '.m3u8' ? 'hls' : 'mpegts'), 'codecs' => array());
+		return ['container' => (substr($rPath, -5) === '.m3u8' ? 'hls' : 'mpegts'), 'codecs' => []];
 	}
 
 	/**
@@ -1426,7 +1422,7 @@ class StreamProcess {
 	 * hand-over without a restart adopts it.
 	 */
 	private static function killPhpMonitor(int $rStreamID): void {
-		$rCandidates = array();
+		$rCandidates = [];
 		if (file_exists(STREAMS_PATH . $rStreamID . '_.monitor')) {
 			$rCandidates[] = intval(@file_get_contents(STREAMS_PATH . $rStreamID . '_.monitor'));
 		}
@@ -1573,7 +1569,7 @@ class StreamProcess {
 	 */
 	private static function killProducer(int $rStreamID, bool $rKeepAdoptable): bool {
 		$rPID = self::pidFromFileOrColumn($rStreamID, 'pid', '_.pid');
-		if ($rPID <= 0 || !ProcessChecker::checkPID($rPID, array($rStreamID . '_.m3u8', $rStreamID . '_%d.ts', 'LLOD[' . $rStreamID . ']', 'Loopback[' . $rStreamID . ']'))) {
+		if ($rPID <= 0 || !ProcessChecker::checkPID($rPID, [$rStreamID . '_.m3u8', $rStreamID . '_%d.ts', 'LLOD[' . $rStreamID . ']', 'Loopback[' . $rStreamID . ']'])) {
 			return false;
 		}
 		if ($rKeepAdoptable && strpos((string) @file_get_contents('/proc/' . $rPID . '/cmdline'), STREAMS_PATH . $rStreamID . '_.m3u8') !== false) {
@@ -1605,17 +1601,17 @@ class StreamProcess {
 		}
 		$rIDs = array_map('intval', array_keys($rStates['streams']));
 		if (count($rIDs) === 0) {
-			return array();
+			return [];
 		}
 		$db = self::db();
 		$db->query('SELECT `stream_id`, `pid`, `monitor_pid`, `stream_status`, `current_source`, `stream_started`, `stream_info`, `audio_codec`, `video_codec`, `resolution`, `bitrate`, `compatible` FROM `streams_servers` WHERE `server_id` = ? AND `stream_id` IN (' . implode(',', $rIDs) . ')', SERVER_ID);
-		$rRows = array();
+		$rRows = [];
 		foreach ($db->get_rows() as $rRow) {
 			$rRows[intval($rRow['stream_id'])] = $rRow;
 		}
 
-		$rKept = array();
-		$rChanged = array();
+		$rKept = [];
+		$rChanged = [];
 		foreach ($rStates['streams'] as $rID => $rState) {
 			$rID = intval($rID);
 			$rRow = $rRows[$rID] ?? null;
@@ -1628,8 +1624,8 @@ class StreamProcess {
 			$rKept[] = $rID;
 			$rSet = self::supervisedRowUpdate($rRow, $rState, (bool) SettingsManager::get('player_allow_hevc'), time());
 			if (count($rSet) > 0) {
-				$rCols = array();
-				$rVals = array();
+				$rCols = [];
+				$rVals = [];
 				foreach ($rSet as $rCol => $rVal) {
 					$rCols[] = '`' . $rCol . '` = ?';
 					$rVals[] = $rVal;
@@ -1671,10 +1667,10 @@ class StreamProcess {
 		} else {
 			$rStatus = 2;
 		}
-		$rWant = array(
+		$rWant = [
 			'stream_status' => $rStatus,
 			'pid'           => ($rRunning && intval($rState['pid'] ?? 0) > 0) ? intval($rState['pid']) : null,
-		);
+		];
 		if (intval($rState['daemon_pid'] ?? 0) > 0) {
 			$rWant['monitor_pid'] = intval($rState['daemon_pid']);
 		}
@@ -1694,10 +1690,10 @@ class StreamProcess {
 		// where stream/auth.php reads the viewer's video codec. Without it a
 		// supervised stream showed "? x ?" and "N/A", and every adaptive variant
 		// was dropped for want of a width.
-		$rMeta = (isset($rState['meta']) && is_array($rState['meta'])) ? $rState['meta'] : array();
+		$rMeta = (isset($rState['meta']) && is_array($rState['meta'])) ? $rState['meta'] : [];
 		$rInfo = json_decode((string) ($rRow['stream_info'] ?? ''), true);
 		if (!is_array($rInfo)) {
-			$rInfo = array();
+			$rInfo = [];
 		}
 		$rInfoWas = $rInfo;
 		if (!empty($rMeta['video_codec']) || !empty($rMeta['audio_codec'])) {
@@ -1705,23 +1701,23 @@ class StreamProcess {
 			$rAudio = (string) ($rMeta['audio_codec'] ?? '') ?: $rRow['audio_codec'];
 			$rWant['video_codec'] = $rVideo;
 			$rWant['audio_codec'] = $rAudio;
-			$rCodecs = array();
+			$rCodecs = [];
 			if ($rVideo) {
-				$rCodecs['video'] = array('codec_name' => $rVideo, 'codec_type' => 'video');
+				$rCodecs['video'] = ['codec_name' => $rVideo, 'codec_type' => 'video'];
 			}
 			if ($rAudio) {
-				$rCodecs['audio'] = array('codec_name' => $rAudio, 'codec_type' => 'audio');
+				$rCodecs['audio'] = ['codec_name' => $rAudio, 'codec_type' => 'audio'];
 			}
-			$rWant['compatible'] = intval(DiagnosticsService::checkCompatibility(array('codecs' => $rCodecs), $rAllowHevc));
+			$rWant['compatible'] = intval(DiagnosticsService::checkCompatibility(['codecs' => $rCodecs], $rAllowHevc));
 			foreach ($rCodecs as $rKind => $rCodec) {
 				$rInfo['codecs'][$rKind] = array_merge(
-					is_array($rInfo['codecs'][$rKind] ?? null) ? $rInfo['codecs'][$rKind] : array(),
+					is_array($rInfo['codecs'][$rKind] ?? null) ? $rInfo['codecs'][$rKind] : [],
 					$rCodec
 				);
 			}
 		}
 		if (intval($rMeta['height'] ?? 0) > 0) {
-			$rWant['resolution'] = StreamSorter::getNearest(array(240, 360, 480, 576, 720, 1080, 1440, 2160), intval($rMeta['height']));
+			$rWant['resolution'] = StreamSorter::getNearest([240, 360, 480, 576, 720, 1080, 1440, 2160], intval($rMeta['height']));
 			$rInfo['codecs']['video']['height'] = intval($rMeta['height']);
 		}
 		if (intval($rMeta['width'] ?? 0) > 0) {
@@ -1737,7 +1733,7 @@ class StreamProcess {
 			$rWant['stream_info'] = json_encode($rInfo);
 		}
 
-		$rSet = array();
+		$rSet = [];
 		foreach ($rWant as $rCol => $rVal) {
 			$rHave = $rRow[$rCol] ?? null;
 			if ((is_null($rVal) !== is_null($rHave)) || (!is_null($rVal) && (string) $rVal !== (string) $rHave)) {
@@ -1750,7 +1746,7 @@ class StreamProcess {
 	public static function createChannelItem($rStreamID, $rSource) {
 		global $rSettings, $rServers, $rFFMPEG_CPU, $rFFMPEG_GPU;
 		$db = self::db();
-		$rStream = array();
+		$rStream = [];
 		$rLoopback = false;
 		$db->query('SELECT * FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type AND t1.type = 3 LEFT JOIN `profiles` t4 ON t1.transcode_profile_id = t4.profile_id WHERE t1.direct_source = 0 AND t1.id = ?', $rStreamID);
 		if ($db->num_rows() > 0) {
@@ -1770,7 +1766,7 @@ class StreamProcess {
 				} else {
 					$rStream['stream_info']['transcode_attributes'] = json_decode($rStream['stream_info']['profile_options'], true);
 					if (!is_array($rStream['stream_info']['transcode_attributes'])) {
-						$rStream['stream_info']['transcode_attributes'] = array();
+						$rStream['stream_info']['transcode_attributes'] = [];
 					}
 
 					$rLogoOptions = self::buildLogoFilterOptions($rStream['stream_info']['transcode_attributes'], $rLoopback);
@@ -1787,7 +1783,7 @@ class StreamProcess {
 					$rCommand .= implode(' ', StreamUtils::parseTranscode($rStream['stream_info']['transcode_attributes'])) . ' ';
 					$rCommand .= '-strict -2 -mpegts_flags +initial_discontinuity -f mpegts "' . CREATED_PATH . intval($rStreamID) . '_' . $rMD5 . '.ts"';
 					$rCommand .= ' >/dev/null 2>"' . CREATED_PATH . intval($rStreamID) . '_' . $rMD5 . '.errors" & echo $! > "' . CREATED_PATH . intval($rStreamID) . '_' . $rMD5 . '.pid"';
-					$rCommand = str_replace(array('{GPU}', '{INPUT_CODEC}', '{LOGO}', '{STREAM_SOURCE}'), array($rGPUOptions, $rInputCodec, $rLogoOptions, escapeshellarg($rSourcePath)), $rCommand);
+					$rCommand = str_replace(['{GPU}', '{INPUT_CODEC}', '{LOGO}', '{STREAM_SOURCE}'], [$rGPUOptions, $rInputCodec, $rLogoOptions, escapeshellarg($rSourcePath)], $rCommand);
 				}
 
 				shell_exec($rCommand);
@@ -1805,7 +1801,7 @@ class StreamProcess {
 	 * @param bool $rStop     Mark the stream as fully stopped (not just restarting).
 	 * @return mixed Stop result.
 	 */
-	public static function stopStream($rStreamID, $rStop = false) {
+	public static function stopStream(int $rStreamID, bool $rStop = false) {
 		// A supervised stream is released FIRST: its producer dying is exactly
 		// what the fanout supervisor restarts, so killing it before the release
 		// would have the daemon start a replacement and the stream refuse to stop.
@@ -1815,13 +1811,13 @@ class StreamProcess {
 
 		$rMonitor = self::pidFromFileOrColumn($rStreamID, 'monitor_pid', '_.monitor');
 
-		if (0 < $rMonitor && ProcessChecker::checkPID($rMonitor, array('XC_VM[' . $rStreamID . ']')) && is_numeric($rMonitor)) {
+		if (0 < $rMonitor && ProcessChecker::checkPID($rMonitor, ['XC_VM[' . $rStreamID . ']']) && is_numeric($rMonitor)) {
 			posix_kill($rMonitor, 9);
 		}
 
 		$rPID = self::pidFromFileOrColumn($rStreamID, 'pid', '_.pid');
 
-		if (0 < $rPID && ProcessChecker::checkPID($rPID, array($rStreamID . '_.m3u8', $rStreamID . '_%d.ts', 'LLOD[' . $rStreamID . ']', 'Loopback[' . $rStreamID . ']')) && is_numeric($rPID)) {
+		if (0 < $rPID && ProcessChecker::checkPID($rPID, [$rStreamID . '_.m3u8', $rStreamID . '_%d.ts', 'LLOD[' . $rStreamID . ']', 'Loopback[' . $rStreamID . ']']) && is_numeric($rPID)) {
 			posix_kill($rPID, 9);
 		}
 
@@ -1850,13 +1846,13 @@ class StreamProcess {
 	 * @param bool $rForce    Force stop.
 	 * @return mixed Stop result.
 	 */
-	public static function stopMovie($rStreamID, $rForce = false) {
+	public static function stopMovie(int $rStreamID, bool $rForce = false) {
 		$db = self::db();
 		shell_exec("kill -9 `ps -ef | grep '/" . intval($rStreamID) . ".' | grep -v grep | awk '{print \$2}'`;");
 		if ($rForce) {
 			exec('rm ' . MAIN_HOME . 'content/vod/' . intval($rStreamID) . '.*');
 		} else {
-			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', SERVER_ID, time(), json_encode(array('type' => 'delete_vod', 'id' => $rStreamID)));
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', SERVER_ID, time(), json_encode(['type' => 'delete_vod', 'id' => $rStreamID]));
 		}
 		self::resetStreamServerRow($rStreamID);
 		self::updateStream($rStreamID);
@@ -1869,7 +1865,7 @@ class StreamProcess {
 	 * @param int|null $rServerID Target server id, or null for the default.
 	 * @return mixed Queue result.
 	 */
-	public static function queueMovie($rStreamID, $rServerID = null) {
+	public static function queueMovie(int $rStreamID, ?int $rServerID = null) {
 		$db = self::db();
 		if (!$rServerID) {
 			$rServerID = SERVER_ID;
@@ -1885,7 +1881,7 @@ class StreamProcess {
 	 * @param int|null $rServerID  Target server id, or null for the default.
 	 * @return void
 	 */
-	public static function queueMovies($rStreamIDs, $rServerID = null) {
+	public static function queueMovies(array $rStreamIDs, ?int $rServerID = null) {
 		$db = self::db();
 		if (!$rServerID) {
 			$rServerID = SERVER_ID;
@@ -1912,7 +1908,7 @@ class StreamProcess {
 	 * @param int   $rType Refresh type.
 	 * @return void
 	 */
-	public static function refreshMovies($rIDs, $rType = 1) {
+	public static function refreshMovies(array $rIDs, int $rType = 1) {
 		$db = self::db();
 		if (0 < count($rIDs)) {
 			$db->query('DELETE FROM `watch_refresh` WHERE `type` = ? AND `stream_id` IN (' . implode(',', array_map('intval', $rIDs)) . ');', $rType);
@@ -1935,10 +1931,10 @@ class StreamProcess {
 	 * @param int $rStreamID Stream id.
 	 * @return mixed Start result.
 	 */
-	public static function startMovie($rStreamID) {
+	public static function startMovie(int $rStreamID) {
 		global $rSettings, $rServers, $rFFMPEG_CPU, $rFFMPEG_GPU;
 		$db = self::db();
-		$rStream = array();
+		$rStream = [];
 		$rLoopback = false;
 		$db->query('SELECT * FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type AND t2.live = 0 LEFT JOIN `profiles` t4 ON t1.transcode_profile_id = t4.profile_id WHERE t1.direct_source = 0 AND t1.id = ?', $rStreamID);
 		if ($db->num_rows() > 0) {
@@ -1985,13 +1981,13 @@ class StreamProcess {
 					if ($rStream['stream_info']['enable_transcode'] == 1) {
 						if ($rStream['stream_info']['transcode_profile_id'] == -1) {
 							$rDecoded = json_decode($rStream['stream_info']['transcode_attributes'], true);
-							$rStream['stream_info']['transcode_attributes'] = array_merge(StreamUtils::getArguments($rStream['stream_arguments'], $rProtocol, 'transcode'), (is_array($rDecoded) ? $rDecoded : array()));
+							$rStream['stream_info']['transcode_attributes'] = array_merge(StreamUtils::getArguments($rStream['stream_arguments'], $rProtocol, 'transcode'), (is_array($rDecoded) ? $rDecoded : []));
 						} else {
 							$rDecoded = json_decode($rStream['stream_info']['profile_options'], true);
-							$rStream['stream_info']['transcode_attributes'] = (is_array($rDecoded) ? $rDecoded : array());
+							$rStream['stream_info']['transcode_attributes'] = (is_array($rDecoded) ? $rDecoded : []);
 						}
 					} else {
-						$rStream['stream_info']['transcode_attributes'] = array();
+						$rStream['stream_info']['transcode_attributes'] = [];
 					}
 
 					$rLogoOptions = self::buildLogoFilterOptions($rStream['stream_info']['transcode_attributes'], $rLoopback);
@@ -2001,14 +1997,14 @@ class StreamProcess {
 					$rMap = self::resolveOutputMap($rStream['stream_info']['custom_map'], $rStream['stream_info']['remove_subtitles']);
 					self::applyDefaultCopyCodecs($rStream['stream_info']['transcode_attributes']);
 					$rStream['stream_info']['transcode_attributes']['-scodec'] = self::subtitleCodecForContainer($rStream['stream_info']['target_container']);
-					$rOutputs = array();
+					$rOutputs = [];
 					$rOutputs[$rStream['stream_info']['target_container']] = '-movflags +faststart -dn ' . $rMap . ' -ignore_unknown ' . $rSubtitlesMetadata . ' ' . VOD_PATH . intval($rStreamID) . '.' . escapeshellcmd($rStream['stream_info']['target_container']);
 					foreach ($rOutputs as $rOutputCommand) {
 						$rFFMPEG .= implode(' ', StreamUtils::parseTranscode($rStream['stream_info']['transcode_attributes'])) . ' ';
 						$rFFMPEG .= $rOutputCommand;
 					}
 					$rFFMPEG .= ' >/dev/null 2>' . VOD_PATH . intval($rStreamID) . '.errors & echo $! > ' . VOD_PATH . intval($rStreamID) . '_.pid';
-					$rFFMPEG = str_replace(array('{GPU}', '{INPUT_CODEC}', '{LOGO}', '{FETCH_OPTIONS}', '{STREAM_SOURCE}', '{READ_NATIVE}'), array($rGPUOptions, $rInputCodec, $rLogoOptions, (empty($rFetchOptions) ? '' : $rFetchOptions), escapeshellarg($rMoviePath), (empty($rStream['stream_info']['custom_ffmpeg']) ? $rReadNative : '')), $rFFMPEG);
+					$rFFMPEG = str_replace(['{GPU}', '{INPUT_CODEC}', '{LOGO}', '{FETCH_OPTIONS}', '{STREAM_SOURCE}', '{READ_NATIVE}'], [$rGPUOptions, $rInputCodec, $rLogoOptions, (empty($rFetchOptions) ? '' : $rFetchOptions), escapeshellarg($rMoviePath), (empty($rStream['stream_info']['custom_ffmpeg']) ? $rReadNative : '')], $rFFMPEG);
 				}
 
 				shell_exec($rFFMPEG);
@@ -2029,11 +2025,11 @@ class StreamProcess {
 	 * @param int $rStreamID Stream id.
 	 * @return mixed Start result.
 	 */
-	public static function startLoopback($rStreamID) {
+	public static function startLoopback(int $rStreamID) {
 		global $rSettings, $rServers;
 		$db = self::db();
 		self::clearStreamPidSegments($rStreamID);
-		$rStream = array();
+		$rStream = [];
 		$db->query('SELECT * FROM `streams` WHERE direct_source = 0 AND id = ?', $rStreamID);
 		if ($db->num_rows() > 0) {
 			$rStream['stream_info'] = $db->get_row();
@@ -2048,9 +2044,9 @@ class StreamProcess {
 					$rPID = intval(file_get_contents(STREAMS_PATH . $rStreamID . '_.pid'));
 					$rLoopURL = (!is_null($rServers[SERVER_ID]['private_url_ip']) && !is_null($rServers[$rStream['server_info']['parent_id']]['private_url_ip']) ? $rServers[$rStream['server_info']['parent_id']]['private_url_ip'] : $rServers[$rStream['server_info']['parent_id']]['public_url_ip']);
 					$rCurrentSource = $rLoopURL . 'admin/live?stream=' . intval($rStreamID) . '&password=' . urlencode($rSettings['live_streaming_pass']) . '&extension=ts';
-					$db->query('UPDATE `streams_servers` SET `delay_available_at` = ?,`to_analyze` = 0,`stream_started` = ?,`stream_info` = ?,`stream_status` = 2,`pid` = ?,`progress_info` = ?,`current_source` = ? WHERE `stream_id` = ? AND `server_id` = ?', null, time(), null, $rPID, json_encode(array()), $rCurrentSource, $rStreamID, SERVER_ID);
+					$db->query('UPDATE `streams_servers` SET `delay_available_at` = ?,`to_analyze` = 0,`stream_started` = ?,`stream_info` = ?,`stream_status` = 2,`pid` = ?,`progress_info` = ?,`current_source` = ? WHERE `stream_id` = ? AND `server_id` = ?', null, time(), null, $rPID, json_encode([]), $rCurrentSource, $rStreamID, SERVER_ID);
 					self::updateStream($rStreamID);
-					return array('main_pid' => $rPID, 'stream_source' => $rLoopURL . 'admin/live?stream=' . intval($rStreamID) . '&password=' . urlencode($rSettings['live_streaming_pass']) . '&extension=ts', 'delay_enabled' => false, 'parent_id' => 0, 'delay_start_at' => null, 'playlist' => STREAMS_PATH . $rStreamID . '_.m3u8', 'transcode' => false, 'offset' => 0);
+					return ['main_pid' => $rPID, 'stream_source' => $rLoopURL . 'admin/live?stream=' . intval($rStreamID) . '&password=' . urlencode($rSettings['live_streaming_pass']) . '&extension=ts', 'delay_enabled' => false, 'parent_id' => 0, 'delay_start_at' => null, 'playlist' => STREAMS_PATH . $rStreamID . '_.m3u8', 'transcode' => false, 'offset' => 0];
 				}
 				return 0;
 			}
@@ -2068,22 +2064,22 @@ class StreamProcess {
 	 * @param string|null $rForceSource     Force a specific source URL.
 	 * @return mixed Start result.
 	 */
-	public static function startLLOD($rStreamID, $rStreamInfo, $rStreamArguments, $rForceSource = null) {
+	public static function startLLOD(int $rStreamID, array $rStreamInfo, array $rStreamArguments, ?string $rForceSource = null) {
 		$db = self::db();
 		self::clearStreamPidSegments($rStreamID);
-		$rSources = ($rForceSource ? array($rForceSource) : json_decode($rStreamInfo['stream_source'], true));
-		$rArgumentMap = array();
+		$rSources = ($rForceSource ? [$rForceSource] : json_decode($rStreamInfo['stream_source'], true));
+		$rArgumentMap = [];
 		foreach ($rStreamArguments as $rStreamArgument) {
-			$rArgumentMap[$rStreamArgument['argument_key']] = array('value' => $rStreamArgument['value'], 'argument_default_value' => $rStreamArgument['argument_default_value']);
+			$rArgumentMap[$rStreamArgument['argument_key']] = ['value' => $rStreamArgument['value'], 'argument_default_value' => $rStreamArgument['argument_default_value']];
 		}
 		// The key first: the segmenter hands it to the daemon when it registers
 		// its ingest, moments after it starts.
 		self::writeStreamKeyIv($rStreamID);
 		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php llod ' . intval($rStreamID) . ' "' . base64_encode(json_encode($rSources)) . '" "' . base64_encode(json_encode($rArgumentMap)) . '" >/dev/null 2>/dev/null & echo $! > ' . STREAMS_PATH . intval($rStreamID) . '_.pid');
 		$rPID = intval(file_get_contents(STREAMS_PATH . $rStreamID . '_.pid'));
-		$db->query('UPDATE `streams_servers` SET `delay_available_at` = ?,`to_analyze` = 0,`stream_started` = ?,`stream_info` = ?,`stream_status` = 2,`pid` = ?,`progress_info` = ?,`current_source` = ? WHERE `stream_id` = ? AND `server_id` = ?', null, time(), null, $rPID, json_encode(array()), $rSources[0], $rStreamID, SERVER_ID);
+		$db->query('UPDATE `streams_servers` SET `delay_available_at` = ?,`to_analyze` = 0,`stream_started` = ?,`stream_info` = ?,`stream_status` = 2,`pid` = ?,`progress_info` = ?,`current_source` = ? WHERE `stream_id` = ? AND `server_id` = ?', null, time(), null, $rPID, json_encode([]), $rSources[0], $rStreamID, SERVER_ID);
 		self::updateStream($rStreamID);
-		return array('main_pid' => $rPID, 'stream_source' => $rSources[0], 'delay_enabled' => false, 'parent_id' => 0, 'delay_start_at' => null, 'playlist' => STREAMS_PATH . $rStreamID . '_.m3u8', 'transcode' => false, 'offset' => 0);
+		return ['main_pid' => $rPID, 'stream_source' => $rSources[0], 'delay_enabled' => false, 'parent_id' => 0, 'delay_start_at' => null, 'playlist' => STREAMS_PATH . $rStreamID . '_.m3u8', 'transcode' => false, 'offset' => 0];
 	}
 
 	/**
@@ -2098,13 +2094,13 @@ class StreamProcess {
 	 * @param int         $rStartPos    Start position/offset.
 	 * @return mixed Start result.
 	 */
-	public static function startStream($rStreamID, $rFromCache = false, $rForceSource = null, $rLLOD = false, $rStartPos = 0) {
+	public static function startStream(int $rStreamID, bool $rFromCache = false, ?string $rForceSource = null, bool $rLLOD = false, int $rStartPos = 0) {
 		global $rSettings, $rServers, $rFFMPEG_CPU, $rFFMPEG_GPU, $rFFPROBE;
 		$db = self::db();
-		$rSegmentSettings = array('seg_time' => intval($rSettings['seg_time']), 'seg_list_size' => intval($rSettings['seg_list_size']), 'seg_delete_threshold' => intval($rSettings['seg_delete_threshold']));
+		$rSegmentSettings = ['seg_time' => intval($rSettings['seg_time']), 'seg_list_size' => intval($rSettings['seg_list_size']), 'seg_delete_threshold' => intval($rSettings['seg_delete_threshold'])];
 		@unlink(STREAMS_PATH . $rStreamID . '_.pid');
 
-		$rStream = array();
+		$rStream = [];
 		$db->query('SELECT * FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type AND t2.live = 1 LEFT JOIN `profiles` t4 ON t1.transcode_profile_id = t4.profile_id WHERE t1.direct_source = 0 AND t1.id = ?', $rStreamID);
 
 		if ($db->num_rows() > 0) {
@@ -2124,12 +2120,12 @@ class StreamProcess {
 
 				if (!$rStream['server_info']['parent_id']) {
 					if ($rStream['stream_info']['type_key'] == 'created_live') {
-						$rSources = array(CREATED_PATH . $rStreamID . '_.list');
+						$rSources = [CREATED_PATH . $rStreamID . '_.list'];
 
 						if ($rStartPos > 0) {
-							$rCCOutput = array();
-							$rCCDuration = array();
-							$rCCInfo = json_decode($rStream['server_info']['cc_info'], true) ?: array();
+							$rCCOutput = [];
+							$rCCDuration = [];
+							$rCCInfo = json_decode($rStream['server_info']['cc_info'], true) ?: [];
 
 							foreach ($rCCInfo as $rItem) {
 								$rCCDuration[$rItem['path']] = intval(explode('.', $rItem['seconds'])[0]);
@@ -2165,7 +2161,7 @@ class StreamProcess {
 							}
 
 							if ($rValid) {
-								$rSources = array(CREATED_PATH . $rStreamID . '_.tlist');
+								$rSources = [CREATED_PATH . $rStreamID . '_.tlist'];
 								$rTList = '';
 
 								foreach ($rCCOutput as $rItem) {
@@ -2180,7 +2176,7 @@ class StreamProcess {
 
 					if (count($rSources) > 0) {
 						if (!empty($rForceSource)) {
-							$rSources = array($rForceSource);
+							$rSources = [$rForceSource];
 						} else {
 							$rSources = self::rotateSourcesPastCurrent($rSources, $rSettings['priority_backup'], $rStream['server_info']['current_source']);
 						}
@@ -2193,7 +2189,7 @@ class StreamProcess {
 					}
 
 					$rLoopURL = (!is_null($rServers[SERVER_ID]['private_url_ip']) && !is_null($rServers[$rStream['server_info']['parent_id']]['private_url_ip']) ? $rServers[$rStream['server_info']['parent_id']]['private_url_ip'] : $rServers[$rStream['server_info']['parent_id']]['public_url_ip']);
-					$rSources = array($rLoopURL . 'admin/live?stream=' . intval($rStreamID) . '&password=' . urlencode($rSettings['live_streaming_pass']) . '&extension=ts');
+					$rSources = [$rLoopURL . 'admin/live?stream=' . intval($rStreamID) . '&password=' . urlencode($rSettings['live_streaming_pass']) . '&extension=ts'];
 				}
 
 				if ($rStream['stream_info']['type_key'] == 'created_live' && file_exists(CREATED_PATH . $rStreamID . '_.info')) {
@@ -2211,7 +2207,7 @@ class StreamProcess {
 				$rRealSource = '';
 				$rStreamSource = '';
 				$rProtocol = '';
-				$rFFProbeOutput = array();
+				$rFFProbeOutput = [];
 				foreach ($rSources as $rSource) {
 					$rRealSource = $rSource;
 					$rStreamSource = StreamUtils::parseStreamURL($rSource);
@@ -2277,7 +2273,7 @@ class StreamProcess {
 							}
 						}
 
-						$rProbeCmd = str_replace(array('{FETCH_OPTIONS}', '{CONCAT}', '{STREAM_SOURCE}'), array($rProbeOptions, ($rStream['stream_info']['type_key'] == 'created_live' && !$rStream['server_info']['parent_id'] ? '-safe 0 -f concat' : ''), escapeshellarg($rStreamSource)), $rFFProbee);
+						$rProbeCmd = str_replace(['{FETCH_OPTIONS}', '{CONCAT}', '{STREAM_SOURCE}'], [$rProbeOptions, ($rStream['stream_info']['type_key'] == 'created_live' && !$rStream['server_info']['parent_id'] ? '-safe 0 -f concat' : ''), escapeshellarg($rStreamSource)], $rFFProbee);
 						$rFFProbeOutput = json_decode(shell_exec($rProbeCmd), true);
 
 						if ($rFFProbeOutput && isset($rFFProbeOutput['streams'])) {
@@ -2350,21 +2346,21 @@ class StreamProcess {
 					// encrypts the HLS segments it serves (ADR 0003, Phase B) —
 					// matching the panel's #EXT-X-KEY.
 					self::writeStreamKeyIv($rStreamID);
-					[$rEncKey, $rEncIV] = (!empty($rSettings['encrypt_hls']) && !$rDelayActive) ? IngestFeeder::streamKey(intval($rStreamID)) : array(null, null);
+					[$rEncKey, $rEncIV] = (!empty($rSettings['encrypt_hls']) && !$rDelayActive) ? IngestFeeder::streamKey(intval($rStreamID)) : [null, null];
 					$rIngestSock = !$rDelayActive ? FanoutClient::registerIngest(intval($rStreamID), $rEncKey, $rEncIV) : null;
 
-					$rFFMPEG = self::buildLive(array(
+					$rFFMPEG = self::buildLive([
 						'stream' => $rStream, 'settings' => $rSettings, 'servers' => $rServers,
 						'streamID' => $rStreamID, 'streamSource' => $rStreamSource,
 						'fetchOptions' => $rFetchOptions, 'ffprobe' => $rFFProbeOutput,
 						'protocol' => $rProtocol, 'source' => $rSource,
-						'segmentSettings' => $rSegmentSettings, 'externalPush' => array(),
+						'segmentSettings' => $rSegmentSettings, 'externalPush' => [],
 						'probesize' => $rProbesize, 'analyseDuration' => $rAnalyseDuration,
 						'llod' => $rLLOD, 'loopback' => $rLoopback,
 						'segmentStart' => $rSegmentStart, 'delayActive' => $rDelayActive,
 						'ffmpegCpu' => $rFFMPEG_CPU, 'ffmpegGpu' => $rFFMPEG_GPU,
 						'ingestSock' => $rIngestSock,
-					));
+					]);
 
 				shell_exec($rFFMPEG);
 				file_put_contents(STREAMS_PATH . $rStreamID . '_.ffmpeg', $rFFMPEG);
@@ -2395,17 +2391,17 @@ class StreamProcess {
 				$rDelayStartAt = ($rDelayEnabled ? time() + $rSleepTime : 0);
 
 				if ($rStream['stream_info']['enable_transcode']) {
-					$rFFProbeOutput = array();
+					$rFFProbeOutput = [];
 				}
 
 				list($rCompatible, $rAudioCodec, $rVideoCodec, $rResolution) = self::resolveStreamCodecMeta($rFFProbeOutput, SettingsManager::get('player_allow_hevc'));
 
 				$rFFProbeOutputSafe = isset($rFFProbeOutput) && is_array($rFFProbeOutput) ? $rFFProbeOutput : [];
-				$db->query('UPDATE `streams_servers` SET `delay_available_at` = ?,`to_analyze` = 0,`stream_started` = ?,`stream_info` = ?,`audio_codec` = ?, `video_codec` = ?, `resolution` = ?,`compatible` = ?,`stream_status` = 2,`pid` = ?,`progress_info` = ?,`current_source` = ? WHERE `stream_id` = ? AND `server_id` = ?', $rDelayStartAt, time(), json_encode($rFFProbeOutputSafe), $rAudioCodec, $rVideoCodec, $rResolution, $rCompatible, $rPID, json_encode(array()), $rSource, $rStreamID, SERVER_ID);
+				$db->query('UPDATE `streams_servers` SET `delay_available_at` = ?,`to_analyze` = 0,`stream_started` = ?,`stream_info` = ?,`audio_codec` = ?, `video_codec` = ?, `resolution` = ?,`compatible` = ?,`stream_status` = 2,`pid` = ?,`progress_info` = ?,`current_source` = ? WHERE `stream_id` = ? AND `server_id` = ?', $rDelayStartAt, time(), json_encode($rFFProbeOutputSafe), $rAudioCodec, $rVideoCodec, $rResolution, $rCompatible, $rPID, json_encode([]), $rSource, $rStreamID, SERVER_ID);
 				self::updateStream($rStreamID);
 				$rPlaylist = (!$rDelayEnabled ? STREAMS_PATH . $rStreamID . '_.m3u8' : DELAY_PATH . $rStreamID . '_.m3u8');
 
-				return array('main_pid' => $rPID, 'stream_source' => $rRealSource, 'delay_enabled' => $rDelayEnabled, 'parent_id' => $rStream['server_info']['parent_id'], 'delay_start_at' => $rDelayStartAt, 'playlist' => $rPlaylist, 'transcode' => $rStream['stream_info']['enable_transcode'], 'offset' => $rOffset);
+				return ['main_pid' => $rPID, 'stream_source' => $rRealSource, 'delay_enabled' => $rDelayEnabled, 'parent_id' => $rStream['server_info']['parent_id'], 'delay_start_at' => $rDelayStartAt, 'playlist' => $rPlaylist, 'transcode' => $rStream['stream_info']['enable_transcode'], 'offset' => $rOffset];
 			} else {
 				return false;
 			}
diff --git a/src/Domain/Stream/StreamRepository.php b/src/Domain/Stream/StreamRepository.php
index ff18568a..60a1c567 100644
--- a/src/Domain/Stream/StreamRepository.php
+++ b/src/Domain/Stream/StreamRepository.php
@@ -22,6 +22,7 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class StreamRepository {
 	use DatabaseAware;
+
 	/**
 	 * Fetch recent error-log entries for a stream.
 	 *
@@ -29,7 +30,7 @@ class StreamRepository {
 	 * @param int $rAmount    Maximum number of entries.
 	 * @return array Error rows.
 	 */
-	public static function getErrors($rStreamID, $rAmount = 250) {
+	public static function getErrors(int $rStreamID, int $rAmount = 250) {
 		$db = self::db();
 		$db->query('SELECT * FROM (SELECT MAX(`date`) AS `date`, `error` FROM `streams_errors` WHERE `stream_id` = ? GROUP BY `error`) AS `output` ORDER BY `date` DESC LIMIT ' . intval($rAmount) . ';', $rStreamID);
 		return $db->get_rows();
@@ -41,7 +42,7 @@ class StreamRepository {
 	 * @param int $rID Stream id.
 	 * @return array|false The stream row, or false if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `streams` WHERE `id` = ?;', $rID);
 
@@ -57,9 +58,9 @@ class StreamRepository {
 	 * @param int $rStreamID Stream id.
 	 * @return array Stats data.
 	 */
-	public static function getStats($rStreamID) {
+	public static function getStats(int $rStreamID) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `streams_stats` WHERE `stream_id` = ?;', $rStreamID);
 
 		if ($db->num_rows() > 0) {
@@ -68,9 +69,9 @@ class StreamRepository {
 			}
 		}
 
-		foreach (array('today', 'week', 'month', 'all') as $rType) {
+		foreach (['today', 'week', 'month', 'all'] as $rType) {
 			if (!isset($rReturn[$rType])) {
-				$rReturn[$rType] = array('rank' => 0, 'users' => 0, 'connections' => 0, 'time' => 0);
+				$rReturn[$rType] = ['rank' => 0, 'users' => 0, 'connections' => 0, 'time' => 0];
 			}
 		}
 
@@ -83,17 +84,17 @@ class StreamRepository {
 	 * @param int $rServerID Server id.
 	 * @return array PID information keyed by stream.
 	 */
-	public static function getPIDs($rServerID) {
+	public static function getPIDs(int $rServerID) {
 		global $rSettings;
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `streams`.`id`, `streams`.`stream_display_name`, `streams`.`type`, `streams_servers`.`pid`, `streams_servers`.`monitor_pid`, `streams_servers`.`delay_pid` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `streams_servers`.`server_id` = ?;', $rServerID);
 
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rRow) {
-				foreach (array('pid', 'monitor_pid', 'delay_pid') as $rPIDType) {
+				foreach (['pid', 'monitor_pid', 'delay_pid'] as $rPIDType) {
 					if ($rRow[$rPIDType]) {
-						$rReturn[$rRow[$rPIDType]] = array('id' => $rRow['id'], 'title' => $rRow['stream_display_name'], 'type' => $rRow['type'], 'pid_type' => $rPIDType);
+						$rReturn[$rRow[$rPIDType]] = ['id' => $rRow['id'], 'title' => $rRow['stream_display_name'], 'type' => $rRow['type'], 'pid_type' => $rPIDType];
 					}
 				}
 			}
@@ -103,7 +104,7 @@ class StreamRepository {
 
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rRow) {
-				$rReturn[$rRow['tv_archive_pid']] = array('id' => $rRow['id'], 'title' => $rRow['stream_display_name'], 'type' => $rRow['type'], 'pid_type' => 'timeshift');
+				$rReturn[$rRow['tv_archive_pid']] = ['id' => $rRow['id'], 'title' => $rRow['stream_display_name'], 'type' => $rRow['type'], 'pid_type' => 'timeshift'];
 			}
 		}
 
@@ -111,12 +112,12 @@ class StreamRepository {
 
 		if ($db->num_rows() > 0) {
 			foreach ($db->get_rows() as $rRow) {
-				$rReturn[$rRow['vframes_pid']] = array('id' => $rRow['id'], 'title' => $rRow['stream_display_name'], 'type' => $rRow['type'], 'pid_type' => 'vframes');
+				$rReturn[$rRow['vframes_pid']] = ['id' => $rRow['id'], 'title' => $rRow['stream_display_name'], 'type' => $rRow['type'], 'pid_type' => 'vframes'];
 			}
 		}
 
 		if ($rSettings['redis_handler']) {
-			$rStreamIDs = $rStreamMap = array();
+			$rStreamIDs = $rStreamMap = [];
 			$rConnections = ConnectionTracker::getRedisConnections(null, $rServerID, null, true, false, false);
 
 			foreach ($rConnections as $rConnection) {
@@ -129,19 +130,19 @@ class StreamRepository {
 				$db->query('SELECT `id`, `type`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rStreamIDs) . ');');
 
 				foreach ($db->get_rows() as $rRow) {
-					$rStreamMap[$rRow['id']] = array($rRow['stream_display_name'], $rRow['type']);
+					$rStreamMap[$rRow['id']] = [$rRow['stream_display_name'], $rRow['type']];
 				}
 			}
 
 			foreach ($rConnections as $rRow) {
-				$rReturn[$rRow['pid']] = array('id' => $rRow['stream_id'], 'title' => $rStreamMap[$rRow['stream_id']][0], 'type' => $rStreamMap[$rRow['stream_id']][1], 'pid_type' => 'activity');
+				$rReturn[$rRow['pid']] = ['id' => $rRow['stream_id'], 'title' => $rStreamMap[$rRow['stream_id']][0], 'type' => $rStreamMap[$rRow['stream_id']][1], 'pid_type' => 'activity'];
 			}
 		} else {
 			$db->query('SELECT `streams`.`id`, `streams`.`stream_display_name`, `streams`.`type`, `lines_live`.`pid` FROM `lines_live` LEFT JOIN `streams` ON `streams`.`id` = `lines_live`.`stream_id` WHERE `lines_live`.`server_id` = ?;', $rServerID);
 
 			if ($db->num_rows() > 0) {
 				foreach ($db->get_rows() as $rRow) {
-					$rReturn[$rRow['pid']] = array('id' => $rRow['id'], 'title' => $rRow['stream_display_name'], 'type' => $rRow['type'], 'pid_type' => 'activity');
+					$rReturn[$rRow['pid']] = ['id' => $rRow['id'], 'title' => $rRow['stream_display_name'], 'type' => $rRow['type'], 'pid_type' => 'activity'];
 				}
 			}
 		}
@@ -155,9 +156,9 @@ class StreamRepository {
 	 * @param int $rID Stream id.
 	 * @return array Stream options.
 	 */
-	public static function getOptions($rID) {
+	public static function getOptions(int $rID) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `streams_options` WHERE `stream_id` = ?;', $rID);
 
 		if ($db->num_rows() > 0) {
@@ -175,9 +176,9 @@ class StreamRepository {
 	 * @param int $rID Stream id.
 	 * @return array System rows.
 	 */
-	public static function getSystemRows($rID) {
+	public static function getSystemRows(int $rID) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `streams_servers` WHERE `stream_id` = ?;', $rID);
 
 		if ($db->num_rows() > 0) {
@@ -212,9 +213,9 @@ class StreamRepository {
 	 * @param int $rID Stream id.
 	 * @return array Encode error rows.
 	 */
-	public static function getEncodeErrors($rID) {
+	public static function getEncodeErrors(int $rID) {
 		$db = self::db();
-		$rErrors = array();
+		$rErrors = [];
 		$db->query('SELECT `server_id`, `error` FROM `streams_errors` WHERE `stream_id` = ?;', $rID);
 
 		foreach ($db->get_rows() as $rRow) {
@@ -230,9 +231,9 @@ class StreamRepository {
 	 * @param array $rSources Source identifiers.
 	 * @return array Matching stream selections.
 	 */
-	public static function getSelections($rSources) {
+	public static function getSelections(array $rSources) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 
 		foreach ($rSources as $rSource) {
 			$db->query("SELECT `id` FROM `streams` WHERE `type` IN (2,5) AND `stream_source` LIKE ? ESCAPE '|' LIMIT 1;", '%' . str_replace('/', '\\/', $rSource) . '"%');
@@ -255,7 +256,7 @@ class StreamRepository {
 	 * @param bool $f2d619cb38696890   Internal flag controlling cascade behavior.
 	 * @return bool True on success.
 	 */
-	public static function deleteStream($rID, $rServerID = -1, $rDeleteFiles = true, $f2d619cb38696890 = true) {
+	public static function deleteStream(int $rID, int $rServerID = -1, bool $rDeleteFiles = true, bool $f2d619cb38696890 = true) {
 		$db = self::db();
 		$db->query('SELECT `id`, `type` FROM `streams` WHERE `id` = ?;', $rID);
 
@@ -285,13 +286,13 @@ class StreamRepository {
 			$db->query('DELETE FROM `recordings` WHERE `created_id` = ? OR `stream_id` = ?;', $rID, $rID);
 			$db->query('UPDATE `lines_activity` SET `stream_id` = 0 WHERE `stream_id` = ?;', $rID);
 			$db->query('SELECT `server_id` FROM `streams_servers` WHERE `stream_id` = ?;', $rID);
-			$rServerIDs = array();
+			$rServerIDs = [];
 
 			foreach ($db->get_rows() as $rRow) {
 				$rServerIDs[] = $rRow['server_id'];
 			}
 
-			if (!($rDeleteFiles && 0 < count($rServerIDs) && in_array($rType, array(2, 5)))) {
+			if (!($rDeleteFiles && 0 < count($rServerIDs) && in_array($rType, [2, 5]))) {
 			} else {
 				MovieService::deleteFile($rServerIDs, $rID);
 			}
@@ -300,9 +301,9 @@ class StreamRepository {
 		} else {
 			$db->query('DELETE FROM `streams_servers` WHERE `stream_id` = ? AND `server_id` = ?;', $rID, $rServerID);
 
-			if (!($rDeleteFiles && in_array($rType, array(2, 5)))) {
+			if (!($rDeleteFiles && in_array($rType, [2, 5]))) {
 			} else {
-				MovieService::deleteFile(array($rServerID), $rID);
+				MovieService::deleteFile([$rServerID], $rID);
 			}
 		}
 
@@ -320,7 +321,7 @@ class StreamRepository {
 	 * @param bool  $rDeleteFiles Also remove on-disk stream files.
 	 * @return bool True on success.
 	 */
-	public static function deleteStreams($rIDs, $rDeleteFiles = false) {
+	public static function deleteStreams(array $rIDs, bool $rDeleteFiles = false) {
 		$db = self::db();
 		$rIDs = AdminHelpers::confirmIDs($rIDs);
 
@@ -341,11 +342,11 @@ class StreamRepository {
 			$db->query('SELECT `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rIDs) . ');');
 			$db->query('DELETE FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rIDs) . ');');
 			$db->query('DELETE FROM `streams_servers` WHERE `parent_id` IS NOT NULL AND `parent_id` > 0 AND `parent_id` NOT IN (SELECT `id` FROM `servers` WHERE `server_type` = 0);');
-			$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(array('type' => 'update_streams', 'id' => $rIDs)));
+			$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(['type' => 'update_streams', 'id' => $rIDs]));
 
 			if ($rDeleteFiles) {
 				foreach (array_keys(ServerRepository::getAll()) as $rServerID) {
-					$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', $rServerID, time(), json_encode(array('type' => 'delete_vods', 'id' => $rIDs)));
+					$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', $rServerID, time(), json_encode(['type' => 'delete_vods', 'id' => $rIDs]));
 				}
 			}
 
@@ -363,7 +364,7 @@ class StreamRepository {
 	 * @param bool  $rDeleteFiles Also remove on-disk stream files.
 	 * @return bool True on success.
 	 */
-	public static function deleteStreamsByServer($rIDs, $rServerID, $rDeleteFiles = false) {
+	public static function deleteStreamsByServer(array $rIDs, int $rServerID, bool $rDeleteFiles = false) {
 		$db = self::db();
 		$rIDs = AdminHelpers::confirmIDs($rIDs);
 
@@ -373,7 +374,7 @@ class StreamRepository {
 			$db->query('UPDATE `streams_servers` SET `parent_id` = NULL WHERE `parent_id` = ? AND `stream_id` IN (' . implode(',', $rIDs) . ');', $rServerID);
 
 			if ($rDeleteFiles) {
-				$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', $rServerID, time(), json_encode(array('type' => 'delete_vods', 'id' => $rIDs)));
+				$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', $rServerID, time(), json_encode(['type' => 'delete_vods', 'id' => $rIDs]));
 			}
 		}
 
@@ -386,7 +387,7 @@ class StreamRepository {
 	 * @param int $rID Watch-folder id.
 	 * @return array|false The row, or false if not found.
 	 */
-	public static function getWatchFolder($rID) {
+	public static function getWatchFolder(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `watch_folders` WHERE `id` = ?;', $rID);
 
@@ -403,7 +404,7 @@ class StreamRepository {
 	 * @param int $rID Watch-folder id.
 	 * @return bool True on success.
 	 */
-	public static function deleteWatchFolder($rID) {
+	public static function deleteWatchFolder(int $rID) {
 		$db = self::db();
 		$db->query('SELECT `id` FROM `watch_folders` WHERE `id` = ?;', $rID);
 
diff --git a/src/Domain/Stream/StreamService.php b/src/Domain/Stream/StreamService.php
index 86e6d914..ad733266 100644
--- a/src/Domain/Stream/StreamService.php
+++ b/src/Domain/Stream/StreamService.php
@@ -23,13 +23,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class StreamService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a stream from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		global $rSettings;
 		$db = self::db();
 		set_time_limit(0);
@@ -55,7 +56,7 @@ class StreamService {
 		}
 
 		if (isset($rData['days_to_restart']) && preg_match('/^(?:2[0-3]|[01][0-9]):[0-5][0-9]$/', $rData['time_to_restart'])) {
-			$rTimeArray = array('days' => array(), 'at' => $rData['time_to_restart']);
+			$rTimeArray = ['days' => [], 'at' => $rData['time_to_restart']];
 
 			foreach ($rData['days_to_restart'] as $rID => $rDay) {
 				$rTimeArray['days'][] = $rDay;
@@ -65,7 +66,7 @@ class StreamService {
 			$rArray['auto_restart'] = '';
 		}
 
-		foreach (array('fps_restart', 'gen_timestamps', 'allow_record', 'rtmp_output', 'stream_all', 'direct_source', 'direct_proxy', 'read_native') as $rKey) {
+		foreach (['fps_restart', 'gen_timestamps', 'allow_record', 'rtmp_output', 'stream_all', 'direct_source', 'direct_proxy', 'read_native'] as $rKey) {
 			if (isset($rData[$rKey])) {
 				$rArray[$rKey] = 1;
 			} else {
@@ -88,7 +89,7 @@ class StreamService {
 		}
 
 		$rReview = false;
-		$rImportStreams = array();
+		$rImportStreams = [];
 
 		if (isset($rData['review'])) {
 			$rReview = true;
@@ -112,11 +113,11 @@ class StreamService {
 		} else {
 			if (isset($_FILES['m3u_file'])) {
 				if (Authorization::check('adv', 'import_streams')) {
-					if (!(empty($_FILES['m3u_file']['tmp_name']) || !in_array(strtolower(pathinfo(explode('?', $_FILES['m3u_file']['name'])[0], PATHINFO_EXTENSION)), array('m3u', 'm3u8')))) {
+					if (!(empty($_FILES['m3u_file']['tmp_name']) || !in_array(strtolower(pathinfo(explode('?', $_FILES['m3u_file']['name'])[0], PATHINFO_EXTENSION)), ['m3u', 'm3u8']))) {
 						$rResults = self::parseM3U($_FILES['m3u_file']['tmp_name']);
 
 						if (count($rResults) > 0) {
-							$rEPGDatabase = $rSourceDatabase = $rStreamDatabase = array();
+							$rEPGDatabase = $rSourceDatabase = $rStreamDatabase = [];
 							$db->query('SELECT `id`, `stream_display_name`, `stream_source`, `channel_id` FROM `streams` WHERE `type` = 1;');
 
 							foreach ($db->get_rows() as $rRow) {
@@ -134,7 +135,7 @@ class StreamService {
 									}
 								}
 							}
-							$rEPGMatch = $rEPGScan = array();
+							$rEPGMatch = $rEPGScan = [];
 							$i = 0;
 
 							foreach ($rResults as $rResult) {
@@ -164,7 +165,7 @@ class StreamService {
 												}
 
 												foreach ($rEPGScan[$rChannelID] as $i) {
-													$rEPGMatch[$i] = array('channel_id' => $rChannelID, 'epg_lang' => $rEPGLang, 'epg_id' => intval($rRow['id']));
+													$rEPGMatch[$i] = ['channel_id' => $rChannelID, 'epg_lang' => $rEPGLang, 'epg_id' => intval($rRow['id'])];
 												}
 											}
 										}
@@ -181,7 +182,7 @@ class StreamService {
 								$rURL = $rResult->getPath();
 
 								if ($rURL) {
-									$rImportArray = array('stream_source' => array($rURL), 'stream_icon' => ($rTag ? ($rTag->getAttribute('tvg-logo') ?: ($rTag->getAttribute('logo') ?: '')) : ''), 'stream_display_name' => ($rTag ? ($rTag->getTitle() ?: basename(parse_url($rURL, PHP_URL_PATH) ?: $rURL)) : basename(parse_url($rURL, PHP_URL_PATH) ?: $rURL)), 'epg_id' => null, 'epg_lang' => null, 'channel_id' => null);
+									$rImportArray = ['stream_source' => [$rURL], 'stream_icon' => ($rTag ? ($rTag->getAttribute('tvg-logo') ?: ($rTag->getAttribute('logo') ?: '')) : ''), 'stream_display_name' => ($rTag ? ($rTag->getTitle() ?: basename(parse_url($rURL, PHP_URL_PATH) ?: $rURL)) : basename(parse_url($rURL, PHP_URL_PATH) ?: $rURL)), 'epg_id' => null, 'epg_lang' => null, 'channel_id' => null];
 
 									if ($rTag && $rTag->getAttribute('tvg-id')) {
 										$rEPG = ($rEPGMatch[$i] ?? null);
@@ -217,10 +218,10 @@ class StreamService {
 										$db->query('SELECT `stream_source` FROM `streams` WHERE `id` = ?;', $rBackupID);
 
 										if ($db->num_rows() > 0) {
-											$rSources = (json_decode($db->get_row()['stream_source'], true) ?: array());
+											$rSources = (json_decode($db->get_row()['stream_source'], true) ?: []);
 											$rSources[] = $rURL;
 											$db->query('UPDATE `streams` SET `stream_source` = ? WHERE `id` = ?;', json_encode($rSources), $rBackupID);
-											$rImportStreams[] = array('update' => true, 'id' => $rBackupID);
+											$rImportStreams[] = ['update' => true, 'id' => $rBackupID];
 										}
 									} else {
 										if ($rExistsID && isset($rData['update_existing'])) {
@@ -237,16 +238,16 @@ class StreamService {
 								$i++;
 							}
 						} else {
-							return array('status' => STATUS_INVALID_FILE, 'data' => $rData);
+							return ['status' => STATUS_INVALID_FILE, 'data' => $rData];
 						}
 					} else {
-						return array('status' => STATUS_INVALID_FILE, 'data' => $rData);
+						return ['status' => STATUS_INVALID_FILE, 'data' => $rData];
 					}
 				} else {
 					exit();
 				}
 			} else {
-				$rImportArray = array('stream_source' => array(), 'stream_icon' => $rArray['stream_icon'], 'stream_display_name' => $rArray['stream_display_name'], 'epg_id' => $rArray['epg_id'], 'epg_lang' => $rArray['epg_lang'], 'channel_id' => $rArray['channel_id']);
+				$rImportArray = ['stream_source' => [], 'stream_icon' => $rArray['stream_icon'], 'stream_display_name' => $rArray['stream_display_name'], 'epg_id' => $rArray['epg_id'], 'epg_lang' => $rArray['epg_lang'], 'channel_id' => $rArray['channel_id']];
 
 				if (isset($rData['stream_source'])) {
 					foreach ($rData['stream_source'] as $rID => $rURL) {
@@ -261,13 +262,13 @@ class StreamService {
 		}
 
 		if (0 < count($rImportStreams)) {
-			$rBouquetCreate = array();
-			$rCategoryCreate = array();
+			$rBouquetCreate = [];
+			$rCategoryCreate = [];
 
 			if (!$rReview) {
 				$rBouquetList = json_decode($rData['bouquet_create_list'] ?? '[]', true) ?: [];
 				foreach ($rBouquetList as $rBouquet) {
-					$rPrepare = QueryHelper::prepareArray(array('bouquet_name' => $rBouquet, 'bouquet_channels' => array(), 'bouquet_movies' => array(), 'bouquet_series' => array(), 'bouquet_radios' => array()));
+					$rPrepare = QueryHelper::prepareArray(['bouquet_name' => $rBouquet, 'bouquet_channels' => [], 'bouquet_movies' => [], 'bouquet_series' => [], 'bouquet_radios' => []]);
 					$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 					if ($db->query($rQuery, ...$rPrepare['data'])) {
@@ -278,7 +279,7 @@ class StreamService {
 
 				$rCategoryList = json_decode($rData['category_create_list'] ?? '[]', true) ?: [];
 				foreach ($rCategoryList as $rCategory) {
-					$rPrepare = QueryHelper::prepareArray(array('category_type' => 'live', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0));
+					$rPrepare = QueryHelper::prepareArray(['category_type' => 'live', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0]);
 					$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 					if ($db->query($rQuery, ...$rPrepare['data'])) {
@@ -303,7 +304,7 @@ class StreamService {
 						$rBouquets = array_map('intval', $rImportStream['bouquets']);
 						unset($rImportStream['bouquets']);
 					} else {
-						$rBouquets = array();
+						$rBouquets = [];
 
 						foreach (($rData['bouquets'] ?? []) as $rBouquet) {
 							if (isset($rBouquetCreate[$rBouquet])) {
@@ -314,7 +315,7 @@ class StreamService {
 								}
 							}
 						}
-						$rCategories = array();
+						$rCategories = [];
 
 						foreach (($rData['category_id'] ?? []) as $rCategory) {
 							if (isset($rCategoryCreate[$rCategory])) {
@@ -358,7 +359,7 @@ class StreamService {
 
 					if ($db->query($rQuery, ...$rPrepare['data'])) {
 						$rInsertID = $db->last_insert_id();
-						$rStreamExists = array();
+						$rStreamExists = [];
 
 						if (isset($rData['edit']) || isset($rImportStream['id'])) {
 							$db->query('SELECT `server_stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` = ?;', $rInsertID);
@@ -368,14 +369,14 @@ class StreamService {
 							}
 						}
 
-						$rStreamsAdded = array();
+						$rStreamsAdded = [];
 						$rServerTree = json_decode($rData['server_tree_data'], true);
 
 						foreach ($rServerTree as $rServer) {
 							if ($rServer['parent'] != '#') {
 								$rServerID = intval($rServer['id']);
 								$rStreamsAdded[] = $rServerID;
-								$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?? array())));
+								$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?? [])));
 
 								if ($rServer['parent'] == 'source') {
 									$rParent = null;
@@ -423,7 +424,7 @@ class StreamService {
 						}
 
 						if ($rRestart) {
-							ApiClient::request(array('action' => 'stream', 'sub' => 'start', 'stream_ids' => array($rInsertID)));
+							ApiClient::request(['action' => 'stream', 'sub' => 'start', 'stream_ids' => [$rInsertID]]);
 						}
 
 						foreach ($rBouquets as $rBouquet) {
@@ -448,14 +449,14 @@ class StreamService {
 							$db->query('DELETE FROM `streams_categories` WHERE `id` = ?;', $rID);
 						}
 
-						return array('status' => STATUS_FAILURE, 'data' => $rData);
+						return ['status' => STATUS_FAILURE, 'data' => $rData];
 					}
 				}
 			}
 
-			return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+			return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 		} else {
-			return array('status' => STATUS_NO_SOURCES, 'data' => $rData);
+			return ['status' => STATUS_NO_SOURCES, 'data' => $rData];
 		}
 	}
 
@@ -465,18 +466,18 @@ class StreamService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
 		ini_set('default_socket_timeout', 0);
 
-		$rArray = array();
+		$rArray = [];
 
 		if (isset($rData['c_days_to_restart'])) {
 			if (isset($rData['days_to_restart']) && preg_match('/^(?:2[0-3]|[01][0-9]):[0-5][0-9]$/', $rData['time_to_restart'])) {
-				$rTimeArray = array('days' => array(), 'at' => $rData['time_to_restart']);
+				$rTimeArray = ['days' => [], 'at' => $rData['time_to_restart']];
 
 				foreach ($rData['days_to_restart'] as $rDay) {
 					$rTimeArray['days'][] = $rDay;
@@ -487,7 +488,7 @@ class StreamService {
 			}
 		}
 
-		foreach (array('gen_timestamps', 'allow_record', 'rtmp_output', 'fps_restart', 'stream_all', 'read_native') as $rKey) {
+		foreach (['gen_timestamps', 'allow_record', 'rtmp_output', 'fps_restart', 'stream_all', 'read_native'] as $rKey) {
 			if (isset($rData['c_' . $rKey])) {
 				if (isset($rData[$rKey])) {
 					$rArray[$rKey] = 1;
@@ -515,7 +516,7 @@ class StreamService {
 			}
 		}
 
-		foreach (array('tv_archive_server_id', 'vframes_server_id', 'tv_archive_duration', 'delay_minutes', 'probesize_ondemand', 'fps_threshold', 'llod') as $rKey) {
+		foreach (['tv_archive_server_id', 'vframes_server_id', 'tv_archive_duration', 'delay_minutes', 'probesize_ondemand', 'fps_threshold', 'llod'] as $rKey) {
 			if (isset($rData['c_' . $rKey])) {
 				$rArray[$rKey] = intval($rData[$rKey]);
 			}
@@ -538,24 +539,24 @@ class StreamService {
 		$rStreamIDs = json_decode($rData['streams'], true);
 
 		if (count($rStreamIDs) > 0) {
-			$rCategoryMap = array();
+			$rCategoryMap = [];
 
-			if (isset($rData['c_category_id']) && in_array($rData['category_id_type'], array('ADD', 'DEL'))) {
+			if (isset($rData['c_category_id']) && in_array($rData['category_id_type'], ['ADD', 'DEL'])) {
 				$db->query('SELECT `id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 				foreach ($db->get_rows() as $rRow) {
-					$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: array());
+					$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: []);
 				}
 			}
 
-			$rDeleteServers = $rStreamExists = array();
+			$rDeleteServers = $rStreamExists = [];
 			$db->query('SELECT `stream_id`, `server_stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 			foreach ($db->get_rows() as $rRow) {
 				$rStreamExists[intval($rRow['stream_id'])][intval($rRow['server_id'])] = intval($rRow['server_stream_id']);
 			}
 			$rBouquets = BouquetService::getAllSimple();
-			$rDelOptions = $rAddBouquet = $rDelBouquet = array();
+			$rDelOptions = $rAddBouquet = $rDelBouquet = [];
 			$rOptQuery = $rAddQuery = '';
 
 			foreach ($rStreamIDs as $rStreamID) {
@@ -563,7 +564,7 @@ class StreamService {
 					$rCategories = array_map('intval', $rData['category_id']);
 
 					if ($rData['category_id_type'] == 'ADD') {
-						foreach (($rCategoryMap[$rStreamID] ?: array()) as $rCategoryID) {
+						foreach (($rCategoryMap[$rStreamID] ?: []) as $rCategoryID) {
 							if (!in_array($rCategoryID, $rCategories)) {
 								$rCategories[] = $rCategoryID;
 							}
@@ -593,15 +594,15 @@ class StreamService {
 				}
 
 				if (isset($rData['c_server_tree'])) {
-					$rStreamsAdded = array();
+					$rStreamsAdded = [];
 					$rServerTree = json_decode($rData['server_tree_data'], true);
 
 					foreach ($rServerTree as $rServer) {
 						if ($rServer['parent'] != '#') {
 							$rServerID = intval($rServer['id']);
 
-							if (in_array($rData['server_type'], array('ADD', 'SET'))) {
-							$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?? array())));
+							if (in_array($rData['server_type'], ['ADD', 'SET'])) {
+								$rOD = intval(in_array($rServerID, ($rData['on_demand'] ?? [])));
 								if ($rServer['parent'] == 'source') {
 									$rParent = null;
 								} else {
@@ -721,11 +722,11 @@ class StreamService {
 			StreamProcess::updateStreams($rStreamIDs);
 
 			if (isset($rData['restart_on_edit'])) {
-				ApiClient::request(array('action' => 'stream', 'sub' => 'start', 'stream_ids' => array_values($rStreamIDs)));
+				ApiClient::request(['action' => 'stream', 'sub' => 'start', 'stream_ids' => array_values($rStreamIDs)]);
 			}
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -734,14 +735,14 @@ class StreamService {
 	 * @param array $rData Selected ids and target destination.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function move($rData) {
+	public static function move(array $rData) {
 		$db = self::db();
 		$rType = intval($rData['content_type']);
 		$rSource = intval($rData['source_server']);
 		$rReplacement = intval($rData['replacement_server']);
 
 		if ($rSource > 0 && $rReplacement > 0 && $rSource != $rReplacement) {
-			$rExisting = array();
+			$rExisting = [];
 
 			if ($rType == 0) {
 				$db->query('SELECT `stream_id` FROM `streams_servers` WHERE `server_id` = ?;', $rReplacement);
@@ -772,7 +773,7 @@ class StreamService {
 			}
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -781,13 +782,13 @@ class StreamService {
 	 * @param array $rData Search/replace host values and target scope.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function replaceDNS($rData) {
+	public static function replaceDNS(array $rData) {
 		$db = self::db();
 		$rOldDNS = str_replace('/', '\\/', $rData['old_dns']);
 		$rNewDNS = str_replace('/', '\\/', $rData['new_dns']);
 		$db->query('UPDATE `streams` SET `stream_source` = REPLACE(`stream_source`, ?, ?);', $rOldDNS, $rNewDNS);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -796,7 +797,7 @@ class StreamService {
 	 * @param array $rData Selected stream ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
@@ -805,7 +806,7 @@ class StreamService {
 		$rStreams = json_decode($rData['streams'], true);
 		StreamRepository::deleteStreams($rStreams, false);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -815,7 +816,7 @@ class StreamService {
 	 * @param bool  $rFile Treat $rData as a file path (true) or content (false).
 	 * @return \M3uParser\M3uData Parsed playlist entries (iterable, countable).
 	 */
-	public static function parseM3U($rData, $rFile = true) {
+	public static function parseM3U(mixed $rData, bool $rFile = true) {
 		$rParser = new \M3uParser\M3uParser();
 		$rParser->addDefaultTags();
 
@@ -833,8 +834,8 @@ class StreamService {
 	 * @param int $rStreamID Stream id.
 	 * @return array Archive file list.
 	 */
-	public static function getArchiveFiles($rServerID, $rStreamID) {
-		return json_decode(ApiClient::systemRequest($rServerID, array('action' => 'get_archive_files', 'stream_id' => $rStreamID)), true)['data'];
+	public static function getArchiveFiles(int $rServerID, int $rStreamID) {
+		return json_decode(ApiClient::systemRequest($rServerID, ['action' => 'get_archive_files', 'stream_id' => $rStreamID]), true)['data'];
 	}
 
 	/**
@@ -843,9 +844,9 @@ class StreamService {
 	 * @param int $rStreamID Stream id.
 	 * @return array Archive information.
 	 */
-	public static function getArchive($rStreamID) {
+	public static function getArchive(int $rStreamID) {
 		/** @var array<int, array<string, mixed>> $rReturn Archive ranges keyed by EPG index, accumulated across $rFiles. */
-		$rReturn = array();
+		$rReturn = [];
 		$rStream = StreamRepository::getById($rStreamID);
 		$rEPG = EpgService::getChannelEpg($rStream, true);
 		$rFiles = self::getArchiveFiles($rStream['tv_archive_server_id'], $rStreamID);
@@ -858,7 +859,7 @@ class StreamService {
 				$rI = 0;
 
 				foreach ($rEPG as $rEPGItem) {
-					if (!filter_var($rTimestamp, FILTER_VALIDATE_INT, array('options' => array('min_range' => $rEPGItem['start'], 'max_range' => $rEPGItem['end'] - 1)))) {
+					if (!filter_var($rTimestamp, FILTER_VALIDATE_INT, ['options' => ['min_range' => $rEPGItem['start'], 'max_range' => $rEPGItem['end'] - 1]])) {
 						$rI++;
 					} else {
 						$rEPGID = $rI;
@@ -894,7 +895,7 @@ class StreamService {
 				$rReturn[$rKey]['in_progress'] = false;
 			}
 
-			if (!$rReturn[$rKey]['in_progress'] && filter_var($rItem['start'], FILTER_VALIDATE_INT, array('options' => array('min_range' => $rItem['archive_start'] - 60, 'max_range' => $rItem['archive_start'] + 60))) && filter_var($rItem['end'], FILTER_VALIDATE_INT, array('options' => array('min_range' => $rItem['archive_stop'] - 60, 'max_range' => $rItem['archive_stop'] + 60)))) {
+			if (!$rReturn[$rKey]['in_progress'] && filter_var($rItem['start'], FILTER_VALIDATE_INT, ['options' => ['min_range' => $rItem['archive_start'] - 60, 'max_range' => $rItem['archive_start'] + 60]]) && filter_var($rItem['end'], FILTER_VALIDATE_INT, ['options' => ['min_range' => $rItem['archive_stop'] - 60, 'max_range' => $rItem['archive_stop'] + 60]])) {
 				$rReturn[$rKey]['complete'] = true;
 			} else {
 				$rReturn[$rKey]['complete'] = false;
diff --git a/src/Domain/Stream/StreamSorter.php b/src/Domain/Stream/StreamSorter.php
index dab5c15b..40cb022b 100644
--- a/src/Domain/Stream/StreamSorter.php
+++ b/src/Domain/Stream/StreamSorter.php
@@ -22,7 +22,7 @@ class StreamSorter {
 	 * @param int|string $rYear  Year (only applied when a valid 1900..next-year value).
 	 * @return string Formatted title.
 	 */
-	public static function formatTitle($rTitle, $rYear) {
+	public static function formatTitle(string $rTitle, int|string $rYear) {
 		if (is_numeric($rYear) && 1900 <= $rYear && $rYear <= intval(date('Y') + 1)) {
 			if (SettingsManager::get('movie_year_append') == 0) {
 				return trim($rTitle) . ' (' . $rYear . ')';
@@ -43,14 +43,14 @@ class StreamSorter {
 	 * @param int[] $rChannels Channel ids.
 	 * @return int[] Reordered channel ids.
 	 */
-	public static function sortChannels($rChannels) {
+	public static function sortChannels(array $rChannels) {
 		if (!(0 < count($rChannels) && file_exists(CACHE_TMP_PATH . 'channel_order') && SettingsManager::get('channel_number_type') != 'bouquet')) {
 			return $rChannels;
 		}
 
 		$rOrder = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'channel_order'));
 		$rChannels = array_flip($rChannels);
-		$rNewOrder = array();
+		$rNewOrder = [];
 
 		foreach ($rOrder as $rID) {
 			if (isset($rChannels[$rID])) {
@@ -71,14 +71,14 @@ class StreamSorter {
 	 * @param int[] $rSeries Series ids.
 	 * @return int[] Reordered series ids (input unchanged if no cached order).
 	 */
-	public static function sortSeries($rSeries) {
+	public static function sortSeries(array $rSeries) {
 		if (!(0 < count($rSeries) && file_exists(CACHE_TMP_PATH . 'series_order'))) {
 			return $rSeries;
 		}
 
 		$rOrder = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'series_order'));
 		$rSeries = array_flip($rSeries);
-		$rNewOrder = array();
+		$rNewOrder = [];
 
 		foreach ($rOrder as $rID) {
 			if (isset($rSeries[$rID])) {
@@ -100,7 +100,7 @@ class StreamSorter {
 	 * @param int|float $rSearch Target value.
 	 * @return mixed The closest value, or null if the array is empty.
 	 */
-	public static function getNearest($rArray, $rSearch) {
+	public static function getNearest(array $rArray, int|float $rSearch) {
 		$rClosest = null;
 		foreach ($rArray as $rItem) {
 			if ($rClosest === null || abs($rItem - $rSearch) < abs($rSearch - $rClosest)) {
diff --git a/src/Domain/User/GroupService.php b/src/Domain/User/GroupService.php
index 462c26b1..8ce88de4 100644
--- a/src/Domain/User/GroupService.php
+++ b/src/Domain/User/GroupService.php
@@ -20,13 +20,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class GroupService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a user group from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processGroup', $rData)) {
 			if (isset($rData['edit'])) {
@@ -44,7 +45,7 @@ class GroupService {
 				}
 			}
 
-			foreach (array('is_admin', 'is_reseller', 'allow_restrictions', 'create_sub_resellers', 'delete_users', 'allow_download', 'can_view_vod', 'reseller_client_connection_logs', 'allow_change_bouquets', 'allow_change_username', 'allow_change_password') as $rSelection) {
+			foreach (['is_admin', 'is_reseller', 'allow_restrictions', 'create_sub_resellers', 'delete_users', 'allow_download', 'can_view_vod', 'reseller_client_connection_logs', 'allow_change_bouquets', 'allow_change_username', 'allow_change_password'] as $rSelection) {
 				if (isset($rData[$rSelection])) {
 					$rArray[$rSelection] = 1;
 				} else {
@@ -100,15 +101,15 @@ class GroupService {
 						}
 					}
 
-					return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+					return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 				} else {
-					return array('status' => STATUS_FAILURE, 'data' => $rData);
+					return ['status' => STATUS_FAILURE, 'data' => $rData];
 				}
 			} else {
-				return array('status' => STATUS_INVALID_NAME, 'data' => $rData);
+				return ['status' => STATUS_INVALID_NAME, 'data' => $rData];
 			}
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -121,7 +122,7 @@ class GroupService {
 	 */
 	public static function getAll() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `users_groups` ORDER BY `group_id` ASC;');
 
 		if (0 >= $db->num_rows()) {
@@ -140,7 +141,7 @@ class GroupService {
 	 * @param int $rID Group id.
 	 * @return array|false The group row, or false if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `users_groups` WHERE `group_id` = ?;', $rID);
 
@@ -157,7 +158,7 @@ class GroupService {
 	 * @param int $rID Group id.
 	 * @return bool True on deletion, false if the group does not exist.
 	 */
-	public static function deleteById($rID) {
+	public static function deleteById(int $rID) {
 		$db = self::db();
 		$rGroup = self::getById($rID);
 
diff --git a/src/Domain/User/ResellerAPI.php b/src/Domain/User/ResellerAPI.php
index ae7d4ef4..9e5a035f 100644
--- a/src/Domain/User/ResellerAPI.php
+++ b/src/Domain/User/ResellerAPI.php
@@ -29,11 +29,16 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class ResellerAPI {
 	use DatabaseAware;
-	public static $rSettings = array();
-	public static $rServers = array();
-	public static $rProxyServers = array();
-	public static $rUserInfo = array();
-	public static $rPermissions = array();
+
+	public static $rSettings = [];
+
+	public static $rServers = [];
+
+	public static $rProxyServers = [];
+
+	public static $rUserInfo = [];
+
+	public static $rPermissions = [];
 
 	/**
 	 * Dispatch a reseller API action by type.
@@ -42,8 +47,8 @@ class ResellerAPI {
 	 * @param array  $rData Request payload.
 	 * @return array Action result.
 	 */
-	public static function processData($rType, $rData) {
-		$rArray = array('line' => array('edit', 'trial', 'bouquets_selected', 'pair_id', 'username', 'password', 'member_id', 'package', 'contact', 'reseller_notes', 'allowed_ips', 'allowed_ua', 'bypass_ua', 'is_isplock', 'isp_clear'), 'mag' => array('edit', 'trial', 'bouquets_selected', 'pair_id', 'mac', 'member_id', 'package', 'parent_password', 'sn', 'stb_type', 'image_version', 'hw_version', 'device_id', 'device_id2', 'ver', 'reseller_notes', 'allowed_ips', 'is_isplock', 'isp_clear'), 'enigma' => array('edit', 'trial', 'bouquets_selected', 'pair_id', 'mac', 'member_id', 'package', 'modem_mac', 'local_ip', 'enigma_version', 'cpu', 'lversion', 'token', 'reseller_notes', 'allowed_ips', 'is_isplock', 'isp_clear'), 'user' => array('edit', 'username', 'password', 'owner_id', 'email', 'reseller_dns', 'notes', 'member_group_id'), 'ticket' => array('edit', 'message', 'title', 'respond'), 'profile' => array('email', 'password', 'api_key', 'reseller_dns', 'theme', 'hue', 'timezone'));
+	public static function processData(string $rType, array $rData) {
+		$rArray = ['line' => ['edit', 'trial', 'bouquets_selected', 'pair_id', 'username', 'password', 'member_id', 'package', 'contact', 'reseller_notes', 'allowed_ips', 'allowed_ua', 'bypass_ua', 'is_isplock', 'isp_clear'], 'mag' => ['edit', 'trial', 'bouquets_selected', 'pair_id', 'mac', 'member_id', 'package', 'parent_password', 'sn', 'stb_type', 'image_version', 'hw_version', 'device_id', 'device_id2', 'ver', 'reseller_notes', 'allowed_ips', 'is_isplock', 'isp_clear'], 'enigma' => ['edit', 'trial', 'bouquets_selected', 'pair_id', 'mac', 'member_id', 'package', 'modem_mac', 'local_ip', 'enigma_version', 'cpu', 'lversion', 'token', 'reseller_notes', 'allowed_ips', 'is_isplock', 'isp_clear'], 'user' => ['edit', 'username', 'password', 'owner_id', 'email', 'reseller_dns', 'notes', 'member_group_id'], 'ticket' => ['edit', 'message', 'title', 'respond'], 'profile' => ['email', 'password', 'api_key', 'reseller_dns', 'theme', 'hue', 'timezone']];
 
 		foreach ($rData as $rKey => $rValue) {
 			if (in_array($rKey, $rArray[$rType])) {
@@ -61,7 +66,7 @@ class ResellerAPI {
 	 * @param int|null $rUserID Reseller user id, or null for the current session user.
 	 * @return void
 	 */
-	public static function init($rUserID = null) {
+	public static function init(?int $rUserID = null) {
 		global $rPermissions;
 		self::$rSettings = SettingsManager::getAll();
 		self::$rServers = ServerRepository::getStreamingSimple($rPermissions);
@@ -75,7 +80,7 @@ class ResellerAPI {
 		if (!$rUserID) {
 		} else {
 			self::$rUserInfo = UserRepository::getRegisteredUserById($rUserID);
-			self::$rPermissions = array_merge((AuthRepository::getPermissions(self::$rUserInfo['member_group_id']) ?: array()), (AuthRepository::getGroupPermissions(self::$rUserInfo['id']) ?: array()));
+			self::$rPermissions = array_merge((AuthRepository::getPermissions(self::$rUserInfo['member_group_id']) ?: []), (AuthRepository::getGroupPermissions(self::$rUserInfo['id']) ?: []));
 		}
 	}
 
@@ -85,19 +90,17 @@ class ResellerAPI {
 	 * @param array $rData Submitted profile fields.
 	 * @return array Result status payload.
 	 */
-	public static function editResellerProfile($rData) {
+	public static function editResellerProfile(array $rData) {
 		$db = self::db();
 		global $allowedLangs;
 		$rData = self::processData('profile', $rData);
 
 		if (0 >= strlen($rData['email']) || filter_var($rData['email'], FILTER_VALIDATE_EMAIL)) {
-
-
 			if (0 < strlen($rData['password'])) {
 				if (!(strlen($rData['password']) < intval(self::$rPermissions['minimum_password_length']))) {
 					$rPassword = Authenticator::hashPassword($rData['password']);
 				} else {
-					return array('status' => STATUS_INVALID_PASSWORD);
+					return ['status' => STATUS_INVALID_PASSWORD];
 				}
 			} else {
 				$rPassword = self::$rUserInfo['password'];
@@ -112,7 +115,7 @@ class ResellerAPI {
 				$rData['hue'] = '';
 			}
 
-			if (!in_array($rData['theme'], array(0, 1))) {
+			if (!in_array($rData['theme'], [0, 1])) {
 				$rData['theme'] = 0;
 			}
 
@@ -122,10 +125,10 @@ class ResellerAPI {
 
 			$db->query('UPDATE `users` SET `password` = ?, `email` = ?, `reseller_dns` = ?, `theme` = ?, `hue` = ?, `timezone` = ?, `api_key` = ?, `lang` = ? WHERE `id` = ?;', $rPassword, $rData['email'], $rData['reseller_dns'], $rData['theme'], $rData['hue'], $rData['timezone'], $rData['api_key'], $rData['lang'], self::$rUserInfo['id']);
 
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		}
 
-		return array('status' => STATUS_INVALID_EMAIL);
+		return ['status' => STATUS_INVALID_EMAIL];
 	}
 
 	/**
@@ -134,7 +137,7 @@ class ResellerAPI {
 	 * @param array $rData Login payload.
 	 * @return array Result status payload.
 	 */
-	public static function processLogin($rData) {
+	public static function processLogin(array $rData) {
 		return Authenticator::resellerLogin($rData);
 	}
 
@@ -144,19 +147,15 @@ class ResellerAPI {
 	 * @param array $rData Submitted MAG/line data.
 	 * @return array|false Result status payload, or false on authorization/validation failure.
 	 */
-	public static function processMAG($rData) {
+	public static function processMAG(array $rData) {
 		$db = self::db();
 		$rData = self::processData('mag', $rData);
 
 		if (self::$rPermissions['create_mag']) {
-
-
 			if (isset($rData['edit'])) {
 				$rArray = MagService::getById($rData['edit']);
 
 				if ($rArray && Authorization::check('line', $rArray['user_id'])) {
-
-
 					$rUserArray = UserRepository::getLineById($rArray['user_id']);
 				} else {
 					return false;
@@ -180,8 +179,6 @@ class ResellerAPI {
 				$rPackage = PackageService::getById($rData['package']);
 
 				if ($rPackage['is_mag']) {
-
-
 					if (0 < intval($rUserArray['package_id']) && $rPackage['check_compatible']) {
 						$rCompatible = PackageService::checkCompatible($rUserArray['package_id'], $rPackage['id']);
 					} else {
@@ -193,7 +190,7 @@ class ResellerAPI {
 							if ($rGenTrials) {
 								$rCost = intval($rPackage['trial_credits']);
 							} else {
-								return array('status' => STATUS_NO_TRIALS, 'data' => $rData);
+								return ['status' => STATUS_NO_TRIALS, 'data' => $rData];
 							}
 						} else {
 							$rOverride = json_decode(self::$rUserInfo['override_packages'], true);
@@ -227,7 +224,7 @@ class ResellerAPI {
 
 							if (!(self::$rPermissions['allow_change_bouquets'] && 0 < count($rData['bouquets_selected'] ?? []))) {
 							} else {
-								$rNewBouquets = array();
+								$rNewBouquets = [];
 
 								foreach ($rData['bouquets_selected'] as $rBouquetID) {
 									if (!in_array($rBouquetID, $rBouquets)) {
@@ -249,8 +246,8 @@ class ResellerAPI {
 							$rUserArray['force_server_id'] = $rPackage['force_server_id'];
 							$rUserArray['forced_country'] = $rPackage['forced_country'];
 							$rUserArray['is_isplock'] = $rPackage['is_isplock'];
-							$rOutputs = array();
-							$rAccessOutput = json_decode($rPackage['output_formats'], true) ?: array();
+							$rOutputs = [];
+							$rAccessOutput = json_decode($rPackage['output_formats'], true) ?: [];
 
 							foreach ($rAccessOutput as $rOutputID) {
 								$rOutputs[] = $rOutputID;
@@ -259,17 +256,17 @@ class ResellerAPI {
 							$rUserArray['package_id'] = $rPackage['id'];
 							$rArray['lock_device'] = $rPackage['lock_device'];
 						} else {
-							return array('status' => STATUS_INSUFFICIENT_CREDITS, 'data' => $rData);
+							return ['status' => STATUS_INSUFFICIENT_CREDITS, 'data' => $rData];
 						}
 					} else {
-						return array('status' => STATUS_INVALID_PACKAGE, 'data' => $rData);
+						return ['status' => STATUS_INVALID_PACKAGE, 'data' => $rData];
 					}
 				} else {
-					return array('status' => STATUS_INVALID_TYPE, 'data' => $rData);
+					return ['status' => STATUS_INVALID_TYPE, 'data' => $rData];
 				}
 			} else {
 				if (!isset($rUserArray['id'])) {
-					return array('status' => STATUS_INVALID_PACKAGE, 'data' => $rData);
+					return ['status' => STATUS_INVALID_PACKAGE, 'data' => $rData];
 				}
 
 				if (!(isset($rData['edit']) && $rUserArray['package_id'])) {
@@ -279,7 +276,7 @@ class ResellerAPI {
 
 					if (!(self::$rPermissions['allow_change_bouquets'] && 0 < count($rData['bouquets_selected'] ?? []))) {
 					} else {
-						$rNewBouquets = array();
+						$rNewBouquets = [];
 
 						foreach ($rData['bouquets_selected'] as $rBouquetID) {
 							if (!in_array($rBouquetID, $rBouquets)) {
@@ -299,7 +296,7 @@ class ResellerAPI {
 				}
 			}
 
-			foreach (array('parent_password', 'sn', 'stb_type', 'image_version', 'hw_version', 'device_id', 'device_id2', 'ver') as $rKey) {
+			foreach (['parent_password', 'sn', 'stb_type', 'image_version', 'hw_version', 'device_id', 'device_id2', 'ver'] as $rKey) {
 				$rArray[$rKey] = $rData[$rKey];
 			}
 			$rUserArray['reseller_notes'] = $rData['reseller_notes'];
@@ -316,7 +313,7 @@ class ResellerAPI {
 				if (isset($rData['allowed_ips'])) {
 					if (is_array($rData['allowed_ips'])) {
 					} else {
-						$rData['allowed_ips'] = array($rData['allowed_ips']);
+						$rData['allowed_ips'] = [$rData['allowed_ips']];
 					}
 
 					$rUserArray['allowed_ips'] = json_encode($rData['allowed_ips']);
@@ -338,8 +335,6 @@ class ResellerAPI {
 			}
 
 			if (filter_var($rData['mac'], FILTER_VALIDATE_MAC)) {
-
-
 				if (isset($rData['edit'])) {
 					$db->query('SELECT `mag_id` FROM `mag_devices` WHERE mac = ? AND `mag_id` <> ? LIMIT 1;', $rArray['mac'], $rData['edit']);
 				} else {
@@ -347,8 +342,6 @@ class ResellerAPI {
 				}
 
 				if (0 >= $db->num_rows()) {
-
-
 					$rArray['mac'] = $rData['mac'];
 
 					if (isset($rData['pair_id']) && Authorization::check('line', $rData['pair_id'])) {
@@ -364,7 +357,7 @@ class ResellerAPI {
 					} else {
 						$rInsertID = $db->last_insert_id();
 						MagService::syncLineDevices($rInsertID);
-						$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(array('type' => 'update_line', 'id' => $rInsertID)));
+						$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(['type' => 'update_line', 'id' => $rInsertID]));
 						$rArray['user_id'] = $rInsertID;
 						unset($rArray['user'], $rArray['paired']);
 
@@ -405,7 +398,7 @@ class ResellerAPI {
 								$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'mag', ?, ?, null, ?, ?, ?, ?);", self::$rUserInfo['id'], 'edit', $rInsertID, 0, self::$rUserInfo['credits'], time(), json_encode($rData));
 							}
 
-							return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+							return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 						}
 
 						if (isset($rData['edit'])) {
@@ -414,13 +407,13 @@ class ResellerAPI {
 						}
 					}
 
-					return array('status' => STATUS_FAILURE, 'data' => $rData);
+					return ['status' => STATUS_FAILURE, 'data' => $rData];
 				}
 
-				return array('status' => STATUS_EXISTS_MAC, 'data' => $rData);
+				return ['status' => STATUS_EXISTS_MAC, 'data' => $rData];
 			}
 
-			return array('status' => STATUS_INVALID_MAC, 'data' => $rData);
+			return ['status' => STATUS_INVALID_MAC, 'data' => $rData];
 		} else {
 			return false;
 		}
@@ -432,19 +425,15 @@ class ResellerAPI {
 	 * @param array $rData Submitted Enigma2/line data.
 	 * @return array|false Result status payload, or false on authorization/validation failure.
 	 */
-	public static function processEnigma($rData) {
+	public static function processEnigma(array $rData) {
 		$db = self::db();
 		$rData = self::processData('enigma', $rData);
 
 		if (self::$rPermissions['create_enigma']) {
-
-
 			if (isset($rData['edit'])) {
 				$rArray = EnigmaService::getById($rData['edit']);
 
 				if ($rArray && Authorization::check('line', $rArray['user_id'])) {
-
-
 					$rUserArray = UserRepository::getLineById($rArray['user_id']);
 				} else {
 					return false;
@@ -467,8 +456,6 @@ class ResellerAPI {
 				$rPackage = PackageService::getById($rData['package']);
 
 				if ($rPackage['is_e2']) {
-
-
 					if (0 < intval($rUserArray['package_id']) && $rPackage['check_compatible']) {
 						$rCompatible = PackageService::checkCompatible($rUserArray['package_id'], $rPackage['id']);
 					} else {
@@ -480,7 +467,7 @@ class ResellerAPI {
 							if ($rGenTrials) {
 								$rCost = intval($rPackage['trial_credits']);
 							} else {
-								return array('status' => STATUS_NO_TRIALS, 'data' => $rData);
+								return ['status' => STATUS_NO_TRIALS, 'data' => $rData];
 							}
 						} else {
 							$rOverride = json_decode(self::$rUserInfo['override_packages'], true);
@@ -514,7 +501,7 @@ class ResellerAPI {
 
 							if (!(self::$rPermissions['allow_change_bouquets'] && 0 < count($rData['bouquets_selected'] ?? []))) {
 							} else {
-								$rNewBouquets = array();
+								$rNewBouquets = [];
 
 								foreach ($rData['bouquets_selected'] as $rBouquetID) {
 									if (!in_array($rBouquetID, $rBouquets)) {
@@ -536,8 +523,8 @@ class ResellerAPI {
 							$rUserArray['force_server_id'] = $rPackage['force_server_id'];
 							$rUserArray['forced_country'] = $rPackage['forced_country'];
 							$rUserArray['is_isplock'] = $rPackage['is_isplock'];
-							$rOutputs = array();
-							$rAccessOutput = json_decode($rPackage['output_formats'], true) ?: array();
+							$rOutputs = [];
+							$rAccessOutput = json_decode($rPackage['output_formats'], true) ?: [];
 
 							foreach ($rAccessOutput as $rOutputID) {
 								$rOutputs[] = $rOutputID;
@@ -546,17 +533,17 @@ class ResellerAPI {
 							$rUserArray['package_id'] = $rPackage['id'];
 							$rArray['lock_device'] = $rPackage['lock_device'];
 						} else {
-							return array('status' => STATUS_INSUFFICIENT_CREDITS, 'data' => $rData);
+							return ['status' => STATUS_INSUFFICIENT_CREDITS, 'data' => $rData];
 						}
 					} else {
-						return array('status' => STATUS_INVALID_PACKAGE, 'data' => $rData);
+						return ['status' => STATUS_INVALID_PACKAGE, 'data' => $rData];
 					}
 				} else {
-					return array('status' => STATUS_INVALID_TYPE, 'data' => $rData);
+					return ['status' => STATUS_INVALID_TYPE, 'data' => $rData];
 				}
 			} else {
 				if (!isset($rUserArray['id'])) {
-					return array('status' => STATUS_INVALID_PACKAGE, 'data' => $rData);
+					return ['status' => STATUS_INVALID_PACKAGE, 'data' => $rData];
 				}
 
 				if (!(isset($rData['edit']) && $rUserArray['package_id'])) {
@@ -566,7 +553,7 @@ class ResellerAPI {
 
 					if (!(self::$rPermissions['allow_change_bouquets'] && 0 < count($rData['bouquets_selected'] ?? []))) {
 					} else {
-						$rNewBouquets = array();
+						$rNewBouquets = [];
 
 						foreach ($rData['bouquets_selected'] as $rBouquetID) {
 							if (!in_array($rBouquetID, $rBouquets)) {
@@ -586,7 +573,7 @@ class ResellerAPI {
 				}
 			}
 
-			foreach (array('modem_mac', 'local_ip', 'enigma_version', 'cpu', 'lversion', 'token') as $rKey) {
+			foreach (['modem_mac', 'local_ip', 'enigma_version', 'cpu', 'lversion', 'token'] as $rKey) {
 				$rArray[$rKey] = $rData[$rKey];
 			}
 			$rUserArray['reseller_notes'] = $rData['reseller_notes'];
@@ -603,7 +590,7 @@ class ResellerAPI {
 				if (isset($rData['allowed_ips'])) {
 					if (is_array($rData['allowed_ips'])) {
 					} else {
-						$rData['allowed_ips'] = array($rData['allowed_ips']);
+						$rData['allowed_ips'] = [$rData['allowed_ips']];
 					}
 
 					$rUserArray['allowed_ips'] = json_encode($rData['allowed_ips']);
@@ -625,8 +612,6 @@ class ResellerAPI {
 			}
 
 			if (filter_var($rData['mac'], FILTER_VALIDATE_MAC)) {
-
-
 				if (isset($rData['edit'])) {
 					$db->query('SELECT `device_id` FROM `enigma2_devices` WHERE mac = ? AND `device_id` <> ? LIMIT 1;', $rArray['mac'], $rData['edit']);
 				} else {
@@ -634,8 +619,6 @@ class ResellerAPI {
 				}
 
 				if (0 >= $db->num_rows()) {
-
-
 					$rArray['mac'] = $rData['mac'];
 
 					if (isset($rData['pair_id']) && Authorization::check('line', $rData['pair_id'])) {
@@ -651,7 +634,7 @@ class ResellerAPI {
 					} else {
 						$rInsertID = $db->last_insert_id();
 						MagService::syncLineDevices($rInsertID);
-						$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(array('type' => 'update_line', 'id' => $rInsertID)));
+						$db->query('INSERT INTO `signals`(`server_id`, `cache`, `time`, `custom_data`) VALUES(?, 1, ?, ?);', SERVER_ID, time(), json_encode(['type' => 'update_line', 'id' => $rInsertID]));
 						$rArray['user_id'] = $rInsertID;
 						unset($rArray['user'], $rArray['paired']);
 
@@ -691,7 +674,7 @@ class ResellerAPI {
 								$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'enigma', ?, ?, null, ?, ?, ?, ?);", self::$rUserInfo['id'], 'edit', $rInsertID, 0, self::$rUserInfo['credits'], time(), json_encode($rData));
 							}
 
-							return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+							return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 						}
 
 						if (isset($rData['edit'])) {
@@ -700,13 +683,13 @@ class ResellerAPI {
 						}
 					}
 
-					return array('status' => STATUS_FAILURE, 'data' => $rData);
+					return ['status' => STATUS_FAILURE, 'data' => $rData];
 				}
 
-				return array('status' => STATUS_EXISTS_MAC, 'data' => $rData);
+				return ['status' => STATUS_EXISTS_MAC, 'data' => $rData];
 			}
 
-			return array('status' => STATUS_INVALID_MAC, 'data' => $rData);
+			return ['status' => STATUS_INVALID_MAC, 'data' => $rData];
 		} else {
 			return false;
 		}
@@ -718,19 +701,15 @@ class ResellerAPI {
 	 * @param array $rData Submitted user data.
 	 * @return array|false Result status payload, or false on authorization/validation failure.
 	 */
-	public static function processUser($rData) {
+	public static function processUser(array $rData) {
 		$db = self::db();
 		$rData = self::processData('user', $rData);
 
 		if (self::$rPermissions['create_sub_resellers']) {
-
-
 			if (isset($rData['edit'])) {
 				$rArray = UserRepository::getRegisteredUserById($rData['edit']);
 
 				if ($rArray && Authorization::check('user', $rArray['id'])) {
-
-
 					if ($rArray['id'] != self::$rUserInfo['id']) {
 					} else {
 						return false;
@@ -763,14 +742,8 @@ class ResellerAPI {
 			}
 
 			if (strlen($rData['username']) >= self::$rPermissions['minimum_username_length'] || (isset($rData['edit']) && strlen($rData['username']) == 0)) {
-
-
 				if (strlen($rData['password']) >= self::$rPermissions['minimum_password_length'] || (isset($rData['edit']) && strlen($rData['password']) == 0)) {
-
-
 					if (!QueryHelper::checkExists('users', 'username', $rArray['username'], 'id', $rData['edit'] ?? null)) {
-
-
 						$rArray['username'] = $rData['username'];
 
 						if (0 >= strlen($rData['password'])) {
@@ -790,7 +763,7 @@ class ResellerAPI {
 
 							if (self::$rUserInfo['credits'] - $rCost >= 0) {
 							} else {
-								return array('status' => STATUS_INSUFFICIENT_CREDITS, 'data' => $rData);
+								return ['status' => STATUS_INSUFFICIENT_CREDITS, 'data' => $rData];
 							}
 						}
 
@@ -800,7 +773,7 @@ class ResellerAPI {
 							if (0 < count(self::$rPermissions['subresellers'])) {
 								$rArray['member_group_id'] = self::$rPermissions['subresellers'][0];
 							} else {
-								return array('status' => STATUS_INVALID_SUBRESELLER, 'data' => $rData);
+								return ['status' => STATUS_INVALID_SUBRESELLER, 'data' => $rData];
 							}
 						}
 
@@ -822,19 +795,19 @@ class ResellerAPI {
 								$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'user', ?, ?, null, ?, ?, ?, ?);", self::$rUserInfo['id'], 'edit', $rInsertID, 0, self::$rUserInfo['credits'], time(), json_encode($rData));
 							}
 
-							return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+							return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 						}
 
-						return array('status' => STATUS_FAILURE, 'data' => $rData);
+						return ['status' => STATUS_FAILURE, 'data' => $rData];
 					}
 
-					return array('status' => STATUS_EXISTS_USERNAME, 'data' => $rData);
+					return ['status' => STATUS_EXISTS_USERNAME, 'data' => $rData];
 				}
 
-				return array('status' => STATUS_INVALID_PASSWORD, 'data' => $rData);
+				return ['status' => STATUS_INVALID_PASSWORD, 'data' => $rData];
 			}
 
-			return array('status' => STATUS_INVALID_USERNAME, 'data' => $rData);
+			return ['status' => STATUS_INVALID_USERNAME, 'data' => $rData];
 		}
 
 		return false;
@@ -846,7 +819,7 @@ class ResellerAPI {
 	 * @param array $rData Ticket payload.
 	 * @return array|false Result status payload, or false on authorization failure.
 	 */
-	public static function submitTicket($rData) {
+	public static function submitTicket(array $rData) {
 		$db = self::db();
 		$rData = self::processData('ticket', $rData);
 
@@ -863,9 +836,6 @@ class ResellerAPI {
 		}
 
 		if (!(strlen($rData['title']) == 0 && !isset($rData['respond']) || strlen($rData['message']) == 0)) {
-
-
-
 			$rArray['member_id'] = self::$rUserInfo['id'];
 
 			if (!isset($rData['respond'])) {
@@ -880,10 +850,10 @@ class ResellerAPI {
 					$rInsertID = $db->last_insert_id();
 					$db->query('INSERT INTO `tickets_replies`(`ticket_id`, `admin_reply`, `message`, `date`) VALUES(?, 0, ?, ?);', $rInsertID, $rData['message'], time());
 
-					return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+					return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 				}
 
-				return array('status' => STATUS_FAILURE, 'data' => $rData);
+				return ['status' => STATUS_FAILURE, 'data' => $rData];
 			}
 
 			$rTicket = TicketRepository::getById($rData['respond']);
@@ -897,13 +867,13 @@ class ResellerAPI {
 					$db->query('INSERT INTO `tickets_replies`(`ticket_id`, `admin_reply`, `message`, `date`) VALUES(?, 1, ?, ?);', $rData['respond'], $rData['message'], time());
 				}
 
-				return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rData['respond']));
+				return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rData['respond']]];
 			}
 
-			return array('status' => STATUS_FAILURE, 'data' => $rData);
+			return ['status' => STATUS_FAILURE, 'data' => $rData];
 		}
 
-		return array('status' => STATUS_INVALID_DATA, 'data' => $rData);
+		return ['status' => STATUS_INVALID_DATA, 'data' => $rData];
 	}
 
 	/**
@@ -912,16 +882,14 @@ class ResellerAPI {
 	 * @param array $rData Submitted line data.
 	 * @return array|false Result status payload, or false on authorization/validation failure.
 	 */
-	public static function processLine($rData) {
+	public static function processLine(array $rData) {
 		$db = self::db();
 		$rData = self::processData('line', $rData);
 
 		if (self::$rPermissions['create_line']) {
-
-
 			if (isset($rData['edit'])) {
 				$rArray = UserRepository::getLineById($rData['edit']);
-				$rOrigCredentials = array('username' => $rArray['username'], 'password' => $rArray['password']);
+				$rOrigCredentials = ['username' => $rArray['username'], 'password' => $rArray['password']];
 
 				if ($rArray && Authorization::check('line', $rArray['id'])) {
 				} else {
@@ -931,7 +899,7 @@ class ResellerAPI {
 				$rArray = QueryHelper::verifyPostTable('lines', $rData);
 				$rArray['created_at'] = time();
 				unset($rArray['id']);
-				$rOrigCredentials = array('username' => '', 'password' => '');
+				$rOrigCredentials = ['username' => '', 'password' => ''];
 			}
 
 			$rArray['is_mag'] = 0;
@@ -942,8 +910,6 @@ class ResellerAPI {
 				$rPackage = PackageService::getById($rData['package']);
 
 				if ($rPackage['is_line']) {
-
-
 					if (0 < intval($rArray['package_id']) && $rPackage['check_compatible']) {
 						$rCompatible = PackageService::checkCompatible($rArray['package_id'], $rPackage['id']);
 					} else {
@@ -955,7 +921,7 @@ class ResellerAPI {
 							if ($rGenTrials) {
 								$rCost = intval($rPackage['trial_credits']);
 							} else {
-								return array('status' => STATUS_NO_TRIALS, 'data' => $rData);
+								return ['status' => STATUS_NO_TRIALS, 'data' => $rData];
 							}
 						} else {
 							$rOverride = json_decode(self::$rUserInfo['override_packages'], true);
@@ -989,7 +955,7 @@ class ResellerAPI {
 
 							if (!(self::$rPermissions['allow_change_bouquets'] && 0 < count($rData['bouquets_selected'] ?? []))) {
 							} else {
-								$rNewBouquets = array();
+								$rNewBouquets = [];
 
 								foreach ($rData['bouquets_selected'] as $rBouquetID) {
 									if (!in_array($rBouquetID, $rBouquets)) {
@@ -1013,17 +979,17 @@ class ResellerAPI {
 							$rArray['is_isplock'] = $rPackage['is_isplock'];
 							$rArray['package_id'] = $rPackage['id'];
 						} else {
-							return array('status' => STATUS_INSUFFICIENT_CREDITS, 'data' => $rData);
+							return ['status' => STATUS_INSUFFICIENT_CREDITS, 'data' => $rData];
 						}
 					} else {
-						return array('status' => STATUS_INVALID_PACKAGE, 'data' => $rData);
+						return ['status' => STATUS_INVALID_PACKAGE, 'data' => $rData];
 					}
 				} else {
-					return array('status' => STATUS_INVALID_TYPE, 'data' => $rData);
+					return ['status' => STATUS_INVALID_TYPE, 'data' => $rData];
 				}
 			} else {
 				if (!isset($rArray['id'])) {
-					return array('status' => STATUS_INVALID_PACKAGE, 'data' => $rData);
+					return ['status' => STATUS_INVALID_PACKAGE, 'data' => $rData];
 				}
 
 				if (!(isset($rData['edit']) && $rArray['package_id'])) {
@@ -1033,7 +999,7 @@ class ResellerAPI {
 
 					if (!(self::$rPermissions['allow_change_bouquets'] && 0 < count($rData['bouquets_selected'] ?? []))) {
 					} else {
-						$rNewBouquets = array();
+						$rNewBouquets = [];
 
 						foreach ($rData['bouquets_selected'] as $rBouquetID) {
 							if (!in_array($rBouquetID, $rBouquets)) {
@@ -1092,7 +1058,7 @@ class ResellerAPI {
 				} else {
 					if (isset($rData['edit']) && $rData['username'] == $rOrigCredentials['username']) {
 					} else {
-						return array('status' => STATUS_INVALID_USERNAME, 'data' => $rData);
+						return ['status' => STATUS_INVALID_USERNAME, 'data' => $rData];
 					}
 				}
 			}
@@ -1108,7 +1074,7 @@ class ResellerAPI {
 				} else {
 					if (isset($rData['edit']) && $rData['password'] == $rOrigCredentials['password']) {
 					} else {
-						return array('status' => STATUS_INVALID_PASSWORD, 'data' => $rData);
+						return ['status' => STATUS_INVALID_PASSWORD, 'data' => $rData];
 					}
 				}
 			}
@@ -1124,14 +1090,12 @@ class ResellerAPI {
 			}
 
 			if (!QueryHelper::checkExists('lines', 'username', $rArray['username'], 'id', $rData['edit'] ?? null)) {
-
-
 				if (!self::$rPermissions['allow_restrictions']) {
 				} else {
 					if (isset($rData['allowed_ips'])) {
 						if (is_array($rData['allowed_ips'])) {
 						} else {
-							$rData['allowed_ips'] = array($rData['allowed_ips']);
+							$rData['allowed_ips'] = [$rData['allowed_ips']];
 						}
 
 						$rArray['allowed_ips'] = json_encode($rData['allowed_ips']);
@@ -1142,7 +1106,7 @@ class ResellerAPI {
 					if (isset($rData['allowed_ua'])) {
 						if (is_array($rData['allowed_ua'])) {
 						} else {
-							$rData['allowed_ua'] = array($rData['allowed_ua']);
+							$rData['allowed_ua'] = [$rData['allowed_ua']];
 						}
 
 						$rArray['allowed_ua'] = json_encode($rData['allowed_ua']);
@@ -1171,8 +1135,8 @@ class ResellerAPI {
 
 				if (!isset($rPackage)) {
 				} else {
-					$rOutputs = array();
-					$rAccessOutput = json_decode($rPackage['output_formats'], true) ?: array();
+					$rOutputs = [];
+					$rAccessOutput = json_decode($rPackage['output_formats'], true) ?: [];
 
 					foreach ($rAccessOutput as $rOutputID) {
 						$rOutputs[] = $rOutputID;
@@ -1210,13 +1174,13 @@ class ResellerAPI {
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'line', ?, ?, null, ?, ?, ?, ?);", self::$rUserInfo['id'], 'edit', $rInsertID, 0, self::$rUserInfo['credits'], time(), json_encode($rData));
 					}
 
-					return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+					return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 				}
 
-				return array('status' => STATUS_FAILURE, 'data' => $rData);
+				return ['status' => STATUS_FAILURE, 'data' => $rData];
 			}
 
-			return array('status' => STATUS_EXISTS_USERNAME, 'data' => $rData);
+			return ['status' => STATUS_EXISTS_USERNAME, 'data' => $rData];
 		}
 
 		return false;
diff --git a/src/Domain/User/TicketRepository.php b/src/Domain/User/TicketRepository.php
index 52e2e0c4..e3fcbbea 100644
--- a/src/Domain/User/TicketRepository.php
+++ b/src/Domain/User/TicketRepository.php
@@ -16,13 +16,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class TicketRepository {
 	use DatabaseAware;
+
 	/**
 	 * Fetch a single ticket (with its messages) by id.
 	 *
 	 * @param int $rID Ticket id.
 	 * @return array|false The ticket row, or false if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `tickets` WHERE `id` = ?;', $rID);
 
@@ -31,7 +32,7 @@ class TicketRepository {
 		}
 
 		$rRow = $db->get_row();
-		$rRow['replies'] = array();
+		$rRow['replies'] = [];
 		$rRow['title'] = htmlspecialchars($rRow['title']);
 		$db->query('SELECT * FROM `tickets_replies` WHERE `ticket_id` = ? ORDER BY `date` ASC;', $rID);
 
@@ -56,17 +57,17 @@ class TicketRepository {
 	 * @param bool     $rAdmin Use admin scope (all tickets).
 	 * @return array Ticket rows.
 	 */
-	public static function getAll($rID = null, $rAdmin = false) {
+	public static function getAll(?int $rID = null, bool $rAdmin = false) {
 		$db = self::db();
 		global $rUserInfo;
 		global $rPermissions;
-		$rReturn = array();
+		$rReturn = [];
 
 		if ($rID) {
 			if ($rAdmin) {
 				$db->query('SELECT `tickets`.`id`, `tickets`.`member_id`, `tickets`.`title`, `tickets`.`status`, `tickets`.`admin_read`, `tickets`.`user_read`, `users`.`username` FROM `tickets`, `users` WHERE `member_id` IN (SELECT `id` FROM `users` WHERE `owner_id` = ?) AND `users`.`id` = `tickets`.`member_id` ORDER BY `id` DESC;', $rID);
 			} else {
-				$db->query('SELECT `tickets`.`id`, `tickets`.`member_id`, `tickets`.`title`, `tickets`.`status`, `tickets`.`admin_read`, `tickets`.`user_read`, `users`.`username` FROM `tickets`, `users` WHERE `member_id` IN (' . implode(',', array_map('intval', array_merge(array($rUserInfo['id']), $rPermissions['all_reports']))) . ') AND `users`.`id` = `tickets`.`member_id` ORDER BY `id` DESC;');
+				$db->query('SELECT `tickets`.`id`, `tickets`.`member_id`, `tickets`.`title`, `tickets`.`status`, `tickets`.`admin_read`, `tickets`.`user_read`, `users`.`username` FROM `tickets`, `users` WHERE `member_id` IN (' . implode(',', array_map('intval', array_merge([$rUserInfo['id']], $rPermissions['all_reports']))) . ') AND `users`.`id` = `tickets`.`member_id` ORDER BY `id` DESC;');
 			}
 		} else {
 			$db->query('SELECT `tickets`.`id`, `tickets`.`member_id`, `tickets`.`title`, `tickets`.`status`, `tickets`.`admin_read`, `tickets`.`user_read`, `users`.`username` FROM `tickets`, `users` WHERE `users`.`id` = `tickets`.`member_id` ORDER BY `id` DESC;');
@@ -136,7 +137,7 @@ class TicketRepository {
 	 * @param int $rID Ticket id.
 	 * @return bool True on deletion, false if not found.
 	 */
-	public static function deleteById($rID) {
+	public static function deleteById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT `id` FROM `tickets` WHERE `id` = ?;', $rID);
 
diff --git a/src/Domain/User/UserRepository.php b/src/Domain/User/UserRepository.php
index 8bc3991b..cce1969f 100644
--- a/src/Domain/User/UserRepository.php
+++ b/src/Domain/User/UserRepository.php
@@ -34,7 +34,7 @@ class UserRepository {
 	 * @param string|null $rIspDesc    ISP currently stored on the line.
 	 * @return bool
 	 */
-	public static function ispChanged($rConIspName, $rIspViolate, $rIspDesc): bool {
+	public static function ispChanged(?string $rConIspName, int $rIspViolate, ?string $rIspDesc): bool {
 		return !empty($rConIspName)
 			&& $rIspViolate == 0
 			&& strtolower((string) $rConIspName) != strtolower((string) $rIspDesc);
@@ -54,7 +54,7 @@ class UserRepository {
 	 * @param string|null $rPassword Password.
 	 * @return array|false The line row, or false when it cannot be resolved.
 	 */
-	private static function loadUserRow($db, $rCached, $rSettings, &$rUserID, $rUsername, $rPassword) {
+	private static function loadUserRow(mixed $db, bool $rCached, array $rSettings, ?int &$rUserID, ?string $rUsername, ?string $rPassword) {
 		if ($rCached) {
 			if (empty($rPassword) && empty($rUserID) && strlen($rUsername) == 32) {
 				$rKey = $rSettings['case_sensitive_line'] ? $rUsername : strtolower($rUsername);
@@ -99,7 +99,7 @@ class UserRepository {
 	 * @param string|null $rPassword Password.
 	 * @return bool True when the credentials are valid.
 	 */
-	private static function verifyCachedCredentials($rUserInfo, $rUserID, $rUsername, $rPassword): bool {
+	private static function verifyCachedCredentials(array $rUserInfo, ?int $rUserID, ?string $rUsername, ?string $rPassword): bool {
 		if (empty($rPassword) && empty($rUserID) && strlen($rUsername) == 32) {
 			return $rUsername == $rUserInfo['access_token'];
 		}
@@ -134,7 +134,7 @@ class UserRepository {
 	 * @param array $rAllowedOutputs Access-output ids the line is allowed.
 	 * @return array<int,string> Output keys.
 	 */
-	private static function resolveOutputFormats($db, $rCached, array $rAllowedOutputs): array {
+	private static function resolveOutputFormats(mixed $db, bool $rCached, array $rAllowedOutputs): array {
 		if ($rCached) {
 			$rRows = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'output_formats'));
 		} else {
@@ -142,7 +142,7 @@ class UserRepository {
 			$rRows = $db->get_rows();
 		}
 
-		$rFormats = array();
+		$rFormats = [];
 		foreach ($rRows as $rRow) {
 			if (in_array(intval($rRow['access_output_id']), $rAllowedOutputs)) {
 				$rFormats[] = $rRow['output_key'];
@@ -159,8 +159,8 @@ class UserRepository {
 	 * @param array $rBouquets Bouquet map (id => ['streams','series','channels','movies','radios']).
 	 * @return array{channel_ids:int[],series_ids:int[],vod_ids:int[],live_ids:int[],radio_ids:int[]}
 	 */
-	private static function aggregateBouquetIds($rBouquet, $rBouquets): array {
-		$rChannelIDs = $rSeriesIDs = $rVODIDs = $rLiveIDs = $rRadioIDs = array();
+	private static function aggregateBouquetIds(array $rBouquet, array $rBouquets): array {
+		$rChannelIDs = $rSeriesIDs = $rVODIDs = $rLiveIDs = $rRadioIDs = [];
 		foreach ($rBouquet as $rID) {
 			if (isset($rBouquets[$rID]['streams'])) {
 				$rChannelIDs = array_merge($rChannelIDs, $rBouquets[$rID]['streams']);
@@ -178,13 +178,13 @@ class UserRepository {
 				$rRadioIDs = array_merge($rRadioIDs, $rBouquets[$rID]['radios']);
 			}
 		}
-		return array(
+		return [
 			'channel_ids' => array_map('intval', array_unique($rChannelIDs)),
 			'series_ids' => array_map('intval', array_unique($rSeriesIDs)),
 			'vod_ids' => array_map('intval', array_unique($rVODIDs)),
 			'live_ids' => array_map('intval', array_unique($rLiveIDs)),
 			'radio_ids' => array_map('intval', array_unique($rRadioIDs)),
-		);
+		];
 	}
 
 	/**
@@ -194,10 +194,10 @@ class UserRepository {
 	 * @param array $rCategoryMap Bouquet id => category id list.
 	 * @return array<int,mixed> Distinct category ids.
 	 */
-	private static function resolveCategoryIds($rBouquet, $rCategoryMap): array {
-		$rAllowedCategories = array();
+	private static function resolveCategoryIds(array $rBouquet, array $rCategoryMap): array {
+		$rAllowedCategories = [];
 		foreach ($rBouquet as $rID) {
-			$rAllowedCategories = array_merge($rAllowedCategories, ($rCategoryMap[$rID] ?: array()));
+			$rAllowedCategories = array_merge($rAllowedCategories, ($rCategoryMap[$rID] ?: []));
 		}
 		return array_values(array_unique($rAllowedCategories));
 	}
@@ -214,7 +214,7 @@ class UserRepository {
 	 * @param mixed  $db        Database handler.
 	 * @return array The (possibly) updated row.
 	 */
-	private static function applyForcedCountry(array $rUserInfo, $rSettings, $rCached, $rIP, $db): array {
+	private static function applyForcedCountry(array $rUserInfo, array $rSettings, bool $rCached, string $rIP, mixed $db): array {
 		if ($rSettings['county_override_1st'] == 1 && empty($rUserInfo['forced_country']) && !empty($rIP) && $rUserInfo['max_connections'] == 1) {
 			$rUserInfo['forced_country'] = GeoIP::getCountry($rIP)['registered_country']['iso_code'];
 			if ($rCached) {
@@ -238,7 +238,7 @@ class UserRepository {
 	 * @param mixed  $db        Database handler.
 	 * @return array The updated row.
 	 */
-	private static function applyIspInfo(array $rUserInfo, $rSettings, $rCached, $rIP, $db): array {
+	private static function applyIspInfo(array $rUserInfo, array $rSettings, bool $rCached, string $rIP, mixed $db): array {
 		$rUserInfo['con_isp_name'] = null;
 		$rUserInfo['isp_asn'] = null;
 		$rUserInfo['isp_violate'] = 0;
@@ -261,7 +261,7 @@ class UserRepository {
 
 			if (self::ispChanged($rUserInfo['con_isp_name'], $rUserInfo['isp_violate'], $rUserInfo['isp_desc'])) {
 				if ($rCached) {
-					SignalQueue::push('isp/' . $rUserInfo['id'], json_encode(array($rUserInfo['con_isp_name'], $rUserInfo['isp_asn'])));
+					SignalQueue::push('isp/' . $rUserInfo['id'], json_encode([$rUserInfo['con_isp_name'], $rUserInfo['isp_asn']]));
 				} else {
 					$db->query('UPDATE `lines` SET `isp_desc` = ?, `as_number` = ? WHERE `id` = ?', $rUserInfo['con_isp_name'], $rUserInfo['isp_asn'], $rUserInfo['id']);
 				}
@@ -277,7 +277,7 @@ class UserRepository {
 	 * @param string $rPassword Plain-text password.
 	 * @return array|null The user row, or null if credentials are invalid.
 	 */
-	public static function getAuthUserByCredentials($rUsername, $rPassword) {
+	public static function getAuthUserByCredentials(string $rUsername, string $rPassword) {
 		$db = self::db();
 		$db->query('SELECT `id`, `username`, `password`, `member_group_id`, `status` FROM `users` WHERE `username` = ? LIMIT 1;', $rUsername);
 
@@ -298,7 +298,7 @@ class UserRepository {
 	 * @param bool $rIncludeSelf Include the owner in the result.
 	 * @return array Reseller rows.
 	 */
-	public static function getResellers($rOwner, $rIncludeSelf = true) {
+	public static function getResellers(int $rOwner, bool $rIncludeSelf = true) {
 		$db = self::db();
 		if ($rIncludeSelf) {
 			$db->query('SELECT `id`, `username` FROM `users` WHERE `owner_id` = ? OR `id` = ? ORDER BY `username` ASC;', $rOwner, $rOwner);
@@ -317,7 +317,7 @@ class UserRepository {
 	 * @param bool  $rIncludeSelf Include the user themselves.
 	 * @return array Direct report rows.
 	 */
-	public static function getDirectReports($rPermissions, $rUserInfo, $rIncludeSelf = true) {
+	public static function getDirectReports(array $rPermissions, array $rUserInfo, bool $rIncludeSelf = true) {
 		$db = self::db();
 		$rUserIDs = $rPermissions['direct_reports'];
 
@@ -325,7 +325,7 @@ class UserRepository {
 			$rUserIDs[] = $rUserInfo['id'];
 		}
 
-		$rReturn = array();
+		$rReturn = [];
 
 		if (0 < count($rUserIDs)) {
 			$db->query('SELECT * FROM `users` WHERE `owner_id` IN (' . implode(',', array_map('intval', $rUserIDs)) . ') ORDER BY `username` ASC;');
@@ -348,7 +348,7 @@ class UserRepository {
 	 * @param int   $rID          Target user id.
 	 * @return int Resolved parent user id.
 	 */
-	public static function getParent($rPermissions, $rUserInfo, $rID) {
+	public static function getParent(array $rPermissions, array $rUserInfo, int $rID) {
 		if (!isset($rPermissions['users'][$rID]['parent']) || $rPermissions['users'][$rID]['parent'] == 0 || $rPermissions['users'][$rID]['parent'] == $rUserInfo['id']) {
 			return $rID;
 		}
@@ -362,13 +362,13 @@ class UserRepository {
 	 * @param int $rUser User id.
 	 * @return array Sub-user rows keyed by id.
 	 */
-	public static function getSubUsers($rUser) {
+	public static function getSubUsers(int $rUser) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `id`, `username` FROM `users` WHERE `owner_id` = ?;', $rUser);
 
 		foreach ($db->get_rows() as $rRow) {
-			$rReturn[$rRow['id']] = array('username' => $rRow['username'], 'parent' => $rUser);
+			$rReturn[$rRow['id']] = ['username' => $rRow['username'], 'parent' => $rUser];
 
 			foreach (self::getSubUsers($rRow['id']) as $rUserID => $rUserData) {
 				$rReturn[$rUserID] = $rUserData;
@@ -384,7 +384,7 @@ class UserRepository {
 	 * @param int $rID Line id.
 	 * @return array|null The line row, or null if not found.
 	 */
-	public static function getLineById($rID) {
+	public static function getLineById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `lines` WHERE `id` = ?;', $rID);
 
@@ -400,7 +400,7 @@ class UserRepository {
 	 * @param string $rUsername Line username.
 	 * @return array|null The line row, or null if not found.
 	 */
-	public static function getLineByUsername($rUsername) {
+	public static function getLineByUsername(string $rUsername) {
 		$db = self::db();
 		$db->query('SELECT * FROM `lines` WHERE `username` = ?;', $rUsername);
 
@@ -416,7 +416,7 @@ class UserRepository {
 	 * @param int $rID User id.
 	 * @return array|null The user row, or null if not found.
 	 */
-	public static function getRegisteredUserById($rID) {
+	public static function getRegisteredUserById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `users` WHERE `id` = ?;', $rID);
 
@@ -432,7 +432,7 @@ class UserRepository {
 	 * @param int $rID User id.
 	 * @return array|null
 	 */
-	public static function getUserById($rID) {
+	public static function getUserById(int $rID) {
 		return self::getRegisteredUserById($rID);
 	}
 
@@ -443,9 +443,9 @@ class UserRepository {
 	 * @param bool     $rIncludeSelf Include the owner in the result.
 	 * @return array Registered user rows.
 	 */
-	public static function getRegisteredUsers($rOwner = null, $rIncludeSelf = true) {
+	public static function getRegisteredUsers(?int $rOwner = null, bool $rIncludeSelf = true) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `users` ORDER BY `username` ASC;');
 
 		if (0 < $db->num_rows()) {
@@ -457,7 +457,7 @@ class UserRepository {
 		}
 
 		if (count($rReturn) == 0) {
-			$rReturn[-1] = array();
+			$rReturn[-1] = [];
 		}
 
 		return $rReturn;
@@ -480,7 +480,7 @@ class UserRepository {
 	 * @param string      $rIP              Client IP.
 	 * @return array|null User info, or null if not found.
 	 */
-	public static function getStreamingUserInfo($rSettings, $rCached, $rBouquets, $rUserID = null, $rUsername = null, $rPassword = null, $rGetChannelIDs = false, $rGetConnections = false, $rIP = '') {
+	public static function getStreamingUserInfo(array $rSettings, bool $rCached, array $rBouquets, ?int $rUserID = null, ?string $rUsername = null, ?string $rPassword = null, bool $rGetChannelIDs = false, bool $rGetConnections = false, string $rIP = '') {
 		$db = self::db();
 		$rUserInfo = null;
 
@@ -518,7 +518,7 @@ class UserRepository {
 	 * @param string      $rIP             Client IP.
 	 * @return array|null User info, or null if not found.
 	 */
-	public static function getUserInfo($rUserID = null, $rUsername = null, $rPassword = null, $rGetChannelIDs = false, $rGetConnections = false, $rIP = '') {
+	public static function getUserInfo(?int $rUserID = null, ?string $rUsername = null, ?string $rPassword = null, bool $rGetChannelIDs = false, bool $rGetConnections = false, string $rIP = '') {
 		global $rSettings;
 		return self::getStreamingUserInfo($rSettings, $rSettings['enable_cache'], BouquetService::getAll(), $rUserID, $rUsername, $rPassword, $rGetChannelIDs, $rGetConnections, $rIP);
 	}
@@ -531,7 +531,7 @@ class UserRepository {
 	 * @param bool  $rGetConnections  Include active connections.
 	 * @return array|null Device user info, or null if not found.
 	 */
-	public static function getE2Info($rDevice, $rGetChannelIDs = false, $rGetConnections = false) {
+	public static function getE2Info(array $rDevice, bool $rGetChannelIDs = false, bool $rGetConnections = false) {
 		$db = self::db();
 		if (empty($rDevice['device_id'])) {
 			$db->query('SELECT * FROM `enigma2_devices` WHERE `mac` = ?', $rDevice['mac']);
@@ -541,11 +541,11 @@ class UserRepository {
 		if (0 >= $db->num_rows()) {
 			return null;
 		}
-		$rReturn = array(
+		$rReturn = [
 			'enigma2' => $db->get_row(),
-			'user_info' => array(),
-			'pair_line_info' => array(),
-		);
+			'user_info' => [],
+			'pair_line_info' => [],
+		];
 
 		if ($rUserInfo = self::getUserInfo($rReturn['enigma2']['user_id'], null, null, $rGetChannelIDs, $rGetConnections)) {
 			$rReturn['user_info'] = $rUserInfo;
diff --git a/src/Domain/User/UserService.php b/src/Domain/User/UserService.php
index 6fa19aef..47260b0c 100644
--- a/src/Domain/User/UserService.php
+++ b/src/Domain/User/UserService.php
@@ -22,22 +22,23 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class UserService {
 	use DatabaseAware;
+
 	/**
 	 * Bulk delete a set of selected users.
 	 *
 	 * @param array $rData Selected user ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
 		ini_set('default_socket_timeout', 0);
 
 		$rUsers = json_decode($rData['users'], true);
-		UserService::deleteRegisteredUser($rUsers);
+		self::deleteRegisteredUser($rUsers);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -46,12 +47,12 @@ class UserService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('massEditUsers', $rData)) {
-			$rArray = array();
+			$rArray = [];
 
-			foreach (array('status') as $rItem) {
+			foreach (['status'] as $rItem) {
 				if (isset($rData['c_' . $rItem])) {
 					if (isset($rData[$rItem])) {
 						$rArray[$rItem] = 1;
@@ -74,7 +75,7 @@ class UserService {
 			}
 
 			if (isset($rData['c_override'])) {
-				$rOverride = array();
+				$rOverride = [];
 
 				foreach ($rData as $rKey => $rCredits) {
 					if (substr($rKey, 0, 9) == 'override_') {
@@ -87,7 +88,7 @@ class UserService {
 						}
 
 						if ($rCredits) {
-							$rOverride[$rID] = array('assign' => 1, 'official_credits' => $rCredits);
+							$rOverride[$rID] = ['assign' => 1, 'official_credits' => $rCredits];
 						}
 					}
 				}
@@ -109,9 +110,9 @@ class UserService {
 				}
 			}
 
-			return array('status' => STATUS_SUCCESS);
+			return ['status' => STATUS_SUCCESS];
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -122,13 +123,13 @@ class UserService {
 	 * @param bool  $rBypassAuth Skip permission checks (internal/trusted callers).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData, $rBypassAuth = false) {
+	public static function process(array $rData, bool $rBypassAuth = false) {
 		$db = self::db();
 		if (InputValidator::validate('processUser', $rData)) {
 			if (isset($rData['edit'])) {
 				if (Authorization::check('adv', 'edit_reguser') || $rBypassAuth) {
 					$rUser = UserRepository::getRegisteredUserById($rData['edit']);
-					$rArray = AdminHelpers::overwriteData($rUser, $rData, array('password'));
+					$rArray = AdminHelpers::overwriteData($rUser, $rData, ['password']);
 				} else {
 					exit();
 				}
@@ -152,7 +153,7 @@ class UserService {
 						$rArray['password'] = Authenticator::hashPassword($rData['password']);
 					}
 
-					$rOverride = array();
+					$rOverride = [];
 
 					foreach ($rData as $rKey => $rCredits) {
 						if (substr($rKey, 0, 9) == 'override_') {
@@ -165,7 +166,7 @@ class UserService {
 							}
 
 							if ($rCredits) {
-								$rOverride[$rID] = array('assign' => 1, 'official_credits' => $rCredits);
+								$rOverride[$rID] = ['assign' => 1, 'official_credits' => $rCredits];
 							}
 						}
 					}
@@ -192,18 +193,18 @@ class UserService {
 							$db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rInsertID, $GLOBALS['rAdminUserInfo']['id'], $rCreditsAdjustment, time(), $rReason);
 						}
 
-						return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+						return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 					}
 
-					return array('status' => STATUS_FAILURE, 'data' => $rData);
+					return ['status' => STATUS_FAILURE, 'data' => $rData];
 				} else {
-					return array('status' => STATUS_EXISTS_USERNAME, 'data' => $rData);
+					return ['status' => STATUS_EXISTS_USERNAME, 'data' => $rData];
 				}
 			} else {
-				return array('status' => STATUS_INVALID_GROUP, 'data' => $rData);
+				return ['status' => STATUS_INVALID_GROUP, 'data' => $rData];
 			}
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -215,10 +216,10 @@ class UserService {
 	 * @param array $allowedLangs Allowed UI languages.
 	 * @return array Result status payload.
 	 */
-	public static function editAdminProfile($rData, $rUserInfo, $allowedLangs) {
+	public static function editAdminProfile(array $rData, array $rUserInfo, array $allowedLangs) {
 		$db = self::db();
 		if (!(0 >= strlen($rData['email']) || filter_var($rData['email'], FILTER_VALIDATE_EMAIL))) {
-			return array('status' => STATUS_INVALID_EMAIL);
+			return ['status' => STATUS_INVALID_EMAIL];
 		}
 
 		if (0 < strlen($rData['password'])) {
@@ -237,7 +238,7 @@ class UserService {
 
 		$db->query('UPDATE `users` SET `password` = ?, `email` = ?, `theme` = ?, `hue` = ?, `timezone` = ?, `api_key` = ?, `lang` = ? WHERE `id` = ?;', $rPassword, $rData['email'], $rData['theme'], $rData['hue'], $rData['timezone'], $rData['api_key'], $rData['lang'], $rUserInfo['id']);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -247,7 +248,7 @@ class UserService {
 	 * @param array $rUserInfo Current admin user row.
 	 * @return array Result status payload.
 	 */
-	public static function submitTicket($rData, $rUserInfo) {
+	public static function submitTicket(array $rData, array $rUserInfo) {
 		$db = self::db();
 		if (isset($rData['edit'])) {
 			$rArray = AdminHelpers::overwriteData(TicketRepository::getById($rData['edit']), $rData);
@@ -257,7 +258,7 @@ class UserService {
 		}
 
 		if (strlen($rData['title']) == 0 && !isset($rData['respond']) || strlen($rData['message']) == 0) {
-			return array('status' => STATUS_INVALID_DATA, 'data' => $rData);
+			return ['status' => STATUS_INVALID_DATA, 'data' => $rData];
 		}
 
 		if (!isset($rData['respond'])) {
@@ -267,15 +268,15 @@ class UserService {
 			if ($db->query($rQuery, ...$rPrepare['data'])) {
 				$rInsertID = $db->last_insert_id();
 				$db->query('INSERT INTO `tickets_replies`(`ticket_id`, `admin_reply`, `message`, `date`) VALUES(?, 0, ?, ?);', $rInsertID, $rData['message'], time());
-				return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+				return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 			}
 
-			return array('status' => STATUS_FAILURE, 'data' => $rData);
+			return ['status' => STATUS_FAILURE, 'data' => $rData];
 		}
 
 		$rTicket = TicketRepository::getById($rData['respond']);
 		if (!$rTicket) {
-			return array('status' => STATUS_FAILURE, 'data' => $rData);
+			return ['status' => STATUS_FAILURE, 'data' => $rData];
 		}
 
 		if (intval($rUserInfo['id']) == intval($rTicket['member_id'])) {
@@ -286,7 +287,7 @@ class UserService {
 			$db->query('INSERT INTO `tickets_replies`(`ticket_id`, `admin_reply`, `message`, `date`) VALUES(?, 1, ?, ?);', $rData['respond'], $rData['message'], time());
 		}
 
-		return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rData['respond']));
+		return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rData['respond']]];
 	}
 
 	/**
@@ -298,7 +299,7 @@ class UserService {
 	 * @param int|null $rReplaceWith    Reassign sub-users/lines to this owner instead.
 	 * @return bool True on success.
 	 */
-	public static function deleteRegisteredUser($rID, $rDeleteSubUsers = false, $rDeleteLines = false, $rReplaceWith = null) {
+	public static function deleteRegisteredUser(int $rID, bool $rDeleteSubUsers = false, bool $rDeleteLines = false, ?int $rReplaceWith = null) {
 		$db = self::db();
 		$rUser = UserRepository::getRegisteredUserById($rID);
 
@@ -341,7 +342,7 @@ class UserService {
 	 * @param int[] $rIDs User ids.
 	 * @return bool True on success.
 	 */
-	public static function deleteRegisteredUsers($rIDs) {
+	public static function deleteRegisteredUsers(array $rIDs) {
 		$db = self::db();
 		$rIDs = AdminHelpers::confirmIDs($rIDs);
 
diff --git a/src/Domain/Vod/EpisodeService.php b/src/Domain/Vod/EpisodeService.php
index 146af680..a40ea21d 100644
--- a/src/Domain/Vod/EpisodeService.php
+++ b/src/Domain/Vod/EpisodeService.php
@@ -23,13 +23,14 @@ use XcVm\Infrastructure\Database\DatabaseAware;
 
 class EpisodeService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a series episode from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		global $rSettings;
 		$db = self::db();
 		if (isset($rData['edit'])) {
@@ -58,13 +59,13 @@ class EpisodeService {
 				$rFallbackStreamSource = $rArray['stream_source'];
 			}
 		}
-		$rArray['stream_source'] = array($rData['stream_source'] ?? $rFallbackStreamSource);
+		$rArray['stream_source'] = [$rData['stream_source'] ?? $rFallbackStreamSource];
 
 		$rMovieSubtitles = $rData['movie_subtitles'] ?? '';
 		if (0 < strlen($rMovieSubtitles)) {
 			$rSplit = explode(':', $rMovieSubtitles);
 			if (2 < count($rSplit) && 0 < strlen($rSplit[2])) {
-				$rArray['movie_subtitles'] = array('files' => array($rSplit[2]), 'names' => array('Subtitles'), 'charset' => array('UTF-8'), 'location' => intval($rSplit[1]));
+				$rArray['movie_subtitles'] = ['files' => [$rSplit[2]], 'names' => ['Subtitles'], 'charset' => ['UTF-8'], 'location' => intval($rSplit[1])];
 			} else {
 				$rArray['movie_subtitles'] = null;
 			}
@@ -76,7 +77,7 @@ class EpisodeService {
 			$rArray['enable_transcode'] = 1;
 		}
 
-		foreach (array('read_native', 'movie_symlink', 'direct_source', 'direct_proxy', 'remove_subtitles') as $rKey) {
+		foreach (['read_native', 'movie_symlink', 'direct_source', 'direct_proxy', 'remove_subtitles'] as $rKey) {
 			if (isset($rData[$rKey])) {
 				$rArray[$rKey] = 1;
 			} else {
@@ -90,7 +91,7 @@ class EpisodeService {
 			$rRestart = false;
 		}
 
-		$rProcessArray = array();
+		$rProcessArray = [];
 
 		if (isset($rData['multi'])) {
 			if (Authorization::check('adv', 'import_episodes')) {
@@ -111,7 +112,7 @@ class EpisodeService {
 
 					if ($rSplit[0] == 'episode' && $rSplit[2] == 'name') {
 						if (0 < strlen($rData['episode_' . $rSplit[1] . '_num'])) {
-							$rImportArray = array('filename' => '', 'properties' => array(), 'name' => '', 'episode' => 0, 'target_container' => '');
+							$rImportArray = ['filename' => '', 'properties' => [], 'name' => '', 'episode' => 0, 'target_container' => ''];
 							$rEpisodeNum = intval($rData['episode_' . $rSplit[1] . '_num']);
 							$rImportArray['filename'] = 's:' . $rData['server'] . ':' . $rData['season_folder'] . $rFilename;
 							$rImage = '';
@@ -138,7 +139,7 @@ class EpisodeService {
 
 									$rImportArray['name'] .= $rEpisode['name'];
 									$rSeconds = intval($rSeries['episode_run_time']) * 60;
-									$rImportArray['properties'] = array('tmdb_id' => $rEpisode['id'], 'release_date' => $rEpisode['air_date'], 'plot' => $rEpisode['overview'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rImage, 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rEpisode['vote_average'], 'season' => $rData['season_num']);
+									$rImportArray['properties'] = ['tmdb_id' => $rEpisode['id'], 'release_date' => $rEpisode['air_date'], 'plot' => $rEpisode['overview'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rImage, 'video' => [], 'audio' => [], 'bitrate' => 0, 'rating' => $rEpisode['vote_average'], 'season' => $rData['season_num']];
 
 									if (empty($rImportArray['properties']['movie_image'])) {
 										unset($rImportArray['properties']['movie_image']);
@@ -160,7 +161,7 @@ class EpisodeService {
 				exit();
 			}
 		} else {
-			$rImportArray = array('filename' => $rArray['stream_source'][0], 'properties' => array(), 'name' => $rArray['stream_display_name'], 'episode' => $rData['episode'], 'target_container' => $rData['target_container']);
+			$rImportArray = ['filename' => $rArray['stream_source'][0], 'properties' => [], 'name' => $rArray['stream_display_name'], 'episode' => $rData['episode'], 'target_container' => $rData['target_container']];
 
 			$rMovieImage = $rData['movie_image'] ?? '';
 			if ($rSettings['download_images'] && 0 < strlen($rMovieImage)) {
@@ -168,7 +169,7 @@ class EpisodeService {
 			}
 
 			$rSeconds = intval($rData['episode_run_time']) * 60;
-			$rImportArray['properties'] = array('release_date' => $rData['release_date'], 'plot' => $rData['plot'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rMovieImage, 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rData['rating'], 'season' => $rData['season_num'], 'tmdb_id' => $rData['tmdb_id']);
+			$rImportArray['properties'] = ['release_date' => $rData['release_date'], 'plot' => $rData['plot'], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'movie_image' => $rMovieImage, 'video' => [], 'audio' => [], 'bitrate' => 0, 'rating' => $rData['rating'], 'season' => $rData['season_num'], 'tmdb_id' => $rData['tmdb_id']];
 
 			if (empty($rImportArray['properties']['movie_image'])) {
 				unset($rImportArray['properties']['movie_image']);
@@ -187,11 +188,11 @@ class EpisodeService {
 			$rProcessArray[] = $rImportArray;
 		}
 
-		$rRestartIDs = array();
+		$rRestartIDs = [];
 		$rInsertID = 0;
 
 		foreach ($rProcessArray as $rImportArray) {
-			$rArray['stream_source'] = array($rImportArray['filename']);
+			$rArray['stream_source'] = [$rImportArray['filename']];
 			$rArray['movie_properties'] = $rImportArray['properties'];
 			$rArray['stream_display_name'] = $rImportArray['name'];
 
@@ -211,7 +212,7 @@ class EpisodeService {
 				$db->query('DELETE FROM `streams_episodes` WHERE `stream_id` = ?;', $rInsertID);
 				$db->query('INSERT INTO `streams_episodes`(`season_num`, `series_id`, `stream_id`, `episode_num`) VALUES(?, ?, ?, ?);', $rData['season_num'], $rData['series'], $rInsertID, $rImportArray['episode']);
 				SeriesService::queueRefresh(intval($rData['series']));
-				$rStreamExists = array();
+				$rStreamExists = [];
 
 				if (isset($rData['edit'])) {
 					$db->query('SELECT `server_stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` = ?;', $rInsertID);
@@ -221,7 +222,7 @@ class EpisodeService {
 					}
 				}
 
-				$rStreamsAdded = array();
+				$rStreamsAdded = [];
 				$rServerTree = json_decode($rData['server_tree_data'], true);
 
 				foreach ($rServerTree as $rServer) {
@@ -251,19 +252,19 @@ class EpisodeService {
 				}
 				StreamProcess::updateStream($rInsertID);
 			} else {
-				return array('status' => STATUS_FAILURE);
+				return ['status' => STATUS_FAILURE];
 			}
 		}
 
 		if ($rRestart) {
-			ApiClient::request(array('action' => 'vod', 'sub' => 'start', 'stream_ids' => $rRestartIDs));
+			ApiClient::request(['action' => 'vod', 'sub' => 'start', 'stream_ids' => $rRestartIDs]);
 		}
 
 		if (isset($rData['multi'])) {
-			return array('status' => STATUS_SUCCESS_MULTI, 0 => array('series_id' => $rData['series']));
+			return ['status' => STATUS_SUCCESS_MULTI, 0 => ['series_id' => $rData['series']]];
 		}
 
-		return array('status' => STATUS_SUCCESS, 'data' => array('series_id' => $rData['series'], 'insert_id' => $rInsertID));
+		return ['status' => STATUS_SUCCESS, 'data' => ['series_id' => $rData['series'], 'insert_id' => $rInsertID]];
 	}
 
 	/**
@@ -272,7 +273,7 @@ class EpisodeService {
 	 * @param array $rData Selected episode ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
@@ -281,7 +282,7 @@ class EpisodeService {
 		$rEpisodes = json_decode($rData['episodes'], true);
 		StreamRepository::deleteStreams($rEpisodes, true);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -290,14 +291,14 @@ class EpisodeService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
 		ini_set('default_socket_timeout', 0);
 
-		$rArray = array();
+		$rArray = [];
 
 		if (isset($rData['c_movie_symlink'])) {
 			if (isset($rData['movie_symlink'])) {
@@ -370,7 +371,7 @@ class EpisodeService {
 				$db->query($rQuery, ...$rPrepare['data']);
 			}
 
-			$rDeleteServers = $rQueueMovies = $rProcessServers = $rStreamExists = array();
+			$rDeleteServers = $rQueueMovies = $rProcessServers = $rStreamExists = [];
 			$db->query('SELECT `stream_id`, `server_stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 			foreach ($db->get_rows() as $rRow) {
@@ -381,14 +382,14 @@ class EpisodeService {
 
 			foreach ($rStreamIDs as $rStreamID) {
 				if (isset($rData['c_server_tree'])) {
-					$rStreamsAdded = array();
+					$rStreamsAdded = [];
 					$rServerTree = json_decode($rData['server_tree_data'], true);
 
 					foreach ($rServerTree as $rServer) {
 						if ($rServer['parent'] != '#') {
 							$rServerID = intval($rServer['id']);
 
-							if (in_array($rData['server_type'], array('ADD', 'SET'))) {
+							if (in_array($rData['server_type'], ['ADD', 'SET'])) {
 								$rStreamsAdded[] = $rServerID;
 
 								if (!isset($rStreamExists[$rStreamID][$rServerID])) {
@@ -443,6 +444,6 @@ class EpisodeService {
 			}
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 }
diff --git a/src/Domain/Vod/MovieService.php b/src/Domain/Vod/MovieService.php
index 613fd655..e4cfcbac 100644
--- a/src/Domain/Vod/MovieService.php
+++ b/src/Domain/Vod/MovieService.php
@@ -30,13 +30,14 @@ use XcVm\Module\Watch\WatchService;
 
 class MovieService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a movie from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processMovie', $rData)) {
 			set_time_limit(0);
@@ -63,7 +64,7 @@ class MovieService {
 
 			if (0 < strlen($rData['movie_subtitles'] ?? '')) {
 				$rSplit = explode(':', $rData['movie_subtitles']);
-				$rArray['movie_subtitles'] = array('files' => array($rSplit[2]), 'names' => array('Subtitles'), 'charset' => array('UTF-8'), 'location' => intval($rSplit[1]));
+				$rArray['movie_subtitles'] = ['files' => [$rSplit[2]], 'names' => ['Subtitles'], 'charset' => ['UTF-8'], 'location' => intval($rSplit[1])];
 			} else {
 				$rArray['movie_subtitles'] = null;
 			}
@@ -78,7 +79,7 @@ class MovieService {
 				$rArray['year'] = null;
 			}
 
-			foreach (array('read_native', 'movie_symlink', 'direct_source', 'direct_proxy', 'remove_subtitles') as $rKey) {
+			foreach (['read_native', 'movie_symlink', 'direct_source', 'direct_proxy', 'remove_subtitles'] as $rKey) {
 				if (isset($rData[$rKey])) {
 					$rArray[$rKey] = 1;
 				} else {
@@ -93,7 +94,7 @@ class MovieService {
 			}
 
 			$rReview = false;
-			$rImportStreams = array();
+			$rImportStreams = [];
 
 			if (isset($rData['review'])) {
 				TMDbService::requireLibrary();
@@ -124,7 +125,7 @@ class MovieService {
 								$rBG = ImageUtils::downloadImage($rBG);
 							}
 
-							$rCast = array();
+							$rCast = [];
 
 							foreach ($rMovieData['credits']['cast'] as $rMember) {
 								if (count($rCast) >= 5) {
@@ -132,7 +133,7 @@ class MovieService {
 									$rCast[] = $rMember['name'];
 								}
 							}
-							$rDirectors = array();
+							$rDirectors = [];
 
 							foreach ($rMovieData['credits']['crew'] as $rMember) {
 								if (!(count($rDirectors) < 5 && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing'))) {
@@ -147,7 +148,7 @@ class MovieService {
 								$rCountry = $rMovieData['production_countries'][0]['name'];
 							}
 
-							$rGenres = array();
+							$rGenres = [];
 
 							foreach ($rMovieData['genres'] as $rGenre) {
 								if (count($rGenres) >= 3) {
@@ -163,7 +164,7 @@ class MovieService {
 								$rYear = null;
 							}
 
-							$rImportStream['movie_properties'] = array('kinopoisk_url' => 'https://www.themoviedb.org/movie/' . $rMovieData['id'], 'tmdb_id' => $rMovieData['id'], 'name' => $rMovieData['title'], 'year' => $rYear, 'o_name' => $rMovieData['original_title'], 'cover_big' => $rThumb, 'movie_image' => $rThumb, 'release_date' => $rMovieData['release_date'], 'episode_run_time' => $rMovieData['runtime'], 'youtube_trailer' => $rMovieData['trailer'], 'director' => implode(', ', $rDirectors), 'actors' => implode(', ', $rCast), 'cast' => implode(', ', $rCast), 'description' => $rMovieData['overview'], 'plot' => $rMovieData['overview'], 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => $rCountry, 'genre' => implode(', ', $rGenres), 'backdrop_path' => array($rBG), 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rMovieData['vote_average']);
+							$rImportStream['movie_properties'] = ['kinopoisk_url' => 'https://www.themoviedb.org/movie/' . $rMovieData['id'], 'tmdb_id' => $rMovieData['id'], 'name' => $rMovieData['title'], 'year' => $rYear, 'o_name' => $rMovieData['original_title'], 'cover_big' => $rThumb, 'movie_image' => $rThumb, 'release_date' => $rMovieData['release_date'], 'episode_run_time' => $rMovieData['runtime'], 'youtube_trailer' => $rMovieData['trailer'], 'director' => implode(', ', $rDirectors), 'actors' => implode(', ', $rCast), 'cast' => implode(', ', $rCast), 'description' => $rMovieData['overview'], 'plot' => $rMovieData['overview'], 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => $rCountry, 'genre' => implode(', ', $rGenres), 'backdrop_path' => [$rBG], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => [], 'audio' => [], 'bitrate' => 0, 'rating' => $rMovieData['vote_average']];
 						}
 					}
 
@@ -179,11 +180,11 @@ class MovieService {
 					$rImportStreams[] = $rImportStream;
 				}
 			} else {
-				$rImportStreams = array();
+				$rImportStreams = [];
 
 				if (!empty($_FILES['m3u_file']['tmp_name'])) {
 					if (Authorization::check('adv', 'import_movies')) {
-						$rStreamDatabase = array();
+						$rStreamDatabase = [];
 
 						$db->query('SELECT `stream_source` FROM `streams` WHERE `type` = 2;');
 
@@ -203,7 +204,7 @@ class MovieService {
 						}
 
 						preg_match_all('/(?P<tag>#EXTINF:[-1,0])|(?:(?P<prop_key>[-a-z]+)=\\"(?P<prop_val>[^"]+)")|(?<name>,[^\\r\\n]+)|(?<url>http[^\\s]*:\\/\\/.*\\/.*)/', $rFile, $rMatches);
-						$rResults = array();
+						$rResults = [];
 						$rIndex = -1;
 
 						for ($i = 0; $i < count($rMatches[0]); $i++) {
@@ -230,7 +231,7 @@ class MovieService {
 							if (in_array($rResult['url'], $rStreamDatabase)) {
 							} else {
 								$rPathInfo = pathinfo(explode('?', $rResult['url'])[0]);
-								$rImportArray = array('stream_source' => array($rResult['url']), 'stream_icon' => ($rResult['tvg-logo'] ?: ''), 'stream_display_name' => ($rResult['name'] ?: ''), 'movie_properties' => array(), 'async' => true, 'target_container' => $rPathInfo['extension']);
+								$rImportArray = ['stream_source' => [$rResult['url']], 'stream_icon' => ($rResult['tvg-logo'] ?: ''), 'stream_display_name' => ($rResult['name'] ?: ''), 'movie_properties' => [], 'async' => true, 'target_container' => $rPathInfo['extension']];
 								$rImportStreams[] = $rImportArray;
 							}
 						}
@@ -240,7 +241,7 @@ class MovieService {
 				} else {
 					if (!empty($rData['import_folder'])) {
 						if (Authorization::check('adv', 'import_movies')) {
-							$rStreamDatabase = array();
+							$rStreamDatabase = [];
 
 							$db->query('SELECT `stream_source` FROM `streams` WHERE `type` = 2;');
 
@@ -257,11 +258,11 @@ class MovieService {
 							if (!is_numeric($rParts[1])) {
 							} else {
 								if (isset($rData['scan_recursive'])) {
-									$rFiles = ApiClient::scanRecursive(intval($rParts[1]), $rParts[2], array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'));
+									$rFiles = ApiClient::scanRecursive(intval($rParts[1]), $rParts[2], ['mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts']);
 								} else {
-									$rFiles = array();
+									$rFiles = [];
 
-									foreach (ApiClient::listDir(intval($rParts[1]), rtrim($rParts[2], '/'), array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'))['files'] as $rFile) {
+									foreach (ApiClient::listDir(intval($rParts[1]), rtrim($rParts[2], '/'), ['mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'])['files'] as $rFile) {
 										$rFiles[] = rtrim($rParts[2], '/') . '/' . $rFile;
 									}
 								}
@@ -272,7 +273,7 @@ class MovieService {
 									if (in_array($rFilePath, $rStreamDatabase)) {
 									} else {
 										$rPathInfo = pathinfo($rFile);
-										$rImportArray = array('stream_source' => array($rFilePath), 'stream_icon' => '', 'stream_display_name' => $rPathInfo['filename'], 'movie_properties' => array(), 'async' => true, 'target_container' => $rPathInfo['extension']);
+										$rImportArray = ['stream_source' => [$rFilePath], 'stream_icon' => '', 'stream_display_name' => $rPathInfo['filename'], 'movie_properties' => [], 'async' => true, 'target_container' => $rPathInfo['extension']];
 										$rImportStreams[] = $rImportArray;
 									}
 								}
@@ -281,7 +282,7 @@ class MovieService {
 							exit();
 						}
 					} else {
-						$rImportArray = array('stream_source' => array($rData['stream_source']), 'stream_icon' => $rArray['stream_icon'], 'stream_display_name' => $rArray['stream_display_name'], 'movie_properties' => array(), 'async' => false, 'target_container' => $rArray['target_container']);
+						$rImportArray = ['stream_source' => [$rData['stream_source']], 'stream_icon' => $rArray['stream_icon'], 'stream_display_name' => $rArray['stream_display_name'], 'movie_properties' => [], 'async' => false, 'target_container' => $rArray['target_container']];
 
 						if (0 < strlen($rData['tmdb_id'])) {
 							$rTMDBURL = 'https://www.themoviedb.org/movie/' . $rData['tmdb_id'];
@@ -296,7 +297,7 @@ class MovieService {
 						}
 
 						$rSeconds = intval($rData['episode_run_time']) * 60;
-						$rImportArray['movie_properties'] = array('kinopoisk_url' => $rTMDBURL, 'tmdb_id' => $rData['tmdb_id'], 'name' => $rArray['stream_display_name'], 'o_name' => $rArray['stream_display_name'], 'cover_big' => $rData['movie_image'], 'movie_image' => $rData['movie_image'], 'release_date' => $rData['release_date'], 'episode_run_time' => $rData['episode_run_time'], 'youtube_trailer' => $rData['youtube_trailer'], 'director' => $rData['director'], 'actors' => $rData['cast'], 'cast' => $rData['cast'], 'description' => $rData['plot'], 'plot' => $rData['plot'], 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => $rData['country'], 'genre' => $rData['genre'], 'backdrop_path' => array($rData['backdrop_path']), 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => array(), 'audio' => array(), 'bitrate' => 0, 'rating' => $rData['rating']);
+						$rImportArray['movie_properties'] = ['kinopoisk_url' => $rTMDBURL, 'tmdb_id' => $rData['tmdb_id'], 'name' => $rArray['stream_display_name'], 'o_name' => $rArray['stream_display_name'], 'cover_big' => $rData['movie_image'], 'movie_image' => $rData['movie_image'], 'release_date' => $rData['release_date'], 'episode_run_time' => $rData['episode_run_time'], 'youtube_trailer' => $rData['youtube_trailer'], 'director' => $rData['director'], 'actors' => $rData['cast'], 'cast' => $rData['cast'], 'description' => $rData['plot'], 'plot' => $rData['plot'], 'age' => '', 'mpaa_rating' => '', 'rating_count_kinopoisk' => 0, 'country' => $rData['country'], 'genre' => $rData['genre'], 'backdrop_path' => [$rData['backdrop_path']], 'duration_secs' => $rSeconds, 'duration' => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60), 'video' => [], 'audio' => [], 'bitrate' => 0, 'rating' => $rData['rating']];
 
 						if (strlen($rImportArray['movie_properties']['backdrop_path'][0]) != 0) {
 						} else {
@@ -321,13 +322,13 @@ class MovieService {
 			}
 
 			if (0 < count($rImportStreams)) {
-				$rBouquetCreate = array();
-				$rCategoryCreate = array();
+				$rBouquetCreate = [];
+				$rCategoryCreate = [];
 
 				if ($rReview) {
 				} else {
 					foreach (json_decode($rData['bouquet_create_list'] ?? '[]', true) ?? [] as $rBouquet) {
-						$rPrepare = QueryHelper::prepareArray(array('bouquet_name' => $rBouquet, 'bouquet_channels' => array(), 'bouquet_movies' => array(), 'bouquet_series' => array(), 'bouquet_radios' => array()));
+						$rPrepare = QueryHelper::prepareArray(['bouquet_name' => $rBouquet, 'bouquet_channels' => [], 'bouquet_movies' => [], 'bouquet_series' => [], 'bouquet_radios' => []]);
 						$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 						if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -338,7 +339,7 @@ class MovieService {
 					}
 
 					foreach (json_decode($rData['category_create_list'] ?? '[]', true) ?? [] as $rCategory) {
-						$rPrepare = QueryHelper::prepareArray(array('category_type' => 'movie', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0));
+						$rPrepare = QueryHelper::prepareArray(['category_type' => 'movie', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0]);
 						$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 						if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -349,7 +350,7 @@ class MovieService {
 					}
 				}
 
-				$rRestartIDs = array();
+				$rRestartIDs = [];
 
 				foreach ($rImportStreams as $rImportStream) {
 					$rImportArray = $rArray;
@@ -359,7 +360,7 @@ class MovieService {
 						$rBouquets = array_map('intval', $rImportStream['bouquets']);
 						unset($rImportStream['bouquets']);
 					} else {
-						$rBouquets = array();
+						$rBouquets = [];
 
 						foreach ($rData['bouquets'] ?? [] as $rBouquet) {
 							if (isset($rBouquetCreate[$rBouquet])) {
@@ -371,7 +372,7 @@ class MovieService {
 								}
 							}
 						}
-						$rCategories = array();
+						$rCategories = [];
 
 						foreach ($rData['category_id'] ?? [] as $rCategory) {
 							if (isset($rCategoryCreate[$rCategory])) {
@@ -408,7 +409,7 @@ class MovieService {
 
 					if ($db->query($rQuery, ...$rPrepare['data'])) {
 						$rInsertID = $db->last_insert_id();
-						$rStreamExists = array();
+						$rStreamExists = [];
 
 						if (!isset($rData['edit'])) {
 						} else {
@@ -430,7 +431,7 @@ class MovieService {
 						// Notify modules (e.g. watch) that a VOD item was imported from this path,
 						// instead of core touching the module-owned watch_logs table directly.
 						EventDispatcher::dispatch(new VodImportedEvent((int) $rInsertID, (string) $rPath, 1));
-						$rStreamsAdded = array();
+						$rStreamsAdded = [];
 						$rServerTree = json_decode($rData['server_tree_data'], true);
 
 						foreach ($rServerTree as $rServer) {
@@ -483,21 +484,21 @@ class MovieService {
 							$db->query('DELETE FROM `streams_categories` WHERE `id` = ?;', $rID);
 						}
 
-						return array('status' => STATUS_FAILURE, 'data' => $rData);
+						return ['status' => STATUS_FAILURE, 'data' => $rData];
 					}
 				}
 
 				if (!$rRestart) {
 				} else {
-					ApiClient::request(array('action' => 'vod', 'sub' => 'start', 'stream_ids' => $rRestartIDs));
+					ApiClient::request(['action' => 'vod', 'sub' => 'start', 'stream_ids' => $rRestartIDs]);
 				}
 
-				return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+				return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 			} else {
-				return array('status' => STATUS_NO_SOURCES, 'data' => $rData);
+				return ['status' => STATUS_NO_SOURCES, 'data' => $rData];
 			}
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -507,13 +508,13 @@ class MovieService {
 	 * @param array $rData Import payload (sources, category, options).
 	 * @return array Import result.
 	 */
-	public static function import($rData) {
+	public static function import(array $rData) {
 		$db = self::db();
 		if (Authorization::check('adv', 'import_movies')) {
 			if (InputValidator::validate('importMovies', $rData)) {
 				$rPostData = $rData;
 
-				foreach (array('read_native', 'movie_symlink', 'direct_source', 'direct_proxy', 'remove_subtitles') as $rKey) {
+				foreach (['read_native', 'movie_symlink', 'direct_source', 'direct_proxy', 'remove_subtitles'] as $rKey) {
 					if (isset($rData[$rKey])) {
 						$rData[$rKey] = 1;
 					} else {
@@ -539,7 +540,7 @@ class MovieService {
 					$rIgnoreMatch = false;
 				}
 
-				$rStreamDatabase = array();
+				$rStreamDatabase = [];
 				$db->query('SELECT `stream_source` FROM `streams` WHERE `type` = 2;');
 
 				foreach ($db->get_rows() as $rRow) {
@@ -550,7 +551,7 @@ class MovieService {
 						}
 					}
 				}
-				$rImportStreams = array();
+				$rImportStreams = [];
 
 				if (!empty($_FILES['m3u_file']['tmp_name'])) {
 					$rFile = '';
@@ -561,7 +562,7 @@ class MovieService {
 					}
 
 					preg_match_all('/(?P<tag>#EXTINF:[-1,0])|(?:(?P<prop_key>[-a-z]+)=\\"(?P<prop_val>[^"]+)")|(?<name>,[^\\r\\n]+)|(?<url>http[^\\s]*:\\/\\/.*\\/.*)/', $rFile, $rMatches);
-					$rResults = array();
+					$rResults = [];
 					$rIndex = -1;
 
 					for ($i = 0; $i < count($rMatches[0]); $i++) {
@@ -594,7 +595,7 @@ class MovieService {
 								$rPathInfo['extension'] = ($rData['target_container'] ?: 'mp4');
 							}
 
-							$rImportStreams[] = array('url' => $rResult['url'], 'title' => ($rResult['name'] ?: ''), 'container' => ($rData['movie_symlink'] || $rData['direct_source'] ? $rPathInfo['extension'] : $rData['target_container']));
+							$rImportStreams[] = ['url' => $rResult['url'], 'title' => ($rResult['name'] ?: ''), 'container' => ($rData['movie_symlink'] || $rData['direct_source'] ? $rPathInfo['extension'] : $rData['target_container'])];
 						}
 					}
 				} else {
@@ -605,11 +606,11 @@ class MovieService {
 						if (!is_numeric($rParts[1])) {
 						} else {
 							if (isset($rData['scan_recursive'])) {
-								$rFiles = ApiClient::scanRecursive(intval($rParts[1]), $rParts[2], array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'));
+								$rFiles = ApiClient::scanRecursive(intval($rParts[1]), $rParts[2], ['mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts']);
 							} else {
-								$rFiles = array();
+								$rFiles = [];
 
-								foreach (ApiClient::listDir(intval($rParts[1]), rtrim($rParts[2], '/'), array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'))['files'] as $rFile) {
+								foreach (ApiClient::listDir(intval($rParts[1]), rtrim($rParts[2], '/'), ['mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'])['files'] as $rFile) {
 									$rFiles[] = rtrim($rParts[2], '/') . '/' . $rFile;
 								}
 							}
@@ -626,7 +627,7 @@ class MovieService {
 										$rPathInfo['extension'] = ($rData['target_container'] ?: 'mp4');
 									}
 
-									$rImportStreams[] = array('url' => $rFilePath, 'title' => $rPathInfo['filename'], 'container' => ($rData['movie_symlink'] || $rData['direct_source'] ? $rPathInfo['extension'] : $rData['target_container']));
+									$rImportStreams[] = ['url' => $rFilePath, 'title' => $rPathInfo['filename'], 'container' => ($rData['movie_symlink'] || $rData['direct_source'] ? $rPathInfo['extension'] : $rData['target_container'])];
 								}
 							}
 						}
@@ -636,15 +637,15 @@ class MovieService {
 				$rMovieCategories = array_keys(CategoryService::getAllByType('movie'));
 
 				if (0 < count($rImportStreams)) {
-					$rBouquets = array();
+					$rBouquets = [];
 
 					$rBouquetCreateList = json_decode(($rData['bouquet_create_list'] ?? '[]'), true);
 					if (!is_array($rBouquetCreateList)) {
-						$rBouquetCreateList = array();
+						$rBouquetCreateList = [];
 					}
 
 					foreach ($rBouquetCreateList as $rBouquet) {
-						$rPrepare = QueryHelper::prepareArray(array('bouquet_name' => $rBouquet, 'bouquet_channels' => array(), 'bouquet_movies' => array(), 'bouquet_series' => array(), 'bouquet_radios' => array()));
+						$rPrepare = QueryHelper::prepareArray(['bouquet_name' => $rBouquet, 'bouquet_channels' => [], 'bouquet_movies' => [], 'bouquet_series' => [], 'bouquet_radios' => []]);
 						$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 						if ($db->query($rQuery, ...$rPrepare['data'])) {
@@ -652,7 +653,7 @@ class MovieService {
 						}
 					}
 
-					$rSelectedBouquets = (isset($rData['bouquets']) && is_array($rData['bouquets']) ? $rData['bouquets'] : array());
+					$rSelectedBouquets = (isset($rData['bouquets']) && is_array($rData['bouquets']) ? $rData['bouquets'] : []);
 
 					foreach ($rSelectedBouquets as $rBouquetID) {
 						if (is_numeric($rBouquetID) && in_array($rBouquetID, array_keys(BouquetService::getAll()))) {
@@ -661,15 +662,15 @@ class MovieService {
 					}
 					unset($rData['bouquets'], $rData['bouquet_create_list']);
 
-					$rCategories = array();
+					$rCategories = [];
 
 					$rCategoryCreateList = json_decode(($rData['category_create_list'] ?? '[]'), true);
 					if (!is_array($rCategoryCreateList)) {
-						$rCategoryCreateList = array();
+						$rCategoryCreateList = [];
 					}
 
 					foreach ($rCategoryCreateList as $rCategory) {
-						$rPrepare = QueryHelper::prepareArray(array('category_type' => 'movie', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0));
+						$rPrepare = QueryHelper::prepareArray(['category_type' => 'movie', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0]);
 						$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 						if ($db->query($rQuery, ...$rPrepare['data'])) {
@@ -677,7 +678,7 @@ class MovieService {
 						}
 					}
 
-					$rSelectedCategories = (isset($rData['category_id']) && is_array($rData['category_id']) ? $rData['category_id'] : array());
+					$rSelectedCategories = (isset($rData['category_id']) && is_array($rData['category_id']) ? $rData['category_id'] : []);
 
 					foreach ($rSelectedCategories as $rCategoryID) {
 						if (!(is_numeric($rCategoryID) && in_array($rCategoryID, $rMovieCategories))) {
@@ -687,11 +688,11 @@ class MovieService {
 					}
 					unset($rData['category_id'], $rData['category_create_list']);
 
-					$rServerIDs = array();
+					$rServerIDs = [];
 
 					$rServerTreeData = json_decode(($rData['server_tree_data'] ?? '[]'), true);
 					if (!is_array($rServerTreeData)) {
-						$rServerTreeData = array();
+						$rServerTreeData = [];
 					}
 
 					foreach ($rServerTreeData as $rServer) {
@@ -706,21 +707,21 @@ class MovieService {
 					// watch is an optional module (fetched from its own repo). When it is
 					// not installed there are no watch categories — degrade to empty.
 					$rWatchCategories = class_exists(WatchService::class)
-						? array(1 => WatchService::getWatchCategories(1), 2 => WatchService::getWatchCategories(2))
-						: array();
+						? [1 => WatchService::getWatchCategories(1), 2 => WatchService::getWatchCategories(2)]
+						: [];
 
 					foreach ($rImportStreams as $rImportStream) {
-						$rData = array('import' => true, 'type' => 'movie', 'title' => $rImportStream['title'], 'file' => $rImportStream['url'], 'subtitles' => array(), 'servers' => $rServerIDs, 'fb_category_id' => $rCategories, 'fb_bouquets' => $rBouquets, 'disable_tmdb' => $rDisableTMDB, 'ignore_no_match' => $rIgnoreMatch, 'bouquets' => array(), 'category_id' => array(), 'language' => SettingsManager::getString('tmdb_language'), 'watch_categories' => $rWatchCategories, 'read_native' => $rData['read_native'], 'movie_symlink' => $rData['movie_symlink'], 'remove_subtitles' => $rData['remove_subtitles'], 'direct_source' => $rData['direct_source'], 'direct_proxy' => $rData['direct_proxy'], 'auto_encode' => $rRestart, 'auto_upgrade' => false, 'fallback_title' => false, 'ffprobe_input' => false, 'transcode_profile_id' => $rData['transcode_profile_id'], 'target_container' => $rImportStream['container'], 'max_genres' => SettingsManager::getInt('max_genres'), 'duplicate_tmdb' => true);
+						$rData = ['import' => true, 'type' => 'movie', 'title' => $rImportStream['title'], 'file' => $rImportStream['url'], 'subtitles' => [], 'servers' => $rServerIDs, 'fb_category_id' => $rCategories, 'fb_bouquets' => $rBouquets, 'disable_tmdb' => $rDisableTMDB, 'ignore_no_match' => $rIgnoreMatch, 'bouquets' => [], 'category_id' => [], 'language' => SettingsManager::getString('tmdb_language'), 'watch_categories' => $rWatchCategories, 'read_native' => $rData['read_native'], 'movie_symlink' => $rData['movie_symlink'], 'remove_subtitles' => $rData['remove_subtitles'], 'direct_source' => $rData['direct_source'], 'direct_proxy' => $rData['direct_proxy'], 'auto_encode' => $rRestart, 'auto_upgrade' => false, 'fallback_title' => false, 'ffprobe_input' => false, 'transcode_profile_id' => $rData['transcode_profile_id'], 'target_container' => $rImportStream['container'], 'max_genres' => SettingsManager::getInt('max_genres'), 'duplicate_tmdb' => true];
 						$rCommand = '/usr/bin/timeout 300 ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php watch_item "' . base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . '" > /dev/null 2>/dev/null &';
 						shell_exec($rCommand);
 					}
 
-					return array('status' => STATUS_SUCCESS);
+					return ['status' => STATUS_SUCCESS];
 				} else {
-					return array('status' => STATUS_NO_SOURCES, 'data' => $rPostData);
+					return ['status' => STATUS_NO_SOURCES, 'data' => $rPostData];
 				}
 			} else {
-				return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+				return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 			}
 		} else {
 			exit();
@@ -733,7 +734,7 @@ class MovieService {
 	 * @param array $rData Selected movie ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
@@ -742,7 +743,7 @@ class MovieService {
 		$rMovies = json_decode($rData['movies'], true);
 		StreamRepository::deleteStreams($rMovies, true);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -751,14 +752,14 @@ class MovieService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
 		ini_set('default_socket_timeout', 0);
 
-		$rArray = array();
+		$rArray = [];
 
 		if (isset($rData['c_movie_symlink'])) {
 			if (isset($rData['movie_symlink'])) {
@@ -819,17 +820,17 @@ class MovieService {
 		$rStreamIDs = json_decode($rData['streams'], true);
 
 		if (0 < count($rStreamIDs)) {
-			$rCategoryMap = array();
+			$rCategoryMap = [];
 
-			if (isset($rData['c_category_id']) && in_array($rData['category_id_type'], array('ADD', 'DEL'))) {
+			if (isset($rData['c_category_id']) && in_array($rData['category_id_type'], ['ADD', 'DEL'])) {
 				$db->query('SELECT `id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 				foreach ($db->get_rows() as $rRow) {
-					$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: array());
+					$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: []);
 				}
 			}
 
-			$rDeleteServers = $rQueueMovies = $rProcessServers = $rStreamExists = array();
+			$rDeleteServers = $rQueueMovies = $rProcessServers = $rStreamExists = [];
 			$db->query('SELECT `stream_id`, `server_stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', array_map('intval', $rStreamIDs)) . ');');
 
 			foreach ($db->get_rows() as $rRow) {
@@ -837,7 +838,7 @@ class MovieService {
 				$rProcessServers[intval($rRow['stream_id'])][] = intval($rRow['server_id']);
 			}
 			$rBouquets = BouquetService::getAllSimple();
-			$rAddBouquet = $rDelBouquet = array();
+			$rAddBouquet = $rDelBouquet = [];
 			$rAddQuery = '';
 
 			foreach ($rStreamIDs as $rStreamID) {
@@ -845,7 +846,7 @@ class MovieService {
 					$rCategories = array_map('intval', $rData['category_id']);
 
 					if ($rData['category_id_type'] == 'ADD') {
-						foreach (($rCategoryMap[$rStreamID] ?: array()) as $rCategoryID) {
+						foreach (($rCategoryMap[$rStreamID] ?: []) as $rCategoryID) {
 							if (!in_array($rCategoryID, $rCategories)) {
 								$rCategories[] = $rCategoryID;
 							}
@@ -873,14 +874,14 @@ class MovieService {
 				}
 
 				if (isset($rData['c_server_tree'])) {
-					$rStreamsAdded = array();
+					$rStreamsAdded = [];
 					$rServerTree = json_decode($rData['server_tree_data'], true);
 
 					foreach ($rServerTree as $rServer) {
 						if ($rServer['parent'] != '#') {
 							$rServerID = intval($rServer['id']);
 
-							if (in_array($rData['server_type'], array('ADD', 'SET'))) {
+							if (in_array($rData['server_type'], ['ADD', 'SET'])) {
 								$rStreamsAdded[] = $rServerID;
 
 								if (!isset($rStreamExists[$rStreamID][$rServerID])) {
@@ -965,7 +966,7 @@ class MovieService {
 			}
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	// ──────────── Из MovieRepository ────────────
@@ -977,7 +978,7 @@ class MovieService {
 	 * @param int $rPage Result page.
 	 * @return array Similar movies.
 	 */
-	public static function getSimilar($rID, $rPage = 1) {
+	public static function getSimilar(int $rID, int $rPage = 1) {
 		TMDbService::requireLibrary();
 
 		if (0 < strlen(SettingsManager::getString('tmdb_language'))) {
@@ -996,11 +997,11 @@ class MovieService {
 		$db = self::db();
 		if (is_array($rServerIDs)) {
 		} else {
-			$rServerIDs = array($rServerIDs);
+			$rServerIDs = [$rServerIDs];
 		}
 
 		foreach ($rServerIDs as $rServerID) {
-			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', $rServerID, time(), json_encode(array('type' => 'delete_vod', 'id' => $rID)));
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`, `cache`) VALUES(?, ?, ?, 1);', $rServerID, time(), json_encode(['type' => 'delete_vod', 'id' => $rID]));
 		}
 
 		return true;
diff --git a/src/Domain/Vod/SeriesService.php b/src/Domain/Vod/SeriesService.php
index cc3f6972..79dd421f 100644
--- a/src/Domain/Vod/SeriesService.php
+++ b/src/Domain/Vod/SeriesService.php
@@ -27,18 +27,19 @@ use XcVm\Module\Watch\WatchService;
 
 class SeriesService {
 	use DatabaseAware;
+
 	/**
 	 * Create or update a series from admin form data.
 	 *
 	 * @param array $rData Submitted form data (includes `edit` id when updating).
 	 * @return array ['status' => STATUS_* constant, 'data' => insert_id or payload].
 	 */
-	public static function process($rData) {
+	public static function process(array $rData) {
 		$db = self::db();
 		if (InputValidator::validate('processSeries', $rData)) {
 			if (isset($rData['edit'])) {
 				if (Authorization::check('adv', 'edit_series')) {
-					$rArray = AdminHelpers::overwriteData(SeriesService::getById($rData['edit']), $rData);
+					$rArray = AdminHelpers::overwriteData(self::getById($rData['edit']), $rData);
 				} else {
 					exit();
 				}
@@ -58,18 +59,18 @@ class SeriesService {
 			}
 
 			if (strlen($rData['backdrop_path']) == 0) {
-				$rArray['backdrop_path'] = array();
+				$rArray['backdrop_path'] = [];
 			} else {
-				$rArray['backdrop_path'] = array($rData['backdrop_path']);
+				$rArray['backdrop_path'] = [$rData['backdrop_path']];
 			}
 
 			$rArray['last_modified'] = time();
 			$rArray['cover'] = $rData['cover'];
 			$rArray['cover_big'] = $rData['cover'];
-			$rBouquetCreate = array();
+			$rBouquetCreate = [];
 
-			foreach ((json_decode($rData['bouquet_create_list'] ?? '', true) ?: array()) as $rBouquet) {
-				$rPrepare = QueryHelper::prepareArray(array('bouquet_name' => $rBouquet, 'bouquet_channels' => array(), 'bouquet_movies' => array(), 'bouquet_series' => array(), 'bouquet_radios' => array()));
+			foreach ((json_decode($rData['bouquet_create_list'] ?? '', true) ?: []) as $rBouquet) {
+				$rPrepare = QueryHelper::prepareArray(['bouquet_name' => $rBouquet, 'bouquet_channels' => [], 'bouquet_movies' => [], 'bouquet_series' => [], 'bouquet_radios' => []]);
 				$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 				if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -78,10 +79,10 @@ class SeriesService {
 					$rBouquetCreate[$rBouquet] = $rBouquetID;
 				}
 			}
-			$rCategoryCreate = array();
+			$rCategoryCreate = [];
 
-			foreach ((json_decode($rData['category_create_list'] ?? '', true) ?: array()) as $rCategory) {
-				$rPrepare = QueryHelper::prepareArray(array('category_type' => 'series', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0));
+			foreach ((json_decode($rData['category_create_list'] ?? '', true) ?: []) as $rCategory) {
+				$rPrepare = QueryHelper::prepareArray(['category_type' => 'series', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0]);
 				$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 				if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -90,7 +91,7 @@ class SeriesService {
 					$rCategoryCreate[$rCategory] = $rCategoryID;
 				}
 			}
-			$rBouquets = array();
+			$rBouquets = [];
 
 			foreach ($rData['bouquets'] as $rBouquet) {
 				if (isset($rBouquetCreate[$rBouquet])) {
@@ -102,7 +103,7 @@ class SeriesService {
 					}
 				}
 			}
-			$rCategories = array();
+			$rCategories = [];
 
 			foreach ($rData['category_id'] as $rCategory) {
 				if (isset($rCategoryCreate[$rCategory])) {
@@ -120,7 +121,7 @@ class SeriesService {
 
 			if ($db->query($rQuery, ...$rPrepare['data'])) {
 				$rInsertID = $db->last_insert_id();
-				SeriesService::queueRefresh($rInsertID);
+				self::queueRefresh($rInsertID);
 
 				foreach ($rBouquets as $rBouquet) {
 					BouquetService::addItems('series', $rBouquet, $rInsertID);
@@ -133,7 +134,7 @@ class SeriesService {
 					}
 				}
 
-				return array('status' => STATUS_SUCCESS, 'data' => array('insert_id' => $rInsertID));
+				return ['status' => STATUS_SUCCESS, 'data' => ['insert_id' => $rInsertID]];
 			} else {
 				foreach ($rBouquetCreate as $rID) {
 					$db->query('DELETE FROM `bouquets` WHERE `id` = ?;', $rID);
@@ -143,10 +144,10 @@ class SeriesService {
 					$db->query('DELETE FROM `streams_categories` WHERE `id` = ?;', $rID);
 				}
 
-				return array('status' => STATUS_FAILURE, 'data' => $rData);
+				return ['status' => STATUS_FAILURE, 'data' => $rData];
 			}
 		} else {
-			return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+			return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 		}
 	}
 
@@ -156,13 +157,13 @@ class SeriesService {
 	 * @param array $rData Import payload (sources, category, options).
 	 * @return array Import result.
 	 */
-	public static function import($rData) {
+	public static function import(array $rData) {
 		$db = self::db();
 		if (Authorization::check('adv', 'import_movies')) {
 			if (InputValidator::validate('importSeries', $rData)) {
 				$rPostData = $rData;
 
-				foreach (array('read_native', 'movie_symlink', 'direct_source', 'direct_proxy', 'remove_subtitles') as $rKey) {
+				foreach (['read_native', 'movie_symlink', 'direct_source', 'direct_proxy', 'remove_subtitles'] as $rKey) {
 					if (isset($rData[$rKey])) {
 						$rData[$rKey] = 1;
 					} else {
@@ -176,7 +177,7 @@ class SeriesService {
 					$rRestart = false;
 				}
 
-				$rStreamDatabase = array();
+				$rStreamDatabase = [];
 				$db->query('SELECT `stream_source` FROM `streams` WHERE `type` = 5;');
 
 				foreach ($db->get_rows() as $rRow) {
@@ -187,7 +188,7 @@ class SeriesService {
 						}
 					}
 				}
-				$rImportStreams = array();
+				$rImportStreams = [];
 
 				if (!empty($_FILES['m3u_file']['tmp_name'])) {
 					$rFile = '';
@@ -198,7 +199,7 @@ class SeriesService {
 					}
 
 					preg_match_all('/(?P<tag>#EXTINF:[-1,0])|(?:(?P<prop_key>[-a-z]+)=\\"(?P<prop_val>[^"]+)")|(?<name>,[^\\r\\n]+)|(?<url>http[^\\s]*:\\/\\/.*\\/.*)/', $rFile, $rMatches);
-					$rResults = array();
+					$rResults = [];
 					$rIndex = -1;
 
 					for ($i = 0; $i < count($rMatches[0]); $i++) {
@@ -231,7 +232,7 @@ class SeriesService {
 								$rPathInfo['extension'] = ($rData['target_container'] ?: 'mp4');
 							}
 
-							$rImportStreams[] = array('url' => $rResult['url'], 'title' => ($rResult['name'] ?: ''), 'container' => ($rData['movie_symlink'] || $rData['direct_source'] ? $rPathInfo['extension'] : $rData['target_container']));
+							$rImportStreams[] = ['url' => $rResult['url'], 'title' => ($rResult['name'] ?: ''), 'container' => ($rData['movie_symlink'] || $rData['direct_source'] ? $rPathInfo['extension'] : $rData['target_container'])];
 						}
 					}
 				} else {
@@ -242,11 +243,11 @@ class SeriesService {
 						if (!is_numeric($rParts[1])) {
 						} else {
 							if (isset($rData['scan_recursive'])) {
-								$rFiles = ApiClient::scanRecursive(intval($rParts[1]), $rParts[2], array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'));
+								$rFiles = ApiClient::scanRecursive(intval($rParts[1]), $rParts[2], ['mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts']);
 							} else {
-								$rFiles = array();
+								$rFiles = [];
 
-								foreach (ApiClient::listDir(intval($rParts[1]), rtrim($rParts[2], '/'), array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'))['files'] as $rFile) {
+								foreach (ApiClient::listDir(intval($rParts[1]), rtrim($rParts[2], '/'), ['mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'])['files'] as $rFile) {
 									$rFiles[] = rtrim($rParts[2], '/') . '/' . $rFile;
 								}
 							}
@@ -263,7 +264,7 @@ class SeriesService {
 										$rPathInfo['extension'] = ($rData['target_container'] ?: 'mp4');
 									}
 
-									$rImportStreams[] = array('url' => $rFilePath, 'title' => $rPathInfo['filename'], 'container' => ($rData['movie_symlink'] || $rData['direct_source'] ? $rPathInfo['extension'] : $rData['target_container']));
+									$rImportStreams[] = ['url' => $rFilePath, 'title' => $rPathInfo['filename'], 'container' => ($rData['movie_symlink'] || $rData['direct_source'] ? $rPathInfo['extension'] : $rData['target_container'])];
 								}
 							}
 						}
@@ -273,10 +274,10 @@ class SeriesService {
 				$rSeriesCategories = array_keys(CategoryService::getAllByType('series'));
 
 				if (0 < count($rImportStreams)) {
-					$rBouquets = array();
+					$rBouquets = [];
 
-					foreach ((json_decode($rData['bouquet_create_list'] ?? '', true) ?: array()) as $rBouquet) {
-						$rPrepare = QueryHelper::prepareArray(array('bouquet_name' => $rBouquet, 'bouquet_channels' => array(), 'bouquet_movies' => array(), 'bouquet_series' => array(), 'bouquet_radios' => array()));
+					foreach ((json_decode($rData['bouquet_create_list'] ?? '', true) ?: []) as $rBouquet) {
+						$rPrepare = QueryHelper::prepareArray(['bouquet_name' => $rBouquet, 'bouquet_channels' => [], 'bouquet_movies' => [], 'bouquet_series' => [], 'bouquet_radios' => []]);
 						$rQuery = 'INSERT INTO `bouquets`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 						if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -293,10 +294,10 @@ class SeriesService {
 					}
 					unset($rData['bouquets'], $rData['bouquet_create_list']);
 
-					$rCategories = array();
+					$rCategories = [];
 
-					foreach ((json_decode($rData['category_create_list'] ?? '', true) ?: array()) as $rCategory) {
-						$rPrepare = QueryHelper::prepareArray(array('category_type' => 'series', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0));
+					foreach ((json_decode($rData['category_create_list'] ?? '', true) ?: []) as $rCategory) {
+						$rPrepare = QueryHelper::prepareArray(['category_type' => 'series', 'category_name' => $rCategory, 'parent_id' => 0, 'cat_order' => 99, 'is_adult' => 0]);
 						$rQuery = 'INSERT INTO `streams_categories`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
 
 						if (!$db->query($rQuery, ...$rPrepare['data'])) {
@@ -313,7 +314,7 @@ class SeriesService {
 					}
 					unset($rData['category_id'], $rData['category_create_list']);
 
-					$rServerIDs = array();
+					$rServerIDs = [];
 
 					foreach (json_decode($rData['server_tree_data'], true) as $rServer) {
 						if ($rServer['parent'] == '#') {
@@ -324,21 +325,21 @@ class SeriesService {
 					// watch is an optional module (fetched from its own repo). When it is
 					// not installed there are no watch categories — degrade to empty.
 					$rWatchCategories = class_exists(WatchService::class)
-						? array(1 => WatchService::getWatchCategories(1), 2 => WatchService::getWatchCategories(2))
-						: array();
+						? [1 => WatchService::getWatchCategories(1), 2 => WatchService::getWatchCategories(2)]
+						: [];
 
 					foreach ($rImportStreams as $rImportStream) {
-						$rData = array('import' => true, 'type' => 'series', 'title' => $rImportStream['title'], 'file' => $rImportStream['url'], 'subtitles' => array(), 'servers' => $rServerIDs, 'fb_category_id' => $rCategories, 'fb_bouquets' => $rBouquets, 'disable_tmdb' => false, 'ignore_no_match' => false, 'bouquets' => array(), 'category_id' => array(), 'language' => SettingsManager::getString('tmdb_language'), 'watch_categories' => $rWatchCategories, 'read_native' => $rData['read_native'], 'movie_symlink' => $rData['movie_symlink'], 'remove_subtitles' => $rData['remove_subtitles'], 'direct_source' => $rData['direct_source'], 'direct_proxy' => $rData['direct_proxy'], 'auto_encode' => $rRestart, 'auto_upgrade' => false, 'fallback_title' => false, 'ffprobe_input' => false, 'transcode_profile_id' => $rData['transcode_profile_id'], 'target_container' => $rImportStream['container'], 'max_genres' => SettingsManager::getInt('max_genres'), 'duplicate_tmdb' => true);
+						$rData = ['import' => true, 'type' => 'series', 'title' => $rImportStream['title'], 'file' => $rImportStream['url'], 'subtitles' => [], 'servers' => $rServerIDs, 'fb_category_id' => $rCategories, 'fb_bouquets' => $rBouquets, 'disable_tmdb' => false, 'ignore_no_match' => false, 'bouquets' => [], 'category_id' => [], 'language' => SettingsManager::getString('tmdb_language'), 'watch_categories' => $rWatchCategories, 'read_native' => $rData['read_native'], 'movie_symlink' => $rData['movie_symlink'], 'remove_subtitles' => $rData['remove_subtitles'], 'direct_source' => $rData['direct_source'], 'direct_proxy' => $rData['direct_proxy'], 'auto_encode' => $rRestart, 'auto_upgrade' => false, 'fallback_title' => false, 'ffprobe_input' => false, 'transcode_profile_id' => $rData['transcode_profile_id'], 'target_container' => $rImportStream['container'], 'max_genres' => SettingsManager::getInt('max_genres'), 'duplicate_tmdb' => true];
 						$rCommand = '/usr/bin/timeout 300 ' . PHP_BIN . ' ' . MAIN_HOME . 'console.php watch_item "' . base64_encode(json_encode($rData, JSON_UNESCAPED_UNICODE)) . '" > /dev/null 2>/dev/null &';
 						shell_exec($rCommand);
 					}
 
-					return array('status' => STATUS_SUCCESS);
+					return ['status' => STATUS_SUCCESS];
 				} else {
-					return array('status' => STATUS_NO_SOURCES, 'data' => $rPostData);
+					return ['status' => STATUS_NO_SOURCES, 'data' => $rPostData];
 				}
 			} else {
-				return array('status' => STATUS_INVALID_INPUT, 'data' => $rData);
+				return ['status' => STATUS_INVALID_INPUT, 'data' => $rData];
 			}
 		} else {
 			exit();
@@ -351,16 +352,16 @@ class SeriesService {
 	 * @param array $rData Selected series ids.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massDelete($rData) {
+	public static function massDelete(array $rData) {
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
 		ini_set('default_socket_timeout', 0);
 
 		$rSeries = json_decode($rData['series'], true);
-		SeriesService::deleteSeriesByIds($rSeries);
+		self::deleteSeriesByIds($rSeries);
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	/**
@@ -369,36 +370,36 @@ class SeriesService {
 	 * @param array $rData Selected ids plus the fields/values to apply.
 	 * @return array ['status' => STATUS_* constant, ...].
 	 */
-	public static function massEdit($rData) {
+	public static function massEdit(array $rData) {
 		$db = self::db();
 		set_time_limit(0);
 		ini_set('mysql.connect_timeout', 0);
 		ini_set('max_execution_time', 0);
 		ini_set('default_socket_timeout', 0);
 
-		$rArray = array();
+		$rArray = [];
 		$rSeriesIDs = json_decode($rData['series'], true);
 
 		if (0 < count($rSeriesIDs)) {
-			$rCategoryMap = array();
+			$rCategoryMap = [];
 
-			if (isset($rData['c_category_id']) && in_array($rData['category_id_type'], array('ADD', 'DEL'))) {
+			if (isset($rData['c_category_id']) && in_array($rData['category_id_type'], ['ADD', 'DEL'])) {
 				$db->query('SELECT `id`, `category_id` FROM `streams_series` WHERE `id` IN (' . implode(',', array_map('intval', $rSeriesIDs)) . ');');
 
 				foreach ($db->get_rows() as $rRow) {
-					$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: array());
+					$rCategoryMap[$rRow['id']] = (json_decode($rRow['category_id'], true) ?: []);
 				}
 			}
 
 			$rBouquets = BouquetService::getAllSimple();
-			$rAddBouquet = $rDelBouquet = array();
+			$rAddBouquet = $rDelBouquet = [];
 
 			foreach ($rSeriesIDs as $rSeriesID) {
 				if (isset($rData['c_category_id'])) {
 					$rCategories = array_map('intval', $rData['category_id']);
 
 					if ($rData['category_id_type'] == 'ADD') {
-						foreach (($rCategoryMap[$rSeriesID] ?: array()) as $rCategoryID) {
+						foreach (($rCategoryMap[$rSeriesID] ?: []) as $rCategoryID) {
 							if (!in_array($rCategoryID, $rCategories)) {
 								$rCategories[] = $rCategoryID;
 							}
@@ -465,7 +466,7 @@ class SeriesService {
 			}
 		}
 
-		return array('status' => STATUS_SUCCESS);
+		return ['status' => STATUS_SUCCESS];
 	}
 
 	// ──────────── Из SeriesRepository ────────────
@@ -477,7 +478,7 @@ class SeriesService {
 	 * @param int $rPage Result page.
 	 * @return array Similar series.
 	 */
-	public static function getSimilar($rID, $rPage = 1) {
+	public static function getSimilar(int $rID, int $rPage = 1) {
 		TMDbService::requireLibrary();
 
 		if (0 < strlen(SettingsManager::getString('tmdb_language'))) {
@@ -494,7 +495,7 @@ class SeriesService {
 	 */
 	public static function getList() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `id`, `title` FROM `streams_series` ORDER BY `title` ASC;');
 
 		if (0 >= $db->num_rows()) {
@@ -531,7 +532,7 @@ class SeriesService {
 					}
 				}
 
-				$rReturn = array();
+				$rReturn = [];
 				$rSeasons = json_decode($rTMDB->getTVShow($rTMDBID)->getJSON(), true)['seasons'];
 
 				foreach ($rSeasons as $rSeason) {
@@ -565,7 +566,7 @@ class SeriesService {
 	 */
 	public static function generatePlaylist($rSeriesNo) {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `stream_id` FROM `streams_episodes` WHERE `series_id` = ? ORDER BY `season_num` ASC, `episode_num` ASC;', $rSeriesNo);
 
 		if (0 >= $db->num_rows()) {
@@ -590,7 +591,7 @@ class SeriesService {
 	 * @param int $rID Series id.
 	 * @return array|false The series row, or false if not found.
 	 */
-	public static function getById($rID) {
+	public static function getById(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rID);
 
@@ -608,7 +609,7 @@ class SeriesService {
 	 */
 	public static function getAll() {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `streams_series` ORDER BY `title` ASC;');
 
 		if ($db->num_rows() > 0) {
@@ -626,7 +627,7 @@ class SeriesService {
 	 * @param int $rID \TMDB id.
 	 * @return array|false The series row, or false if not found.
 	 */
-	public static function getByTMDBId($rID) {
+	public static function getByTMDBId(int $rID) {
 		$db = self::db();
 		$db->query('SELECT * FROM `streams_series` WHERE `tmdb_id` = ?;', $rID);
 
@@ -644,7 +645,7 @@ class SeriesService {
 	 * @param bool $rDeleteFiles Also remove on-disk episode files.
 	 * @return bool True on success.
 	 */
-	public static function deleteSeriesById($rID, $rDeleteFiles = true) {
+	public static function deleteSeriesById(int $rID, bool $rDeleteFiles = true) {
 		$db = self::db();
 		$rSeries = self::getById($rID);
 
@@ -670,7 +671,7 @@ class SeriesService {
 	 * @param int[] $rIDs Series ids.
 	 * @return bool True on success.
 	 */
-	public static function deleteSeriesByIds($rIDs) {
+	public static function deleteSeriesByIds(array $rIDs) {
 		$db = self::db();
 		$rIDs = AdminHelpers::confirmIDs($rIDs);
 
@@ -678,7 +679,7 @@ class SeriesService {
 			return false;
 		}
 
-		$rStreamIDs = array();
+		$rStreamIDs = [];
 		$db->query('SELECT `stream_id` FROM `streams_episodes` WHERE `series_id` IN (' . implode(',', $rIDs) . ');');
 
 		foreach ($db->get_rows() as $rRow) {
diff --git a/src/Domain/Vod/TMDbService.php b/src/Domain/Vod/TMDbService.php
index dccb2d38..2cfb6f3e 100644
--- a/src/Domain/Vod/TMDbService.php
+++ b/src/Domain/Vod/TMDbService.php
@@ -52,7 +52,7 @@ class TMDbService {
 	 * @param int $rID \TMDB movie id.
 	 * @return \Movie|null Movie metadata object, or null on failure.
 	 */
-	public static function getMovie($rID) {
+	public static function getMovie(int $rID) {
 		$rTMDB = self::client();
 
 		return ($rTMDB->getMovie($rID) ?: null);
@@ -64,7 +64,7 @@ class TMDbService {
 	 * @param int $rID \TMDB series id.
 	 * @return array|null Series metadata, or null on failure.
 	 */
-	public static function getSeries($rID) {
+	public static function getSeries(int $rID) {
 		$rTMDB = self::client();
 
 		return (json_decode($rTMDB->getTVShow($rID)->getJSON(), true) ?: null);
@@ -77,7 +77,7 @@ class TMDbService {
 	 * @param int $rSeason Season number.
 	 * @return array|null Season metadata, or null on failure.
 	 */
-	public static function getSeason($rID, $rSeason) {
+	public static function getSeason(int $rID, int $rSeason) {
 		$rTMDB = self::client();
 
 		return json_decode($rTMDB->getSeason($rID, intval($rSeason))->getJSON(), true);
@@ -90,7 +90,7 @@ class TMDbService {
 	 * @param string|null $rLanguage Preferred language, or null for default.
 	 * @return string|null Trailer reference, or null if none.
 	 */
-	public static function getSeriesTrailer($rTMDBID, $rLanguage = null) {
+	public static function getSeriesTrailer(int $rTMDBID, ?string $rLanguage = null) {
 		$rURL = 'https://api.themoviedb.org/3/tv/' . intval($rTMDBID) . '/videos?api_key=' . urlencode(SettingsManager::getString('tmdb_api_key'));
 
 		if ($rLanguage) {
@@ -122,7 +122,7 @@ class TMDbService {
 	 * @param int $rEpisode Episode number.
 	 * @return array Still image references.
 	 */
-	public static function getStills($rTMDBID, $rSeason, $rEpisode) {
+	public static function getStills(int $rTMDBID, int $rSeason, int $rEpisode) {
 		$rURL = 'https://api.themoviedb.org/3/tv/' . intval($rTMDBID) . '/season/' . intval($rSeason) . '/episode/' . intval($rEpisode) . '/images?api_key=' . urlencode(SettingsManager::getString('tmdb_api_key'));
 
 		if (0 >= strlen(SettingsManager::getString('tmdb_language'))) {
@@ -142,7 +142,7 @@ class TMDbService {
 		$db = self::db();
 		$rTMDB = self::client();
 
-		$rCurrentCats = array('movie' => array(), 'series' => array());
+		$rCurrentCats = ['movie' => [], 'series' => []];
 
 		$db->query('SELECT `id`, `category_type`, `category_name` FROM `streams_categories`;');
 
diff --git a/src/Domain/Vod/TmdbCron.php b/src/Domain/Vod/TmdbCron.php
index d60624d8..de0547c8 100644
--- a/src/Domain/Vod/TmdbCron.php
+++ b/src/Domain/Vod/TmdbCron.php
@@ -26,625 +26,624 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  */
 
 class TmdbCron {
-    use DatabaseAware;
-
-
-    /**
-     * Создать \TMDB-клиент с корректным языком.
-     *
-     * Приоритет: язык потока → глобальная настройка → без языка.
-     *
-     * @param string|null $streamLang Язык потока (tmdb_language)
-     * @return \TMDB
-     */
-    private static function createTmdbClient(?string $streamLang = null): \TMDB {
-        if (0 < strlen($streamLang)) {
-            return new \TMDB(SettingsManager::getString('tmdb_api_key'), $streamLang);
-        }
-        if (0 < strlen(SettingsManager::getString('tmdb_language'))) {
-            return new \TMDB(SettingsManager::getString('tmdb_api_key'), SettingsManager::getString('tmdb_language'));
-        }
-        return new \TMDB(SettingsManager::getString('tmdb_api_key'));
-    }
-
-    /**
-     * Найти лучшее совпадение в \TMDB по названию.
-     *
-     * Выполняет поиск дважды: сначала с годом, затем без.
-     * Возвращает \TMDB ID или 0.
-     *
-     * @param \TMDB        $tmdb       Инстанс клиента
-     * @param string      $title      Основной заголовок
-     * @param string|null $altTitle    Альтернативный заголовок
-     * @param string|null $year       Год выпуска
-     * @param string      $searchType 'movie' или 'tv'
-     * @return int \TMDB ID (0 — не найден)
-     */
-    private static function findBestMatch(\TMDB $tmdb, string $title, ?string $altTitle, ?string $year, string $searchType = 'movie'): int {
-        $rMatch = null;
-        $rMatches = array();
-        $rPercentageMatch = SettingsManager::getInt('percentage_match');
-
-        foreach (range(0, 1) as $rIgnoreYear) {
-            if ($rIgnoreYear) {
-                if ($year) {
-                    $year = null;
-                } else {
-                    break;
-                }
-            }
-
-            $rResults = ($searchType === 'movie')
-                ? $tmdb->searchMovie($title, $year)
-                : $tmdb->searchTVShow($title, $year);
-
-            foreach ($rResults as $rResultArr) {
-                $rPercentage = 0;
-                $rPercentageAlt = 0;
-                $rResultName = (string)($rResultArr->get('title') ?: $rResultArr->get('name'));
-
-                similar_text(
-                    strtoupper($title),
-                    strtoupper($rResultName),
-                    $rPercentage
-                );
-
-                if (!$altTitle) {
-                } else {
-                    similar_text(
-                        strtoupper($altTitle),
-                        strtoupper($rResultName),
-                        $rPercentageAlt
-                    );
-                }
-
-                if (!($rPercentageMatch <= $rPercentage
-                    || $rPercentageMatch <= $rPercentageAlt)) {
-                } else {
-                    if ($year && !in_array(
-                        intval(substr((string)($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)),
-                        range(intval($year) - 1, intval($year) + 1)
-                    )) {
-                    } else {
-                        if ($altTitle && strtolower($rResultName) == strtolower($altTitle)) {
-                            $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                            break;
-                        }
-                        if (strtolower($rResultName) == strtolower($title) && !$altTitle) {
-                            $rMatches = array(array('percentage' => 100, 'data' => $rResultArr));
-                            break;
-                        }
-                        $rMatches[] = array('percentage' => $rPercentage, 'data' => $rResultArr);
-                    }
-                }
-            }
-
-            if (0 >= count($rMatches)) {
-            } else {
-                break;
-            }
-        }
-
-        if (0 >= count($rMatches)) {
-            return 0;
-        }
-
-        $rMax = max(array_column($rMatches, 'percentage'));
-        $rKeys = array_filter(array_map(function ($rMatches) use ($rMax) {
-            return ($rMatches['percentage'] == $rMax ? $rMatches['data'] : null);
-        }, $rMatches));
-        list($rMatch) = array_values($rKeys);
-
-        return intval($rMatch->get('id'));
-    }
-
-    /**
-     * Обработать обновление фильма (type=1).
-     *
-     * Ищет в \TMDB по названию/файлу, загружает метаданные,
-     * обновляет streams и watch_refresh.
-     *
-     * @param array $row Строка из watch_refresh
-     */
-    private static function processMovie(array $row): void {
-        $db = self::db();
-
-        $db->query('SELECT * FROM `streams` WHERE `id` = ?;', $row['stream_id']);
-        if ($db->num_rows() != 1) {
-            $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
-            return;
-        }
-
-        $rStream = $db->get_row();
-        $rTMDB = self::createTmdbClient($rStream['tmdb_language']);
-
-        /* --- Определяем \TMDB ID --- */
-        if ($rStream['tmdb_id']) {
-            $rTMDBID = $rStream['tmdb_id'];
-        } else {
-            if (0 < strlen($rStream['movie_properties'])) {
-                $rTMDBID = intval(json_decode($rStream['movie_properties'], true)['tmdb_id']);
-            } else {
-                $rTMDBID = 0;
-            }
-        }
-
-        /* --- Если \TMDB ID неизвестен — ищем --- */
-        if ($rTMDBID == 0) {
-            $rFilename = pathinfo(json_decode($rStream['stream_source'], true)[0])['filename'];
-            foreach (array($rFilename, $rStream['stream_display_name']) as $rStreamTitle) {
-                $rRelease = AdminHelpers::parserelease($rStreamTitle);
-                $rTitle = $rRelease['title'];
-
-                if (!isset($rRelease['excess'])) {
-                } else {
-                    $rTitle = trim($rTitle, (is_array($rRelease['excess']) ? $rRelease['excess'][0] : $rRelease['excess']));
-                }
-
-                $rAltTitle = null;
-                if (isset($rRelease['group'])) {
-                    $rAltTitle = $rTitle . '-' . $rRelease['group'];
-                } else {
-                    if (!isset($rRelease['alternative_title'])) {
-                    } else {
-                        $rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
-                    }
-                }
-
-                if (!isset($rRelease['season'])) {
-                } else {
-                    $rTitle .= $rRelease['season'];
-                }
-
-                $rYear = $rRelease['year'];
-                if ($rTitle) {
-                } else {
-                    $rTitle = $rStreamTitle;
-                }
-
-                $rTMDBID = self::findBestMatch($rTMDB, $rTitle ?? '', $rAltTitle, $rYear, 'movie');
-                if ($rTMDBID > 0) {
-                    break;
-                }
-            }
-        }
-
-        /* --- Загружаем данные фильма --- */
-        if (0 < $rTMDBID) {
-            $rMovie = $rTMDB->getMovie($rTMDBID);
-            $rMovieData = json_decode($rMovie->getJSON(), true);
-            $rMovieData['trailer'] = $rMovie->getTrailer();
-
-            $rThumb = ($rMovieData['poster_path']
-                ? 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rMovieData['poster_path']
-                : '');
-            $rBG = ($rMovieData['backdrop_path']
-                ? 'https://image.tmdb.org/t/p/w1280' . $rMovieData['backdrop_path']
-                : '');
-
-            if (!SettingsManager::getBool('download_images')) {
-            } else {
-                if (empty($rThumb)) {
-                } else {
-                    $rThumb = ImageUtils::downloadImage($rThumb, 2);
-                }
-                if (empty($rBG)) {
-                } else {
-                    $rBG = ImageUtils::downloadImage($rBG);
-                }
-            }
-
-            if (!$rBG) {
-            } else {
-                $rBG = array($rBG);
-            }
-
-            $rCast = array();
-            foreach (($rMovieData['credits']['cast'] ?? []) as $rMember) {
-                if (count($rCast) >= 5) {
-                } else {
-                    $rCast[] = $rMember['name'];
-                }
-            }
-
-            $rDirectors = array();
-            foreach (($rMovieData['credits']['crew'] ?? []) as $rMember) {
-                if (
-                    !(count($rDirectors) < 5
-                        && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing'))
-                    || in_array($rMember['name'], $rDirectors)
-                ) {
-                } else {
-                    $rDirectors[] = $rMember['name'];
-                }
-            }
-
-            $rCountry = '';
-            if (!isset($rMovieData['production_countries'][0]['name'])) {
-            } else {
-                $rCountry = $rMovieData['production_countries'][0]['name'];
-            }
-
-            $rGenres = array();
-            foreach ($rMovieData['genres'] as $rGenre) {
-                if (count($rGenres) >= 3) {
-                } else {
-                    $rGenres[] = $rGenre['name'];
-                }
-            }
-
-            $rSeconds = intval($rMovieData['runtime']) * 60;
-
-            $rProperties = array(
-                'kinopoisk_url'        => 'https://www.themoviedb.org/movie/' . $rMovieData['id'],
-                'tmdb_id'              => $rMovieData['id'],
-                'name'                 => $rMovieData['title'],
-                'o_name'               => $rMovieData['original_title'],
-                'cover_big'            => $rThumb,
-                'movie_image'          => $rThumb,
-                'release_date'         => $rMovieData['release_date'],
-                'episode_run_time'     => $rMovieData['runtime'],
-                'youtube_trailer'      => $rMovieData['trailer'],
-                'director'             => implode(', ', $rDirectors),
-                'actors'               => implode(', ', $rCast),
-                'cast'                 => implode(', ', $rCast),
-                'description'          => $rMovieData['overview'],
-                'plot'                 => $rMovieData['overview'],
-                'age'                  => '',
-                'mpaa_rating'          => '',
-                'rating_count_kinopoisk' => 0,
-                'country'              => $rCountry,
-                'genre'                => implode(', ', $rGenres),
-                'backdrop_path'        => $rBG,
-                'duration_secs'        => $rSeconds,
-                'duration'             => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60),
-                'video'                => array(),
-                'audio'                => array(),
-                'bitrate'              => 0,
-                'rating'               => $rMovieData['vote_average'],
-            );
-
-            $rTitle   = $rMovieData['title'];
-            $rYear    = null;
-            $rRating  = ($rMovieData['vote_average'] ?: 0);
-
-            if (0 >= strlen($rMovieData['release_date'])) {
-            } else {
-                $rYear = intval(substr($rMovieData['release_date'], 0, 4));
-            }
-
-            $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
-            $db->query(
-                'UPDATE `streams` SET `stream_display_name` = ?, `year` = ?, `movie_properties` = ?, `rating` = ? WHERE `id` = ?;',
-                $rTitle,
-                $rYear,
-                json_encode($rProperties, JSON_UNESCAPED_UNICODE),
-                $rRating,
-                $row['stream_id']
-            );
-        } else {
-            $db->query('UPDATE `watch_refresh` SET `status` = -1 WHERE `id` = ?;', $row['id']);
-        }
-    }
-
-    /**
-     * Обработать обновление сериала (type=2).
-     *
-     * Ищет в \TMDB по названию, загружает метаданные шоу,
-     * обновляет streams_series и watch_refresh.
-     *
-     * @param array $row           Строка из watch_refresh
-     * @param array &$updateSeries Массив ID сериалов для последующего updateSeries()
-     */
-    private static function processSeries(array $row, array &$updateSeries): void {
-        $db = self::db();
-
-        $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $row['stream_id']);
-        if ($db->num_rows() != 1) {
-            $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
-            return;
-        }
-
-        $rStream = $db->get_row();
-        $rTMDB = self::createTmdbClient($rStream['tmdb_language']);
-        $rTMDBID = intval($rStream['tmdb_id']);
-
-        /* --- Если \TMDB ID неизвестен — ищем --- */
-        if ($rTMDBID == 0) {
-            $rFilename = $rStream['title'];
-            $rRelease = AdminHelpers::parserelease($rFilename);
-            $rTitle = $rRelease['title'];
-
-            if (!isset($rRelease['excess'])) {
-            } else {
-                // Strip the excess token as a WHOLE WORD — never trim($title, $excess):
-                // its 2nd arg is a char-mask, so trim('Marshals…', 'MULTI') eats the
-                // leading 'M' and yields 'arshals…', breaking the TMDb search.
-                $rExcess = is_array($rRelease['excess']) ? ($rRelease['excess'][0] ?? '') : $rRelease['excess'];
-                if ($rExcess !== '') {
-                    $rTitle = preg_replace('/\b' . preg_quote((string) $rExcess, '/') . '\b/u', ' ', $rTitle);
-                    $rTitle = trim(preg_replace('/\s+/u', ' ', $rTitle));
-                }
-            }
-
-            $rAltTitle = null;
-            if (isset($rRelease['group'])) {
-                $rAltTitle = $rTitle . '-' . $rRelease['group'];
-            } else {
-                if (!isset($rRelease['alternative_title'])) {
-                } else {
-                    $rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
-                }
-            }
-
-            $rYear = $rRelease['year'];
-            if ($rTitle) {
-            } else {
-                $rTitle = $rFilename;
-            }
-
-            $rTMDBID = self::findBestMatch($rTMDB, $rTitle, $rAltTitle, $rYear, 'tv');
-        }
-
-        /* --- Загружаем данные шоу --- */
-        if (0 < $rTMDBID) {
-            $rShow = $rTMDB->getTVShow($rTMDBID);
-            $rShowData = json_decode($rShow->getJSON(), true);
-
-            $rSeriesArray = $rStream;
-            $rSeriesArray['title']           = $rShowData['name'];
-            $rSeriesArray['tmdb_id']         = $rShowData['id'];
-            $rSeriesArray['plot']            = $rShowData['overview'];
-            $rSeriesArray['rating']          = $rShowData['vote_average'];
-            $rSeriesArray['release_date']    = $rShowData['first_air_date'];
-            $rSeriesArray['youtube_trailer'] = TMDbService::getSeriesTrailer($rShowData['id']);
-            $rSeriesArray['cover']           = ($rShowData['poster_path']
-                ? 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rShowData['poster_path']
-                : '');
-            $rSeriesArray['cover_big']       = $rSeriesArray['cover'];
-            $rSeriesArray['backdrop_path']   = array();
-
-            $rBG = ($rShowData['backdrop_path']
-                ? 'https://image.tmdb.org/t/p/w1280' . $rShowData['backdrop_path']
-                : '');
-
-            if (!SettingsManager::getBool('download_images')) {
-            } else {
-                if (empty($rSeriesArray['cover'])) {
-                } else {
-                    $rSeriesArray['cover'] = ImageUtils::downloadImage($rSeriesArray['cover'], 2);
-                }
-                if (empty($rBG)) {
-                } else {
-                    $rBG = ImageUtils::downloadImage($rBG);
-                }
-            }
-
-            if (empty($rBG)) {
-            } else {
-                $rSeriesArray['backdrop_path'][] = $rBG;
-            }
-
-            $rCast = array();
-            foreach ($rShowData['credits']['cast'] as $rMember) {
-                if (count($rCast) >= 5) {
-                } else {
-                    $rCast[] = $rMember['name'];
-                }
-            }
-            $rSeriesArray['cast'] = implode(', ', $rCast);
-
-            $rDirectors = array();
-            foreach ($rShowData['credits']['crew'] as $rMember) {
-                if (
-                    !(count($rDirectors) < 5
-                        && ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing'))
-                    || in_array($rMember['name'], $rDirectors)
-                ) {
-                } else {
-                    $rDirectors[] = $rMember['name'];
-                }
-            }
-            $rSeriesArray['director'] = implode(', ', $rDirectors);
-
-            $rGenres = array();
-            foreach ($rShowData['genres'] as $rGenre) {
-                if (count($rGenres) >= 3) {
-                } else {
-                    $rGenres[] = $rGenre['name'];
-                }
-            }
-            $rSeriesArray['genre'] = implode(', ', $rGenres);
-
-            $rSeriesArray['episode_run_time'] = intval($rShowData['episode_run_time'][0]);
-
-            $rPrepare = QueryHelper::prepareArray($rSeriesArray);
-            $rQuery = 'REPLACE INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
-
-            if ($db->query($rQuery, ...$rPrepare['data'])) {
-                $rInsertID = $db->last_insert_id();
-                SeriesService::updateFromTMDB(intval($rInsertID));
-                $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
-            } else {
-                $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
-            }
-        } else {
-            $db->query('UPDATE `watch_refresh` SET `status` = -1 WHERE `id` = ?;', $row['id']);
-        }
-    }
-
-    /**
-     * Обработать обновление эпизода (type=3).
-     *
-     * Получает данные сезона/эпизода из \TMDB,
-     * обновляет streams, streams_episodes и watch_refresh.
-     *
-     * @param array $row           Строка из watch_refresh
-     * @param array &$updateSeries Массив ID сериалов для последующего updateSeries()
-     */
-    private static function processEpisode(array $row, array &$updateSeries): void {
-        $db = self::db();
-
-        $db->query('SELECT * FROM `streams` WHERE `id` = ?;', $row['stream_id']);
-        if ($db->num_rows() != 1) {
-            $db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
-            return;
-        }
-        $rStream = $db->get_row();
-
-        $db->query('SELECT * FROM `streams_episodes` WHERE `stream_id` = ?;', $row['stream_id']);
-        if ($db->num_rows() != 1) {
-            $db->query('UPDATE `watch_refresh` SET `status` = -3 WHERE `id` = ?;', $row['id']);
-            return;
-        }
-        $rSeriesEpisode = $db->get_row();
-
-        $db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rSeriesEpisode['series_id']);
-        if ($db->num_rows() != 1) {
-            $db->query('UPDATE `watch_refresh` SET `status` = -4 WHERE `id` = ?;', $row['id']);
-            return;
-        }
-        $rSeries = $db->get_row();
-
-        $rTMDB = self::createTmdbClient($rSeries['tmdb_language']);
-
-        if (!(0 < strlen($rSeries['tmdb_id']))) {
-            $db->query('UPDATE `watch_refresh` SET `status` = -5 WHERE `id` = ?;', $row['id']);
-            return;
-        }
-
-        $rShow = $rTMDB->getTVShow($rSeries['tmdb_id']);
-        $rShowData = json_decode($rShow->getJSON(), true);
-
-        if (!isset($rShowData['name'])) {
-            return;
-        }
-
-        $rFilename = pathinfo(json_decode($rStream['stream_source'], true)[0])['filename'];
-        $rRelease = AdminHelpers::parserelease($rFilename);
-        $rReleaseSeason = $rRelease['season'];
-
-        if (is_array($rRelease['episode'])) {
-            $rReleaseEpisode = $rRelease['episode'][0];
-        } else {
-            $rReleaseEpisode = $rRelease['episode'];
-        }
-
-        if ($rReleaseSeason && $rReleaseEpisode) {
-        } else {
-            $rReleaseSeason  = $rSeriesEpisode['season_num'];
-            $rReleaseEpisode = $rSeriesEpisode['episode_num'];
-        }
-
-        if (is_array($rRelease['episode']) && count($rRelease['episode']) == 2) {
-            $rTitle = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason))
-                . 'E' . sprintf('%02d', $rRelease['episode'][0])
-                . '-' . sprintf('%02d', $rRelease['episode'][1]);
-        } else {
-            $rTitle = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason))
-                . 'E' . sprintf('%02d', $rReleaseEpisode);
-        }
-
-        $rEpisodes  = json_decode($rTMDB->getSeason($rShowData['id'], intval($rReleaseSeason))->getJSON(), true);
-        $rProperties = array();
-        $rDownloadImages = SettingsManager::getBool('download_images');
-
-        foreach ($rEpisodes['episodes'] as $rEpisode) {
-            if (intval($rEpisode['episode_number']) != $rReleaseEpisode) {
-            } else {
-                $rImage = null;
-                if (0 >= strlen($rEpisode['still_path'])) {
-                } else {
-                    $rImage = 'https://image.tmdb.org/t/p/w1280' . $rEpisode['still_path'];
-                    if ($rDownloadImages) {
-                        $rImage = ImageUtils::downloadImage($rImage, 5);
-                    }
-                }
-
-                if (0 >= strlen($rEpisode['name'])) {
-                } else {
-                    $rTitle .= ' - ' . $rEpisode['name'];
-                }
-
-                $rSeconds = intval($rShowData['episode_run_time'][0]) * 60;
-
-                $rProperties = array(
-                    'tmdb_id'       => $rEpisode['id'],
-                    'release_date'  => $rEpisode['air_date'],
-                    'plot'          => $rEpisode['overview'],
-                    'duration_secs' => $rSeconds,
-                    'duration'      => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60),
-                    'movie_image'   => $rImage,
-                    'video'         => array(),
-                    'audio'         => array(),
-                    'bitrate'       => 0,
-                    'rating'        => $rEpisode['vote_average'],
-                    'season'        => $rReleaseSeason,
-                );
-
-                if (strlen($rProperties['movie_image'][0]) != 0) {
-                } else {
-                    unset($rProperties['movie_image']);
-                }
-
-                break;
-            }
-        }
-
-        $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
-        $db->query(
-            'UPDATE `streams` SET `stream_display_name` = ?, `movie_properties` = ? WHERE `id` = ?;',
-            $rTitle,
-            json_encode($rProperties, JSON_UNESCAPED_UNICODE),
-            $row['stream_id']
-        );
-        $db->query(
-            'UPDATE `streams_episodes` SET `season_num` = ?, `episode_num` = ? WHERE `stream_id` = ?;',
-            $rReleaseSeason,
-            $rReleaseEpisode,
-            $row['stream_id']
-        );
-
-        if (in_array($rSeries['id'], $updateSeries)) {
-        } else {
-            $updateSeries[] = $rSeries['id'];
-        }
-    }
-
-    /**
-     * Основная точка входа — обработка всей очереди watch_refresh.
-     *
-     * Подключает библиотеки \TMDB, выбирает записи из очереди
-     * и делегирует обработку по типу.
-     */
-    public static function run(): void {
-        $db = self::db();
-
-        TMDbService::requireLibrary();
-
-        $rUpdateSeries = array();
-
-        $db->query('SELECT `id`, `type`, `stream_id` FROM `watch_refresh` WHERE `status` = 0 ORDER BY `stream_id` ASC;');
-
-        foreach ($db->get_rows() as $rRow) {
-            if ($rRow['type'] == 1) {
-                self::processMovie($rRow);
-            } else if ($rRow['type'] == 2) {
-                self::processSeries($rRow, $rUpdateSeries);
-            } else if ($rRow['type'] == 3) {
-                self::processEpisode($rRow, $rUpdateSeries);
-            } else {
-                /* type=4 — запрос на updateSeries */
-                if (in_array($rRow['stream_id'], $rUpdateSeries)) {
-                } else {
-                    $db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $rRow['id']);
-                    $rUpdateSeries[] = intval($rRow['stream_id']);
-                }
-            }
-        }
-
-        foreach ($rUpdateSeries as $rSeriesID) {
-            SeriesService::updateFromTMDB(intval($rSeriesID));
-        }
-    }
+	use DatabaseAware;
+
+	/**
+	 * Создать \TMDB-клиент с корректным языком.
+	 *
+	 * Приоритет: язык потока → глобальная настройка → без языка.
+	 *
+	 * @param string|null $streamLang Язык потока (tmdb_language)
+	 * @return \TMDB
+	 */
+	private static function createTmdbClient(?string $streamLang = null): \TMDB {
+		if (0 < strlen($streamLang)) {
+			return new \TMDB(SettingsManager::getString('tmdb_api_key'), $streamLang);
+		}
+		if (0 < strlen(SettingsManager::getString('tmdb_language'))) {
+			return new \TMDB(SettingsManager::getString('tmdb_api_key'), SettingsManager::getString('tmdb_language'));
+		}
+		return new \TMDB(SettingsManager::getString('tmdb_api_key'));
+	}
+
+	/**
+	 * Найти лучшее совпадение в \TMDB по названию.
+	 *
+	 * Выполняет поиск дважды: сначала с годом, затем без.
+	 * Возвращает \TMDB ID или 0.
+	 *
+	 * @param \TMDB        $tmdb       Инстанс клиента
+	 * @param string      $title      Основной заголовок
+	 * @param string|null $altTitle    Альтернативный заголовок
+	 * @param string|null $year       Год выпуска
+	 * @param string      $searchType 'movie' или 'tv'
+	 * @return int \TMDB ID (0 — не найден)
+	 */
+	private static function findBestMatch(\TMDB $tmdb, string $title, ?string $altTitle, ?string $year, string $searchType = 'movie'): int {
+		$rMatch = null;
+		$rMatches = [];
+		$rPercentageMatch = SettingsManager::getInt('percentage_match');
+
+		foreach (range(0, 1) as $rIgnoreYear) {
+			if ($rIgnoreYear) {
+				if ($year) {
+					$year = null;
+				} else {
+					break;
+				}
+			}
+
+			$rResults = ($searchType === 'movie')
+				? $tmdb->searchMovie($title, $year)
+				: $tmdb->searchTVShow($title, $year);
+
+			foreach ($rResults as $rResultArr) {
+				$rPercentage = 0;
+				$rPercentageAlt = 0;
+				$rResultName = (string) ($rResultArr->get('title') ?: $rResultArr->get('name'));
+
+				similar_text(
+					strtoupper($title),
+					strtoupper($rResultName),
+					$rPercentage
+				);
+
+				if (!$altTitle) {
+				} else {
+					similar_text(
+						strtoupper($altTitle),
+						strtoupper($rResultName),
+						$rPercentageAlt
+					);
+				}
+
+				if (!($rPercentageMatch <= $rPercentage
+					|| $rPercentageMatch <= $rPercentageAlt)) {
+				} else {
+					if ($year && !in_array(
+						intval(substr((string) ($rResultArr->get('release_date') ?: $rResultArr->get('first_air_date')), 0, 4)),
+						range(intval($year) - 1, intval($year) + 1)
+					)) {
+					} else {
+						if ($altTitle && strtolower($rResultName) == strtolower($altTitle)) {
+							$rMatches = [['percentage' => 100, 'data' => $rResultArr]];
+							break;
+						}
+						if (strtolower($rResultName) == strtolower($title) && !$altTitle) {
+							$rMatches = [['percentage' => 100, 'data' => $rResultArr]];
+							break;
+						}
+						$rMatches[] = ['percentage' => $rPercentage, 'data' => $rResultArr];
+					}
+				}
+			}
+
+			if (0 >= count($rMatches)) {
+			} else {
+				break;
+			}
+		}
+
+		if (0 >= count($rMatches)) {
+			return 0;
+		}
+
+		$rMax = max(array_column($rMatches, 'percentage'));
+		$rKeys = array_filter(array_map(function ($rMatches) use ($rMax) {
+			return ($rMatches['percentage'] == $rMax ? $rMatches['data'] : null);
+		}, $rMatches));
+		list($rMatch) = array_values($rKeys);
+
+		return intval($rMatch->get('id'));
+	}
+
+	/**
+	 * Обработать обновление фильма (type=1).
+	 *
+	 * Ищет в \TMDB по названию/файлу, загружает метаданные,
+	 * обновляет streams и watch_refresh.
+	 *
+	 * @param array $row Строка из watch_refresh
+	 */
+	private static function processMovie(array $row): void {
+		$db = self::db();
+
+		$db->query('SELECT * FROM `streams` WHERE `id` = ?;', $row['stream_id']);
+		if ($db->num_rows() != 1) {
+			$db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
+			return;
+		}
+
+		$rStream = $db->get_row();
+		$rTMDB = self::createTmdbClient($rStream['tmdb_language']);
+
+		/* --- Определяем \TMDB ID --- */
+		if ($rStream['tmdb_id']) {
+			$rTMDBID = $rStream['tmdb_id'];
+		} else {
+			if (0 < strlen($rStream['movie_properties'])) {
+				$rTMDBID = intval(json_decode($rStream['movie_properties'], true)['tmdb_id']);
+			} else {
+				$rTMDBID = 0;
+			}
+		}
+
+		/* --- Если \TMDB ID неизвестен — ищем --- */
+		if ($rTMDBID == 0) {
+			$rFilename = pathinfo(json_decode($rStream['stream_source'], true)[0])['filename'];
+			foreach ([$rFilename, $rStream['stream_display_name']] as $rStreamTitle) {
+				$rRelease = AdminHelpers::parserelease($rStreamTitle);
+				$rTitle = $rRelease['title'];
+
+				if (!isset($rRelease['excess'])) {
+				} else {
+					$rTitle = trim($rTitle, (is_array($rRelease['excess']) ? $rRelease['excess'][0] : $rRelease['excess']));
+				}
+
+				$rAltTitle = null;
+				if (isset($rRelease['group'])) {
+					$rAltTitle = $rTitle . '-' . $rRelease['group'];
+				} else {
+					if (!isset($rRelease['alternative_title'])) {
+					} else {
+						$rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
+					}
+				}
+
+				if (!isset($rRelease['season'])) {
+				} else {
+					$rTitle .= $rRelease['season'];
+				}
+
+				$rYear = $rRelease['year'];
+				if ($rTitle) {
+				} else {
+					$rTitle = $rStreamTitle;
+				}
+
+				$rTMDBID = self::findBestMatch($rTMDB, $rTitle ?? '', $rAltTitle, $rYear, 'movie');
+				if ($rTMDBID > 0) {
+					break;
+				}
+			}
+		}
+
+		/* --- Загружаем данные фильма --- */
+		if (0 < $rTMDBID) {
+			$rMovie = $rTMDB->getMovie($rTMDBID);
+			$rMovieData = json_decode($rMovie->getJSON(), true);
+			$rMovieData['trailer'] = $rMovie->getTrailer();
+
+			$rThumb = ($rMovieData['poster_path']
+				? 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rMovieData['poster_path']
+				: '');
+			$rBG = ($rMovieData['backdrop_path']
+				? 'https://image.tmdb.org/t/p/w1280' . $rMovieData['backdrop_path']
+				: '');
+
+			if (!SettingsManager::getBool('download_images')) {
+			} else {
+				if (empty($rThumb)) {
+				} else {
+					$rThumb = ImageUtils::downloadImage($rThumb, 2);
+				}
+				if (empty($rBG)) {
+				} else {
+					$rBG = ImageUtils::downloadImage($rBG);
+				}
+			}
+
+			if (!$rBG) {
+			} else {
+				$rBG = [$rBG];
+			}
+
+			$rCast = [];
+			foreach (($rMovieData['credits']['cast'] ?? []) as $rMember) {
+				if (count($rCast) >= 5) {
+				} else {
+					$rCast[] = $rMember['name'];
+				}
+			}
+
+			$rDirectors = [];
+			foreach (($rMovieData['credits']['crew'] ?? []) as $rMember) {
+				if (
+					!(count($rDirectors) < 5
+						&& ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing'))
+					|| in_array($rMember['name'], $rDirectors)
+				) {
+				} else {
+					$rDirectors[] = $rMember['name'];
+				}
+			}
+
+			$rCountry = '';
+			if (!isset($rMovieData['production_countries'][0]['name'])) {
+			} else {
+				$rCountry = $rMovieData['production_countries'][0]['name'];
+			}
+
+			$rGenres = [];
+			foreach ($rMovieData['genres'] as $rGenre) {
+				if (count($rGenres) >= 3) {
+				} else {
+					$rGenres[] = $rGenre['name'];
+				}
+			}
+
+			$rSeconds = intval($rMovieData['runtime']) * 60;
+
+			$rProperties = [
+				'kinopoisk_url'        => 'https://www.themoviedb.org/movie/' . $rMovieData['id'],
+				'tmdb_id'              => $rMovieData['id'],
+				'name'                 => $rMovieData['title'],
+				'o_name'               => $rMovieData['original_title'],
+				'cover_big'            => $rThumb,
+				'movie_image'          => $rThumb,
+				'release_date'         => $rMovieData['release_date'],
+				'episode_run_time'     => $rMovieData['runtime'],
+				'youtube_trailer'      => $rMovieData['trailer'],
+				'director'             => implode(', ', $rDirectors),
+				'actors'               => implode(', ', $rCast),
+				'cast'                 => implode(', ', $rCast),
+				'description'          => $rMovieData['overview'],
+				'plot'                 => $rMovieData['overview'],
+				'age'                  => '',
+				'mpaa_rating'          => '',
+				'rating_count_kinopoisk' => 0,
+				'country'              => $rCountry,
+				'genre'                => implode(', ', $rGenres),
+				'backdrop_path'        => $rBG,
+				'duration_secs'        => $rSeconds,
+				'duration'             => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60),
+				'video'                => [],
+				'audio'                => [],
+				'bitrate'              => 0,
+				'rating'               => $rMovieData['vote_average'],
+			];
+
+			$rTitle   = $rMovieData['title'];
+			$rYear    = null;
+			$rRating  = ($rMovieData['vote_average'] ?: 0);
+
+			if (0 >= strlen($rMovieData['release_date'])) {
+			} else {
+				$rYear = intval(substr($rMovieData['release_date'], 0, 4));
+			}
+
+			$db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
+			$db->query(
+				'UPDATE `streams` SET `stream_display_name` = ?, `year` = ?, `movie_properties` = ?, `rating` = ? WHERE `id` = ?;',
+				$rTitle,
+				$rYear,
+				json_encode($rProperties, JSON_UNESCAPED_UNICODE),
+				$rRating,
+				$row['stream_id']
+			);
+		} else {
+			$db->query('UPDATE `watch_refresh` SET `status` = -1 WHERE `id` = ?;', $row['id']);
+		}
+	}
+
+	/**
+	 * Обработать обновление сериала (type=2).
+	 *
+	 * Ищет в \TMDB по названию, загружает метаданные шоу,
+	 * обновляет streams_series и watch_refresh.
+	 *
+	 * @param array $row           Строка из watch_refresh
+	 * @param array &$updateSeries Массив ID сериалов для последующего updateSeries()
+	 */
+	private static function processSeries(array $row, array &$updateSeries): void {
+		$db = self::db();
+
+		$db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $row['stream_id']);
+		if ($db->num_rows() != 1) {
+			$db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
+			return;
+		}
+
+		$rStream = $db->get_row();
+		$rTMDB = self::createTmdbClient($rStream['tmdb_language']);
+		$rTMDBID = intval($rStream['tmdb_id']);
+
+		/* --- Если \TMDB ID неизвестен — ищем --- */
+		if ($rTMDBID == 0) {
+			$rFilename = $rStream['title'];
+			$rRelease = AdminHelpers::parserelease($rFilename);
+			$rTitle = $rRelease['title'];
+
+			if (!isset($rRelease['excess'])) {
+			} else {
+				// Strip the excess token as a WHOLE WORD — never trim($title, $excess):
+				// its 2nd arg is a char-mask, so trim('Marshals…', 'MULTI') eats the
+				// leading 'M' and yields 'arshals…', breaking the TMDb search.
+				$rExcess = is_array($rRelease['excess']) ? ($rRelease['excess'][0] ?? '') : $rRelease['excess'];
+				if ($rExcess !== '') {
+					$rTitle = preg_replace('/\b' . preg_quote((string) $rExcess, '/') . '\b/u', ' ', $rTitle);
+					$rTitle = trim(preg_replace('/\s+/u', ' ', $rTitle));
+				}
+			}
+
+			$rAltTitle = null;
+			if (isset($rRelease['group'])) {
+				$rAltTitle = $rTitle . '-' . $rRelease['group'];
+			} else {
+				if (!isset($rRelease['alternative_title'])) {
+				} else {
+					$rAltTitle = $rTitle . ' - ' . $rRelease['alternative_title'];
+				}
+			}
+
+			$rYear = $rRelease['year'];
+			if ($rTitle) {
+			} else {
+				$rTitle = $rFilename;
+			}
+
+			$rTMDBID = self::findBestMatch($rTMDB, $rTitle, $rAltTitle, $rYear, 'tv');
+		}
+
+		/* --- Загружаем данные шоу --- */
+		if (0 < $rTMDBID) {
+			$rShow = $rTMDB->getTVShow($rTMDBID);
+			$rShowData = json_decode($rShow->getJSON(), true);
+
+			$rSeriesArray = $rStream;
+			$rSeriesArray['title']           = $rShowData['name'];
+			$rSeriesArray['tmdb_id']         = $rShowData['id'];
+			$rSeriesArray['plot']            = $rShowData['overview'];
+			$rSeriesArray['rating']          = $rShowData['vote_average'];
+			$rSeriesArray['release_date']    = $rShowData['first_air_date'];
+			$rSeriesArray['youtube_trailer'] = TMDbService::getSeriesTrailer($rShowData['id']);
+			$rSeriesArray['cover']           = ($rShowData['poster_path']
+				? 'https://image.tmdb.org/t/p/w600_and_h900_bestv2' . $rShowData['poster_path']
+				: '');
+			$rSeriesArray['cover_big']       = $rSeriesArray['cover'];
+			$rSeriesArray['backdrop_path']   = [];
+
+			$rBG = ($rShowData['backdrop_path']
+				? 'https://image.tmdb.org/t/p/w1280' . $rShowData['backdrop_path']
+				: '');
+
+			if (!SettingsManager::getBool('download_images')) {
+			} else {
+				if (empty($rSeriesArray['cover'])) {
+				} else {
+					$rSeriesArray['cover'] = ImageUtils::downloadImage($rSeriesArray['cover'], 2);
+				}
+				if (empty($rBG)) {
+				} else {
+					$rBG = ImageUtils::downloadImage($rBG);
+				}
+			}
+
+			if (empty($rBG)) {
+			} else {
+				$rSeriesArray['backdrop_path'][] = $rBG;
+			}
+
+			$rCast = [];
+			foreach ($rShowData['credits']['cast'] as $rMember) {
+				if (count($rCast) >= 5) {
+				} else {
+					$rCast[] = $rMember['name'];
+				}
+			}
+			$rSeriesArray['cast'] = implode(', ', $rCast);
+
+			$rDirectors = [];
+			foreach ($rShowData['credits']['crew'] as $rMember) {
+				if (
+					!(count($rDirectors) < 5
+						&& ($rMember['department'] == 'Directing' || $rMember['known_for_department'] == 'Directing'))
+					|| in_array($rMember['name'], $rDirectors)
+				) {
+				} else {
+					$rDirectors[] = $rMember['name'];
+				}
+			}
+			$rSeriesArray['director'] = implode(', ', $rDirectors);
+
+			$rGenres = [];
+			foreach ($rShowData['genres'] as $rGenre) {
+				if (count($rGenres) >= 3) {
+				} else {
+					$rGenres[] = $rGenre['name'];
+				}
+			}
+			$rSeriesArray['genre'] = implode(', ', $rGenres);
+
+			$rSeriesArray['episode_run_time'] = intval($rShowData['episode_run_time'][0]);
+
+			$rPrepare = QueryHelper::prepareArray($rSeriesArray);
+			$rQuery = 'REPLACE INTO `streams_series`(' . $rPrepare['columns'] . ') VALUES(' . $rPrepare['placeholder'] . ');';
+
+			if ($db->query($rQuery, ...$rPrepare['data'])) {
+				$rInsertID = $db->last_insert_id();
+				SeriesService::updateFromTMDB(intval($rInsertID));
+				$db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
+			} else {
+				$db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
+			}
+		} else {
+			$db->query('UPDATE `watch_refresh` SET `status` = -1 WHERE `id` = ?;', $row['id']);
+		}
+	}
+
+	/**
+	 * Обработать обновление эпизода (type=3).
+	 *
+	 * Получает данные сезона/эпизода из \TMDB,
+	 * обновляет streams, streams_episodes и watch_refresh.
+	 *
+	 * @param array $row           Строка из watch_refresh
+	 * @param array &$updateSeries Массив ID сериалов для последующего updateSeries()
+	 */
+	private static function processEpisode(array $row, array &$updateSeries): void {
+		$db = self::db();
+
+		$db->query('SELECT * FROM `streams` WHERE `id` = ?;', $row['stream_id']);
+		if ($db->num_rows() != 1) {
+			$db->query('UPDATE `watch_refresh` SET `status` = -2 WHERE `id` = ?;', $row['id']);
+			return;
+		}
+		$rStream = $db->get_row();
+
+		$db->query('SELECT * FROM `streams_episodes` WHERE `stream_id` = ?;', $row['stream_id']);
+		if ($db->num_rows() != 1) {
+			$db->query('UPDATE `watch_refresh` SET `status` = -3 WHERE `id` = ?;', $row['id']);
+			return;
+		}
+		$rSeriesEpisode = $db->get_row();
+
+		$db->query('SELECT * FROM `streams_series` WHERE `id` = ?;', $rSeriesEpisode['series_id']);
+		if ($db->num_rows() != 1) {
+			$db->query('UPDATE `watch_refresh` SET `status` = -4 WHERE `id` = ?;', $row['id']);
+			return;
+		}
+		$rSeries = $db->get_row();
+
+		$rTMDB = self::createTmdbClient($rSeries['tmdb_language']);
+
+		if (!(0 < strlen($rSeries['tmdb_id']))) {
+			$db->query('UPDATE `watch_refresh` SET `status` = -5 WHERE `id` = ?;', $row['id']);
+			return;
+		}
+
+		$rShow = $rTMDB->getTVShow($rSeries['tmdb_id']);
+		$rShowData = json_decode($rShow->getJSON(), true);
+
+		if (!isset($rShowData['name'])) {
+			return;
+		}
+
+		$rFilename = pathinfo(json_decode($rStream['stream_source'], true)[0])['filename'];
+		$rRelease = AdminHelpers::parserelease($rFilename);
+		$rReleaseSeason = $rRelease['season'];
+
+		if (is_array($rRelease['episode'])) {
+			$rReleaseEpisode = $rRelease['episode'][0];
+		} else {
+			$rReleaseEpisode = $rRelease['episode'];
+		}
+
+		if ($rReleaseSeason && $rReleaseEpisode) {
+		} else {
+			$rReleaseSeason  = $rSeriesEpisode['season_num'];
+			$rReleaseEpisode = $rSeriesEpisode['episode_num'];
+		}
+
+		if (is_array($rRelease['episode']) && count($rRelease['episode']) == 2) {
+			$rTitle = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason))
+				. 'E' . sprintf('%02d', $rRelease['episode'][0])
+				. '-' . sprintf('%02d', $rRelease['episode'][1]);
+		} else {
+			$rTitle = $rShowData['name'] . ' - S' . sprintf('%02d', intval($rReleaseSeason))
+				. 'E' . sprintf('%02d', $rReleaseEpisode);
+		}
+
+		$rEpisodes  = json_decode($rTMDB->getSeason($rShowData['id'], intval($rReleaseSeason))->getJSON(), true);
+		$rProperties = [];
+		$rDownloadImages = SettingsManager::getBool('download_images');
+
+		foreach ($rEpisodes['episodes'] as $rEpisode) {
+			if (intval($rEpisode['episode_number']) != $rReleaseEpisode) {
+			} else {
+				$rImage = null;
+				if (0 >= strlen($rEpisode['still_path'])) {
+				} else {
+					$rImage = 'https://image.tmdb.org/t/p/w1280' . $rEpisode['still_path'];
+					if ($rDownloadImages) {
+						$rImage = ImageUtils::downloadImage($rImage, 5);
+					}
+				}
+
+				if (0 >= strlen($rEpisode['name'])) {
+				} else {
+					$rTitle .= ' - ' . $rEpisode['name'];
+				}
+
+				$rSeconds = intval($rShowData['episode_run_time'][0]) * 60;
+
+				$rProperties = [
+					'tmdb_id'       => $rEpisode['id'],
+					'release_date'  => $rEpisode['air_date'],
+					'plot'          => $rEpisode['overview'],
+					'duration_secs' => $rSeconds,
+					'duration'      => sprintf('%02d:%02d:%02d', $rSeconds / 3600, ($rSeconds / 60) % 60, $rSeconds % 60),
+					'movie_image'   => $rImage,
+					'video'         => [],
+					'audio'         => [],
+					'bitrate'       => 0,
+					'rating'        => $rEpisode['vote_average'],
+					'season'        => $rReleaseSeason,
+				];
+
+				if (strlen($rProperties['movie_image'][0]) != 0) {
+				} else {
+					unset($rProperties['movie_image']);
+				}
+
+				break;
+			}
+		}
+
+		$db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $row['id']);
+		$db->query(
+			'UPDATE `streams` SET `stream_display_name` = ?, `movie_properties` = ? WHERE `id` = ?;',
+			$rTitle,
+			json_encode($rProperties, JSON_UNESCAPED_UNICODE),
+			$row['stream_id']
+		);
+		$db->query(
+			'UPDATE `streams_episodes` SET `season_num` = ?, `episode_num` = ? WHERE `stream_id` = ?;',
+			$rReleaseSeason,
+			$rReleaseEpisode,
+			$row['stream_id']
+		);
+
+		if (in_array($rSeries['id'], $updateSeries)) {
+		} else {
+			$updateSeries[] = $rSeries['id'];
+		}
+	}
+
+	/**
+	 * Основная точка входа — обработка всей очереди watch_refresh.
+	 *
+	 * Подключает библиотеки \TMDB, выбирает записи из очереди
+	 * и делегирует обработку по типу.
+	 */
+	public static function run(): void {
+		$db = self::db();
+
+		TMDbService::requireLibrary();
+
+		$rUpdateSeries = [];
+
+		$db->query('SELECT `id`, `type`, `stream_id` FROM `watch_refresh` WHERE `status` = 0 ORDER BY `stream_id` ASC;');
+
+		foreach ($db->get_rows() as $rRow) {
+			if ($rRow['type'] == 1) {
+				self::processMovie($rRow);
+			} elseif ($rRow['type'] == 2) {
+				self::processSeries($rRow, $rUpdateSeries);
+			} elseif ($rRow['type'] == 3) {
+				self::processEpisode($rRow, $rUpdateSeries);
+			} else {
+				/* type=4 — запрос на updateSeries */
+				if (in_array($rRow['stream_id'], $rUpdateSeries)) {
+				} else {
+					$db->query('UPDATE `watch_refresh` SET `status` = 1 WHERE `id` = ?;', $rRow['id']);
+					$rUpdateSeries[] = intval($rRow['stream_id']);
+				}
+			}
+		}
+
+		foreach ($rUpdateSeries as $rSeriesID) {
+			SeriesService::updateFromTMDB(intval($rSeriesID));
+		}
+	}
 }
diff --git a/src/Domain/Vod/TmdbPopularCron.php b/src/Domain/Vod/TmdbPopularCron.php
index 5db184c6..aaa0d648 100644
--- a/src/Domain/Vod/TmdbPopularCron.php
+++ b/src/Domain/Vod/TmdbPopularCron.php
@@ -25,204 +25,203 @@ use XcVm\Infrastructure\Database\DatabaseAware;
  */
 
 class TmdbPopularCron {
-    use DatabaseAware;
+	use DatabaseAware;
 
+	/**
+	 * Собрать популярные фильмы и сериалы из \TMDB.
+	 *
+	 * Сопоставляет \TMDB ID с локальными записями.
+	 *
+	 * @param \TMDB  $tmdb    Инстанс клиента
+	 * @param array $tmdbIDs Маппинг tmdb_id => local_id
+	 * @param int   $pages   Количество страниц для запроса
+	 * @return array ['movies' => int[], 'series' => int[]]
+	 */
+	private static function collectPopular(\TMDB $tmdb, array $tmdbIDs, int $pages = 100): array {
+		$rReturn = ['movies' => [], 'series' => []];
 
-    /**
-     * Собрать популярные фильмы и сериалы из \TMDB.
-     *
-     * Сопоставляет \TMDB ID с локальными записями.
-     *
-     * @param \TMDB  $tmdb    Инстанс клиента
-     * @param array $tmdbIDs Маппинг tmdb_id => local_id
-     * @param int   $pages   Количество страниц для запроса
-     * @return array ['movies' => int[], 'series' => int[]]
-     */
-    private static function collectPopular(\TMDB $tmdb, array $tmdbIDs, int $pages = 100): array {
-        $rReturn = ['movies' => [], 'series' => []];
+		// Popular movies
+		foreach (range(1, $pages) as $rPage) {
+			foreach ($tmdb->getPopularMovies($rPage) as $rItem) {
+				$id = $rItem->getID();
+				if (isset($tmdbIDs[$id])) {
+					$rReturn['movies'][] = $tmdbIDs[$id];
+				}
+			}
+		}
 
-        // Popular movies
-        foreach (range(1, $pages) as $rPage) {
-            foreach ($tmdb->getPopularMovies($rPage) as $rItem) {
-                $id = $rItem->getID();
-                if (isset($tmdbIDs[$id])) {
-                    $rReturn['movies'][] = $tmdbIDs[$id];
-                }
-            }
-        }
+		// Popular TV shows
+		foreach (range(1, $pages) as $rPage) {
+			foreach ($tmdb->getPopularTVShows($rPage) as $rItem) {
+				$id = $rItem->getID();
+				if (isset($tmdbIDs[$id])) {
+					$rReturn['series'][] = $tmdbIDs[$id];
+				}
+			}
+		}
 
-        // Popular TV shows
-        foreach (range(1, $pages) as $rPage) {
-            foreach ($tmdb->getPopularTVShows($rPage) as $rItem) {
-                $id = $rItem->getID();
-                if (isset($tmdbIDs[$id])) {
-                    $rReturn['series'][] = $tmdbIDs[$id];
-                }
-            }
-        }
+		return $rReturn;
+	}
 
-        return $rReturn;
-    }
+	/**
+	 * Заполнить поле `similar` для фильмов.
+	 *
+	 * @param \TMDB $tmdb Инстанс клиента
+	 */
+	private static function processSimilarMovies(\TMDB $tmdb): void {
+		$db = self::db();
 
-    /**
-     * Заполнить поле `similar` для фильмов.
-     *
-     * @param \TMDB $tmdb Инстанс клиента
-     */
-    private static function processSimilarMovies(\TMDB $tmdb): void {
-        $db = self::db();
-
-        $db->query(
-            'SELECT COUNT(*) AS `count` FROM `streams`
+		$db->query(
+			'SELECT COUNT(*) AS `count` FROM `streams`
              WHERE `type` = 2 AND `similar` IS NULL AND `tmdb_id` > 0;'
-        );
-        $rCount = (int)($db->get_row()['count'] ?? 0);
-        if ($rCount <= 0) {
-            return;
-        }
+		);
+		$rCount = (int) ($db->get_row()['count'] ?? 0);
+		if ($rCount <= 0) {
+			return;
+		}
 
-        $rSteps = $rCount >= 1000 ? range(0, $rCount, 1000) : [0];
-        foreach ($rSteps as $rStep) {
-            $db->query(
-                'SELECT `id`, `tmdb_id` FROM `streams`
+		$rSteps = $rCount >= 1000 ? range(0, $rCount, 1000) : [0];
+		foreach ($rSteps as $rStep) {
+			$db->query(
+				'SELECT `id`, `tmdb_id` FROM `streams`
                  WHERE `type` = 2 AND `similar` IS NULL AND `tmdb_id` > 0
                  LIMIT ' . $rStep . ', 1000;'
-            );
-            foreach ($db->get_rows() as $rRow) {
-                $rSimilar = [];
-                foreach (range(1, 3) as $rPage) {
-                    $items = $tmdb->getSimilarMovies($rRow['tmdb_id'], $rPage);
-                    foreach (json_decode(json_encode($items), true) as $rItem) {
-                        $rSimilar[] = (int)($rItem['_data']['id'] ?? 0);
-                    }
-                }
-                $db->query(
-                    'UPDATE `streams` SET `similar` = ? WHERE `id` = ?;',
-                    json_encode(array_values(array_unique($rSimilar))),
-                    $rRow['id']
-                );
-            }
-        }
-    }
+			);
+			foreach ($db->get_rows() as $rRow) {
+				$rSimilar = [];
+				foreach (range(1, 3) as $rPage) {
+					$items = $tmdb->getSimilarMovies($rRow['tmdb_id'], $rPage);
+					foreach (json_decode(json_encode($items), true) as $rItem) {
+						$rSimilar[] = (int) ($rItem['_data']['id'] ?? 0);
+					}
+				}
+				$db->query(
+					'UPDATE `streams` SET `similar` = ? WHERE `id` = ?;',
+					json_encode(array_values(array_unique($rSimilar))),
+					$rRow['id']
+				);
+			}
+		}
+	}
 
-    /**
-     * Заполнить поле `similar` для сериалов.
-     *
-     * @param \TMDB $tmdb Инстанс клиента
-     */
-    private static function processSimilarSeries(\TMDB $tmdb): void {
-        $db = self::db();
+	/**
+	 * Заполнить поле `similar` для сериалов.
+	 *
+	 * @param \TMDB $tmdb Инстанс клиента
+	 */
+	private static function processSimilarSeries(\TMDB $tmdb): void {
+		$db = self::db();
 
-        $db->query(
-            'SELECT COUNT(*) AS `count` FROM `streams_series`
+		$db->query(
+			'SELECT COUNT(*) AS `count` FROM `streams_series`
              WHERE `similar` IS NULL AND `tmdb_id` > 0;'
-        );
-        $rCount = (int)($db->get_row()['count'] ?? 0);
-        if ($rCount <= 0) {
-            return;
-        }
+		);
+		$rCount = (int) ($db->get_row()['count'] ?? 0);
+		if ($rCount <= 0) {
+			return;
+		}
 
-        $rSteps = $rCount >= 1000 ? range(0, $rCount, 1000) : [0];
-        foreach ($rSteps as $rStep) {
-            $db->query(
-                'SELECT `id`, `tmdb_id` FROM `streams_series`
+		$rSteps = $rCount >= 1000 ? range(0, $rCount, 1000) : [0];
+		foreach ($rSteps as $rStep) {
+			$db->query(
+				'SELECT `id`, `tmdb_id` FROM `streams_series`
                  WHERE `similar` IS NULL AND `tmdb_id` > 0
                  LIMIT ' . $rStep . ', 1000;'
-            );
-            foreach ($db->get_rows() as $rRow) {
-                $rSimilar = [];
-                foreach (range(1, 3) as $rPage) {
-                    $items = $tmdb->getSimilarSeries($rRow['tmdb_id'], $rPage);
-                    foreach (json_decode(json_encode($items), true) as $rItem) {
-                        $rSimilar[] = (int)($rItem['id'] ?? 0);
-                    }
-                }
-                $db->query(
-                    'UPDATE `streams_series` SET `similar` = ? WHERE `id` = ?;',
-                    json_encode(array_values(array_unique($rSimilar))),
-                    $rRow['id']
-                );
-            }
-        }
-    }
+			);
+			foreach ($db->get_rows() as $rRow) {
+				$rSimilar = [];
+				foreach (range(1, 3) as $rPage) {
+					$items = $tmdb->getSimilarSeries($rRow['tmdb_id'], $rPage);
+					foreach (json_decode(json_encode($items), true) as $rItem) {
+						$rSimilar[] = (int) ($rItem['id'] ?? 0);
+					}
+				}
+				$db->query(
+					'UPDATE `streams_series` SET `similar` = ? WHERE `id` = ?;',
+					json_encode(array_values(array_unique($rSimilar))),
+					$rRow['id']
+				);
+			}
+		}
+	}
 
-    /**
-     * Собрать популярные live-потоки по активности за 28 дней.
-     */
-    private static function collectPopularLive(): void {
-        $db = self::db();
+	/**
+	 * Собрать популярные live-потоки по активности за 28 дней.
+	 */
+	private static function collectPopularLive(): void {
+		$db = self::db();
 
-        $rPopularLive = [];
-        $db->query(
-            'SELECT `stream_id`, COUNT(`activity_id`) AS `count`
+		$rPopularLive = [];
+		$db->query(
+			'SELECT `stream_id`, COUNT(`activity_id`) AS `count`
              FROM `lines_activity`
              LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id`
              WHERE `type` = 1 AND `date_end` < UNIX_TIMESTAMP() - (86400*28)
              GROUP BY `stream_id`
              ORDER BY `count` DESC
              LIMIT 500;'
-        );
-        foreach ($db->get_rows() as $rRow) {
-            $rPopularLive[] = $rRow['stream_id'];
-        }
+		);
+		foreach ($db->get_rows() as $rRow) {
+			$rPopularLive[] = $rRow['stream_id'];
+		}
 
-        file_put_contents(CONTENT_PATH . 'live_popular', igbinary_serialize($rPopularLive));
-    }
+		file_put_contents(CONTENT_PATH . 'live_popular', igbinary_serialize($rPopularLive));
+	}
 
-    /**
-     * Главная точка входа крона.
-     *
-     * Выполняет:
-     *   1. Сбор популярных фильмов/сериалов из \TMDB
-     *   2. Заполнение similar для фильмов
-     *   3. Заполнение similar для сериалов
-     *   4. Сбор популярных live-потоков
-     */
-    public static function run(): void {
-        $db = self::db();
+	/**
+	 * Главная точка входа крона.
+	 *
+	 * Выполняет:
+	 *   1. Сбор популярных фильмов/сериалов из \TMDB
+	 *   2. Заполнение similar для фильмов
+	 *   3. Заполнение similar для сериалов
+	 *   4. Сбор популярных live-потоков
+	 */
+	public static function run(): void {
+		$db = self::db();
 
-        TMDbService::requireLibrary();
+		TMDbService::requireLibrary();
 
-        if (SettingsManager::getString('tmdb_api_key') !== '') {
-            $lang = SettingsManager::getString('tmdb_language');
-            $rTMDB = $lang !== ''
-                ? new \TMDB(SettingsManager::getString('tmdb_api_key'), $lang)
-                : new \TMDB(SettingsManager::getString('tmdb_api_key'));
+		if (SettingsManager::getString('tmdb_api_key') !== '') {
+			$lang = SettingsManager::getString('tmdb_language');
+			$rTMDB = $lang !== ''
+				? new \TMDB(SettingsManager::getString('tmdb_api_key'), $lang)
+				: new \TMDB(SettingsManager::getString('tmdb_api_key'));
 
-            $rPages = 100;
-            $rTMDBIDs = [];
+			$rPages = 100;
+			$rTMDBIDs = [];
 
-            // --- Movies
-            $db->query(
-                'SELECT `id`, `movie_properties` FROM `streams`
+			// --- Movies
+			$db->query(
+				'SELECT `id`, `movie_properties` FROM `streams`
                  WHERE `type` = 2 AND `movie_properties` IS NOT NULL AND LENGTH(`movie_properties`) > 0;'
-            );
-            foreach ($db->get_rows() as $rRow) {
-                $rProperties = json_decode($rRow['movie_properties'], true);
-                if (!empty($rProperties['tmdb_id'])) {
-                    $rTMDBIDs[$rProperties['tmdb_id']] = $rRow['id'];
-                }
-            }
+			);
+			foreach ($db->get_rows() as $rRow) {
+				$rProperties = json_decode($rRow['movie_properties'], true);
+				if (!empty($rProperties['tmdb_id'])) {
+					$rTMDBIDs[$rProperties['tmdb_id']] = $rRow['id'];
+				}
+			}
 
-            // --- Series
-            $db->query(
-                'SELECT `id`, `tmdb_id` FROM `streams_series`
+			// --- Series
+			$db->query(
+				'SELECT `id`, `tmdb_id` FROM `streams_series`
                  WHERE `tmdb_id` IS NOT NULL AND LENGTH(`tmdb_id`) > 0;'
-            );
-            foreach ($db->get_rows() as $rRow) {
-                $rTMDBIDs[$rRow['tmdb_id']] = $rRow['id'];
-            }
+			);
+			foreach ($db->get_rows() as $rRow) {
+				$rTMDBIDs[$rRow['tmdb_id']] = $rRow['id'];
+			}
 
-            // Collect & save popular
-            $rReturn = self::collectPopular($rTMDB, $rTMDBIDs, $rPages);
-            file_put_contents(CONTENT_PATH . 'tmdb_popular', igbinary_serialize($rReturn));
+			// Collect & save popular
+			$rReturn = self::collectPopular($rTMDB, $rTMDBIDs, $rPages);
+			file_put_contents(CONTENT_PATH . 'tmdb_popular', igbinary_serialize($rReturn));
 
-            // Similar movies & series
-            self::processSimilarMovies($rTMDB);
-            self::processSimilarSeries($rTMDB);
-        }
+			// Similar movies & series
+			self::processSimilarMovies($rTMDB);
+			self::processSimilarSeries($rTMDB);
+		}
 
-        // Popular live streams (always, regardless of \TMDB key)
-        self::collectPopularLive();
-    }
+		// Popular live streams (always, regardless of \TMDB key)
+		self::collectPopularLive();
+	}
 }
diff --git a/src/Infrastructure/Bootstrap/AdminScopeBootstrap.php b/src/Infrastructure/Bootstrap/AdminScopeBootstrap.php
index dee689c4..825fd192 100644
--- a/src/Infrastructure/Bootstrap/AdminScopeBootstrap.php
+++ b/src/Infrastructure/Bootstrap/AdminScopeBootstrap.php
@@ -26,7 +26,6 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class AdminScopeBootstrap implements ScopeBootstrap {
-
 	public function boot(): void {
 		$this->bootSession();
 		$this->bootFunctions();
diff --git a/src/Infrastructure/Bootstrap/PlayerScopeBootstrap.php b/src/Infrastructure/Bootstrap/PlayerScopeBootstrap.php
index 10ddc3c1..2e51d3ad 100644
--- a/src/Infrastructure/Bootstrap/PlayerScopeBootstrap.php
+++ b/src/Infrastructure/Bootstrap/PlayerScopeBootstrap.php
@@ -24,7 +24,6 @@ use XcVm\Domain\Vod\TMDbService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class PlayerScopeBootstrap implements ScopeBootstrap {
-
 	public function boot(): void {
 		$this->bootSession();
 		$this->bootFunctions();
diff --git a/src/Infrastructure/Bootstrap/ResellerScopeBootstrap.php b/src/Infrastructure/Bootstrap/ResellerScopeBootstrap.php
index 40cadff2..1366961f 100644
--- a/src/Infrastructure/Bootstrap/ResellerScopeBootstrap.php
+++ b/src/Infrastructure/Bootstrap/ResellerScopeBootstrap.php
@@ -25,7 +25,6 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class ResellerScopeBootstrap implements ScopeBootstrap {
-
 	public function boot(): void {
 		$this->bootSession();
 		$this->bootFunctions();
@@ -114,7 +113,7 @@ final class ResellerScopeBootstrap implements ScopeBootstrap {
 			$rPermissions['category_ids'] = $rPermissions['category_ids'] ?? [];
 			$rPermissions['series_ids'] = $rPermissions['series_ids'] ?? [];
 			$rPermissions['subresellers'] = $rPermissions['subresellers'] ?? [];
-			$rUserInfo['reports'] = array_map('intval', array_merge(array($rUserInfo['id']), $rPermissions['all_reports']));
+			$rUserInfo['reports'] = array_map('intval', array_merge([$rUserInfo['id']], $rPermissions['all_reports']));
 			$rIP = NetworkUtils::getUserIP();
 			$rIPMatch = ($rSettings['ip_subnet_match'] ? implode('.', array_slice(explode('.', $_SESSION['rip']), 0, -1)) == implode('.', array_slice(explode('.', $rIP), 0, -1)) : $_SESSION['rip'] == $rIP);
 
diff --git a/src/Infrastructure/Bootstrap/ScopeBootstrap.php b/src/Infrastructure/Bootstrap/ScopeBootstrap.php
index 0c2e0ed4..bc718449 100644
--- a/src/Infrastructure/Bootstrap/ScopeBootstrap.php
+++ b/src/Infrastructure/Bootstrap/ScopeBootstrap.php
@@ -22,7 +22,6 @@ namespace XcVm\Infrastructure\Bootstrap;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 interface ScopeBootstrap {
-
 	/**
 	 * Boot the request scope: session lifecycle, then framework + user context.
 	 *
diff --git a/src/Infrastructure/Bootstrap/ScopeBootstrapFactory.php b/src/Infrastructure/Bootstrap/ScopeBootstrapFactory.php
index 8736f9fe..239ccc74 100644
--- a/src/Infrastructure/Bootstrap/ScopeBootstrapFactory.php
+++ b/src/Infrastructure/Bootstrap/ScopeBootstrapFactory.php
@@ -15,7 +15,6 @@ namespace XcVm\Infrastructure\Bootstrap;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class ScopeBootstrapFactory {
-
 	/**
 	 * @param string $rScope 'admin' | 'reseller' | 'player' (others → admin).
 	 * @return ScopeBootstrap
diff --git a/src/Infrastructure/Bootstrap/StreamingRequestBootstrap.php b/src/Infrastructure/Bootstrap/StreamingRequestBootstrap.php
index 2b76a1de..c771f300 100644
--- a/src/Infrastructure/Bootstrap/StreamingRequestBootstrap.php
+++ b/src/Infrastructure/Bootstrap/StreamingRequestBootstrap.php
@@ -79,7 +79,7 @@ class StreamingRequestBootstrap {
 				unset($rAllowedDomains);
 			}
 
-			$rShowErrors = isset($rSettings['debug_show_errors']) ? (bool)$rSettings['debug_show_errors'] : false;
+			$rShowErrors = isset($rSettings['debug_show_errors']) ? (bool) $rSettings['debug_show_errors'] : false;
 		}
 
 		// ── 5. Logger ────────────────────────────────────────────
diff --git a/src/Infrastructure/Bootstrap/WebApiBootstrap.php b/src/Infrastructure/Bootstrap/WebApiBootstrap.php
index 09b92bfa..2e8e497d 100644
--- a/src/Infrastructure/Bootstrap/WebApiBootstrap.php
+++ b/src/Infrastructure/Bootstrap/WebApiBootstrap.php
@@ -20,7 +20,6 @@ use XcVm\Infrastructure\Database\DatabaseFactory;
  */
 
 class WebApiBootstrap {
-
 	/**
 	 * Инициализирует web API контекст.
 	 *
diff --git a/src/Infrastructure/Bootstrap/player_utility_functions.php b/src/Infrastructure/Bootstrap/player_utility_functions.php
index 51ce8b01..7fdbbe32 100644
--- a/src/Infrastructure/Bootstrap/player_utility_functions.php
+++ b/src/Infrastructure/Bootstrap/player_utility_functions.php
@@ -38,7 +38,7 @@ function sortArrayStreamName($a, $b) {
  * @param int $rID Stream id.
  * @return array|false The stream row, or false if not found.
  */
-function getStream($rID) {
+function getStream(int $rID) {
 	global $db;
 	$db->query('SELECT * FROM `streams` WHERE `id` = ?;', $rID);
 	if ($db->num_rows() == 1) {
@@ -60,10 +60,10 @@ function getStream($rID) {
  * @param mixed $rSubtitles Raw subtitle definition(s).
  * @return array Subtitle entries.
  */
-function getSubtitles($rStreamID, $rSubtitles) {
+function getSubtitles(int $rStreamID, mixed $rSubtitles) {
 	global $rUserInfo;
 	$rDomainName = DomainResolver::resolve(SERVER_ID, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443);
-	$rReturn = array();
+	$rReturn = [];
 
 	if (is_array($rSubtitles)) {
 		$i = 0;
@@ -72,7 +72,7 @@ function getSubtitles($rStreamID, $rSubtitles) {
 			$rLanguage = null;
 
 			foreach (array_keys($rSubtitle['tags']) as $rKey) {
-				if (!in_array(strtoupper(explode('-', $rKey)[0]), array('BPS', 'DURATION', 'NUMBER_OF_FRAMES', 'NUMBER_OF_BYTES'))) {
+				if (!in_array(strtoupper(explode('-', $rKey)[0]), ['BPS', 'DURATION', 'NUMBER_OF_FRAMES', 'NUMBER_OF_BYTES'])) {
 					if ($rKey == 'language') {
 						$rLanguage = $rSubtitle['tags'][$rKey];
 						break;
@@ -87,7 +87,7 @@ function getSubtitles($rStreamID, $rSubtitles) {
 				$rLanguage = 'Subtitle #' . ($i + 1);
 			}
 
-			$rReturn[] = array('label' => $rLanguage, 'file' => $rDomainName . 'subtitle/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rStreamID . '?sub_id=' . $i . '&webvtt=1', 'kind' => 'subtitles');
+			$rReturn[] = ['label' => $rLanguage, 'file' => $rDomainName . 'subtitle/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rStreamID . '?sub_id=' . $i . '&webvtt=1', 'kind' => 'subtitles'];
 			$i++;
 		}
 	}
@@ -102,21 +102,21 @@ function getSubtitles($rStreamID, $rSubtitles) {
  * @param string $rType       Content type ('movie', 'series', ...).
  * @return array Ordered categories.
  */
-function getOrderedCategories($rCategories, $rType = 'movie') {
-	$rReturn = array();
+function getOrderedCategories(array $rCategories, string $rType = 'movie') {
+	$rReturn = [];
 
 	foreach (CategoryService::getFromDatabase($rType) as $rCategory) {
 		if (in_array($rCategory['id'], $rCategories)) {
-			$rReturn[] = array('title' => $rCategory['category_name'], 'id' => $rCategory['id'], 'cat_order' => $rCategory['cat_order']);
+			$rReturn[] = ['title' => $rCategory['category_name'], 'id' => $rCategory['id'], 'cat_order' => $rCategory['cat_order']];
 		}
 	}
 	$rTitle = array_column($rReturn, 'cat_order');
 	array_multisort($rTitle, SORT_ASC, $rReturn);
 
 	if ($rType != 'live') {
-		array_unshift($rReturn, array('id' => '0', 'cat_order' => 0, 'title' => 'All Genres'));
+		array_unshift($rReturn, ['id' => '0', 'cat_order' => 0, 'title' => 'All Genres']);
 	} else {
-		array_unshift($rReturn, array('id' => '0', 'cat_order' => 0, 'title' => 'Most Popular'));
+		array_unshift($rReturn, ['id' => '0', 'cat_order' => 0, 'title' => 'Most Popular']);
 	}
 
 	return $rReturn;
@@ -137,11 +137,11 @@ function getOrderedCategories($rCategories, $rType = 'movie') {
  * @param bool        $rIDs        Return only ids instead of full rows.
  * @return array Streams (or ids) visible to the user.
  */
-function getUserStreams($rUserInfo, $rTypes = array(), $rCategoryID = null, $rFav = null, $rOrderBy = null, $rSearchBy = null, $rPicking = array(), $rStart = 0, $rLimit = 10, $rIDs = false) {
+function getUserStreams(array $rUserInfo, array $rTypes = [], ?int $rCategoryID = null, ?bool $rFav = null, ?string $rOrderBy = null, ?string $rSearchBy = null, array $rPicking = [], int $rStart = 0, int $rLimit = 10, bool $rIDs = false) {
 	global $db;
 	$rPicking = $rPicking ?? [];
 	$rAdded = false;
-	$rChannels = array();
+	$rChannels = [];
 
 	foreach ($rTypes as $rType) {
 		switch ($rType) {
@@ -167,9 +167,9 @@ function getUserStreams($rUserInfo, $rTypes = array(), $rCategoryID = null, $rFa
 				break;
 		}
 	}
-	$rStreams = array('count' => 0, 'streams' => array());
+	$rStreams = ['count' => 0, 'streams' => []];
 	$rKey = $rStart + 1;
-	$rWhereV = $rWhere = array();
+	$rWhereV = $rWhere = [];
 
 	if (SettingsManager::getBool('player_hide_incompatible')) {
 		$rWhere[] = '(SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1';
@@ -207,7 +207,7 @@ function getUserStreams($rUserInfo, $rTypes = array(), $rCategoryID = null, $rFa
 	$rChannels = StreamSorter::sortChannels($rChannels);
 
 	if (!empty($rFav)) {
-		$favoriteChannelIds = array();
+		$favoriteChannelIds = [];
 
 		foreach ($rTypes as $rType) {
 			foreach ($rUserInfo['fav_channels'][$rType] as $rStreamID) {
@@ -297,7 +297,7 @@ function getUserStreams($rUserInfo, $rTypes = array(), $rCategoryID = null, $rFa
 		foreach ($rRows as $rStream) {
 			$rStream['number'] = $rKey;
 
-			$rStreamCategories = json_decode($rStream['category_id'], true) ?: array();
+			$rStreamCategories = json_decode($rStream['category_id'], true) ?: [];
 			if (in_array($rCategoryID, $rStreamCategories)) {
 				$rStream['category_id'] = $rCategoryID;
 			} else {
@@ -329,13 +329,13 @@ function getUserStreams($rUserInfo, $rTypes = array(), $rCategoryID = null, $rFa
  * @param mixed       $additionalOptions Extra query options.
  * @return array Series visible to the user.
  */
-function getUserSeries($rUserInfo, $rCategoryID = null, $rFav = null, $rOrderBy = null, $rSearchBy = null, $rPicking = array(), $rStart = 0, $rLimit = 10, $additionalOptions = null) {
+function getUserSeries(array $rUserInfo, ?int $rCategoryID = null, ?bool $rFav = null, ?string $rOrderBy = null, ?string $rSearchBy = null, array $rPicking = [], int $rStart = 0, int $rLimit = 10, mixed $additionalOptions = null) {
 	global $db;
 	$rPicking = $rPicking ?? [];
 	$rSeries = $rUserInfo['series_ids'];
-	$rStreams = array('count' => 0, 'streams' => array());
+	$rStreams = ['count' => 0, 'streams' => []];
 	$rKey = $rStart + 1;
-	$rWhereV = $rWhere = array();
+	$rWhereV = $rWhere = [];
 
 	if (SettingsManager::getBool('player_hide_incompatible')) {
 		$rWhere[] = '(SELECT MAX(`compatible`) FROM `streams_servers` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams_servers`.`stream_id` WHERE `streams_episodes`.`series_id` = `streams_series`.`id`) = 1';
@@ -419,7 +419,7 @@ function getUserSeries($rUserInfo, $rCategoryID = null, $rFav = null, $rOrderBy
 		foreach ($rRows as $rStream) {
 			$rStream['number'] = $rKey;
 
-			$rStreamCategories = json_decode($rStream['category_id'], true) ?: array();
+			$rStreamCategories = json_decode($rStream['category_id'], true) ?: [];
 			if (in_array($rCategoryID, $rStreamCategories)) {
 				$rStream['category_id'] = $rCategoryID;
 			} else {
@@ -442,9 +442,9 @@ function getUserSeries($rUserInfo, $rCategoryID = null, $rFav = null, $rOrderBy
  * @param string[] $rTypes Content-type names.
  * @return int[] Corresponding numeric type ids.
  */
-function mapContentTypesToNumbers($rTypes) {
-	$rReturn = array();
-	$rTypeInt = array('live' => 1, 'movie' => 2, 'created_live' => 3, 'radio_streams' => 4, 'series' => 5);
+function mapContentTypesToNumbers(array $rTypes) {
+	$rReturn = [];
+	$rTypeInt = ['live' => 1, 'movie' => 2, 'created_live' => 3, 'radio_streams' => 4, 'series' => 5];
 
 	foreach ($rTypes as $rType) {
 		$rReturn[] = $rTypeInt[$rType];
diff --git a/src/Infrastructure/Cache/CacheReader.php b/src/Infrastructure/Cache/CacheReader.php
index 8e1afcff..05812175 100644
--- a/src/Infrastructure/Cache/CacheReader.php
+++ b/src/Infrastructure/Cache/CacheReader.php
@@ -19,7 +19,7 @@ class CacheReader {
 	 * @param string $rCache Имя кэш-файла (без пути)
 	 * @return mixed|null
 	 */
-	public static function get($rCache) {
+	public static function get(string $rCache) {
 		$rPath = CACHE_TMP_PATH . $rCache;
 		if (!is_file($rPath)) {
 			return null;
@@ -34,7 +34,7 @@ class CacheReader {
 	 * @param array $rSettings Настройки приложения
 	 * @return bool
 	 */
-	public static function isReady($rSettings) {
+	public static function isReady(array $rSettings) {
 		if (!$rSettings['enable_cache']) {
 			return false;
 		}
diff --git a/src/Infrastructure/Database/DatabaseAware.php b/src/Infrastructure/Database/DatabaseAware.php
index 292429f4..d8c75c5e 100644
--- a/src/Infrastructure/Database/DatabaseAware.php
+++ b/src/Infrastructure/Database/DatabaseAware.php
@@ -48,7 +48,7 @@ trait DatabaseAware {
 	 * @param DatabaseHandler $db Database handler.
 	 * @return void
 	 */
-	public static function setDb($db): void {
+	public static function setDb(DatabaseHandler $db): void {
 		self::$db = $db;
 	}
 
diff --git a/src/Infrastructure/Redis/RedisManager.php b/src/Infrastructure/Redis/RedisManager.php
index 262e057f..ea0175f0 100644
--- a/src/Infrastructure/Redis/RedisManager.php
+++ b/src/Infrastructure/Redis/RedisManager.php
@@ -21,6 +21,7 @@ use XcVm\Infrastructure\Signal\SignalQueue;
 class RedisManager {
 	/** @var \Redis|null Singleton instance */
 	private static $instance = null;
+
 	/** @var int Last ping health-check timestamp */
 	private static $lastPingCheck = 0;
 
@@ -99,8 +100,6 @@ class RedisManager {
 		return is_object(self::$instance);
 	}
 
-
-
 	/**
 	 * @deprecated Signals now live in {@see SignalQueue}.
 	 * Kept as a thin back-compat alias; call SignalQueue::push() directly.
@@ -109,7 +108,7 @@ class RedisManager {
 	 * @param mixed  $rData Signal payload.
 	 * @return void
 	 */
-	public static function setSignal(string $rKey, $rData): void {
+	public static function setSignal(string $rKey, mixed $rData): void {
 		SignalQueue::push($rKey, $rData);
 	}
 
diff --git a/src/Infrastructure/ResellerApiDispatcher.php b/src/Infrastructure/ResellerApiDispatcher.php
index 13235392..c74edffe 100644
--- a/src/Infrastructure/ResellerApiDispatcher.php
+++ b/src/Infrastructure/ResellerApiDispatcher.php
@@ -133,10 +133,10 @@ class ResellerApiDispatcher {
 	 */
 	private static function handleDashboard(array $rUserInfo, array $rPermissions): void {
 		$db = self::db();
-		$rReturn = array('open_connections' => 0, 'online_users' => 0, 'active_accounts' => 0, 'credits' => 0, 'credits_assigned' => 0);
+		$rReturn = ['open_connections' => 0, 'online_users' => 0, 'active_accounts' => 0, 'credits' => 0, 'credits_assigned' => 0];
 
 		if (SettingsManager::getBool('redis_handler')) {
-			$rReports = array();
+			$rReports = [];
 			$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
 			foreach ($db->get_rows() as $rRow) {
 				$rReports[] = $rRow['id'];
@@ -180,7 +180,7 @@ class ResellerApiDispatcher {
 
 			if ($rSub == 'purge') {
 				if (SettingsManager::getBool('redis_handler')) {
-					$rReports = array();
+					$rReports = [];
 					$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
 					foreach ($db->get_rows() as $rRow) {
 						$rReports[] = $rRow['id'];
@@ -197,11 +197,11 @@ class ResellerApiDispatcher {
 						ConnectionTracker::closeConnection($rRow);
 					}
 				}
-				echo json_encode(array('result' => true));
+				echo json_encode(['result' => true]);
 				exit();
 			}
 
-			echo json_encode(array('result' => false));
+			echo json_encode(['result' => false]);
 			exit();
 		}
 		exit();
@@ -225,34 +225,34 @@ class ResellerApiDispatcher {
 				if ($rSub == 'delete') {
 					LineService::deleteLineById($rUserID);
 					$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'line', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'delete', RequestManager::get('user_id'), 0, $rUserInfo['credits'], time(), json_encode($rLine));
-					echo json_encode(array('result' => true));
+					echo json_encode(['result' => true]);
 					exit();
 				}
 
 				if ($rSub == 'enable') {
 					$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rUserID);
 					$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'line', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'enable', RequestManager::get('user_id'), 0, $rUserInfo['credits'], time(), json_encode($rLine));
-					echo json_encode(array('result' => true));
+					echo json_encode(['result' => true]);
 					exit();
 				}
 
 				if ($rSub == 'disable') {
 					$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rUserID);
 					$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'line', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'disable', RequestManager::get('user_id'), 0, $rUserInfo['credits'], time(), json_encode($rLine));
-					echo json_encode(array('result' => true));
+					echo json_encode(['result' => true]);
 					exit();
 				}
 
 				if ($rSub == 'reset_isp') {
 					$db->query("UPDATE `lines` SET `isp_desc` = '', `as_number` = NULL WHERE `id` = ?;", $rUserID);
-					echo json_encode(array('result' => true));
+					echo json_encode(['result' => true]);
 					exit();
 				}
 
 				if ($rSub == 'kill_line') {
 					if ($rPermissions['reseller_client_connection_logs']) {
 						if (SettingsManager::getBool('redis_handler')) {
-							foreach (ConnectionTracker::getUserConnections(array($rUserID), false)[$rUserID] as $rConnection) {
+							foreach (ConnectionTracker::getUserConnections([$rUserID], false)[$rUserID] as $rConnection) {
 								ConnectionTracker::closeConnection($rConnection);
 							}
 						} else {
@@ -263,17 +263,17 @@ class ResellerApiDispatcher {
 								}
 							}
 						}
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 					exit();
 				}
 
-				echo json_encode(array('result' => false));
+				echo json_encode(['result' => false]);
 				exit();
 			}
 
-			echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+			echo json_encode(['result' => false, 'error' => 'No permissions.']);
 			exit();
 		}
 		exit();
@@ -298,10 +298,10 @@ class ResellerApiDispatcher {
 					if ($rActivityInfo) {
 						if (Authorization::check('line', $rActivityInfo['user_id'])) {
 							ConnectionTracker::closeConnection($rActivityInfo);
-							echo json_encode(array('result' => true));
+							echo json_encode(['result' => true]);
 							exit();
 						}
-						echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+						echo json_encode(['result' => false, 'error' => 'No permissions.']);
 						exit();
 					}
 				} else {
@@ -310,16 +310,16 @@ class ResellerApiDispatcher {
 						$rRow = $db->get_row();
 						if (Authorization::check('line', $rRow['user_id'])) {
 							ConnectionTracker::closeConnection($rRow);
-							echo json_encode(array('result' => true));
+							echo json_encode(['result' => true]);
 							exit();
 						}
-						echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+						echo json_encode(['result' => false, 'error' => 'No permissions.']);
 						exit();
 					}
 				}
 			}
 
-			echo json_encode(array('result' => false));
+			echo json_encode(['result' => false]);
 			exit();
 		}
 		exit();
@@ -347,16 +347,16 @@ class ResellerApiDispatcher {
 						$db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rCredits, $rUser['id']);
 						$db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rUser['id'], $rUserInfo['id'], RequestManager::get('credits'), time(), RequestManager::get('reason'));
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'user', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'adjust_credits', RequestManager::get('id'), intval(RequestManager::get('credits')), $rOwnerCredits, time(), json_encode($rUser));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 				}
 
-				echo json_encode(array('result' => false));
+				echo json_encode(['result' => false]);
 				exit();
 			}
 
-			echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+			echo json_encode(['result' => false, 'error' => 'No permissions.']);
 			exit();
 		}
 		exit();
@@ -383,7 +383,7 @@ class ResellerApiDispatcher {
 						UserService::deleteRegisteredUser(RequestManager::get('user_id'), false, false, $rUserInfo['id']);
 						$db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rUserInfo['id'], $rUserInfo['id'], intval($rUser['credits']), time(), 'Deleted user: ' . $rUser['username']);
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'user', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'delete', RequestManager::get('user_id'), intval($rUser['credits']), $rOwnerCredits, time(), json_encode($rUser));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 					exit();
@@ -392,22 +392,22 @@ class ResellerApiDispatcher {
 				if ($rSub == 'enable') {
 					$db->query('UPDATE `users` SET `status` = 1 WHERE `id` = ?;', RequestManager::get('user_id'));
 					$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'user', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'enable', RequestManager::get('user_id'), 0, $rUserInfo['credits'], time(), json_encode($rUser));
-					echo json_encode(array('result' => true));
+					echo json_encode(['result' => true]);
 					exit();
 				}
 
 				if ($rSub == 'disable') {
 					$db->query('UPDATE `users` SET `status` = 0 WHERE `id` = ?;', RequestManager::get('user_id'));
 					$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'user', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'disable', RequestManager::get('user_id'), 0, $rUserInfo['credits'], time(), json_encode($rUser));
-					echo json_encode(array('result' => true));
+					echo json_encode(['result' => true]);
 					exit();
 				}
 
-				echo json_encode(array('result' => false));
+				echo json_encode(['result' => false]);
 				exit();
 			}
 
-			echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+			echo json_encode(['result' => false, 'error' => 'No permissions.']);
 			exit();
 		}
 		exit();
@@ -430,25 +430,25 @@ class ResellerApiDispatcher {
 
 				if ($rSub == 'close') {
 					$db->query('UPDATE `tickets` SET `status` = 0 WHERE `id` = ?;', RequestManager::get('ticket_id'));
-					echo json_encode(array('result' => true));
+					echo json_encode(['result' => true]);
 					exit();
 				}
 
 				if ($rSub == 'reopen') {
 					if ($rTicket['member_id'] != $rUserInfo['id']) {
 						$db->query('UPDATE `tickets` SET `status` = 1 WHERE `id` = ?;', RequestManager::get('ticket_id'));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 					exit();
 				}
 			} else {
-				echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+				echo json_encode(['result' => false, 'error' => 'No permissions.']);
 				exit();
 			}
 		}
 
-		echo json_encode(array('result' => false));
+		echo json_encode(['result' => false]);
 		exit();
 	}
 
@@ -470,41 +470,41 @@ class ResellerApiDispatcher {
 					if ($rSub == 'delete') {
 						MagService::deleteDevice(RequestManager::get('mag_id'));
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'mag', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'delete', RequestManager::get('mag_id'), 0, $rUserInfo['credits'], time(), json_encode($rMagDetails));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 
 					if ($rSub == 'enable') {
 						$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rMagDetails['user_id']);
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'mag', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'enable', RequestManager::get('mag_id'), 0, $rUserInfo['credits'], time(), json_encode($rMagDetails));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 
 					if ($rSub == 'disable') {
 						$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rMagDetails['user_id']);
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'mag', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'disable', RequestManager::get('mag_id'), 0, $rUserInfo['credits'], time(), json_encode($rMagDetails));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 
 					if ($rSub == 'convert') {
 						MagService::deleteDevice(RequestManager::get('mag_id'), false, false, true);
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'line', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'convert', $rMagDetails['user']['id'], 0, $rUserInfo['credits'], time(), json_encode($rMagDetails['user']));
-						echo json_encode(array('result' => true, 'line_id' => $rMagDetails['user']['id']));
+						echo json_encode(['result' => true, 'line_id' => $rMagDetails['user']['id']]);
 						exit();
 					}
 
 					if ($rSub == 'reset_isp') {
 						$db->query("UPDATE `lines` SET `isp_desc` = '', `as_number` = NULL WHERE `id` = ?;", $rMagDetails['user']['id']);
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 
 					if ($rSub == 'kill_line') {
 						if ($rPermissions['reseller_client_connection_logs']) {
 							if (SettingsManager::getBool('redis_handler')) {
-								foreach (ConnectionTracker::getUserConnections(array($rMagDetails['user_id']), false)[$rMagDetails['user_id']] as $rConnection) {
+								foreach (ConnectionTracker::getUserConnections([$rMagDetails['user_id']], false)[$rMagDetails['user_id']] as $rConnection) {
 									ConnectionTracker::closeConnection($rConnection);
 								}
 							} else {
@@ -515,18 +515,18 @@ class ResellerApiDispatcher {
 									}
 								}
 							}
-							echo json_encode(array('result' => true));
+							echo json_encode(['result' => true]);
 							exit();
 						}
 						exit();
 					}
 				} else {
-					echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+					echo json_encode(['result' => false, 'error' => 'No permissions.']);
 					exit();
 				}
 			}
 
-			echo json_encode(array('result' => false));
+			echo json_encode(['result' => false]);
 			exit();
 		}
 		exit();
@@ -550,41 +550,41 @@ class ResellerApiDispatcher {
 					if ($rSub == 'delete') {
 						EnigmaService::deleteDevice(RequestManager::get('e2_id'));
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'enigma', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'delete', RequestManager::get('e2_id'), 0, $rUserInfo['credits'], time(), json_encode($rE2Details));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 
 					if ($rSub == 'enable') {
 						$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rE2Details['user_id']);
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'enigma', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'enable', RequestManager::get('e2_id'), 0, $rUserInfo['credits'], time(), json_encode($rE2Details));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 
 					if ($rSub == 'disable') {
 						$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rE2Details['user_id']);
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'enigma', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'disable', RequestManager::get('e2_id'), 0, $rUserInfo['credits'], time(), json_encode($rE2Details));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 
 					if ($rSub == 'convert') {
 						EnigmaService::deleteDevice(RequestManager::get('e2_id'), false, false, true);
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'line', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'convert', $rE2Details['user']['id'], 0, $rUserInfo['credits'], time(), json_encode($rE2Details['user']));
-						echo json_encode(array('result' => true, 'line_id' => $rE2Details['user']['id']));
+						echo json_encode(['result' => true, 'line_id' => $rE2Details['user']['id']]);
 						exit();
 					}
 
 					if ($rSub == 'reset_isp') {
 						$db->query("UPDATE `lines` SET `isp_desc` = '', `as_number` = NULL WHERE `id` = ?;", $rE2Details['user']['id']);
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 
 					if ($rSub == 'kill_line') {
 						if ($rPermissions['reseller_client_connection_logs']) {
 							if (SettingsManager::getBool('redis_handler')) {
-								foreach (ConnectionTracker::getUserConnections(array($rE2Details['user_id']), false)[$rE2Details['user_id']] as $rConnection) {
+								foreach (ConnectionTracker::getUserConnections([$rE2Details['user_id']], false)[$rE2Details['user_id']] as $rConnection) {
 									ConnectionTracker::closeConnection($rConnection);
 								}
 							} else {
@@ -595,18 +595,18 @@ class ResellerApiDispatcher {
 									}
 								}
 							}
-							echo json_encode(array('result' => true));
+							echo json_encode(['result' => true]);
 							exit();
 						}
 						exit();
 					}
 				} else {
-					echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+					echo json_encode(['result' => false, 'error' => 'No permissions.']);
 					exit();
 				}
 			}
 
-			echo json_encode(array('result' => false));
+			echo json_encode(['result' => false]);
 			exit();
 		}
 		exit();
@@ -621,7 +621,7 @@ class ResellerApiDispatcher {
 	 */
 	private static function handleGetPackage(array $rUserInfo, array $rPermissions): void {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$rOverride = json_decode($rUserInfo['override_packages'], true);
 		$db->query('SELECT `id`, `bouquets`, `official_credits` AS `cost_credits`, `official_duration`, `official_duration_in`, `max_connections`, `check_compatible`, `is_isplock` FROM `users_packages` WHERE `id` = ?;', RequestManager::get('package_id'));
 
@@ -655,13 +655,13 @@ class ResellerApiDispatcher {
 				$db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rBouquet);
 				if ($db->num_rows() == 1) {
 					$rRow = $db->get_row();
-					$rReturn[] = array('id' => $rRow['id'], 'bouquet_name' => str_replace("'", "\\'", $rRow['bouquet_name']), 'bouquet_channels' => json_decode($rRow['bouquet_channels'], true), 'bouquet_radios' => json_decode($rRow['bouquet_radios'], true), 'bouquet_movies' => json_decode($rRow['bouquet_movies'], true), 'bouquet_series' => json_decode($rRow['bouquet_series'], true));
+					$rReturn[] = ['id' => $rRow['id'], 'bouquet_name' => str_replace("'", "\\'", $rRow['bouquet_name']), 'bouquet_channels' => json_decode($rRow['bouquet_channels'], true), 'bouquet_radios' => json_decode($rRow['bouquet_radios'], true), 'bouquet_movies' => json_decode($rRow['bouquet_movies'], true), 'bouquet_series' => json_decode($rRow['bouquet_series'], true)];
 				}
 			}
 			$rData['duration'] = $rData['official_duration'] . ' ' . $rData['official_duration_in'];
-			echo json_encode(array('result' => true, 'bouquets' => $rReturn, 'data' => $rData));
+			echo json_encode(['result' => true, 'bouquets' => $rReturn, 'data' => $rData]);
 		} else {
-			echo json_encode(array('result' => false));
+			echo json_encode(['result' => false]);
 		}
 		exit();
 	}
@@ -675,7 +675,7 @@ class ResellerApiDispatcher {
 	 */
 	private static function handleGetPackageTrial(array $rUserInfo, array $rPermissions): void {
 		$db = self::db();
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT `bouquets`, `trial_credits` AS `cost_credits`, `trial_duration`, `trial_duration_in`, `max_connections`, `is_isplock` FROM `users_packages` WHERE `id` = ?;', RequestManager::get('package_id'));
 
 		if ($db->num_rows() == 1) {
@@ -686,14 +686,14 @@ class ResellerApiDispatcher {
 				$db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rBouquet);
 				if ($db->num_rows() == 1) {
 					$rRow = $db->get_row();
-					$rReturn[] = array('id' => $rRow['id'], 'bouquet_name' => str_replace("'", "\\'", $rRow['bouquet_name']), 'bouquet_channels' => json_decode($rRow['bouquet_channels'], true), 'bouquet_radios' => json_decode($rRow['bouquet_radios'], true), 'bouquet_movies' => json_decode($rRow['bouquet_movies'], true), 'bouquet_series' => json_decode($rRow['bouquet_series'], true));
+					$rReturn[] = ['id' => $rRow['id'], 'bouquet_name' => str_replace("'", "\\'", $rRow['bouquet_name']), 'bouquet_channels' => json_decode($rRow['bouquet_channels'], true), 'bouquet_radios' => json_decode($rRow['bouquet_radios'], true), 'bouquet_movies' => json_decode($rRow['bouquet_movies'], true), 'bouquet_series' => json_decode($rRow['bouquet_series'], true)];
 				}
 			}
 			$rData['duration'] = $rData['trial_duration'] . ' ' . $rData['trial_duration_in'];
 			$rData['compatible'] = true;
-			echo json_encode(array('result' => true, 'bouquets' => $rReturn, 'data' => $rData));
+			echo json_encode(['result' => true, 'bouquets' => $rReturn, 'data' => $rData]);
 		} else {
-			echo json_encode(array('result' => false));
+			echo json_encode(['result' => false]);
 		}
 		exit();
 	}
@@ -707,10 +707,10 @@ class ResellerApiDispatcher {
 	 */
 	private static function handleHeaderStats(array $rUserInfo, array $rPermissions): void {
 		$db = self::db();
-		$rReturn = array('total_connections' => 0, 'total_users' => 0);
+		$rReturn = ['total_connections' => 0, 'total_users' => 0];
 
 		if (SettingsManager::getBool('redis_handler')) {
-			$rReports = array();
+			$rReports = [];
 			$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
 			foreach ($db->get_rows() as $rRow) {
 				$rReports[] = $rRow['id'];
@@ -743,10 +743,10 @@ class ResellerApiDispatcher {
 	 */
 	private static function handleStats(array $rUserInfo, array $rPermissions): void {
 		$db = self::db();
-		$rReturn = array('open_connections' => 0, 'online_users' => 0, 'total_lines' => 0, 'total_users' => 0, 'owner_credits' => 0, 'user_credits' => 0, 'total_credits' => 0);
+		$rReturn = ['open_connections' => 0, 'online_users' => 0, 'total_lines' => 0, 'total_users' => 0, 'owner_credits' => 0, 'user_credits' => 0, 'total_credits' => 0];
 
 		if (SettingsManager::getBool('redis_handler')) {
-			$rReports = array();
+			$rReports = [];
 			$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
 			foreach ($db->get_rows() as $rRow) {
 				$rReports[] = $rRow['id'];
@@ -787,7 +787,7 @@ class ResellerApiDispatcher {
 	 */
 	private static function handleUserList(array $rUserInfo, array $rPermissions): void {
 		$db = self::db();
-		$rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
 
 		if (RequestManager::has('search')) {
 			$rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
@@ -798,7 +798,7 @@ class ResellerApiDispatcher {
 
 			if ($db->num_rows() > 0) {
 				foreach ($db->get_rows() as $rRow) {
-					$rReturn['items'][] = array('id' => $rRow['id'], 'text' => $rRow['username']);
+					$rReturn['items'][] = ['id' => $rRow['id'], 'text' => $rRow['username']];
 				}
 			}
 		}
@@ -824,13 +824,13 @@ class ResellerApiDispatcher {
 				if (Authorization::check('line', $rMag['user_id'])) {
 					if ($rData['type'] == 'send_msg') {
 						$rData['need_confirm'] = 1;
-					} else if ($rData['type'] == 'play_channel') {
+					} elseif ($rData['type'] == 'play_channel') {
 						$rData['need_confirm'] = 0;
 						$rData['reboot_portal'] = 0;
 						$rData['message'] = intval($rData['channel']);
-					} else if ($rData['type'] == 'reset_stb_lock') {
+					} elseif ($rData['type'] == 'reset_stb_lock') {
 						MagService::resetSTB($rData['id']);
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					} else {
 						$rData['need_confirm'] = 0;
@@ -840,16 +840,16 @@ class ResellerApiDispatcher {
 
 					if ($db->query('INSERT INTO `mag_events`(`status`, `mag_device_id`, `event`, `need_confirm`, `msg`, `reboot_after_ok`, `send_time`) VALUES (0, ?, ?, ?, ?, ?, ?);', $rData['id'], $rData['type'], $rData['need_confirm'], $rData['message'], $rData['reboot_portal'], time())) {
 						$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'mag', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'send_event', $rMag['mag_id'], 0, $rUserInfo['credits'], time(), json_encode($rMag));
-						echo json_encode(array('result' => true));
+						echo json_encode(['result' => true]);
 						exit();
 					}
 				} else {
-					echo json_encode(array('result' => false, 'error' => 'No permissions.'));
+					echo json_encode(['result' => false, 'error' => 'No permissions.']);
 					exit();
 				}
 			}
 
-			echo json_encode(array('result' => false));
+			echo json_encode(['result' => false]);
 			exit();
 		}
 		exit();
@@ -865,7 +865,7 @@ class ResellerApiDispatcher {
 	private static function handleStreamList(array $rUserInfo, array $rPermissions): void {
 		$db = self::db();
 		if ($rPermissions['create_mag'] || $rPermissions['can_view_vod'] || $rPermissions['reseller_client_connection_logs']) {
-			$rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
+			$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
 
 			if (RequestManager::has('search')) {
 				$rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
@@ -876,7 +876,7 @@ class ResellerApiDispatcher {
 
 				if ($db->num_rows() > 0) {
 					foreach ($db->get_rows() as $rRow) {
-						$rReturn['items'][] = array('id' => $rRow['id'], 'text' => $rRow['stream_display_name']);
+						$rReturn['items'][] = ['id' => $rRow['id'], 'text' => $rRow['stream_display_name']];
 					}
 				}
 			}
@@ -922,7 +922,7 @@ class ResellerApiDispatcher {
 			}
 		}
 
-		echo json_encode(array('result' => true, 'data' => $rResponse));
+		echo json_encode(['result' => true, 'data' => $rResponse]);
 		exit();
 	}
 
@@ -939,7 +939,7 @@ class ResellerApiDispatcher {
 			if (count($rPermissions['stream_ids']) != 0) {
 				$rTimezone = (RequestManager::get('timezone') ?: 'Europe/London');
 				date_default_timezone_set($rTimezone);
-				$rReturn = array('Channels' => array());
+				$rReturn = ['Channels' => []];
 				$rChannels = array_map('intval', explode(',', RequestManager::get('channels')));
 
 				if (count($rChannels) != 0) {
@@ -949,9 +949,9 @@ class ResellerApiDispatcher {
 					$rPerUnit = floatval(100 / ($rHours * 60));
 					$rChannelsSort = $rChannels;
 					sort($rChannelsSort);
-					$rListings = array();
+					$rListings = [];
 
-					$rArchiveInfo = array();
+					$rArchiveInfo = [];
 					$db->query('SELECT `id`, `tv_archive_server_id`, `tv_archive_duration` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ');');
 					if ($db->num_rows() > 0) {
 						foreach ($db->get_rows() as $rRow) {
@@ -973,7 +973,7 @@ class ResellerApiDispatcher {
 							if (isset($rArchiveInfo[$rChannelID])) {
 								if (0 < $rArchiveInfo[$rChannelID]['tv_archive_server_id'] && 0 < $rArchiveInfo[$rChannelID]['tv_archive_duration']) {
 									if (!(time() - $rArchiveInfo[$rChannelID]['tv_archive_duration'] * 86400 > $rEPGItem['start'])) {
-										$rArchive = array($rEPGItem['start'], intval(($rEPGItem['end'] - $rEPGItem['start']) / 60));
+										$rArchive = [$rEPGItem['start'], intval(($rEPGItem['end'] - $rEPGItem['start']) / 60)];
 									}
 								}
 							}
@@ -985,11 +985,11 @@ class ResellerApiDispatcher {
 								$rRelativeSize -= $rFullSize - 100;
 							}
 
-							$rListings[$rChannelID][] = array('ListingId' => $rEPGItem['id'], 'ChannelId' => $rChannelID, 'Title' => $rEPGItem['title'], 'RelativeSize' => $rRelativeSize, 'StartTime' => date('h:iA', $rCapStart), 'EndTime' => date('h:iA', $rCapEnd), 'Start' => $rEPGItem['start'], 'End' => $rEPGItem['end'], 'Specialisation' => 'tv', 'Archive' => $rArchive);
+							$rListings[$rChannelID][] = ['ListingId' => $rEPGItem['id'], 'ChannelId' => $rChannelID, 'Title' => $rEPGItem['title'], 'RelativeSize' => $rRelativeSize, 'StartTime' => date('h:iA', $rCapStart), 'EndTime' => date('h:iA', $rCapEnd), 'Start' => $rEPGItem['start'], 'End' => $rEPGItem['end'], 'Specialisation' => 'tv', 'Archive' => $rArchive];
 						}
 					}
 
-					$rDefaultEPG = array('ChannelId' => null, 'Title' => 'No Programme Information...', 'RelativeSize' => 100, 'StartTime' => 'Not Available', 'EndTime' => '', 'Specialisation' => 'tv', 'Archive' => null);
+					$rDefaultEPG = ['ChannelId' => null, 'Title' => 'No Programme Information...', 'RelativeSize' => 100, 'StartTime' => 'Not Available', 'EndTime' => '', 'Specialisation' => 'tv', 'Archive' => null];
 					$db->query('SELECT `id`, `stream_icon`, `stream_display_name`, `tv_archive_duration`, `tv_archive_server_id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ') ORDER BY FIELD(`id`, ' . implode(',', $rChannels) . ') ASC;');
 
 					foreach ($db->get_rows() as $rStream) {
@@ -1014,7 +1014,7 @@ class ResellerApiDispatcher {
 							$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
 						}
 
-						$rReturn['Channels'][] = array('Id' => $rStream['id'], 'DisplayName' => $rStream['stream_display_name'], 'CategoryName' => $rCategory, 'Archive' => $rArchive, 'Image' => (ImageUtils::validateURL($rStream['stream_icon']) ?: ''), 'TvListings' => ($rListings[$rStream['id']] ?? array($rDefaultArray)));
+						$rReturn['Channels'][] = ['Id' => $rStream['id'], 'DisplayName' => $rStream['stream_display_name'], 'CategoryName' => $rCategory, 'Archive' => $rArchive, 'Image' => (ImageUtils::validateURL($rStream['stream_icon']) ?: ''), 'TvListings' => ($rListings[$rStream['id']] ?? [$rDefaultArray])];
 					}
 					echo json_encode($rReturn);
 					exit();
@@ -1060,12 +1060,12 @@ class ResellerApiDispatcher {
 					}
 
 					$rRow['date'] = date('H:i', $rRow['start']) . ' - ' . date('H:i', $rRow['end']);
-					echo json_encode(array('result' => true, 'data' => $rRow, 'available' => $rAvailable, 'archive' => $rArchive));
+					echo json_encode(['result' => true, 'data' => $rRow, 'available' => $rAvailable, 'archive' => $rArchive]);
 					exit();
 				}
 			}
 
-			echo json_encode(array('result' => false));
+			echo json_encode(['result' => false]);
 			exit();
 		}
 		exit();
@@ -1082,7 +1082,7 @@ class ResellerApiDispatcher {
 			exit();
 		}
 
-		$allowedReports = (array)($rUserInfo['reports'] ?? [$rUserInfo['id']]);
+		$allowedReports = (array) ($rUserInfo['reports'] ?? [$rUserInfo['id']]);
 		$code = $db->fetchOne(
 			"SELECT `activation_codes`.*, `lines`.`username` as `sub_username`, `lines`.`password` as `sub_password`,
 			        `lines`.`exp_date` as `sub_exp_date`, `lines`.`max_connections` as `line_max_conn`
@@ -1097,8 +1097,8 @@ class ResellerApiDispatcher {
 			exit();
 		}
 
-		$package = PackageService::getById((int)$code['package_id']);
-		$portalUrl = self::resolveBaseUrl((string)($code['dns_base'] ?? ''));
+		$package = PackageService::getById((int) $code['package_id']);
+		$portalUrl = self::resolveBaseUrl((string) ($code['dns_base'] ?? ''));
 		$portalParsed = parse_url($portalUrl);
 
 		$m3uHls = "{$portalUrl}/get.php?username={$code['sub_username']}&password={$code['sub_password']}&type=m3u_plus&output=hls";
@@ -1117,28 +1117,28 @@ class ResellerApiDispatcher {
 		}
 
 		$subscriberPortalUrl = $portalCode ? "{$portalUrl}/{$portalCode}/" : "{$portalUrl}/portal";
-		$directActivateUrl   = "{$subscriberPortalUrl}?code=" . urlencode((string)$code['activation_code']);
+		$directActivateUrl   = "{$subscriberPortalUrl}?code=" . urlencode((string) $code['activation_code']);
 		$webPlayerUrl        = $playerCode ? "{$portalUrl}/{$playerCode}/" : null;
 
 		// phpcs:ignore SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable -- consumed by the required active_code_details.php view
 		$d = [
-			'id' => (int)$code['id'],
+			'id' => (int) $code['id'],
 			'code' => $code['activation_code'],
 			'batch_name' => $code['batch_name'],
-			'status' => (int)$code['status'],
+			'status' => (int) $code['status'],
 			'status_text' => ($code['status'] == 1) ? 'Ready (Stock)' : (($code['status'] == 2) ? 'Active' : 'Disabled'),
 			'package_name' => $package['package_name'] ?? 'Custom Package',
-			'is_trial' => (bool)$code['is_trial'],
-			'max_connections' => (int)($code['line_max_conn'] ?: $code['max_connections']),
-			'exp_date' => $code['sub_exp_date'] ? date('Y-m-d H:i:s', (int)$code['sub_exp_date']) : 'Frozen (Stock)',
-			'activated_at' => $code['activated_at'] ? date('Y-m-d H:i:s', (int)$code['activated_at']) : 'Never',
-			'created_at' => $code['created_at'] ? date('Y-m-d H:i:s', (int)$code['created_at']) : '-',
+			'is_trial' => (bool) $code['is_trial'],
+			'max_connections' => (int) ($code['line_max_conn'] ?: $code['max_connections']),
+			'exp_date' => $code['sub_exp_date'] ? date('Y-m-d H:i:s', (int) $code['sub_exp_date']) : 'Frozen (Stock)',
+			'activated_at' => $code['activated_at'] ? date('Y-m-d H:i:s', (int) $code['activated_at']) : 'Never',
+			'created_at' => $code['created_at'] ? date('Y-m-d H:i:s', (int) $code['created_at']) : '-',
 			'mac' => $code['mac'] ?: 'None',
 			'device_id' => $code['device_id'] ?: 'None',
 			'username' => $code['sub_username'],
 			'password' => $code['sub_password'],
 			'server' => $portalParsed['host'] ?? 'localhost',
-			'port' => $portalParsed['port'] ?? (isset($_SERVER['SERVER_PORT']) ? (int)$_SERVER['SERVER_PORT'] : 80),
+			'port' => $portalParsed['port'] ?? (isset($_SERVER['SERVER_PORT']) ? (int) $_SERVER['SERVER_PORT'] : 80),
 			'portal_url' => $portalUrl,
 			'activation_portal_url' => $subscriberPortalUrl,
 			'direct_activate_url' => $directActivateUrl,
@@ -1169,8 +1169,8 @@ class ResellerApiDispatcher {
 			return rtrim($dnsBase, '/');
 		}
 
-		$scheme = (!empty($_SERVER['HTTPS']) && strtolower((string)$_SERVER['HTTPS']) !== 'off') ? 'https' : 'http';
-		$host = (string)($_SERVER['HTTP_HOST'] ?? '');
+		$scheme = (!empty($_SERVER['HTTPS']) && strtolower((string) $_SERVER['HTTPS']) !== 'off') ? 'https' : 'http';
+		$host = (string) ($_SERVER['HTTP_HOST'] ?? '');
 
 		return $host !== '' ? $scheme . '://' . $host : '';
 	}
@@ -1209,7 +1209,7 @@ class ResellerApiDispatcher {
 			exit();
 		}
 
-		$allowedReports = (array)($rUserInfo['reports'] ?? [$rUserInfo['id']]);
+		$allowedReports = (array) ($rUserInfo['reports'] ?? [$rUserInfo['id']]);
 		$codes = $db->fetchAll(
 			"SELECT `id` FROM `activation_codes` WHERE `batch_name` = ? AND `created_by` IN (" . implode(',', array_map('intval', $allowedReports)) . ");",
 			$batchName
diff --git a/src/Infrastructure/ResellerTableRenderer.php b/src/Infrastructure/ResellerTableRenderer.php
index f534e1a8..156bd343 100644
--- a/src/Infrastructure/ResellerTableRenderer.php
+++ b/src/Infrastructure/ResellerTableRenderer.php
@@ -119,13 +119,13 @@ class ResellerTableRenderer {
 		// order emitted by the reseller lines view: leading Responsive-control column,
 		// then id, username, password, owner, status, online, trial, restreamer,
 		// active connections, max connections, expiration, last connection, actions.
-		$rOrder = array(false, '`lines`.`id`', '`lines`.`username`', '`lines`.`password`', '`users`.`username`', '`lines`.`enabled` - `lines`.`admin_enabled`', '`active_connections` > 0', '`lines`.`is_trial`', '`lines`.`is_restreamer`', '`active_connections`', '`lines`.`max_connections`', '`lines`.`exp_date`', '`active_connections` ' . $rOrderDirection . ', `last_activity`', false);
+		$rOrder = [false, '`lines`.`id`', '`lines`.`username`', '`lines`.`password`', '`users`.`username`', '`lines`.`enabled` - `lines`.`admin_enabled`', '`active_connections` > 0', '`lines`.`is_trial`', '`lines`.`is_restreamer`', '`active_connections`', '`lines`.`max_connections`', '`lines`.`exp_date`', '`active_connections` ' . $rOrderDirection . ', `last_activity`', false];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		$rWhere[] = '`lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0';
 		$rWhere[] = '(`lines`.`is_activecode` = 0 OR `lines`.`is_activecode` IS NULL)';
 		$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
@@ -189,10 +189,10 @@ class ResellerTableRenderer {
 			if (0 >= $db->num_rows()) {
 			} else {
 				$rRows = $db->get_rows();
-				$rActivityIDs = $rLineInfo = $rLineIDs = array();
+				$rActivityIDs = $rLineInfo = $rLineIDs = [];
 				foreach ($rRows as $rRow) {
 					$rLineIDs[] = intval($rRow['id']);
-					$rLineInfo[intval($rRow['id'])] = array('owner_name' => null, 'stream_display_name' => null, 'stream_id' => null, 'last_active' => null);
+					$rLineInfo[intval($rRow['id'])] = ['owner_name' => null, 'stream_display_name' => null, 'stream_id' => null, 'last_active' => null];
 					if ($rLastInfo = json_decode($rRow['last_activity_array'], true)) {
 						$rLineInfo[intval($rRow['id'])]['stream_id'] = $rLastInfo['stream_id'];
 						$rLineInfo[intval($rRow['id'])]['last_active'] = $rLastInfo['date_end'];
@@ -210,9 +210,9 @@ class ResellerTableRenderer {
 						$rLineInfo[$rRow['id']]['owner_name'] = $rRow['username'];
 					}
 					if ($rRedis) {
-						$rConnectionCount = array();
+						$rConnectionCount = [];
 						$rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
-						$rStreamIDs = array();
+						$rStreamIDs = [];
 						foreach ($rConnectionMap as $rUserID => $rConnections) {
 							foreach ($rConnections as $rConnection) {
 								if (in_array($rConnection['stream_id'], $rStreamIDs)) {
@@ -221,7 +221,7 @@ class ResellerTableRenderer {
 								}
 							}
 						}
-						$rStreamMap = array();
+						$rStreamMap = [];
 						if (0 >= count($rStreamIDs)) {
 						} else {
 							$db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rStreamIDs) . ');');
@@ -285,8 +285,8 @@ class ResellerTableRenderer {
 						$rLastStr = $rLastUnix ? date(SettingsManager::getString('date_format'), $rLastUnix) . ' ' . date('H:i:s', $rLastUnix) : '';
 						// Direct reports (and the reseller itself) are "owned" lines;
 						// anything deeper in the tree is an indirect report.
-						$rIndirect = !in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])));
-						$rReturn['data'][] = array(
+						$rIndirect = !in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]));
+						$rReturn['data'][] = [
 							'id' => (int) $rRow['id'],
 							'username' => $rRow['username'],
 							'password' => $rRow['password'],
@@ -310,7 +310,7 @@ class ResellerTableRenderer {
 							'is_isplock' => (bool) $rRow['is_isplock'],
 							'notes' => (string) $rRow['reseller_notes'],
 							'contact' => $rRow['contact'],
-						);
+						];
 					} else {
 						$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 					}
@@ -342,13 +342,13 @@ class ResellerTableRenderer {
 		// Column index -> SQL order expression. Mirrors the keyed Bootstrap 5 column
 		// order emitted by the reseller mags view: leading Responsive-control column,
 		// then id, username, mac, stb type, owner, status, online, trial, expiration, actions.
-		$rOrder = array(false, '`lines`.`id`', '`lines`.`username`', '`mag_devices`.`mac`', '`mag_devices`.`stb_type`', '`users`.`username`', '`lines`.`enabled`', '`active_connections`', '`lines`.`is_trial`', '`lines`.`exp_date`', false);
+		$rOrder = [false, '`lines`.`id`', '`lines`.`username`', '`mag_devices`.`mac`', '`mag_devices`.`stb_type`', '`users`.`username`', '`lines`.`enabled`', '`active_connections`', '`lines`.`is_trial`', '`lines`.`exp_date`', false];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
 		if (0 >= strlen(RequestManager::get('search')['value'])) {
 		} else {
@@ -406,7 +406,7 @@ class ResellerTableRenderer {
 			if (0 >= $db->num_rows()) {
 			} else {
 				$rRows = $db->get_rows();
-				$rLineIDs = array();
+				$rLineIDs = [];
 				foreach ($rRows as $rRow) {
 					if (!$rRow['id']) {
 					} else {
@@ -417,7 +417,7 @@ class ResellerTableRenderer {
 				} else {
 					if (!$rRedis) {
 					} else {
-						$rConnectionCount = array();
+						$rConnectionCount = [];
 						$rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
 						foreach (array_keys($rConnectionMap) as $rUserID) {
 							$rConnectionCount[$rUserID] = count($rConnectionMap[$rUserID]);
@@ -434,8 +434,8 @@ class ResellerTableRenderer {
 						// Clean, keyed row payload; the Bootstrap 5 reseller mags view renders
 						// every status icon, badge and action item client-side. Direct reports
 						// (and the reseller itself) are "owned"; deeper rows are indirect reports.
-						$rIndirect = !in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])));
-						$rReturn['data'][] = array(
+						$rIndirect = !in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]));
+						$rReturn['data'][] = [
 							'mag_id' => (int) $rRow['mag_id'],
 							'username' => $rRow['username'],
 							'mac' => $rRow['mac'],
@@ -450,7 +450,7 @@ class ResellerTableRenderer {
 							'is_trial' => (bool) $rRow['is_trial'],
 							'is_isplock' => (bool) $rRow['is_isplock'],
 							'notes' => (string) $rRow['reseller_notes'],
-						);
+						];
 					} else {
 						$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 					}
@@ -482,13 +482,13 @@ class ResellerTableRenderer {
 		// Column index -> SQL order expression. Mirrors the keyed Bootstrap 5 column
 		// order emitted by the reseller enigmas view: leading Responsive-control column,
 		// then id, username, mac, public ip, owner, status, online, trial, expiration, actions.
-		$rOrder = array(false, '`lines`.`id`', '`lines`.`username`', '`enigma2_devices`.`mac`', '`enigma2_devices`.`public_ip`', '`users`.`username`', '`lines`.`enabled`', '`active_connections`', '`lines`.`is_trial`', '`lines`.`exp_date`', false);
+		$rOrder = [false, '`lines`.`id`', '`lines`.`username`', '`enigma2_devices`.`mac`', '`enigma2_devices`.`public_ip`', '`users`.`username`', '`lines`.`enabled`', '`active_connections`', '`lines`.`is_trial`', '`lines`.`exp_date`', false];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
 		if (0 >= strlen(RequestManager::get('search')['value'])) {
 		} else {
@@ -546,7 +546,7 @@ class ResellerTableRenderer {
 			if (0 >= $db->num_rows()) {
 			} else {
 				$rRows = $db->get_rows();
-				$rLineIDs = array();
+				$rLineIDs = [];
 				foreach ($rRows as $rRow) {
 					if (!$rRow['id']) {
 					} else {
@@ -557,7 +557,7 @@ class ResellerTableRenderer {
 				} else {
 					if (!$rRedis) {
 					} else {
-						$rConnectionCount = array();
+						$rConnectionCount = [];
 						$rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
 						foreach (array_keys($rConnectionMap) as $rUserID) {
 							$rConnectionCount[$rUserID] = count($rConnectionMap[$rUserID]);
@@ -574,8 +574,8 @@ class ResellerTableRenderer {
 						// Clean, keyed row payload; the Bootstrap 5 reseller enigmas view renders
 						// every status icon, badge and action item client-side. Direct reports
 						// (and the reseller itself) are "owned"; deeper rows are indirect reports.
-						$rIndirect = !in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])));
-						$rReturn['data'][] = array(
+						$rIndirect = !in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]));
+						$rReturn['data'][] = [
 							'device_id' => (int) $rRow['device_id'],
 							'username' => $rRow['username'],
 							'mac' => $rRow['mac'],
@@ -590,7 +590,7 @@ class ResellerTableRenderer {
 							'is_trial' => (bool) $rRow['is_trial'],
 							'is_isplock' => (bool) $rRow['is_isplock'],
 							'notes' => (string) $rRow['reseller_notes'],
-						);
+						];
 					} else {
 						$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 					}
@@ -623,14 +623,14 @@ class ResellerTableRenderer {
 		// Column index -> SQL order expression. Mirrors the keyed Bootstrap 5 column
 		// order emitted by the reseller streams view: leading Responsive-control
 		// column, then id, icon, title, category, connections, actions.
-		$rOrder = array(false, '`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false);
+		$rOrder = [false, '`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
 		$rCreated = RequestManager::has('created');
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		if (0 < count($rPermissions['stream_ids'])) {
 			$rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
 			if ($rCreated) {
@@ -675,7 +675,7 @@ class ResellerTableRenderer {
 				if ($db->num_rows() > 0) {
 					$rRows = $db->get_rows();
 					if ($rRedis) {
-						$rConnectionCount = $rReports = array();
+						$rConnectionCount = $rReports = [];
 						$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
 						foreach ($db->get_rows() as $rRow) {
 							$rReports[] = $rRow['id'];
@@ -707,14 +707,14 @@ class ResellerTableRenderer {
 							if (1 < count($rCategoryIDs)) {
 								$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
 							}
-							$rReturn['data'][] = array(
+							$rReturn['data'][] = [
 								'id' => (int) $rRow['id'],
 								'icon' => (string) $rRow['stream_icon'],
 								'title' => (string) $rRow['stream_display_name'],
 								'archive' => (bool) (0 < $rRow['tv_archive_duration'] && 0 < $rRow['tv_archive_server_id']),
 								'category' => $rCategory,
 								'clients' => (int) $rRow['clients'],
-							);
+							];
 						} else {
 							$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 						}
@@ -750,13 +750,13 @@ class ResellerTableRenderer {
 		// Column index -> SQL order expression. Mirrors the keyed Bootstrap 5 column
 		// order emitted by the reseller radios view: leading Responsive-control
 		// column, then id, icon, title, category, connections, actions.
-		$rOrder = array(false, '`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false);
+		$rOrder = [false, '`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		if (0 < count($rPermissions['stream_ids'])) {
 			$rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
 			$rWhere[] = '`type` = 4';
@@ -799,7 +799,7 @@ class ResellerTableRenderer {
 					$rRows = $db->get_rows();
 					if (!$rRedis) {
 					} else {
-						$rConnectionCount = $rReports = array();
+						$rConnectionCount = $rReports = [];
 						$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
 						foreach ($db->get_rows() as $rRow) {
 							$rReports[] = $rRow['id'];
@@ -831,13 +831,13 @@ class ResellerTableRenderer {
 							if (1 < count($rCategoryIDs)) {
 								$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
 							}
-							$rReturn['data'][] = array(
+							$rReturn['data'][] = [
 								'id' => (int) $rRow['id'],
 								'icon' => (string) $rRow['stream_icon'],
 								'title' => (string) $rRow['stream_display_name'],
 								'category' => $rCategory,
 								'clients' => (int) $rRow['clients'],
-							);
+							];
 						} else {
 							$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 						}
@@ -873,13 +873,13 @@ class ResellerTableRenderer {
 		// Column index -> SQL order expression. Mirrors the keyed Bootstrap 5 column
 		// order emitted by the reseller movies view: leading Responsive-control
 		// column, then id, cover, title, category, connections, actions.
-		$rOrder = array(false, '`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false);
+		$rOrder = [false, '`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		if (0 < count($rPermissions['stream_ids'])) {
 			$rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
 			$rWhere[] = '`type` = 2';
@@ -922,7 +922,7 @@ class ResellerTableRenderer {
 					$rRows = $db->get_rows();
 					if (!$rRedis) {
 					} else {
-						$rConnectionCount = $rReports = array();
+						$rConnectionCount = $rReports = [];
 						$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
 						foreach ($db->get_rows() as $rRow) {
 							$rReports[] = $rRow['id'];
@@ -955,13 +955,13 @@ class ResellerTableRenderer {
 								$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
 							}
 							$rProperties = json_decode($rRow['movie_properties'], true);
-							$rReturn['data'][] = array(
+							$rReturn['data'][] = [
 								'id' => (int) $rRow['id'],
 								'image' => (string) ($rProperties['movie_image'] ?? ''),
 								'title' => (string) $rRow['stream_display_name'],
 								'category' => $rCategory,
 								'clients' => (int) $rRow['clients'],
-							);
+							];
 						} else {
 							$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 						}
@@ -999,13 +999,13 @@ class ResellerTableRenderer {
 		// column, then id, image, title, category, connections, actions. The category
 		// column is qualified (`streams_series`) because `streams` also has a
 		// `category_id`, which would make an unqualified ORDER BY ambiguous.
-		$rOrder = array(false, '`streams`.`id`', false, '`stream_display_name`', '`streams_series`.`category_id`', '`clients`', false);
+		$rOrder = [false, '`streams`.`id`', false, '`stream_display_name`', '`streams_series`.`category_id`', '`clients`', false];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		if (0 < count($rPermissions['stream_ids'])) {
 			$rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
 			$rWhere[] = '`type` = 5';
@@ -1054,7 +1054,7 @@ class ResellerTableRenderer {
 					$rRows = $db->get_rows();
 					if (!$rRedis) {
 					} else {
-						$rConnectionCount = $rReports = array();
+						$rConnectionCount = $rReports = [];
 						$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
 						foreach ($db->get_rows() as $rRow) {
 							$rReports[] = $rRow['id'];
@@ -1088,7 +1088,7 @@ class ResellerTableRenderer {
 								$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
 							}
 							$rProperties = json_decode($rRow['movie_properties'], true);
-							$rReturn['data'][] = array(
+							$rReturn['data'][] = [
 								'id' => (int) $rRow['id'],
 								'image' => (string) ($rProperties['movie_image'] ?? ''),
 								'title' => (string) $rRow['stream_display_name'],
@@ -1096,7 +1096,7 @@ class ResellerTableRenderer {
 								'season' => ($rRow['season_num'] !== null ? (int) $rRow['season_num'] : null),
 								'category' => $rCategory,
 								'clients' => (int) $rRow['clients'],
-							);
+							];
 						} else {
 							$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 						}
@@ -1131,13 +1131,13 @@ class ResellerTableRenderer {
 		// Responsive control column (client index 0); the remaining entries mirror the
 		// keyed reseller line_activity columns: username, stream, player, isp, ip,
 		// start, stop, duration, container, restreamer.
-		$rOrder = array(false, '`username`', '`streams`.`stream_display_name`', '`lines_activity`.`user_agent`', '`lines_activity`.`isp`', '`lines_activity`.`user_ip`', '`lines_activity`.`date_start`', '`lines_activity`.`date_end`', '`lines_activity`.`date_end` - `lines_activity`.`date_start`', '`lines_activity`.`container`', '`lines`.`is_restreamer`');
+		$rOrder = [false, '`username`', '`streams`.`stream_display_name`', '`lines_activity`.`user_agent`', '`lines_activity`.`isp`', '`lines_activity`.`user_ip`', '`lines_activity`.`date_start`', '`lines_activity`.`date_end`', '`lines_activity`.`date_end` - `lines_activity`.`date_start`', '`lines_activity`.`container`', '`lines`.`is_restreamer`'];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
 		if (0 >= strlen(RequestManager::get('search')['value'])) {
 		} else {
@@ -1218,7 +1218,7 @@ class ResellerTableRenderer {
 						}
 						// Reseller stream links only when the reseller may view VOD/streams.
 						$rStreamUrl = ($rPermissions['can_view_vod'] && 0 < (int) $rRow['stream_id']) ? 'stream_view?id=' . (int) $rRow['stream_id'] : null;
-						$rReturn['data'][] = array(
+						$rReturn['data'][] = [
 							'user_label'    => $rRow['username'],
 							'user_sub'      => null,
 							'user_url'      => $rUserUrl,
@@ -1233,7 +1233,7 @@ class ResellerTableRenderer {
 							'duration'      => (int) $rRow['date_end'] - (int) $rRow['date_start'],
 							'container'     => strtoupper((string) $rRow['container']),
 							'is_restreamer' => (1 == (int) $rRow['is_restreamer']),
-						);
+						];
 					} else {
 						$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 					}
@@ -1262,10 +1262,10 @@ class ResellerTableRenderer {
 			exit();
 		}
 		$rOrderBy = '';
-		$rRows = array();
+		$rRows = [];
 		if ($rRedis) {
 			$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? false : true);
-			$rReports = array();
+			$rReports = [];
 			$rUserID = (0 < intval(RequestManager::get('user')) ? intval(RequestManager::get('user')) : null);
 			$rStreamID = (0 < intval(RequestManager::get('stream_id')) ? intval(RequestManager::get('stream_id')) : null);
 			if ($rUserID && in_array($rUserID, $rUserInfo['reports'])) {
@@ -1306,7 +1306,7 @@ class ResellerTableRenderer {
 			// Responsive control column (client index 0); mirrors the keyed reseller
 			// live_connections columns: uuid, divergence, line, stream, player, isp,
 			// ip, duration, container, restreamer, actions.
-			$rOrder = array(false, 'uuid', 'divergence', 'identifier', 'stream_display_name', 'user_agent', 'isp', 'user_ip', 'active_time', 'container', null, null);
+			$rOrder = [false, 'uuid', 'divergence', 'identifier', 'stream_display_name', 'user_agent', 'isp', 'user_ip', 'active_time', 'container', null, null];
 			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 			} else {
@@ -1317,7 +1317,7 @@ class ResellerTableRenderer {
 				array_multisort(array_column($rRows, $rOrder[$rOrderRow]), ($rOrderDirection ? SORT_ASC : SORT_DESC), $rRows);
 			}
 			$rRows = array_slice($rRows, $rStart, $rLimit);
-			$rUUIDs = $rStreamIDs = $rUserIDs = array();
+			$rUUIDs = $rStreamIDs = $rUserIDs = [];
 			foreach ($rRows as $rRow) {
 				if (!$rRow['stream_id']) {
 				} else {
@@ -1332,7 +1332,7 @@ class ResellerTableRenderer {
 					$rUUIDs[] = $rRow['uuid'];
 				}
 			}
-			$rStreamNames = $rDivergenceMap = $rSeriesMap = $rUserMap = array();
+			$rStreamNames = $rDivergenceMap = $rSeriesMap = $rUserMap = [];
 			if (0 >= count($rUserIDs)) {
 			} else {
 				$db->query('SELECT `lines`.`id`, `lines`.`is_mag`, `lines`.`is_e2`, `lines`.`is_restreamer`, `lines`.`username`, `mag_devices`.`mag_id`, `enigma2_devices`.`device_id` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` WHERE `lines`.`id` IN (' . implode(',', $rUserIDs) . ');');
@@ -1350,7 +1350,7 @@ class ResellerTableRenderer {
 				}
 				$db->query('SELECT `id`, `type`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rStreamIDs) . ');');
 				foreach ($db->get_rows() as $rRow) {
-					$rStreamNames[$rRow['id']] = array($rRow['stream_display_name'], $rRow['type']);
+					$rStreamNames[$rRow['id']] = [$rRow['stream_display_name'], $rRow['type']];
 				}
 			}
 			if (0 >= count($rUUIDs)) {
@@ -1368,7 +1368,7 @@ class ResellerTableRenderer {
 				$rRows[$i]['series_no'] = ($rSeriesMap[$rRows[$i]['stream_id']] ?? null);
 				$rRows[$i]['stream_display_name'] = ($rStreamNames[$rRows[$i]['stream_id']][0] ?? '');
 				$rRows[$i]['type'] = ($rStreamNames[$rRows[$i]['stream_id']][1] ?? 1);
-				$rRows[$i] = array_merge($rRows[$i], ($rUserMap[$rRows[$i]['user_id']] ?? array()));
+				$rRows[$i] = array_merge($rRows[$i], ($rUserMap[$rRows[$i]['user_id']] ?? []));
 				$i++;
 			}
 			$rReturn['recordsTotal'] = $rKeyCount;
@@ -1378,13 +1378,13 @@ class ResellerTableRenderer {
 			// Column index -> SQL order expression. Leading false = the Bootstrap 5
 			// Responsive control column (client index 0); mirrors the keyed reseller
 			// live_connections columns (see the Redis path above).
-			$rOrder = array(false, '`lines_live`.`activity_id`', '`lines_live`.`divergence`', '`username`', '`streams`.`stream_display_name`', '`lines_live`.`user_agent`', '`lines_live`.`isp`', '`lines_live`.`user_ip`', 'UNIX_TIMESTAMP() - `lines_live`.`date_start`', '`lines_live`.`container`', '`lines`.`is_restreamer`', false);
+			$rOrder = [false, '`lines_live`.`activity_id`', '`lines_live`.`divergence`', '`username`', '`streams`.`stream_display_name`', '`lines_live`.`user_agent`', '`lines_live`.`isp`', '`lines_live`.`user_ip`', 'UNIX_TIMESTAMP() - `lines_live`.`date_start`', '`lines_live`.`container`', '`lines`.`is_restreamer`', false];
 			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 			} else {
 				$rOrderRow = 0;
 			}
-			$rWhere = $rWhereV = array();
+			$rWhere = $rWhereV = [];
 			$rWhere[] = '`hls_end` = 0';
 			$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
 			if (0 >= strlen(RequestManager::get('search')['value'])) {
@@ -1448,7 +1448,7 @@ class ResellerTableRenderer {
 					}
 					// Reseller stream links only when the reseller may view VOD/streams.
 					$rStreamUrl = ($rPermissions['can_view_vod'] && 0 < (int) $rRow['stream_id']) ? 'stream_view?id=' . (int) $rRow['stream_id'] : null;
-					$rReturn['data'][] = array(
+					$rReturn['data'][] = [
 						'activity_id'   => $rRow['activity_id'],
 						'uuid'          => $rRow['uuid'] ?? null,
 						'user_id'       => (int) $rRow['user_id'],
@@ -1464,7 +1464,7 @@ class ResellerTableRenderer {
 						'date_start'    => (int) $rRow['date_start'],
 						'container'     => strtoupper((string) $rRow['container']),
 						'is_restreamer' => (1 == (int) $rRow['is_restreamer']),
-					);
+					];
 				} else {
 					$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 				}
@@ -1491,13 +1491,13 @@ class ResellerTableRenderer {
 		// Column index -> SQL order expression. Leading false = the Bootstrap 5
 		// Responsive control column (client index 0); mirrors the keyed reseller
 		// user_logs columns: owner, target, action text, cost, credits after, date.
-		$rOrder = array(false, '`users`.`username`', '`users_logs`.`log_id`', '`users_logs`.`type`, `users_logs`.`action`', '`users_logs`.`cost`', '`users_logs`.`credits_after`', '`users_logs`.`date`');
+		$rOrder = [false, '`users`.`username`', '`users_logs`.`log_id`', '`users_logs`.`type`, `users_logs`.`action`', '`users_logs`.`cost`', '`users_logs`.`credits_after`', '`users_logs`.`date`'];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		$rWhere[] = '`users_logs`.`owner` IN (' . implode(',', $rUserInfo['reports']) . ')';
 		if (0 >= strlen(RequestManager::get('search')['value'])) {
 		} else {
@@ -1561,8 +1561,8 @@ class ResellerTableRenderer {
 						// target line/user/device link and the numeric badges client-side.
 						// Direct reports (and the reseller itself) are "owned" rows; anything
 						// deeper in the tree is an indirect report.
-						$rOwnerIndirect = !in_array($rRow['owner'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])));
-						$rDevice = array('line' => 'User Line', 'mag' => 'MAG Device', 'enigma' => 'Enigma2 Device', 'user' => 'Reseller')[$rRow['type']] ?? (string) $rRow['type'];
+						$rOwnerIndirect = !in_array($rRow['owner'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]));
+						$rDevice = ['line' => 'User Line', 'mag' => 'MAG Device', 'enigma' => 'Enigma2 Device', 'user' => 'Reseller'][$rRow['type']] ?? (string) $rRow['type'];
 						$rText = '';
 						switch ($rRow['action']) {
 							case 'new':
@@ -1628,7 +1628,7 @@ class ResellerTableRenderer {
 							$rDeletedInfo = json_decode($rRow['deleted_info'], true);
 							$rLineLabel = is_array($rDeletedInfo) ? ($rDeletedInfo['mac'] ?? $rDeletedInfo['username'] ?? 'DELETED') : 'DELETED';
 						}
-						$rReturn['data'][] = array(
+						$rReturn['data'][] = [
 							'id'             => (int) $rRow['id'],
 							'owner'          => $rRow['username'],
 							'owner_url'      => 'user?id=' . (int) $rRow['owner'],
@@ -1639,7 +1639,7 @@ class ResellerTableRenderer {
 							'cost'           => (int) $rRow['cost'],
 							'credits_after'  => (int) $rRow['credits_after'],
 							'date'           => (int) $rRow['date'],
-						);
+						];
 					} else {
 						unset($rRow['deleted_info']);
 						$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
@@ -1671,13 +1671,13 @@ class ResellerTableRenderer {
 		// Column index -> SQL order expression. Mirrors the keyed Bootstrap 5 column
 		// order emitted by the reseller users view: leading Responsive-control column,
 		// then id, username, owner, ip, status, credits, lines, last login, actions.
-		$rOrder = array(false, '`users`.`id`', '`users`.`username`', '`r`.`username`', '`users`.`ip`', '`users`.`status`', '`users`.`credits`', '`user_count`', '`users`.`last_login`', false);
+		$rOrder = [false, '`users`.`id`', '`users`.`username`', '`r`.`username`', '`users`.`ip`', '`users`.`status`', '`users`.`credits`', '`user_count`', '`users`.`last_login`', false];
 		if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
 			$rOrderRow = intval(RequestManager::get('order')[0]['column']);
 		} else {
 			$rOrderRow = 0;
 		}
-		$rWhere = $rWhereV = array();
+		$rWhere = $rWhereV = [];
 		$rWhere[] = '`users`.`owner_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
 		if (0 >= strlen(RequestManager::get('search')['value'])) {
 		} else {
@@ -1732,9 +1732,9 @@ class ResellerTableRenderer {
 						// the status icon, credit / line-count badges, IP whois link and action
 						// dropdown client-side). Direct reports (and the reseller itself) are
 						// "owned" rows; anything deeper in the tree is an indirect report.
-						$rIndirect = !in_array($rRow['id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])));
-						$rOwnerIndirect = !in_array($rRow['owner_id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])));
-						$rReturn['data'][] = array(
+						$rIndirect = !in_array($rRow['id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]));
+						$rOwnerIndirect = !in_array($rRow['owner_id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]));
+						$rReturn['data'][] = [
 							'id' => (int) $rRow['id'],
 							'username' => $rRow['username'],
 							'owner_id' => (int) $rRow['owner_id'],
@@ -1748,7 +1748,7 @@ class ResellerTableRenderer {
 							'user_count' => (int) $rRow['user_count'],
 							'last_login' => $rRow['last_login'] ?: '',
 							'notes' => (string) $rRow['notes'],
-						);
+						];
 					} else {
 						$rReturn['data'][] = self::filterRow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
 					}
@@ -1767,9 +1767,9 @@ class ResellerTableRenderer {
 	 * @param array $rHide Columns to remove (blacklist).
 	 * @return array The filtered row.
 	 */
-	private static function filterRow($rRow, $rShow, $rHide) {
+	private static function filterRow(array $rRow, array $rShow, array $rHide) {
 		if ($rShow || $rHide) {
-			$rReturn = array();
+			$rReturn = [];
 			foreach (array_keys($rRow) as $rKey) {
 				if ($rShow) {
 					if (!in_array($rKey, $rShow)) {
@@ -1838,7 +1838,7 @@ class ResellerTableRenderer {
 
 		// Status filter: 1=Ready/Stock, 2=Active, 3=Expired, 4=Disabled
 		$filter = RequestManager::get('filter');
-		if (strlen((string)$filter) > 0 && $filter != 0) {
+		if (strlen((string) $filter) > 0 && $filter != 0) {
 			if ($filter == 1) {
 				$rWhere[] = '`activation_codes`.`status` = 1';
 			} elseif ($filter == 2) {
@@ -1851,7 +1851,7 @@ class ResellerTableRenderer {
 		}
 
 		// Batch filter
-		$batchFilter = trim((string)RequestManager::get('batch'));
+		$batchFilter = trim((string) RequestManager::get('batch'));
 		if (strlen($batchFilter) > 0) {
 			$rWhere[] = '`activation_codes`.`batch_name` = ?';
 			$rWhereV[] = $batchFilter;
@@ -1868,7 +1868,7 @@ class ResellerTableRenderer {
 
 		$countSql = "SELECT COUNT(*) as `total` FROM `activation_codes` LEFT JOIN `lines` ON `lines`.`id` = `activation_codes`.`subscriber_id` {$whereClause};";
 		$db->query($countSql, ...$rWhereV);
-		$rReturn['recordsTotal'] = $rReturn['recordsFiltered'] = (int)($db->get_row()['total'] ?? 0);
+		$rReturn['recordsTotal'] = $rReturn['recordsFiltered'] = (int) ($db->get_row()['total'] ?? 0);
 
 		$sql = "SELECT
 					`activation_codes`.*,
diff --git a/src/Infrastructure/Signal/SignalQueue.php b/src/Infrastructure/Signal/SignalQueue.php
index a20cd9cd..fcda0978 100644
--- a/src/Infrastructure/Signal/SignalQueue.php
+++ b/src/Infrastructure/Signal/SignalQueue.php
@@ -22,7 +22,6 @@ namespace XcVm\Infrastructure\Signal;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 final class SignalQueue {
-
 	/** Filename prefix shared by every queued signal. */
 	public const PREFIX = 'cache_';
 
@@ -44,8 +43,8 @@ final class SignalQueue {
 	 * @param mixed  $rData JSON-encodable payload.
 	 * @return void
 	 */
-	public static function push(string $rKey, $rData): void {
-		file_put_contents(self::pathFor($rKey), json_encode(array($rKey, $rData)));
+	public static function push(string $rKey, mixed $rData): void {
+		file_put_contents(self::pathFor($rKey), json_encode([$rKey, $rData]));
 	}
 
 	/**
@@ -55,11 +54,11 @@ final class SignalQueue {
 	 * @return array<int,array{0:string,1:string,2:mixed}>
 	 */
 	public static function pending(): array {
-		$rOut = array();
-		foreach (glob(SIGNALS_TMP_PATH . self::PREFIX . '*') ?: array() as $rFile) {
+		$rOut = [];
+		foreach (glob(SIGNALS_TMP_PATH . self::PREFIX . '*') ?: [] as $rFile) {
 			$rDecoded = json_decode((string) @file_get_contents($rFile), true);
 			if (is_array($rDecoded) && array_key_exists(0, $rDecoded) && array_key_exists(1, $rDecoded)) {
-				$rOut[] = array($rFile, $rDecoded[0], $rDecoded[1]);
+				$rOut[] = [$rFile, $rDecoded[0], $rDecoded[1]];
 			}
 		}
 		return $rOut;
diff --git a/src/Infrastructure/Tmdb/TmdbApiService.php b/src/Infrastructure/Tmdb/TmdbApiService.php
index c3df550f..8b4388c8 100644
--- a/src/Infrastructure/Tmdb/TmdbApiService.php
+++ b/src/Infrastructure/Tmdb/TmdbApiService.php
@@ -32,165 +32,164 @@ use XcVm\Domain\Vod\TMDbService;
  */
 
 class TmdbApiService {
+	/**
+	 * Создать экземпляр \TMDB API-клиента
+	 *
+	 * @param string      $apiKey   \TMDB API key
+	 * @param string|null $language Язык запроса (приоритет: явный → настройка → default)
+	 * @return \TMDB
+	 */
+	public static function createClient(string $apiKey, ?string $language = null): \TMDB {
+		self::requireLibrary();
 
-    /**
-     * Создать экземпляр \TMDB API-клиента
-     *
-     * @param string      $apiKey   \TMDB API key
-     * @param string|null $language Язык запроса (приоритет: явный → настройка → default)
-     * @return \TMDB
-     */
-    public static function createClient(string $apiKey, ?string $language = null): \TMDB {
-        self::requireLibrary();
+		if ($language !== null && strlen($language) > 0) {
+			return new \TMDB($apiKey, $language);
+		}
 
-        if ($language !== null && strlen($language) > 0) {
-            return new \TMDB($apiKey, $language);
-        }
+		$settingsLang = SettingsManager::getString('tmdb_language');
+		if (strlen($settingsLang) > 0) {
+			return new \TMDB($apiKey, $settingsLang);
+		}
 
-        $settingsLang = SettingsManager::getString('tmdb_language');
-        if (strlen($settingsLang) > 0) {
-            return new \TMDB($apiKey, $settingsLang);
-        }
+		return new \TMDB($apiKey);
+	}
 
-        return new \TMDB($apiKey);
-    }
+	/**
+	 * Поиск по \TMDB (фильмы, сериалы, эпизоды)
+	 *
+	 * Поддерживает поиск:
+	 *   - По числовому ID (прямой getMovie/getTVShow/getSeason)
+	 *   - По текстовому запросу (searchMovie/searchTVShow)
+	 *
+	 * @param string      $term     Поисковый запрос или \TMDB ID
+	 * @param string      $type     Тип: movie|series|episode
+	 * @param string|null $language Язык запроса
+	 * @param int|null    $season   Номер сезона (для episode)
+	 * @return array ['result' => bool, 'data' => array|null]
+	 */
+	public static function search(string $term, string $type, ?string $language = null, ?int $season = null): array {
+		$apiKey = SettingsManager::getString('tmdb_api_key');
+		if (strlen($apiKey) === 0) {
+			return ['result' => false];
+		}
 
-    /**
-     * Поиск по \TMDB (фильмы, сериалы, эпизоды)
-     *
-     * Поддерживает поиск:
-     *   - По числовому ID (прямой getMovie/getTVShow/getSeason)
-     *   - По текстовому запросу (searchMovie/searchTVShow)
-     *
-     * @param string      $term     Поисковый запрос или \TMDB ID
-     * @param string      $type     Тип: movie|series|episode
-     * @param string|null $language Язык запроса
-     * @param int|null    $season   Номер сезона (для episode)
-     * @return array ['result' => bool, 'data' => array|null]
-     */
-    public static function search(string $term, string $type, ?string $language = null, ?int $season = null): array {
-        $apiKey = SettingsManager::getString('tmdb_api_key');
-        if (strlen($apiKey) === 0) {
-            return ['result' => false];
-        }
+		self::requireLibrary();
+		$rTMDB = self::createClient($apiKey, $language);
 
-        self::requireLibrary();
-        $rTMDB = self::createClient($apiKey, $language);
+		// Прямой поиск по числовому \TMDB ID
+		if (is_numeric($term) && in_array($type, ['movie', 'series', 'episode'])) {
+			$rResult = self::fetchByID($rTMDB, $term, $type, $season);
+			if (is_array($rResult)) {
+				return ['result' => true, 'data' => $rResult];
+			}
+		}
 
-        // Прямой поиск по числовому \TMDB ID
-        if (is_numeric($term) && in_array($type, ['movie', 'series', 'episode'])) {
-            $rResult = self::fetchByID($rTMDB, $term, $type, $season);
-            if (is_array($rResult)) {
-                return ['result' => true, 'data' => $rResult];
-            }
-        }
+		// Текстовый поиск
+		$rRelease = AdminHelpers::parserelease($term);
+		$searchTerm = $rRelease['title'] ?? $term;
+		$rJSON = [];
 
-        // Текстовый поиск
-        $rRelease = AdminHelpers::parserelease($term);
-        $searchTerm = $rRelease['title'] ?? $term;
-        $rJSON = [];
+		if ($type === 'movie') {
+			foreach ($rTMDB->searchMovie($searchTerm) as $rResult) {
+				$rJSON[] = json_decode($rResult->getJSON(), true);
+			}
+		} elseif ($type === 'series') {
+			foreach ($rTMDB->searchTVShow($searchTerm) as $rResult) {
+				$rJSON[] = json_decode($rResult->getJSON(), true);
+			}
+		}
 
-        if ($type === 'movie') {
-            foreach ($rTMDB->searchMovie($searchTerm) as $rResult) {
-                $rJSON[] = json_decode($rResult->getJSON(), true);
-            }
-        } elseif ($type === 'series') {
-            foreach ($rTMDB->searchTVShow($searchTerm) as $rResult) {
-                $rJSON[] = json_decode($rResult->getJSON(), true);
-            }
-        }
+		if (count($rJSON) > 0) {
+			return ['result' => true, 'data' => $rJSON];
+		}
 
-        if (count($rJSON) > 0) {
-            return ['result' => true, 'data' => $rJSON];
-        }
+		return ['result' => false];
+	}
 
-        return ['result' => false];
-    }
+	/**
+	 * Получить детальную информацию о фильме/сериале по \TMDB ID
+	 *
+	 * @param int         $id       \TMDB ID
+	 * @param string      $type     Тип: movie|series
+	 * @param string|null $language Язык запроса
+	 * @return array ['result' => bool, 'data' => array|null]
+	 */
+	public static function getDetails(int $id, string $type, ?string $language = null): array {
+		$apiKey = SettingsManager::getString('tmdb_api_key');
+		if (strlen($apiKey) === 0) {
+			return ['result' => false];
+		}
 
-    /**
-     * Получить детальную информацию о фильме/сериале по \TMDB ID
-     *
-     * @param int         $id       \TMDB ID
-     * @param string      $type     Тип: movie|series
-     * @param string|null $language Язык запроса
-     * @return array ['result' => bool, 'data' => array|null]
-     */
-    public static function getDetails(int $id, string $type, ?string $language = null): array {
-        $apiKey = SettingsManager::getString('tmdb_api_key');
-        if (strlen($apiKey) === 0) {
-            return ['result' => false];
-        }
+		self::requireLibrary();
+		$rTMDB = self::createClient($apiKey, $language);
+		$rResult = null;
 
-        self::requireLibrary();
-        $rTMDB = self::createClient($apiKey, $language);
-        $rResult = null;
+		if ($type === 'movie') {
+			$rMovie = $rTMDB->getMovie($id);
+			$rResult = json_decode($rMovie->getJSON(), true);
+			$rResult['trailer'] = $rMovie->getTrailer();
+		} elseif ($type === 'series') {
+			$rSeries = $rTMDB->getTVShow($id);
+			$rResult = json_decode($rSeries->getJSON(), true);
+			$settingsLang = SettingsManager::getString('tmdb_language');
+			$rResult['trailer'] = TMDbService::getSeriesTrailer($id, ($language ?: $settingsLang));
+		}
 
-        if ($type === 'movie') {
-            $rMovie = $rTMDB->getMovie($id);
-            $rResult = json_decode($rMovie->getJSON(), true);
-            $rResult['trailer'] = $rMovie->getTrailer();
-        } elseif ($type === 'series') {
-            $rSeries = $rTMDB->getTVShow($id);
-            $rResult = json_decode($rSeries->getJSON(), true);
-            $settingsLang = SettingsManager::getString('tmdb_language');
-            $rResult['trailer'] = TMDbService::getSeriesTrailer($id, ($language ?: $settingsLang));
-        }
+		if (!$rResult) {
+			return ['result' => false];
+		}
 
-        if (!$rResult) {
-            return ['result' => false];
-        }
+		return ['result' => true, 'data' => $rResult];
+	}
 
-        return ['result' => true, 'data' => $rResult];
-    }
+	/**
+	 * Получить данные по числовому ID
+	 *
+	 * @param \TMDB     $tmdb   Экземпляр \TMDB
+	 * @param string   $id     \TMDB ID
+	 * @param string   $type   Тип: movie|series|episode
+	 * @param int|null $season Номер сезона
+	 * @return array|null
+	 */
+	private static function fetchByID(\TMDB $tmdb, string $id, string $type, ?int $season): ?array {
+		if ($type === 'movie') {
+			return [json_decode($tmdb->getMovie((int) $id)->getJSON(), true)];
+		}
 
-    /**
-     * Получить данные по числовому ID
-     *
-     * @param \TMDB     $tmdb   Экземпляр \TMDB
-     * @param string   $id     \TMDB ID
-     * @param string   $type   Тип: movie|series|episode
-     * @param int|null $season Номер сезона
-     * @return array|null
-     */
-    private static function fetchByID(\TMDB $tmdb, string $id, string $type, ?int $season): ?array {
-        if ($type === 'movie') {
-            return [json_decode($tmdb->getMovie((int) $id)->getJSON(), true)];
-        }
+		if ($type === 'series') {
+			return [json_decode($tmdb->getTVShow((int) $id)->getJSON(), true)];
+		}
 
-        if ($type === 'series') {
-            return [json_decode($tmdb->getTVShow((int) $id)->getJSON(), true)];
-        }
+		if ($type === 'episode' && $season !== null) {
+			$rResult = json_decode($tmdb->getSeason((int) $id, $season)->getJSON(), true);
+			if (isset($rResult['tvshow_id']) && $rResult['tvshow_id'] == 0) {
+				return null;
+			}
+			return $rResult;
+		}
 
-        if ($type === 'episode' && $season !== null) {
-            $rResult = json_decode($tmdb->getSeason((int) $id, $season)->getJSON(), true);
-            if (isset($rResult['tvshow_id']) && $rResult['tvshow_id'] == 0) {
-                return null;
-            }
-            return $rResult;
-        }
+		return null;
+	}
 
-        return null;
-    }
-
-    /**
-     * Подключить библиотеку \TMDB (один раз).
-     *
-     * Загружает клиент и парсер релизов (parserelease). Единственная точка,
-     * знающая путь до вендоренной библиотеки — весь остальной код обязан
-     * идти через этот метод, а не require'ить путь вручную.
-     */
-    public static function requireLibrary(): void {
-        static $loaded = false;
-        if (!$loaded) {
-            // class_exists-защита: сторонние модули могут возить собственную
-            // копию библиотеки — повторное объявление \TMDB/\Release фатально.
-            if (!class_exists('TMDB', false)) {
-                require_once __DIR__ . '/lib/TmdbClient.php';
-            }
-            if (!class_exists('Release', false)) {
-                require_once __DIR__ . '/lib/Release.php';
-            }
-            $loaded = true;
-        }
-    }
+	/**
+	 * Подключить библиотеку \TMDB (один раз).
+	 *
+	 * Загружает клиент и парсер релизов (parserelease). Единственная точка,
+	 * знающая путь до вендоренной библиотеки — весь остальной код обязан
+	 * идти через этот метод, а не require'ить путь вручную.
+	 */
+	public static function requireLibrary(): void {
+		static $loaded = false;
+		if (!$loaded) {
+			// class_exists-защита: сторонние модули могут возить собственную
+			// копию библиотеки — повторное объявление \TMDB/\Release фатально.
+			if (!class_exists('TMDB', false)) {
+				require_once __DIR__ . '/lib/TmdbClient.php';
+			}
+			if (!class_exists('Release', false)) {
+				require_once __DIR__ . '/lib/Release.php';
+			}
+			$loaded = true;
+		}
+	}
 }
diff --git a/src/Ministra/MinistraBootstrap.php b/src/Ministra/MinistraBootstrap.php
index 24470e14..92fac49b 100644
--- a/src/Ministra/MinistraBootstrap.php
+++ b/src/Ministra/MinistraBootstrap.php
@@ -26,15 +26,13 @@ use XcVm\Infrastructure\Bootstrap\StreamingRequestBootstrap;
  * @copyright 2025-2026 Vateron Media
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class MinistraBootstrap
-{
+class MinistraBootstrap {
 	/**
 	 * Boot the Ministra boundary.
 	 *
 	 * Must be called after autoload.php is loaded.
 	 */
-	public static function boot(): void
-	{
+	public static function boot(): void {
 		StreamingRequestBootstrap::init("portal");
 	}
 }
diff --git a/src/Ministra/PortalHandler.php b/src/Ministra/PortalHandler.php
index d0f4c4a0..f8dbc710 100644
--- a/src/Ministra/PortalHandler.php
+++ b/src/Ministra/PortalHandler.php
@@ -21,10 +21,8 @@ class PortalHandler {
 	 * Phase 1: Pre-init stub responses (no DB needed).
 	 * Exits immediately if the action is handled, otherwise returns void.
 	 *
-	 * @param string|null $rReqType
-	 * @param string|null $rReqAction
 	 */
-	public static function handlePreInit($rReqType, $rReqAction) {
+	public static function handlePreInit(?string $rReqType, ?string $rReqAction) {
 		if ($rReqType && $rReqAction) {
 			switch ($rReqType) {
 				case "stb":
@@ -138,10 +136,9 @@ class PortalHandler {
 	 * Called when $rReqType == 'stb' from the outer switch.
 	 * Exits if action is handled, otherwise returns void.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array with device, profile, language, theme, authenticated, etc.
 	 */
-	public static function handleStbPublic($rReqAction, &$ctx) {
+	public static function handleStbPublic(string $rReqAction, array &$ctx) {
 		global $rSettings, $rServers;
 
 		switch ($rReqAction) {
@@ -182,10 +179,8 @@ class PortalHandler {
 				$rTotal["watchdog_timeout"] = mt_rand(80, 120);
 
 				if (
-					!(
-						empty($rTotal["aspect"]) &&
-						$rServers[SERVER_ID]["server_protocol"] == "https"
-					)
+					!(empty($rTotal["aspect"]) &&
+						$rServers[SERVER_ID]["server_protocol"] == "https")
 				) {
 				} else {
 					$rTotal["aspect"] = "16";
@@ -195,15 +190,15 @@ class PortalHandler {
 
 			case "get_types_list":
 				exit(json_encode([
-						"js" => [
-							"allowed_stb_types" => array_values(
-								(array) ($rSettings["allowed_stb_types"] ?? []),
-							),
-							"strict_stb_type_check" => empty($rSettings["strict_stb_type_check"])
+					"js" => [
+						"allowed_stb_types" => array_values(
+							(array) ($rSettings["allowed_stb_types"] ?? []),
+						),
+						"strict_stb_type_check" => empty($rSettings["strict_stb_type_check"])
 								? ""
 								: $rSettings["strict_stb_type_check"],
-						],
-					]));
+					],
+				]));
 
 			case "get_localization":
 				exit(json_encode(["js" => $ctx["language"][$ctx["device"]["locale"]]]));
@@ -272,11 +267,9 @@ class PortalHandler {
 	 * Phase 5: Authenticated action dispatcher.
 	 * Sets up player, then dispatches to the appropriate sub-handler.
 	 *
-	 * @param string $rReqType
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleAuthenticated($rReqType, $rReqAction, &$ctx) {
+	public static function handleAuthenticated(string $rReqType, string $rReqAction, array &$ctx) {
 		$ctx["device"]["mag_player"] = trim($ctx["device"]["mag_player"], "'\"");
 		$ctx["player"] = !empty($ctx["device"]["mag_player"])
 			? $ctx["device"]["mag_player"] . " "
@@ -342,10 +335,9 @@ class PortalHandler {
 	 *          set_screensaver_delay, set_playback_buffer, set_plasma_saving,
 	 *          set_parent_password, set_locale, set_hdmi_reaction.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleStbSettings($rReqAction, &$ctx) {
+	public static function handleStbSettings(string $rReqAction, array &$ctx) {
 		global $db, $rSettings, $rRequest;
 
 		switch ($rReqAction) {
@@ -687,10 +679,9 @@ class PortalHandler {
 	 * Actions: get_events, confirm_event.
 	 * Also updates last_watchdog before processing action.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleWatchdog($rReqAction, &$ctx) {
+	public static function handleWatchdog(string $rReqAction, array &$ctx) {
 		global $db, $rRequest;
 
 		$ctx["device"]["last_watchdog"] = time();
@@ -760,10 +751,9 @@ class PortalHandler {
 	 * Phase 5 sub-handler: Audioclub actions.
 	 * Actions: get_categories.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleAudioclub($rReqAction, &$ctx) {
+	public static function handleAudioclub(string $rReqAction, array &$ctx) {
 		global $rSettings, $rCategories;
 		$rCategories = is_array($rCategories ?? null) ? $rCategories : [];
 
@@ -806,10 +796,9 @@ class PortalHandler {
 	 *          get_ordered_list, get_all_fav_channels, get_epg_info, get_short_epg,
 	 *          set_last_id, get_genres.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleItv($rReqAction, &$ctx) {
+	public static function handleItv(string $rReqAction, array &$ctx) {
 		global $db, $rSettings, $rServers, $rRequest, $rCategories;
 		$rCategories = is_array($rCategories ?? null) ? $rCategories : [];
 		$rCategoryIDs = is_array($ctx["device"]["category_ids"] ?? null)
@@ -860,12 +849,12 @@ class PortalHandler {
 				}
 
 				exit(json_encode([
-						"js" => ["id" => $rStreamID, "cmd" => $rURL],
-						"streamer_id" => 0,
-						"link_id" => 0,
-						"load" => 0,
-						"error" => "",
-					]));
+					"js" => ["id" => $rStreamID, "cmd" => $rURL],
+					"streamer_id" => 0,
+					"link_id" => 0,
+					"load" => 0,
+					"error" => "",
+				]));
 
 			case "set_claim":
 				if (empty($rRequest["id"]) || empty($rRequest["real_type"])) {
@@ -945,10 +934,8 @@ class PortalHandler {
 
 						foreach ($rRows as $rRow) {
 							if (
-								!(
-									($rRow["start"] <= $rTime && $rTime <= $rRow["end"]) ||
-									$rTime <= $rRow["start"]
-								)
+								!(($rRow["start"] <= $rTime && $rTime <= $rRow["end"]) ||
+									$rTime <= $rRow["start"])
 							) {
 							} else {
 								$rRow["start_timestamp"] = $rRow["start"];
@@ -1059,10 +1046,9 @@ class PortalHandler {
 	 * Actions: set_claim, set_fav, del_fav, get_categories, get_genres_by_category_alias,
 	 *          get_years, get_ordered_list, create_link, get_abc.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleVod($rReqAction, &$ctx) {
+	public static function handleVod(string $rReqAction, array &$ctx) {
 		global $db, $rSettings, $rServers, $rRequest, $rCategories;
 		$rCategories = is_array($rCategories ?? null) ? $rCategories : [];
 		$rCategoryIDs = is_array($ctx["device"]["category_ids"] ?? null)
@@ -1303,10 +1289,9 @@ class PortalHandler {
 	 * Actions: set_claim, set_fav, del_fav, get_categories, get_genres_by_category_alias,
 	 *          get_years, get_ordered_list, get_abc.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleSeries($rReqAction, &$ctx) {
+	public static function handleSeries(string $rReqAction, array &$ctx) {
 		global $db, $rSettings, $rRequest, $rCategories;
 		$rCategories = is_array($rCategories ?? null) ? $rCategories : [];
 		$rCategoryIDs = is_array($ctx["device"]["category_ids"] ?? null)
@@ -1451,10 +1436,9 @@ class PortalHandler {
 	 * Phase 5 sub-handler: Account info actions.
 	 * Actions: get_main_info.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleAccountInfo($rReqAction, &$ctx) {
+	public static function handleAccountInfo(string $rReqAction, array &$ctx) {
 		global $rSettings;
 
 		switch ($rReqAction) {
@@ -1466,14 +1450,14 @@ class PortalHandler {
 				}
 
 				exit(json_encode([
-						"js" => [
-							"mac" => $ctx["mac"],
-							"phone" => $rExpiry,
-							"message" => htmlspecialchars_decode(
-								str_replace("\n", "<br/>", $rSettings["mag_message"]),
-							),
-						],
-					]));
+					"js" => [
+						"mac" => $ctx["mac"],
+						"phone" => $rExpiry,
+						"message" => htmlspecialchars_decode(
+							str_replace("\n", "<br/>", $rSettings["mag_message"]),
+						),
+					],
+				]));
 		}
 	}
 
@@ -1481,10 +1465,9 @@ class PortalHandler {
 	 * Phase 5 sub-handler: Radio actions.
 	 * Actions: get_ordered_list, get_all_fav_radio, set_fav, get_fav_ids.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleRadio($rReqAction, &$ctx) {
+	public static function handleRadio(string $rReqAction, array &$ctx) {
 		global $db, $rRequest;
 
 		switch ($rReqAction) {
@@ -1521,10 +1504,9 @@ class PortalHandler {
 	 * Phase 5 sub-handler: TV Archive actions.
 	 * Actions: get_next_part_url, create_link, get_link_for_channel.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleTvArchive($rReqAction, &$ctx) {
+	public static function handleTvArchive(string $rReqAction, array &$ctx) {
 		global $db, $rSettings, $rServers, $rRequest;
 
 		switch ($rReqAction) {
@@ -1683,10 +1665,9 @@ class PortalHandler {
 	 * Phase 5 sub-handler: EPG (Electronic Program Guide) actions.
 	 * Actions: get_week, get_data_table, get_simple_data_table, get_all_program_for_ch.
 	 *
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleEpg($rReqAction, &$ctx) {
+	public static function handleEpg(string $rReqAction, array &$ctx) {
 		global $db, $rRequest;
 
 		switch ($rReqAction) {
@@ -1761,10 +1742,8 @@ class PortalHandler {
 
 				foreach ($rEPGDatas as $rKey => $rEPGData) {
 					if (
-						!(
-							$rEPGData["start_timestamp"] <= time() &&
-							time() <= $rEPGData["stop_timestamp"]
-						)
+						!($rEPGData["start_timestamp"] <= time() &&
+							time() <= $rEPGData["stop_timestamp"])
 					) {
 					} else {
 						$rChannelIDx = $rKey + 1;
@@ -1912,11 +1891,9 @@ class PortalHandler {
 	 * If not authenticated and action is stb/get_profile, performs bruteforce check.
 	 * Then exits.
 	 *
-	 * @param string $rReqType
-	 * @param string $rReqAction
 	 * @param array  &$ctx Context array
 	 */
-	public static function handleUnauthenticated($rReqType, $rReqAction, &$ctx) {
+	public static function handleUnauthenticated(string $rReqType, string $rReqAction, array &$ctx) {
 		if (!($rReqType == "stb" && $rReqAction == "get_profile")) {
 		} else {
 			BruteforceGuard::checkBruteforce($ctx["ip"], $ctx["mac"]);
@@ -1930,9 +1907,8 @@ class PortalHandler {
 	 * Phase 7: Handshake — token generation.
 	 * Generates a new token for the device identified by MAC, updates DB, and exits with token.
 	 *
-	 * @param string $rMAC
 	 */
-	public static function handleHandshake($rMAC) {
+	public static function handleHandshake(string $rMAC) {
 		global $db, $rSettings, $rDevice;
 
 		$rDevice = getdevice(null, $rMAC);
diff --git a/src/Ministra/PortalHelpers.php b/src/Ministra/PortalHelpers.php
index de55cf69..78bb0bf0 100644
--- a/src/Ministra/PortalHelpers.php
+++ b/src/Ministra/PortalHelpers.php
@@ -22,16 +22,14 @@ use XcVm\Infrastructure\Cache\CacheReader;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class PortalHelpers
-{
+class PortalHelpers {
 	// ─── Устройство / кэш ───────────────────────────────────────────
 
 	/**
 	 * Получить устройство MAG по ID или MAC.
 	 * Загружает из кэша (igbinary) или БД, собирает права из букетов.
 	 */
-	public static function getDevice($rID = null, $rMAC = null)
-	{
+	public static function getDevice($rID = null, $rMAC = null) {
 		global $db, $rIP, $rBouquets, $rSettings, $rCached;
 		$rBouquets = CacheReader::get("bouquets");
 		$rDevice =
@@ -223,8 +221,7 @@ class PortalHelpers
 	/**
 	 * Сохранить кэш устройства в файл.
 	 */
-	public static function updateCache(&$rDevice)
-	{
+	public static function updateCache(&$rDevice) {
 		file_put_contents(
 			MINISTRA_TMP_PATH . "ministra_" . $rDevice["mag_id"],
 			igbinary_serialize($rDevice),
@@ -264,8 +261,7 @@ class PortalHelpers
 	/**
 	 * Получить EPG для нескольких стримов.
 	 */
-	public static function getEPGs($rStreamIDs, $rStartDate = null, $rFinishDate = null)
-	{
+	public static function getEPGs($rStreamIDs, $rStartDate = null, $rFinishDate = null) {
 		$rReturn = [];
 
 		foreach ($rStreamIDs as $rStreamID) {
@@ -278,8 +274,7 @@ class PortalHelpers
 	/**
 	 * Получить конкретную программу.
 	 */
-	public static function getProgramme($rStreamID, $rProgrammeID)
-	{
+	public static function getProgramme($rStreamID, $rProgrammeID) {
 		$rData = self::getEPG($rStreamID, null, null, true);
 
 		if (!isset($rData[$rProgrammeID])) {
@@ -293,8 +288,7 @@ class PortalHelpers
 	/**
 	 * Преобразовать строковые типы в числовые.
 	 */
-	public static function convertTypes($rTypes)
-	{
+	public static function convertTypes($rTypes) {
 		$rReturn = [];
 		$rTypeInt = [
 			"live" => 1,
@@ -552,21 +546,15 @@ class PortalHelpers
 
 				if (
 					(empty($rSearchBy) || stristr($rSeriesO["title"], $rSearchBy)) &&
-					!(
-						!empty($rPicking["abc"]) &&
+					!(!empty($rPicking["abc"]) &&
 						$rPicking["abc"] != "*" &&
-						strtoupper(substr($rSeriesO["title"], 0, 1)) != $rPicking["abc"]
-					) &&
-					!(
-						!empty($rPicking["genre"]) &&
+						strtoupper(substr($rSeriesO["title"], 0, 1)) != $rPicking["abc"]) &&
+					!(!empty($rPicking["genre"]) &&
 						$rPicking["genre"] != "*" &&
-						$rSeriesO["category_id"] != $rPicking["genre"]
-					) &&
-					!(
-						!empty($rPicking["years"]) &&
+						$rSeriesO["category_id"] != $rPicking["genre"]) &&
+					!(!empty($rPicking["years"]) &&
 						$rPicking["years"] != "*" &&
-						$rSeriesO["year"] != $rPicking["years"]
-					)
+						$rSeriesO["year"] != $rPicking["years"])
 				) {
 					if (empty($rFav)) {
 					} else {
@@ -613,8 +601,7 @@ class PortalHelpers
 	/**
 	 * Получить сезоны определённого сериала.
 	 */
-	public static function getSeasons($rSeriesID)
-	{
+	public static function getSeasons($rSeriesID) {
 		global $db;
 		$db->query(
 			"SELECT * FROM `streams_episodes` t1 INNER JOIN `streams` t2 ON t2.id=t1.stream_id WHERE t1.series_id = ? ORDER BY t1.season_num DESC, t1.episode_num ASC",
@@ -1384,8 +1371,7 @@ class PortalHelpers
 
 	// ─── Сортировка ──────────────────────────────────────────────────
 
-	public static function sortArrayStreamRating($a, $b)
-	{
+	public static function sortArrayStreamRating($a, $b) {
 		if (isset($a["rating"])) {
 		} else {
 			if (isset($a["movie_properties"]) && isset($b["movie_properties"])) {
@@ -1412,8 +1398,7 @@ class PortalHelpers
 		return 0;
 	}
 
-	public static function sortArrayStreamAdded($a, $b)
-	{
+	public static function sortArrayStreamAdded($a, $b) {
 		$rColumn = isset($a["added"]) ? "added" : "last_modified";
 
 		if (is_numeric($a[$rColumn])) {
@@ -1433,8 +1418,7 @@ class PortalHelpers
 		return 0;
 	}
 
-	public static function sortArrayStreamNumber($a, $b)
-	{
+	public static function sortArrayStreamNumber($a, $b) {
 		if ($a["number"] != $b["number"]) {
 			return $a["number"] < $b["number"] ? -1 : 1;
 		}
@@ -1442,8 +1426,7 @@ class PortalHelpers
 		return 0;
 	}
 
-	public static function sortArrayStreamName($a, $b)
-	{
+	public static function sortArrayStreamName($a, $b) {
 		$rColumn = isset($a["stream_display_name"]) ? "stream_display_name" : "title";
 
 		return strcmp($a[$rColumn], $b[$rColumn]);
@@ -1454,8 +1437,7 @@ class PortalHelpers
 	/**
 	 * Извлечь HTTP-заголовки из $_SERVER.
 	 */
-	public static function getHeaders()
-	{
+	public static function getHeaders() {
 		$rHeaders = [];
 
 		foreach ($_SERVER as $rName => $rValue) {
@@ -1477,8 +1459,7 @@ class PortalHelpers
 	/**
 	 * Shutdown callback: закрыть MySQL-соединение.
 	 */
-	public static function shutdown()
-	{
+	public static function shutdown() {
 		global $db;
 
 		if (!is_object($db)) {
diff --git a/src/Ministra/portal.php b/src/Ministra/portal.php
index dc9cc2ba..64e7556f 100644
--- a/src/Ministra/portal.php
+++ b/src/Ministra/portal.php
@@ -1011,21 +1011,15 @@ function getSeriesItems(
 
 			if (
 				(empty($rSearchBy) || stristr($rSeriesO["title"], $rSearchBy)) &&
-				!(
-					!empty($rPicking["abc"]) &&
+				!(!empty($rPicking["abc"]) &&
 					$rPicking["abc"] != "*" &&
-					strtoupper(substr($rSeriesO["title"], 0, 1)) != $rPicking["abc"]
-				) &&
-				!(
-					!empty($rPicking["genre"]) &&
+					strtoupper(substr($rSeriesO["title"], 0, 1)) != $rPicking["abc"]) &&
+				!(!empty($rPicking["genre"]) &&
 					$rPicking["genre"] != "*" &&
-					$rSeriesO["category_id"] != $rPicking["genre"]
-				) &&
-				!(
-					!empty($rPicking["years"]) &&
+					$rSeriesO["category_id"] != $rPicking["genre"]) &&
+				!(!empty($rPicking["years"]) &&
 					$rPicking["years"] != "*" &&
-					$rSeriesO["year"] != $rPicking["years"]
-				)
+					$rSeriesO["year"] != $rPicking["years"])
 			) {
 				if (empty($rFav)) {
 				} else {
@@ -1070,8 +1064,7 @@ function getSeriesItems(
 	return $rOutputSeries;
 }
 
-function convertTypes($rTypes)
-{
+function convertTypes($rTypes) {
 	$rReturn = [];
 	$rTypeInt = [
 		"live" => 1,
@@ -1309,8 +1302,7 @@ function getItems(
 	return $rStreams;
 }
 
-function sortArrayStreamRating($a, $b)
-{
+function sortArrayStreamRating($a, $b) {
 	if (!isset($a["rating"])) {
 		if (isset($a["movie_properties"]) && isset($b["movie_properties"])) {
 			if (!is_array($a["movie_properties"])) {
@@ -1336,8 +1328,7 @@ function sortArrayStreamRating($a, $b)
 	return 0;
 }
 
-function sortArrayStreamAdded($a, $b)
-{
+function sortArrayStreamAdded($a, $b) {
 	$rColumn = isset($a["added"]) ? "added" : "last_modified";
 
 	if (is_numeric($a[$rColumn])) {
@@ -1357,8 +1348,7 @@ function sortArrayStreamAdded($a, $b)
 	return 0;
 }
 
-function getDevice($rID = null, $rMAC = null)
-{
+function getDevice($rID = null, $rMAC = null) {
 	global $db, $rSettings, $rCached;
 	global $rIP;
 	$rBouquets = CacheReader::get("bouquets");
@@ -1550,8 +1540,7 @@ function getDevice($rID = null, $rMAC = null)
 	return $rDevice;
 }
 
-function getEPG($rStreamID, $rStartDate = null, $rFinishDate = null, $rByID = false)
-{
+function getEPG($rStreamID, $rStartDate = null, $rFinishDate = null, $rByID = false) {
 	$rReturn = [];
 	$rData = file_exists(EPG_PATH . "stream_" . $rStreamID)
 		? igbinary_unserialize(file_get_contents(EPG_PATH . "stream_" . $rStreamID))
@@ -1571,8 +1560,7 @@ function getEPG($rStreamID, $rStartDate = null, $rFinishDate = null, $rByID = fa
 	return $rReturn;
 }
 
-function getEPGs($rStreamIDs, $rStartDate = null, $rFinishDate = null)
-{
+function getEPGs($rStreamIDs, $rStartDate = null, $rFinishDate = null) {
 	$rReturn = [];
 
 	foreach ($rStreamIDs as $rStreamID) {
@@ -1582,8 +1570,7 @@ function getEPGs($rStreamIDs, $rStartDate = null, $rFinishDate = null)
 	return $rReturn;
 }
 
-function getProgramme($rStreamID, $rProgrammeID)
-{
+function getProgramme($rStreamID, $rProgrammeID) {
 	$rData = getepg($rStreamID, null, null, true);
 
 	if (!isset($rData[$rProgrammeID])) {
@@ -1592,8 +1579,7 @@ function getProgramme($rStreamID, $rProgrammeID)
 	}
 }
 
-function updateCache()
-{
+function updateCache() {
 	global $rDevice;
 
 	if (!is_array($rDevice) || empty($rDevice["mag_id"])) {
@@ -1778,8 +1764,7 @@ function getMovies(
 	return json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR);
 }
 
-function getSeasons($rSeriesID)
-{
+function getSeasons($rSeriesID) {
 	global $db;
 	$db->query(
 		"SELECT * FROM `streams_episodes` t1 INNER JOIN `streams` t2 ON t2.id=t1.stream_id WHERE t1.series_id = ? ORDER BY t1.season_num DESC, t1.episode_num ASC",
@@ -2002,8 +1987,7 @@ function getSeries(
 	return json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR);
 }
 
-function sortArrayStreamNumber($a, $b)
-{
+function sortArrayStreamNumber($a, $b) {
 	if ($a["number"] != $b["number"]) {
 		return $a["number"] < $b["number"] ? -1 : 1;
 	}
@@ -2011,15 +1995,13 @@ function sortArrayStreamNumber($a, $b)
 	return 0;
 }
 
-function sortArrayStreamName($a, $b)
-{
+function sortArrayStreamName($a, $b) {
 	$rColumn = isset($a["stream_display_name"]) ? "stream_display_name" : "title";
 
 	return strcmp($a[$rColumn], $b[$rColumn]);
 }
 
-function getStations($rCategoryID = null, $rFav = null, $rOrderBy = null)
-{
+function getStations($rCategoryID = null, $rFav = null, $rOrderBy = null) {
 	global $rDevice;
 	global $rPlayer;
 	global $rPageItems;
@@ -2363,8 +2345,7 @@ function getStreams(
 	return json_encode($rOutput, JSON_PARTIAL_OUTPUT_ON_ERROR);
 }
 
-function getHeaders()
-{
+function getHeaders() {
 	$rHeaders = [];
 
 	foreach ($_SERVER as $rName => $rValue) {
@@ -2379,8 +2360,7 @@ function getHeaders()
 	return $rHeaders;
 }
 
-function shutdown()
-{
+function shutdown() {
 	global $db;
 
 	if (!is_object($db)) {
diff --git a/src/Public/Controllers/Admin/ActiveCodeController.php b/src/Public/Controllers/Admin/ActiveCodeController.php
index af3918c0..d6a5bb38 100644
--- a/src/Public/Controllers/Admin/ActiveCodeController.php
+++ b/src/Public/Controllers/Admin/ActiveCodeController.php
@@ -11,17 +11,15 @@ use XcVm\Domain\Line\PackageService;
  *
  * @package XC_VM_Public_Controllers_Admin
  */
-class ActiveCodeController extends BaseAdminController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Generate Active Codes');
+class ActiveCodeController extends BaseAdminController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Generate Active Codes');
 
-        $this->render('active_code', [
-            'rPackages'  => PackageService::getAll(null, 'line') ?: [],
-            'rBouquets'  => BouquetService::getAllSimple() ?: [],
-            'rResellers' => ActiveCodeService::getResellersForAssignment(),
-        ]);
-    }
+		$this->render('active_code', [
+			'rPackages'  => PackageService::getAll(null, 'line') ?: [],
+			'rBouquets'  => BouquetService::getAllSimple() ?: [],
+			'rResellers' => ActiveCodeService::getResellersForAssignment(),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/ActiveCodeDetailsController.php b/src/Public/Controllers/Admin/ActiveCodeDetailsController.php
index 7cd8a051..4202fb9f 100644
--- a/src/Public/Controllers/Admin/ActiveCodeDetailsController.php
+++ b/src/Public/Controllers/Admin/ActiveCodeDetailsController.php
@@ -17,103 +17,100 @@ use XcVm\Domain\Line\PackageService;
  *
  * @package XC_VM_Public_Controllers_Admin
  */
-class ActiveCodeDetailsController
-{
-    /**
-     * action=active_code_details — full voucher & companion line details.
-     */
-    public function index(): never
-    {
-        if (
-            !(defined('PHP_ERRORS') && PHP_ERRORS)
-            && strtolower($_SERVER['HTTP_X_REQUESTED_WITH'] ?? '') !== 'xmlhttprequest'
-        ) {
-            exit();
-        }
+class ActiveCodeDetailsController {
+	/**
+	 * action=active_code_details — full voucher & companion line details.
+	 */
+	public function index(): never {
+		if (
+			!(defined('PHP_ERRORS') && PHP_ERRORS)
+			&& strtolower($_SERVER['HTTP_X_REQUESTED_WITH'] ?? '') !== 'xmlhttprequest'
+		) {
+			exit();
+		}
 
-        global $db;
-        $codeId = (int) (RequestManager::get('id') ?? 0);
+		global $db;
+		$codeId = (int) (RequestManager::get('id') ?? 0);
 
-        $code = $codeId ? $db->fetchOne(
-            "SELECT `activation_codes`.*, `lines`.`username` as `sub_username`, `lines`.`password` as `sub_password`,
+		$code = $codeId ? $db->fetchOne(
+			"SELECT `activation_codes`.*, `lines`.`username` as `sub_username`, `lines`.`password` as `sub_password`,
                     `lines`.`exp_date` as `sub_exp_date`, `lines`.`max_connections` as `line_max_conn`
              FROM `activation_codes`
              LEFT JOIN `lines` ON `lines`.`id` = `activation_codes`.`subscriber_id`
              WHERE `activation_codes`.`id` = ? LIMIT 1;",
-            $codeId
-        ) : null;
+			$codeId
+		) : null;
 
-        if (!$code) {
-            http_response_code(404);
-            exit();
-        }
+		if (!$code) {
+			http_response_code(404);
+			exit();
+		}
 
-        $package = PackageService::getById((int) $code['package_id']);
-        $portalUrl = $this->resolveBaseUrl((string) ($code['dns_base'] ?? ''));
-        $portalParsed = parse_url($portalUrl);
+		$package = PackageService::getById((int) $code['package_id']);
+		$portalUrl = $this->resolveBaseUrl((string) ($code['dns_base'] ?? ''));
+		$portalParsed = parse_url($portalUrl);
 
-        $m3uHls = "{$portalUrl}/get.php?username={$code['sub_username']}&password={$code['sub_password']}&type=m3u_plus&output=hls";
-        $m3uTs  = "{$portalUrl}/get.php?username={$code['sub_username']}&password={$code['sub_password']}&type=m3u_plus&output=ts";
+		$m3uHls = "{$portalUrl}/get.php?username={$code['sub_username']}&password={$code['sub_password']}&type=m3u_plus&output=hls";
+		$m3uTs  = "{$portalUrl}/get.php?username={$code['sub_username']}&password={$code['sub_password']}&type=m3u_plus&output=ts";
 
-        $portalCode = AuthRepository::getActiveCodePortalCode();
-        $playerCode = AuthRepository::getWebPlayerCode();
+		$portalCode = AuthRepository::getActiveCodePortalCode();
+		$playerCode = AuthRepository::getWebPlayerCode();
 
-        $subscriberPortalUrl = $portalCode ? "{$portalUrl}/{$portalCode}/" : "{$portalUrl}/portal";
-        $directActivateUrl   = "{$subscriberPortalUrl}?code=" . urlencode((string) $code['activation_code']);
-        $webPlayerUrl        = $playerCode ? "{$portalUrl}/{$playerCode}/" : null;
+		$subscriberPortalUrl = $portalCode ? "{$portalUrl}/{$portalCode}/" : "{$portalUrl}/portal";
+		$directActivateUrl   = "{$subscriberPortalUrl}?code=" . urlencode((string) $code['activation_code']);
+		$webPlayerUrl        = $playerCode ? "{$portalUrl}/{$playerCode}/" : null;
 
-        $d = [
-            'id' => (int) $code['id'],
-            'code' => $code['activation_code'],
-            'batch_name' => $code['batch_name'],
-            'status' => (int) $code['status'],
-            'status_text' => ($code['status'] == 1) ? 'Ready (Stock)' : (($code['status'] == 2) ? 'Active' : 'Disabled'),
-            'package_name' => $package['package_name'] ?? 'Custom Package',
-            'is_trial' => (bool) $code['is_trial'],
-            'max_connections' => (int) ($code['line_max_conn'] ?: $code['max_connections']),
-            'exp_date' => $code['sub_exp_date'] ? date('Y-m-d H:i:s', (int) $code['sub_exp_date']) : 'Frozen (Stock)',
-            'activated_at' => $code['activated_at'] ? date('Y-m-d H:i:s', (int) $code['activated_at']) : 'Never',
-            'created_at' => $code['created_at'] ? date('Y-m-d H:i:s', (int) $code['created_at']) : '-',
-            'mac' => $code['mac'] ?: 'None',
-            'device_id' => $code['device_id'] ?: 'None',
-            'username' => $code['sub_username'],
-            'password' => $code['sub_password'],
-            'server' => $portalParsed['host'] ?? 'localhost',
-            'port' => $portalParsed['port'] ?? (isset($_SERVER['SERVER_PORT']) ? (int) $_SERVER['SERVER_PORT'] : 80),
-            'portal_url' => $portalUrl,
-            'activation_portal_url' => $subscriberPortalUrl,
-            'direct_activate_url' => $directActivateUrl,
-            'web_player_url' => $webPlayerUrl,
-            'm3u_hls' => $m3uHls,
-            'm3u_ts' => $m3uTs,
-        ];
+		$d = [
+			'id' => (int) $code['id'],
+			'code' => $code['activation_code'],
+			'batch_name' => $code['batch_name'],
+			'status' => (int) $code['status'],
+			'status_text' => ($code['status'] == 1) ? 'Ready (Stock)' : (($code['status'] == 2) ? 'Active' : 'Disabled'),
+			'package_name' => $package['package_name'] ?? 'Custom Package',
+			'is_trial' => (bool) $code['is_trial'],
+			'max_connections' => (int) ($code['line_max_conn'] ?: $code['max_connections']),
+			'exp_date' => $code['sub_exp_date'] ? date('Y-m-d H:i:s', (int) $code['sub_exp_date']) : 'Frozen (Stock)',
+			'activated_at' => $code['activated_at'] ? date('Y-m-d H:i:s', (int) $code['activated_at']) : 'Never',
+			'created_at' => $code['created_at'] ? date('Y-m-d H:i:s', (int) $code['created_at']) : '-',
+			'mac' => $code['mac'] ?: 'None',
+			'device_id' => $code['device_id'] ?: 'None',
+			'username' => $code['sub_username'],
+			'password' => $code['sub_password'],
+			'server' => $portalParsed['host'] ?? 'localhost',
+			'port' => $portalParsed['port'] ?? (isset($_SERVER['SERVER_PORT']) ? (int) $_SERVER['SERVER_PORT'] : 80),
+			'portal_url' => $portalUrl,
+			'activation_portal_url' => $subscriberPortalUrl,
+			'direct_activate_url' => $directActivateUrl,
+			'web_player_url' => $webPlayerUrl,
+			'm3u_hls' => $m3uHls,
+			'm3u_ts' => $m3uTs,
+		];
 
-        // Expose the translator to the view the same way BaseAdminController does,
-        // so the fragment can use $language::get(...) like every other view.
-        $language = Translator::class;
+		// Expose the translator to the view the same way BaseAdminController does,
+		// so the fragment can use $language::get(...) like every other view.
+		$language = Translator::class;
 
-        header('Content-Type: text/html; charset=utf-8');
-        require MAIN_HOME . 'Public/Views/admin/active_code_details.php';
-        exit();
-    }
+		header('Content-Type: text/html; charset=utf-8');
+		require MAIN_HOME . 'Public/Views/admin/active_code_details.php';
+		exit();
+	}
 
-    /**
-     * Public base URL for the subscriber portal / credential links.
-     *
-     * Honours a well-formed per-code dns_base (one that carries an http(s)://
-     * scheme); otherwise falls back to this panel's own request origin, which is
-     * where the portal is served. Returns no trailing slash.
-     */
-    private function resolveBaseUrl(string $dnsBase): string
-    {
-        $dnsBase = trim($dnsBase);
-        if ($dnsBase !== '' && preg_match('#^https?://#i', $dnsBase)) {
-            return rtrim($dnsBase, '/');
-        }
+	/**
+	 * Public base URL for the subscriber portal / credential links.
+	 *
+	 * Honours a well-formed per-code dns_base (one that carries an http(s)://
+	 * scheme); otherwise falls back to this panel's own request origin, which is
+	 * where the portal is served. Returns no trailing slash.
+	 */
+	private function resolveBaseUrl(string $dnsBase): string {
+		$dnsBase = trim($dnsBase);
+		if ($dnsBase !== '' && preg_match('#^https?://#i', $dnsBase)) {
+			return rtrim($dnsBase, '/');
+		}
 
-        $scheme = (!empty($_SERVER['HTTPS']) && strtolower((string) $_SERVER['HTTPS']) !== 'off') ? 'https' : 'http';
-        $host = (string) ($_SERVER['HTTP_HOST'] ?? '');
+		$scheme = (!empty($_SERVER['HTTPS']) && strtolower((string) $_SERVER['HTTPS']) !== 'off') ? 'https' : 'http';
+		$host = (string) ($_SERVER['HTTP_HOST'] ?? '');
 
-        return $host !== '' ? $scheme . '://' . $host : '';
-    }
+		return $host !== '' ? $scheme . '://' . $host : '';
+	}
 }
diff --git a/src/Public/Controllers/Admin/ActiveCodesBatchController.php b/src/Public/Controllers/Admin/ActiveCodesBatchController.php
index 1c7eff97..75d47734 100644
--- a/src/Public/Controllers/Admin/ActiveCodesBatchController.php
+++ b/src/Public/Controllers/Admin/ActiveCodesBatchController.php
@@ -9,17 +9,15 @@ use XcVm\Domain\Line\ActiveCodeService;
  *
  * @package XC_VM_Public_Controllers_Admin
  */
-class ActiveCodesBatchController extends BaseAdminController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Active Codes Batch Manager');
+class ActiveCodesBatchController extends BaseAdminController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Active Codes Batch Manager');
 
-        $batches = ActiveCodeService::getBatchSummary([], true);
+		$batches = ActiveCodeService::getBatchSummary([], true);
 
-        $this->render('active_codes_batch', [
-            'batches' => $batches,
-        ]);
-    }
+		$this->render('active_codes_batch', [
+			'batches' => $batches,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/ActiveCodesController.php b/src/Public/Controllers/Admin/ActiveCodesController.php
index af42b993..3e99c2c4 100644
--- a/src/Public/Controllers/Admin/ActiveCodesController.php
+++ b/src/Public/Controllers/Admin/ActiveCodesController.php
@@ -10,16 +10,14 @@ use XcVm\Domain\Line\PackageService;
  *
  * @package XC_VM_Public_Controllers_Admin
  */
-class ActiveCodesController extends BaseAdminController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Active Codes');
-        $this->render('active_codes', [
-            'rPackages' => PackageService::getAll(null, 'line') ?: [],
-            'resellers' => ActiveCodeService::getResellersWithCodes(),
-            'batches'   => ActiveCodeService::getRecentBatchNames(),
-        ]);
-    }
+class ActiveCodesController extends BaseAdminController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Active Codes');
+		$this->render('active_codes', [
+			'rPackages' => PackageService::getAll(null, 'line') ?: [],
+			'resellers' => ActiveCodeService::getResellersWithCodes(),
+			'batches'   => ActiveCodeService::getRecentBatchNames(),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/ActiveCodesMassController.php b/src/Public/Controllers/Admin/ActiveCodesMassController.php
index f96c81a8..589e754d 100644
--- a/src/Public/Controllers/Admin/ActiveCodesMassController.php
+++ b/src/Public/Controllers/Admin/ActiveCodesMassController.php
@@ -10,17 +10,15 @@ use XcVm\Domain\Line\PackageService;
  *
  * @package XC_VM_Public_Controllers_Admin
  */
-class ActiveCodesMassController extends BaseAdminController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Mass Edit Active Codes');
+class ActiveCodesMassController extends BaseAdminController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Mass Edit Active Codes');
 
-        $this->render('active_codes_mass', [
-            'rPackages' => PackageService::getAll(null, 'line') ?: [],
-            'batches'   => ActiveCodeService::getRecentBatchNames(),
-            'resellers' => ActiveCodeService::getResellersWithCodes(),
-        ]);
-    }
+		$this->render('active_codes_mass', [
+			'rPackages' => PackageService::getAll(null, 'line') ?: [],
+			'batches'   => ActiveCodeService::getRecentBatchNames(),
+			'resellers' => ActiveCodeService::getResellersWithCodes(),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/ActiveCodeAjaxController.php b/src/Public/Controllers/Admin/Ajax/ActiveCodeAjaxController.php
index 0d3dbcbc..de7e826e 100644
--- a/src/Public/Controllers/Admin/Ajax/ActiveCodeAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/ActiveCodeAjaxController.php
@@ -18,88 +18,83 @@ use XcVm\Domain\Line\ActiveCodeService;
  *
  * @package XC_VM_Public_Controllers_Admin
  */
-class ActiveCodeAjaxController extends BaseAjaxController
-{
+class ActiveCodeAjaxController extends BaseAjaxController {
+	/**
+	 * action=generate_active_codes — Generate active codes batch (Admin).
+	 */
+	public function generate(): never {
+		$this->requireXhr();
 
-    /**
-     * action=generate_active_codes — Generate active codes batch (Admin).
-     */
-    public function generate(): never
-    {
-        $this->requireXhr();
+		$data = RequestManager::getAll();
+		$user = $GLOBALS['rUserInfo'] ?? [];
+		$res = ActiveCodeService::generateCodes($data, $user, true);
 
-        $data = RequestManager::getAll();
-        $user = $GLOBALS['rUserInfo'] ?? [];
-        $res = ActiveCodeService::generateCodes($data, $user, true);
+		if ($res['status'] === 'SUCCESS') {
+			$this->ok([
+				'message' => $res['message'] ?? '',
+				'batch_name' => $res['batch_name'] ?? null,
+				'qty' => $res['qty'] ?? 0,
+				'codes' => $res['codes'] ?? []
+			]);
+		}
 
-        if ($res['status'] === 'SUCCESS') {
-            $this->ok([
-                'message' => $res['message'] ?? '',
-                'batch_name' => $res['batch_name'] ?? null,
-                'qty' => $res['qty'] ?? 0,
-                'codes' => $res['codes'] ?? []
-            ]);
-        }
+		$this->fail([
+			'message' => $res['message'] ?? 'Failed to generate codes.'
+		]);
+	}
 
-        $this->fail([
-            'message' => $res['message'] ?? 'Failed to generate codes.'
-        ]);
-    }
+	/**
+	 * action=active_codes_batch_action — Batch enable/disable/delete (Admin).
+	 */
+	public function batchAction(): never {
+		$this->requireXhr();
 
-    /**
-     * action=active_codes_batch_action — Batch enable/disable/delete (Admin).
-     */
-    public function batchAction(): never
-    {
-        $this->requireXhr();
+		global $db;
+		$batchName = trim(RequestManager::get('batch_name') ?? '');
+		$subAction = trim(RequestManager::get('sub_action') ?? '');
+		$refund = !empty(RequestManager::get('refund_credits'));
 
-        global $db;
-        $batchName = trim(RequestManager::get('batch_name') ?? '');
-        $subAction = trim(RequestManager::get('sub_action') ?? '');
-        $refund = !empty(RequestManager::get('refund_credits'));
+		if (empty($batchName)) {
+			$this->fail(['message' => 'Missing batch name.']);
+		}
 
-        if (empty($batchName)) {
-            $this->fail(['message' => 'Missing batch name.']);
-        }
+		$codes = $db->fetchAll(
+			"SELECT `id` FROM `activation_codes` WHERE `batch_name` = ?;",
+			$batchName
+		);
 
-        $codes = $db->fetchAll(
-            "SELECT `id` FROM `activation_codes` WHERE `batch_name` = ?;",
-            $batchName
-        );
+		if (empty($codes)) {
+			$this->fail(['message' => 'No codes found for this batch.']);
+		}
 
-        if (empty($codes)) {
-            $this->fail(['message' => 'No codes found for this batch.']);
-        }
+		$ids = array_column($codes, 'id');
+		$user = $GLOBALS['rUserInfo'] ?? [];
+		$res = ActiveCodeService::massAction($subAction, $ids, $user, true, ['refund_credits' => $refund]);
 
-        $ids = array_column($codes, 'id');
-        $user = $GLOBALS['rUserInfo'] ?? [];
-        $res = ActiveCodeService::massAction($subAction, $ids, $user, true, ['refund_credits' => $refund]);
+		if ($res['status'] === 'SUCCESS') {
+			$this->ok(['message' => $res['message'] ?? 'Batch action processed.']);
+		}
 
-        if ($res['status'] === 'SUCCESS') {
-            $this->ok(['message' => $res['message'] ?? 'Batch action processed.']);
-        }
+		$this->fail(['message' => $res['message'] ?? 'Batch action failed.']);
+	}
 
-        $this->fail(['message' => $res['message'] ?? 'Batch action failed.']);
-    }
+	/**
+	 * action=active_codes_export_txt — Export physical scratch card vouchers as .txt.
+	 */
+	public function exportTxt(): never {
+		$batchName = trim(RequestManager::get('batch_name') ?? '');
+		if (empty($batchName)) {
+			exit('Invalid batch name');
+		}
 
-    /**
-     * action=active_codes_export_txt — Export physical scratch card vouchers as .txt.
-     */
-    public function exportTxt(): never
-    {
-        $batchName = trim(RequestManager::get('batch_name') ?? '');
-        if (empty($batchName)) {
-            exit('Invalid batch name');
-        }
+		$user = $GLOBALS['rUserInfo'] ?? [];
+		$content = ActiveCodeService::exportBatchTxt($batchName, $user, true);
+		$filename = preg_replace('/[^A-Za-z0-9_\-]/', '_', $batchName) . '_vouchers.txt';
 
-        $user = $GLOBALS['rUserInfo'] ?? [];
-        $content = ActiveCodeService::exportBatchTxt($batchName, $user, true);
-        $filename = preg_replace('/[^A-Za-z0-9_\-]/', '_', $batchName) . '_vouchers.txt';
-
-        header('Content-Type: text/plain; charset=utf-8');
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
-        header('Content-Length: ' . strlen($content));
-        echo $content;
-        exit();
-    }
+		header('Content-Type: text/plain; charset=utf-8');
+		header('Content-Disposition: attachment; filename="' . $filename . '"');
+		header('Content-Length: ' . strlen($content));
+		echo $content;
+		exit();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/BackupAjaxController.php b/src/Public/Controllers/Admin/Ajax/BackupAjaxController.php
index 51b50c31..83d17a6d 100644
--- a/src/Public/Controllers/Admin/Ajax/BackupAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/BackupAjaxController.php
@@ -26,171 +26,170 @@ use XcVm\Public\Controllers\Admin\TableController;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class BackupAjaxController extends BaseAjaxController {
+	/** action=clear_logs — delete/truncate a log table over an optional date range. */
+	public function clearLogs(): never {
+		$this->requireXhr();
+		$this->gateAny([
+			['adv', 'reg_userlog'],
+			['adv', 'client_request_log'],
+			['adv', 'connection_logs'],
+			['adv', 'stream_errors'],
+			['adv', 'credits_log'],
+			['adv', 'folder_watch_settings'],
+			['adv', 'panel_logs'],
+		]);
 
-    /** action=clear_logs — delete/truncate a log table over an optional date range. */
-    public function clearLogs(): never {
-        $this->requireXhr();
-        $this->gateAny(array(
-            array('adv', 'reg_userlog'),
-            array('adv', 'client_request_log'),
-            array('adv', 'connection_logs'),
-            array('adv', 'stream_errors'),
-            array('adv', 'credits_log'),
-            array('adv', 'folder_watch_settings'),
-            array('adv', 'panel_logs'),
-        ));
+		global $db;
 
-        global $db;
+		if (strlen(RequestManager::get('from')) == 0) {
+			$rStartTime = null;
+		} else {
+			$rStartTime = strtotime(RequestManager::get('from') . ' 00:00:00');
 
-        if (strlen(RequestManager::get('from')) == 0) {
-            $rStartTime = null;
-        } else {
-            $rStartTime = strtotime(RequestManager::get('from') . ' 00:00:00');
+			if (!$rStartTime) {
+				$this->fail();
+			}
+		}
 
-            if (!$rStartTime) {
-                $this->fail();
-            }
-        }
+		if (strlen(RequestManager::get('to')) == 0) {
+			$rEndTime = null;
+		} else {
+			$rEndTime = strtotime(RequestManager::get('to') . ' 23:59:59');
 
-        if (strlen(RequestManager::get('to')) == 0) {
-            $rEndTime = null;
-        } else {
-            $rEndTime = strtotime(RequestManager::get('to') . ' 23:59:59');
+			if (!$rEndTime) {
+				$this->fail();
+			}
+		}
 
-            if (!$rEndTime) {
-                $this->fail();
-            }
-        }
+		if (in_array(RequestManager::get('type'), ['lines_logs', 'streams_errors', 'lines_activity', 'users_credits_logs', 'users_logs', 'panel_logs'])) {
+			$rColumn = (RequestManager::get('type') == 'lines_activity') ? 'date_start' : 'date';
+			$rTable = QueryHelper::prepareColumn(RequestManager::get('type'));
 
-        if (in_array(RequestManager::get('type'), array('lines_logs', 'streams_errors', 'lines_activity', 'users_credits_logs', 'users_logs', 'panel_logs'))) {
-            $rColumn = (RequestManager::get('type') == 'lines_activity') ? 'date_start' : 'date';
-            $rTable = QueryHelper::prepareColumn(RequestManager::get('type'));
+			if ($rStartTime && $rEndTime) {
+				$db->query('DELETE FROM ' . $rTable . ' WHERE `' . $rColumn . '` >= ? AND `' . $rColumn . '` <= ?;', $rStartTime, $rEndTime);
+			} elseif ($rStartTime) {
+				$db->query('DELETE FROM ' . $rTable . ' WHERE `' . $rColumn . '` >= ?;', $rStartTime);
+			} elseif ($rEndTime) {
+				$db->query('DELETE FROM ' . $rTable . ' WHERE `' . $rColumn . '` <= ?;', $rEndTime);
+			} else {
+				$db->query('TRUNCATE ' . $rTable . ';');
+			}
+		}
 
-            if ($rStartTime && $rEndTime) {
-                $db->query('DELETE FROM ' . $rTable . ' WHERE `' . $rColumn . '` >= ? AND `' . $rColumn . '` <= ?;', $rStartTime, $rEndTime);
-            } elseif ($rStartTime) {
-                $db->query('DELETE FROM ' . $rTable . ' WHERE `' . $rColumn . '` >= ?;', $rStartTime);
-            } elseif ($rEndTime) {
-                $db->query('DELETE FROM ' . $rTable . ' WHERE `' . $rColumn . '` <= ?;', $rEndTime);
-            } else {
-                $db->query('TRUNCATE ' . $rTable . ';');
-            }
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=backup — delete/restore a DB backup or trigger a new one (local + Dropbox). */
+	public function backup(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'database');
 
-    /** action=backup — delete/restore a DB backup or trigger a new one (local + Dropbox). */
-    public function backup(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'database');
+		global $rSettings;
+		$rSub = RequestManager::get('sub');
 
-        global $rSettings;
-        $rSub = RequestManager::get('sub');
+		if ($rSub == 'delete') {
+			$rBackup = pathinfo(RequestManager::get('filename'))['filename'];
 
-        if ($rSub == 'delete') {
-            $rBackup = pathinfo(RequestManager::get('filename'))['filename'];
+			if (file_exists(MAIN_HOME . 'backups/' . $rBackup . '.sql')) {
+				unlink(MAIN_HOME . 'backups/' . $rBackup . '.sql');
+			}
 
-            if (file_exists(MAIN_HOME . 'backups/' . $rBackup . '.sql')) {
-                unlink(MAIN_HOME . 'backups/' . $rBackup . '.sql');
-            }
+			if (0 < strlen($rSettings['dropbox_token'])) {
+				BackupService::deleteRemote('/' . $rBackup . '.sql');
+			}
 
-            if (0 < strlen($rSettings['dropbox_token'])) {
-                BackupService::deleteRemote('/' . $rBackup . '.sql');
-            }
+			$this->ok();
+		}
 
-            $this->ok();
-        }
+		if ($rSub == 'restore') {
+			$rBackup = pathinfo(RequestManager::get('filename'))['filename'];
+			$rFilename = MAIN_HOME . 'backups/' . $rBackup . '.sql';
 
-        if ($rSub == 'restore') {
-            $rBackup = pathinfo(RequestManager::get('filename'))['filename'];
-            $rFilename = MAIN_HOME . 'backups/' . $rBackup . '.sql';
+			if (!file_exists($rFilename)) {
+				$rFilename = MAIN_HOME . 'tmp/restore.sql';
 
-            if (!file_exists($rFilename)) {
-                $rFilename = MAIN_HOME . 'tmp/restore.sql';
+				if (0 < strlen($rSettings['dropbox_token'])) {
+					if (!BackupService::downloadRemote('/' . $rBackup . '.sql', $rFilename)) {
+						$this->fail();
+					}
+				} else {
+					$this->fail();
+				}
+			}
 
-                if (0 < strlen($rSettings['dropbox_token'])) {
-                    if (!BackupService::downloadRemote('/' . $rBackup . '.sql', $rFilename)) {
-                        $this->fail();
-                    }
-                } else {
-                    $this->fail();
-                }
-            }
+			$this->json(['result' => BackupService::restore($rFilename)]);
+		}
 
-            $this->json(array('result' => BackupService::restore($rFilename)));
-        }
+		if ($rSub != 'backup') {
+			$this->fail();
+		}
 
-        if ($rSub != 'backup') {
-            $this->fail();
-        }
+		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:backups 1 > /dev/null 2>/dev/null &');
 
-        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:backups 1 > /dev/null 2>/dev/null &');
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/**
+	 * action=report — stream a DataTables result as a CSV/JSON download.
+	 *
+	 * Opened via full-page navigation (no XHR header), so it does NOT call
+	 * requireXhr(). The DataTables handler is dispatched in-process (the old
+	 * loopback curl is unreachable under the Front Controller); its echoed JSON
+	 * is captured from a shutdown hook and converted to the requested format.
+	 */
+	public function report(): never {
+		$this->gate('adv', 'backups');
 
-    /**
-     * action=report — stream a DataTables result as a CSV/JSON download.
-     *
-     * Opened via full-page navigation (no XHR header), so it does NOT call
-     * requireXhr(). The DataTables handler is dispatched in-process (the old
-     * loopback curl is unreachable under the Front Controller); its echoed JSON
-     * is captured from a shutdown hook and converted to the requested format.
-     */
-    public function report(): never {
-        $this->gate('adv', 'backups');
+		global $rUserInfo;
+		set_time_limit(60);
+		ini_set('memory_limit', '-1');
+		$rParams = json_decode(RequestManager::get('params'), true) ?: [];
+		$rParams['report'] = true;
+		$rParams['start'] = 0;
+		$rParams['length'] = 100000;
+		$rParams['draw'] = 0;
 
-        global $rUserInfo;
-        set_time_limit(60);
-        ini_set('memory_limit', '-1');
-        $rParams = json_decode(RequestManager::get('params'), true) ?: array();
-        $rParams['report'] = true;
-        $rParams['start'] = 0;
-        $rParams['length'] = 100000;
-        $rParams['draw'] = 0;
+		$rReportName = preg_replace('/[^A-Za-z0-9 ]/', '', ($rParams['id'] ?? 'report')) . '_' . date('YmdHis');
+		$rWantJson = RequestManager::get('format') === 'json';
 
-        $rReportName = preg_replace('/[^A-Za-z0-9 ]/', '', ($rParams['id'] ?? 'report')) . '_' . date('YmdHis');
-        $rWantJson = RequestManager::get('format') === 'json';
+		register_shutdown_function(static function () use ($rReportName, $rWantJson) {
+			$rJson = ob_get_level() > 0 ? ob_get_clean() : '';
+			$rDecoded = json_decode((string) $rJson, true);
+			$rRows = (is_array($rDecoded) && !empty($rDecoded['data'])) ? $rDecoded['data'] : [];
 
-        register_shutdown_function(static function () use ($rReportName, $rWantJson) {
-            $rJson = ob_get_level() > 0 ? ob_get_clean() : '';
-            $rDecoded = json_decode((string) $rJson, true);
-            $rRows = (is_array($rDecoded) && !empty($rDecoded['data'])) ? $rDecoded['data'] : array();
+			if ($rWantJson) {
+				header('Content-Type: application/json; charset=utf-8');
+				header('Content-Disposition: attachment; filename=report_' . $rReportName . '.json');
+				echo json_encode($rRows, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
 
-            if ($rWantJson) {
-                header('Content-Type: application/json; charset=utf-8');
-                header('Content-Disposition: attachment; filename=report_' . $rReportName . '.json');
-                echo json_encode($rRows, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+				return;
+			}
 
-                return;
-            }
+			header('Content-Type: text/csv; charset=utf-8');
+			header('Content-Disposition: attachment; filename=report_' . $rReportName . '.csv');
 
-            header('Content-Type: text/csv; charset=utf-8');
-            header('Content-Disposition: attachment; filename=report_' . $rReportName . '.csv');
+			if (0 < count($rRows)) {
+				echo file_get_contents(AdminHelpers::convertToCSV($rRows));
+			}
+		});
 
-            if (0 < count($rRows)) {
-                echo file_get_contents(AdminHelpers::convertToCSV($rRows));
-            }
-        });
+		// Authenticate the in-process dispatch via the loopback + api_user_id branch
+		// in TableController::index() (avoids its session/functions.php include path).
+		$rParams['api_user_id'] = $rUserInfo['id'];
+		RequestManager::set(array_merge(RequestManager::getAll(), $rParams));
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
+		$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 
-        // Authenticate the in-process dispatch via the loopback + api_user_id branch
-        // in TableController::index() (avoids its session/functions.php include path).
-        $rParams['api_user_id'] = $rUserInfo['id'];
-        RequestManager::set(array_merge(RequestManager::getAll(), $rParams));
-        $_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
-        $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+		ob_start();
+		(new TableController())->index();
 
-        ob_start();
-        (new TableController())->index();
+		exit();
+	}
 
-        exit();
-    }
+	/** action=download_panel_logs — collect recent panel error-log rows (no per-action gate). */
+	public function downloadPanelLogs(): never {
+		$this->requireXhr();
 
-    /** action=download_panel_logs — collect recent panel error-log rows (no per-action gate). */
-    public function downloadPanelLogs(): never {
-        $this->requireXhr();
-
-        $this->ok(array('data' => DiagnosticsService::downloadPanelLogs()));
-    }
+		$this->ok(['data' => DiagnosticsService::downloadPanelLogs()]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/BaseAjaxController.php b/src/Public/Controllers/Admin/Ajax/BaseAjaxController.php
index 24258007..b208b9d2 100644
--- a/src/Public/Controllers/Admin/Ajax/BaseAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/BaseAjaxController.php
@@ -24,81 +24,80 @@ use XcVm\Core\Auth\Authorization;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 abstract class BaseAjaxController {
+	/**
+	 * JSON response that terminates the request, with the correct Content-Type
+	 * (like {@see BaseAdminController::json()}).
+	 *
+	 * @param array<string, mixed> $rData
+	 * @param int $rFlags optional json_encode() flags (e.g. JSON_PARTIAL_OUTPUT_ON_ERROR)
+	 */
+	protected function json(array $rData, int $rFlags = 0): never {
+		if (!headers_sent()) {
+			header('Content-Type: application/json');
+		}
 
-    /**
-     * JSON response that terminates the request, with the correct Content-Type
-     * (like {@see BaseAdminController::json()}).
-     *
-     * @param array<string, mixed> $rData
-     * @param int $rFlags optional json_encode() flags (e.g. JSON_PARTIAL_OUTPUT_ON_ERROR)
-     */
-    protected function json(array $rData, int $rFlags = 0): never {
-        if (!headers_sent()) {
-            header('Content-Type: application/json');
-        }
+		echo json_encode($rData, $rFlags);
 
-        echo json_encode($rData, $rFlags);
+		exit();
+	}
 
-        exit();
-    }
+	/**
+	 * Success: `{"result":true}` plus optional extra keys.
+	 *
+	 * @param array<string, mixed> $rExtra
+	 */
+	protected function ok(array $rExtra = []): never {
+		$this->json(['result' => true] + $rExtra);
+	}
 
-    /**
-     * Success: `{"result":true}` plus optional extra keys.
-     *
-     * @param array<string, mixed> $rExtra
-     */
-    protected function ok(array $rExtra = array()): never {
-        $this->json(array('result' => true) + $rExtra);
-    }
+	/**
+	 * Failure: `{"result":false}` plus optional extra keys.
+	 *
+	 * @param array<string, mixed> $rExtra
+	 */
+	protected function fail(array $rExtra = []): never {
+		$this->json(['result' => false] + $rExtra);
+	}
 
-    /**
-     * Failure: `{"result":false}` plus optional extra keys.
-     *
-     * @param array<string, mixed> $rExtra
-     */
-    protected function fail(array $rExtra = array()): never {
-        $this->json(array('result' => false) + $rExtra);
-    }
+	/**
+	 * Permission gate: `Authorization::check($type, $key)`. On failure it emits
+	 * `{"result":false}` and ends the request.
+	 */
+	protected function gate(string $rType, string $rKey): void {
+		if (!Authorization::check($rType, $rKey)) {
+			$this->fail();
+		}
+	}
 
-    /**
-     * Permission gate: `Authorization::check($type, $key)`. On failure it emits
-     * `{"result":false}` and ends the request.
-     */
-    protected function gate(string $rType, string $rKey): void {
-        if (!Authorization::check($rType, $rKey)) {
-            $this->fail();
-        }
-    }
+	/**
+	 * OR gate: passes if at least one `[type, key]` check succeeds; if every
+	 * check fails it emits `{"result":false}` and ends the request.
+	 *
+	 * @param array<array{0: string, 1: string}> $rChecks [type, key] pairs
+	 */
+	protected function gateAny(array $rChecks): void {
+		foreach ($rChecks as $rCheck) {
+			if (Authorization::check($rCheck[0], $rCheck[1])) {
+				return;
+			}
+		}
 
-    /**
-     * OR gate: passes if at least one `[type, key]` check succeeds; if every
-     * check fails it emits `{"result":false}` and ends the request.
-     *
-     * @param array<array{0: string, 1: string}> $rChecks [type, key] pairs
-     */
-    protected function gateAny(array $rChecks): void {
-        foreach ($rChecks as $rCheck) {
-            if (Authorization::check($rCheck[0], $rCheck[1])) {
-                return;
-            }
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/**
+	 * XHR guard: non-AJAX requests are rejected unless debug mode (`PHP_ERRORS`)
+	 * is on.
+	 */
+	protected function requireXhr(): void {
+		if (defined('PHP_ERRORS') && PHP_ERRORS) {
+			return;
+		}
 
-    /**
-     * XHR guard: non-AJAX requests are rejected unless debug mode (`PHP_ERRORS`)
-     * is on.
-     */
-    protected function requireXhr(): void {
-        if (defined('PHP_ERRORS') && PHP_ERRORS) {
-            return;
-        }
+		$rRequestedWith = $_SERVER['HTTP_X_REQUESTED_WITH'] ?? '';
 
-        $rRequestedWith = $_SERVER['HTTP_X_REQUESTED_WITH'] ?? '';
-
-        if (strtolower($rRequestedWith) !== 'xmlhttprequest') {
-            exit();
-        }
-    }
+		if (strtolower($rRequestedWith) !== 'xmlhttprequest') {
+			exit();
+		}
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/BlocklistAjaxController.php b/src/Public/Controllers/Admin/Ajax/BlocklistAjaxController.php
index 8966a1ad..e239b240 100644
--- a/src/Public/Controllers/Admin/Ajax/BlocklistAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/BlocklistAjaxController.php
@@ -21,192 +21,191 @@ use XcVm\Domain\Security\BlocklistService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class BlocklistAjaxController extends BaseAjaxController {
+	/** action=useragent — remove a blocked user-agent. */
+	public function useragent(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'block_uas');
 
-    /** action=useragent — remove a blocked user-agent. */
-    public function useragent(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'block_uas');
+		if (RequestManager::get('sub') == 'delete') {
+			BlocklistService::deleteBlockedUA(RequestManager::get('ua_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            BlocklistService::deleteBlockedUA(RequestManager::get('ua_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=isp — remove a blocked ISP. */
+	public function isp(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'block_isps');
 
-    /** action=isp — remove a blocked ISP. */
-    public function isp(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'block_isps');
+		if (RequestManager::get('sub') == 'delete') {
+			BlocklistService::deleteBlockedISP(RequestManager::get('isp_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            BlocklistService::deleteBlockedISP(RequestManager::get('isp_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=mysql_syslog — block a brute-forcing IP surfaced by the MySQL syslog. */
+	public function mysqlSyslog(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'block_ips');
 
-    /** action=mysql_syslog — block a brute-forcing IP surfaced by the MySQL syslog. */
-    public function mysqlSyslog(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'block_ips');
+		global $db;
 
-        global $db;
+		if (RequestManager::get('sub') == 'block' && filter_var(RequestManager::get('ip'), FILTER_VALIDATE_IP)) {
+			$db->query("INSERT INTO `blocked_ips`(`ip`, `notes`, `date`) VALUES(?, 'MySQL Bruteforce', ?);", RequestManager::get('ip'), time());
+			touch(FLOOD_TMP_PATH . 'block_' . RequestManager::get('ip'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'block' && filter_var(RequestManager::get('ip'), FILTER_VALIDATE_IP)) {
-            $db->query("INSERT INTO `blocked_ips`(`ip`, `notes`, `date`) VALUES(?, 'MySQL Bruteforce', ?);", RequestManager::get('ip'), time());
-            touch(FLOOD_TMP_PATH . 'block_' . RequestManager::get('ip'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=ip — remove a blocked IP. */
+	public function ip(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'block_ips');
 
-    /** action=ip — remove a blocked IP. */
-    public function ip(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'block_ips');
+		if (RequestManager::get('sub') == 'delete') {
+			BlocklistService::deleteBlockedIP(RequestManager::get('ip'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            BlocklistService::deleteBlockedIP(RequestManager::get('ip'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=ip_whois — GeoIP/ISP/ASN whois lookup for an IP (no per-action gate). */
+	public function ipWhois(): never {
+		$this->requireXhr();
 
-    /** action=ip_whois — GeoIP/ISP/ASN whois lookup for an IP (no per-action gate). */
-    public function ipWhois(): never {
-        $this->requireXhr();
+		global $db;
+		$rIP = RequestManager::get('ip');
+		$rReader = new \MaxMind\Db\Reader(GEOLITE2C_BIN);
+		$rResponse = $rReader->get($rIP);
 
-        global $db;
-        $rIP = RequestManager::get('ip');
-        $rReader = new \MaxMind\Db\Reader(GEOLITE2C_BIN);
-        $rResponse = $rReader->get($rIP);
+		if (isset($rResponse['location']['time_zone'])) {
+			$rDate = new \DateTime('now', new \DateTimeZone($rResponse['location']['time_zone']));
+			$rResponse['location']['time'] = $rDate->format('Y-m-d H:i:s');
+		}
 
-        if (isset($rResponse['location']['time_zone'])) {
-            $rDate = new \DateTime('now', new \DateTimeZone($rResponse['location']['time_zone']));
-            $rResponse['location']['time'] = $rDate->format('Y-m-d H:i:s');
-        }
+		$rReader->close();
 
-        $rReader->close();
+		if (RequestManager::has('isp')) {
+			$rReader = new \MaxMind\Db\Reader(GEOISP_BIN);
+			$rResponse['isp'] = $rReader->get($rIP);
+			$rReader->close();
+		}
 
-        if (RequestManager::has('isp')) {
-            $rReader = new \MaxMind\Db\Reader(GEOISP_BIN);
-            $rResponse['isp'] = $rReader->get($rIP);
-            $rReader->close();
-        }
+		$rResponse['type'] = null;
 
-        $rResponse['type'] = null;
+		if (!empty($rResponse['isp']['autonomous_system_number'])) {
+			$rASN = $rResponse['isp']['autonomous_system_number'];
+			$db->query('SELECT `type` FROM `blocked_asns` WHERE `asn` = ?;', $rASN);
 
-        if (!empty($rResponse['isp']['autonomous_system_number'])) {
-            $rASN = $rResponse['isp']['autonomous_system_number'];
-            $db->query('SELECT `type` FROM `blocked_asns` WHERE `asn` = ?;', $rASN);
+			if (0 < $db->num_rows()) {
+				$rResponse['type'] = $db->get_row()['type'];
+			}
 
-            if (0 < $db->num_rows()) {
-                $rResponse['type'] = $db->get_row()['type'];
-            }
+			if (file_exists(CIDR_TMP_PATH . $rASN)) {
+				$rCIDRs = json_decode(file_get_contents(CIDR_TMP_PATH . $rASN), true);
 
-            if (file_exists(CIDR_TMP_PATH . $rASN)) {
-                $rCIDRs = json_decode(file_get_contents(CIDR_TMP_PATH . $rASN), true);
+				foreach ($rCIDRs as $rData) {
+					if (ip2long($rData[1]) <= ip2long($rIP) && ip2long($rIP) <= ip2long($rData[2])) {
+						$rTypes = [];
 
-                foreach ($rCIDRs as $rData) {
-                    if (ip2long($rData[1]) <= ip2long($rIP) && ip2long($rIP) <= ip2long($rData[2])) {
-                        $rTypes = array();
+						if ($rData[3]) {
+							$rTypes[] = 'HOSTING';
+						}
 
-                        if ($rData[3]) {
-                            $rTypes[] = 'HOSTING';
-                        }
+						if ($rData[4]) {
+							$rTypes[] = 'PROXY';
+						}
 
-                        if ($rData[4]) {
-                            $rTypes[] = 'PROXY';
-                        }
+						$rResponse['type'] = implode(', ', $rTypes);
 
-                        $rResponse['type'] = implode(', ', $rTypes);
+						break;
+					}
+				}
+			}
+		}
 
-                        break;
-                    }
-                }
-            }
-        }
+		$this->ok(['data' => $rResponse]);
+	}
 
-        $this->ok(array('data' => $rResponse));
-    }
+	/** action=asn — block/allow a single ASN or a whole ASN type. */
+	public function asn(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'block_isps');
 
-    /** action=asn — block/allow a single ASN or a whole ASN type. */
-    public function asn(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'block_isps');
+		global $db;
+		$rSub = RequestManager::get('sub');
+		$rASN = RequestManager::get('id');
 
-        global $db;
-        $rSub = RequestManager::get('sub');
-        $rASN = RequestManager::get('id');
+		if ($rSub == 'allow') {
+			$db->query('UPDATE `blocked_asns` SET `blocked` = 0 WHERE `id` = ?;', $rASN);
+			$this->ok();
+		}
 
-        if ($rSub == 'allow') {
-            $db->query('UPDATE `blocked_asns` SET `blocked` = 0 WHERE `id` = ?;', $rASN);
-            $this->ok();
-        }
+		if ($rSub == 'block') {
+			$db->query('UPDATE `blocked_asns` SET `blocked` = 1 WHERE `id` = ?;', $rASN);
+			$this->ok();
+		}
 
-        if ($rSub == 'block') {
-            $db->query('UPDATE `blocked_asns` SET `blocked` = 1 WHERE `id` = ?;', $rASN);
-            $this->ok();
-        }
+		if ($rSub == 'allow_all') {
+			$db->query('UPDATE `blocked_asns` SET `blocked` = 0 WHERE `type` = ?;', $rASN);
+			$this->ok();
+		}
 
-        if ($rSub == 'allow_all') {
-            $db->query('UPDATE `blocked_asns` SET `blocked` = 0 WHERE `type` = ?;', $rASN);
-            $this->ok();
-        }
+		if ($rSub == 'block_all') {
+			$db->query('UPDATE `blocked_asns` SET `blocked` = 1 WHERE `type` = ?;', $rASN);
+			$this->ok();
+		}
 
-        if ($rSub == 'block_all') {
-            $db->query('UPDATE `blocked_asns` SET `blocked` = 1 WHERE `type` = ?;', $rASN);
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=decrypt_text — decrypt live-stream tokens pasted as text. */
+	public function decryptText(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'stream_tools');
 
-    /** action=decrypt_text — decrypt live-stream tokens pasted as text. */
-    public function decryptText(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'stream_tools');
+		$rDecryptedArray = [];
+		$rText = (RequestManager::get('text') ?: null);
 
-        $rDecryptedArray = array();
-        $rText = (RequestManager::get('text') ?: null);
+		if ($rText) {
+			$rLines = explode("\n", $rText);
 
-        if ($rText) {
-            $rLines = explode("\n", $rText);
+			foreach ($rLines as $rLine) {
+				$rSplit = explode('/', $rLine);
 
-            foreach ($rLines as $rLine) {
-                $rSplit = explode('/', $rLine);
+				foreach ($rSplit as $rPiece) {
+					if (stripos($rPiece, 'token=') !== false) {
+						list(, $rPiece) = explode('token=', $rPiece);
+					}
 
-                foreach ($rSplit as $rPiece) {
-                    if (stripos($rPiece, 'token=') !== false) {
-                        list(, $rPiece) = explode('token=', $rPiece);
-                    }
+					$rDecoded = base64_decode(strtr($rPiece, '-_', '+/'));
 
-                    $rDecoded = base64_decode(strtr($rPiece, '-_', '+/'));
+					if (!empty($rDecoded)) {
+						try {
+							$rDecrypted = Encryption::readToken($rPiece, SettingsManager::get('live_streaming_pass'), OPENSSL_EXTRA, true);
+						} catch (\Exception) {
+							$rDecrypted = null;
+						}
 
-                    if (!empty($rDecoded)) {
-                        try {
-                            $rDecrypted = Encryption::readToken($rPiece, SettingsManager::get('live_streaming_pass'), OPENSSL_EXTRA, true);
-                        } catch (\Exception) {
-                            $rDecrypted = null;
-                        }
+						if ($rDecrypted) {
+							$rDecryptedArray[] = utf8_decode($rDecrypted);
+						}
+					}
+				}
+			}
+		}
 
-                        if ($rDecrypted) {
-                            $rDecryptedArray[] = utf8_decode($rDecrypted);
-                        }
-                    }
-                }
-            }
-        }
+		if (0 < count($rDecryptedArray)) {
+			$this->ok(['data' => $rDecryptedArray]);
+		}
 
-        if (0 < count($rDecryptedArray)) {
-            $this->ok(array('data' => $rDecryptedArray));
-        }
-
-        $this->fail();
-    }
+		$this->fail();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/CacheAjaxController.php b/src/Public/Controllers/Admin/Ajax/CacheAjaxController.php
index a3865aa6..d41a5939 100644
--- a/src/Public/Controllers/Admin/Ajax/CacheAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/CacheAjaxController.php
@@ -16,149 +16,148 @@ use XcVm\Infrastructure\Redis\RedisManager;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class CacheAjaxController extends BaseAjaxController {
+	/** action=regenerate_cache — force a run of the cache engine. */
+	public function regenerate(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'backups');
 
-    /** action=regenerate_cache — force a run of the cache engine. */
-    public function regenerate(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'backups');
+		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "force"');
 
-        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine "force"');
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=enable_cache — enable the cache and start cache_handler if not running. */
+	public function enableCache(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'backups');
 
-    /** action=enable_cache — enable the cache and start cache_handler if not running. */
-    public function enableCache(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'backups');
+		global $db;
+		$db->query('UPDATE `settings` SET `enable_cache` = 1;');
 
-        global $db;
-        $db->query('UPDATE `settings` SET `enable_cache` = 1;');
+		if (file_exists(CACHE_TMP_PATH . 'settings')) {
+			unlink(CACHE_TMP_PATH . 'settings');
+		}
 
-        if (file_exists(CACHE_TMP_PATH . 'settings')) {
-            unlink(CACHE_TMP_PATH . 'settings');
-        }
+		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine');
+		$rCache = intval(trim(shell_exec('pgrep -U xc_vm | xargs ps -f -p | grep -E "cache_handler|XC_VM\\[CacheHandler\\]" | grep -v grep | grep -v pgrep | wc -l')));
 
-        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine');
-        $rCache = intval(trim(shell_exec('pgrep -U xc_vm | xargs ps -f -p | grep -E "cache_handler|XC_VM\\[CacheHandler\\]" | grep -v grep | grep -v pgrep | wc -l')));
+		if ($rCache == 0) {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cache_handler > /dev/null 2>/dev/null &');
+		}
 
-        if ($rCache == 0) {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cache_handler > /dev/null 2>/dev/null &');
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=disable_cache — disable the cache. */
+	public function disableCache(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'backups');
 
-    /** action=disable_cache — disable the cache. */
-    public function disableCache(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'backups');
+		global $db;
+		$db->query('UPDATE `settings` SET `enable_cache` = 0;');
 
-        global $db;
-        $db->query('UPDATE `settings` SET `enable_cache` = 0;');
+		if (file_exists(CACHE_TMP_PATH . 'settings')) {
+			unlink(CACHE_TMP_PATH . 'settings');
+		}
 
-        if (file_exists(CACHE_TMP_PATH . 'settings')) {
-            unlink(CACHE_TMP_PATH . 'settings');
-        }
+		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache');
 
-        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache');
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=enable_handler — enable the Redis handler and restart redis/signals/watchdog. */
+	public function enableHandler(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'backups');
 
-    /** action=enable_handler — enable the Redis handler and restart redis/signals/watchdog. */
-    public function enableHandler(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'backups');
+		global $db;
+		$db->query('UPDATE `settings` SET `redis_handler` = 1;');
 
-        global $db;
-        $db->query('UPDATE `settings` SET `redis_handler` = 1;');
+		if (file_exists(CACHE_TMP_PATH . 'settings')) {
+			unlink(CACHE_TMP_PATH . 'settings');
+		}
 
-        if (file_exists(CACHE_TMP_PATH . 'settings')) {
-            unlink(CACHE_TMP_PATH . 'settings');
-        }
+		exec('pgrep -u xc_vm redis-server', $rRedis);
 
-        exec('pgrep -u xc_vm redis-server', $rRedis);
+		if (0 < count($rRedis) && is_numeric($rRedis[0])) {
+			$rPID = intval($rRedis[0]);
+			shell_exec('kill -9 ' . $rPID);
+		}
 
-        if (0 < count($rRedis) && is_numeric($rRedis[0])) {
-            $rPID = intval($rRedis[0]);
-            shell_exec('kill -9 ' . $rPID);
-        }
+		shell_exec(MAIN_HOME . 'bin/redis/redis-server ' . MAIN_HOME . '/bin/redis/redis.conf > /dev/null 2>/dev/null &');
+		sleep(1);
+		exec("pgrep -U xc_vm | xargs ps | grep -E 'signals|XC_VM\\[Signals\\]' | awk '{print \$1}'", $rPID);
 
-        shell_exec(MAIN_HOME . 'bin/redis/redis-server ' . MAIN_HOME . '/bin/redis/redis.conf > /dev/null 2>/dev/null &');
-        sleep(1);
-        exec("pgrep -U xc_vm | xargs ps | grep -E 'signals|XC_VM\\[Signals\\]' | awk '{print \$1}'", $rPID);
+		if (0 < count($rPID) && is_numeric($rPID[0])) {
+			$rPID = intval($rPID[0]);
+			shell_exec('kill -9 ' . $rPID);
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php signals > /dev/null 2>/dev/null &');
+		}
 
-        if (0 < count($rPID) && is_numeric($rPID[0])) {
-            $rPID = intval($rPID[0]);
-            shell_exec('kill -9 ' . $rPID);
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php signals > /dev/null 2>/dev/null &');
-        }
+		exec("pgrep -U xc_vm | xargs ps | grep -E 'watchdog|XC_VM\\[Watchdog\\]' | awk '{print \$1}'", $rPID);
 
-        exec("pgrep -U xc_vm | xargs ps | grep -E 'watchdog|XC_VM\\[Watchdog\\]' | awk '{print \$1}'", $rPID);
+		if (0 < count($rPID) && is_numeric($rPID[0])) {
+			$rPID = intval($rPID[0]);
+			shell_exec('kill -9 ' . $rPID);
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php watchdog > /dev/null 2>/dev/null &');
+		}
 
-        if (0 < count($rPID) && is_numeric($rPID[0])) {
-            $rPID = intval($rPID[0]);
-            shell_exec('kill -9 ' . $rPID);
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php watchdog > /dev/null 2>/dev/null &');
-        }
+		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:users 1 > /dev/null 2>/dev/null &');
 
-        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:users 1 > /dev/null 2>/dev/null &');
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=disable_handler — disable the Redis handler and stop redis/signals/watchdog. */
+	public function disableHandler(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'backups');
 
-    /** action=disable_handler — disable the Redis handler and stop redis/signals/watchdog. */
-    public function disableHandler(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'backups');
+		global $db;
+		$db->query('UPDATE `settings` SET `redis_handler` = 0;');
 
-        global $db;
-        $db->query('UPDATE `settings` SET `redis_handler` = 0;');
+		if (file_exists(CACHE_TMP_PATH . 'settings')) {
+			unlink(CACHE_TMP_PATH . 'settings');
+		}
 
-        if (file_exists(CACHE_TMP_PATH . 'settings')) {
-            unlink(CACHE_TMP_PATH . 'settings');
-        }
+		exec('pgrep -u xc_vm redis-server', $rRedis);
 
-        exec('pgrep -u xc_vm redis-server', $rRedis);
+		if (0 < count($rRedis) && is_numeric($rRedis[0])) {
+			$rPID = intval($rRedis[0]);
+			shell_exec('kill -9 ' . $rPID);
+		}
 
-        if (0 < count($rRedis) && is_numeric($rRedis[0])) {
-            $rPID = intval($rRedis[0]);
-            shell_exec('kill -9 ' . $rPID);
-        }
+		exec("pgrep -U xc_vm | xargs ps | grep -E 'signals|XC_VM\\[Signals\\]' | awk '{print \$1}'", $rPID);
 
-        exec("pgrep -U xc_vm | xargs ps | grep -E 'signals|XC_VM\\[Signals\\]' | awk '{print \$1}'", $rPID);
+		if (0 < count($rPID) && is_numeric($rPID[0])) {
+			$rPID = intval($rPID[0]);
+			shell_exec('kill -9 ' . $rPID);
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php signals > /dev/null 2>/dev/null &');
+		}
 
-        if (0 < count($rPID) && is_numeric($rPID[0])) {
-            $rPID = intval($rPID[0]);
-            shell_exec('kill -9 ' . $rPID);
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php signals > /dev/null 2>/dev/null &');
-        }
+		exec("pgrep -U xc_vm | xargs ps | grep -E 'watchdog|XC_VM\\[Watchdog\\]' | awk '{print \$1}'", $rPID);
 
-        exec("pgrep -U xc_vm | xargs ps | grep -E 'watchdog|XC_VM\\[Watchdog\\]' | awk '{print \$1}'", $rPID);
+		if (0 < count($rPID) && is_numeric($rPID[0])) {
+			$rPID = intval($rPID[0]);
+			shell_exec('kill -9 ' . $rPID);
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php watchdog > /dev/null 2>/dev/null &');
+		}
 
-        if (0 < count($rPID) && is_numeric($rPID[0])) {
-            $rPID = intval($rPID[0]);
-            shell_exec('kill -9 ' . $rPID);
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php watchdog > /dev/null 2>/dev/null &');
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=clear_redis — flush the entire Redis store. */
+	public function clearRedis(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'backups');
 
-    /** action=clear_redis — flush the entire Redis store. */
-    public function clearRedis(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'backups');
+		$rRedis = RedisManager::instance();
 
-        $rRedis = RedisManager::instance();
+		if (!$rRedis) {
+			$this->fail();
+		}
 
-        if (!$rRedis) {
-            $this->fail();
-        }
+		$rRedis->flushAll();
 
-        $rRedis->flushAll();
-
-        $this->ok();
-    }
+		$this->ok();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/DeviceAjaxController.php b/src/Public/Controllers/Admin/Ajax/DeviceAjaxController.php
index 12322f21..4b67535d 100644
--- a/src/Public/Controllers/Admin/Ajax/DeviceAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/DeviceAjaxController.php
@@ -19,98 +19,97 @@ use XcVm\Domain\Device\MagService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class DeviceAjaxController extends BaseAjaxController {
+	use LineStateTrait;
 
-    use LineStateTrait;
+	/** action=mag — MAG device operations (dispatches on sub). */
+	public function mag(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_mag');
 
-    /** action=mag — MAG device operations (dispatches on sub). */
-    public function mag(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_mag');
+		$rSub = RequestManager::get('sub');
+		$rMagDetails = MagService::getById(intval(RequestManager::get('mag_id')));
 
-        $rSub = RequestManager::get('sub');
-        $rMagDetails = MagService::getById(intval(RequestManager::get('mag_id')));
+		if ($rSub == 'delete') {
+			MagService::deleteDevice(RequestManager::get('mag_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            MagService::deleteDevice(RequestManager::get('mag_id'));
-            $this->ok();
-        }
+		if ($rSub == 'convert') {
+			MagService::deleteDevice(RequestManager::get('mag_id'), false, false, true);
+			$this->ok(['line_id' => $rMagDetails['user']['id']]);
+		}
 
-        if ($rSub == 'convert') {
-            MagService::deleteDevice(RequestManager::get('mag_id'), false, false, true);
-            $this->ok(array('line_id' => $rMagDetails['user']['id']));
-        }
+		$this->lineStateAction($rSub, $rMagDetails['user_id']);
+	}
 
-        $this->lineStateAction($rSub, $rMagDetails['user_id']);
-    }
+	/** action=enigma — Enigma2 device operations (dispatches on sub). */
+	public function enigma(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_e2');
 
-    /** action=enigma — Enigma2 device operations (dispatches on sub). */
-    public function enigma(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_e2');
+		$rSub = RequestManager::get('sub');
+		$rE2Details = EnigmaService::getById(intval(RequestManager::get('e2_id')));
 
-        $rSub = RequestManager::get('sub');
-        $rE2Details = EnigmaService::getById(intval(RequestManager::get('e2_id')));
+		if ($rSub == 'delete') {
+			EnigmaService::deleteDevice(RequestManager::get('e2_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            EnigmaService::deleteDevice(RequestManager::get('e2_id'));
-            $this->ok();
-        }
+		if ($rSub == 'convert') {
+			EnigmaService::deleteDevice(RequestManager::get('e2_id'), false, false, true);
+			$this->ok(['line_id' => $rE2Details['user']['id']]);
+		}
 
-        if ($rSub == 'convert') {
-            EnigmaService::deleteDevice(RequestManager::get('e2_id'), false, false, true);
-            $this->ok(array('line_id' => $rE2Details['user']['id']));
-        }
+		$this->lineStateAction($rSub, $rE2Details['user_id']);
+	}
 
-        $this->lineStateAction($rSub, $rE2Details['user_id']);
-    }
+	/** action=mag_event — delete a scheduled MAG event. */
+	public function magEvent(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'manage_events');
 
-    /** action=mag_event — delete a scheduled MAG event. */
-    public function magEvent(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'manage_events');
+		global $db;
 
-        global $db;
+		if (RequestManager::get('sub') == 'delete') {
+			$db->query('DELETE FROM `mag_events` WHERE `id` = ?;', RequestManager::get('mag_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            $db->query('DELETE FROM `mag_events` WHERE `id` = ?;', RequestManager::get('mag_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=send_event — queue MAG events (message / play channel / reset lock) for devices. */
+	public function sendEvent(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'manage_events');
 
-    /** action=send_event — queue MAG events (message / play channel / reset lock) for devices. */
-    public function sendEvent(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'manage_events');
+		global $db;
+		$rData = json_decode(RequestManager::get('data'), true);
 
-        global $db;
-        $rData = json_decode(RequestManager::get('data'), true);
+		if (!is_numeric($rData['id'])) {
+			$rIDs = json_decode($rData['id'], true);
+		} else {
+			$rIDs = [intval($rData['id'])];
+		}
 
-        if (!is_numeric($rData['id'])) {
-            $rIDs = json_decode($rData['id'], true);
-        } else {
-            $rIDs = array(intval($rData['id']));
-        }
+		foreach ($rIDs as $rID) {
+			if ($rData['type'] == 'send_msg') {
+				$rData['need_confirm'] = 1;
+			} elseif ($rData['type'] == 'play_channel') {
+				$rData['need_confirm'] = 0;
+				$rData['reboot_portal'] = 0;
+				$rData['message'] = intval($rData['channel']);
+			} elseif ($rData['type'] == 'reset_stb_lock') {
+				MagService::resetSTB($rData['id']);
+			} else {
+				$rData['need_confirm'] = 0;
+				$rData['reboot_portal'] = 0;
+				$rData['message'] = '';
+			}
 
-        foreach ($rIDs as $rID) {
-            if ($rData['type'] == 'send_msg') {
-                $rData['need_confirm'] = 1;
-            } elseif ($rData['type'] == 'play_channel') {
-                $rData['need_confirm'] = 0;
-                $rData['reboot_portal'] = 0;
-                $rData['message'] = intval($rData['channel']);
-            } elseif ($rData['type'] == 'reset_stb_lock') {
-                MagService::resetSTB($rData['id']);
-            } else {
-                $rData['need_confirm'] = 0;
-                $rData['reboot_portal'] = 0;
-                $rData['message'] = '';
-            }
+			$db->query('INSERT INTO `mag_events`(`status`, `mag_device_id`, `event`, `need_confirm`, `msg`, `reboot_after_ok`, `send_time`) VALUES (0, ?, ?, ?, ?, ?, ?);', $rID, $rData['type'], $rData['need_confirm'], $rData['message'], $rData['reboot_portal'], time());
+		}
 
-            $db->query('INSERT INTO `mag_events`(`status`, `mag_device_id`, `event`, `need_confirm`, `msg`, `reboot_after_ok`, `send_time`) VALUES (0, ?, ?, ?, ?, ?, ?);', $rID, $rData['type'], $rData['need_confirm'], $rData['message'], $rData['reboot_portal'], time());
-        }
-
-        $this->ok();
-    }
+		$this->ok();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/EpgAjaxController.php b/src/Public/Controllers/Admin/Ajax/EpgAjaxController.php
index 890b420c..e5a8a383 100644
--- a/src/Public/Controllers/Admin/Ajax/EpgAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/EpgAjaxController.php
@@ -25,404 +25,403 @@ use XcVm\Domain\Stream\CategoryService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class EpgAjaxController extends BaseAjaxController {
+	/** action=epg — delete or reload a single EPG source. */
+	public function epg(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'epg_edit');
 
-    /** action=epg — delete or reload a single EPG source. */
-    public function epg(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'epg_edit');
+		$rSub = RequestManager::get('sub');
 
-        $rSub = RequestManager::get('sub');
+		if ($rSub == 'delete') {
+			EpgService::deleteEpgById(RequestManager::get('epg_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            EpgService::deleteEpgById(RequestManager::get('epg_id'));
-            $this->ok();
-        }
+		if ($rSub == 'reload') {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:epg "' . intval(RequestManager::get('epg_id')) . '" > /dev/null 2>/dev/null &');
+			$this->ok();
+		}
 
-        if ($rSub == 'reload') {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:epg "' . intval(RequestManager::get('epg_id')) . '" > /dev/null 2>/dev/null &');
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=epglist — Select2 search over EPG channels grouped by source. */
+	public function epglist(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'import_streams');
 
-    /** action=epglist — Select2 search over EPG channels grouped by source. */
-    public function epglist(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'import_streams');
+		global $db;
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
 
-        global $db;
-        $rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
+		if (RequestManager::has('search')) {
+			$rEPGNames = $rEPGMap = [];
+			$db->query('SELECT `epg_channels`.`epg_id`, `epg_channels`.`channel_id`, `epg_channels`.`name`, `epg_channels`.`langs`, `epg`.`epg_name` FROM `epg_channels` LEFT JOIN `epg` ON `epg_channels`.`epg_id` = `epg`.`id` WHERE (LOWER(`epg_channels`.`channel_id`) LIKE ? OR LOWER(`epg_channels`.`name`) LIKE ?) ORDER BY `epg_channels`.`name` ASC LIMIT 50;', strtolower(RequestManager::get('search')) . '%', strtolower(RequestManager::get('search')) . '%');
 
-        if (RequestManager::has('search')) {
-            $rEPGNames = $rEPGMap = array();
-            $db->query('SELECT `epg_channels`.`epg_id`, `epg_channels`.`channel_id`, `epg_channels`.`name`, `epg_channels`.`langs`, `epg`.`epg_name` FROM `epg_channels` LEFT JOIN `epg` ON `epg_channels`.`epg_id` = `epg`.`id` WHERE (LOWER(`epg_channels`.`channel_id`) LIKE ? OR LOWER(`epg_channels`.`name`) LIKE ?) ORDER BY `epg_channels`.`name` ASC LIMIT 50;', strtolower(RequestManager::get('search')) . '%', strtolower(RequestManager::get('search')) . '%');
+			foreach ($db->get_rows() as $rRow) {
+				if (!isset($rEPGNames[$rRow['epg_id']])) {
+					$rEPGNames[$rRow['epg_id']] = $rRow['epg_name'];
+				}
 
-            foreach ($db->get_rows() as $rRow) {
-                if (!isset($rEPGNames[$rRow['epg_id']])) {
-                    $rEPGNames[$rRow['epg_id']] = $rRow['epg_name'];
-                }
+				$rLangs = json_decode($rRow['langs'], true);
+				$rEPGMap[$rRow['epg_id']][] = ['id' => $rRow['channel_id'], 'text' => $rRow['name'], 'icon' => null, 'lang' => (isset($rLangs[0]) ? $rLangs[0] : ''), 'epg_id' => $rRow['epg_id'], 'type' => 0];
+			}
 
-                $rLangs = json_decode($rRow['langs'], true);
-                $rEPGMap[$rRow['epg_id']][] = array('id' => $rRow['channel_id'], 'text' => $rRow['name'], 'icon' => null, 'lang' => (isset($rLangs[0]) ? $rLangs[0] : ''), 'epg_id' => $rRow['epg_id'], 'type' => 0);
-            }
+			foreach ($rEPGMap as $rEPGID => $rResults) {
+				$rReturn['items'][] = ['text' => $rEPGNames[$rEPGID], 'children' => $rResults];
+				$rReturn['total_count'] += count($rResults);
+			}
+		}
 
-            foreach ($rEPGMap as $rEPGID => $rResults) {
-                $rReturn['items'][] = array('text' => $rEPGNames[$rEPGID], 'children' => $rResults);
-                $rReturn['total_count'] += count($rResults);
-            }
-        }
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
 
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
+	/** action=force_epg — trigger a full EPG cron run. */
+	public function forceEpg(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'epg');
 
-    /** action=force_epg — trigger a full EPG cron run. */
-    public function forceEpg(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'epg');
+		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:epg > /dev/null 2>/dev/null &');
 
-        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:epg > /dev/null 2>/dev/null &');
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=epg_auto_assign — fuzzy-match streams to EPG channels in batches. */
+	public function epgAutoAssign(): never {
+		$this->requireXhr();
 
-    /** action=epg_auto_assign — fuzzy-match streams to EPG channels in batches. */
-    public function epgAutoAssign(): never {
-        $this->requireXhr();
+		if (!Authorization::check('adv', 'stream_tools')) {
+			$this->json(['status' => STATUS_FAILURE]);
+		}
 
-        if (!Authorization::check('adv', 'stream_tools')) {
-            $this->json(array('status' => STATUS_FAILURE));
-        }
+		global $db;
+		set_time_limit(120);
+		$rLastId    = max(0, intval(RequestManager::get('last_id') ?? 0));
+		$rThreshold = min(100, max(50, intval(RequestManager::get('threshold') ?? 80)));
+		$rCatId     = intval(RequestManager::get('category_id') ?? 0);
+		$rLimit     = 300;
 
-        global $db;
-        set_time_limit(120);
-        $rLastId    = max(0, intval(RequestManager::get('last_id') ?? 0));
-        $rThreshold = min(100, max(50, intval(RequestManager::get('threshold') ?? 80)));
-        $rCatId     = intval(RequestManager::get('category_id') ?? 0);
-        $rLimit     = 300;
+		$fnNormalize = function (string $name): string {
+			$name = strtolower($name);
+			$name = preg_replace('/\b(fhd|uhd|4k|hd|sd|hq|lq|\+1|plus)\b/i', '', $name);
+			$name = preg_replace('/[^a-z0-9]/i', '', $name);
+			return trim($name);
+		};
 
-        $fnNormalize = function (string $name): string {
-            $name = strtolower($name);
-            $name = preg_replace('/\b(fhd|uhd|4k|hd|sd|hq|lq|\+1|plus)\b/i', '', $name);
-            $name = preg_replace('/[^a-z0-9]/i', '', $name);
-            return trim($name);
-        };
+		// Base WHERE clause — optionally filter by category
+		$rCatWhere = $rCatId > 0
+			? ' AND JSON_CONTAINS(`category_id`, \'' . $rCatId . '\')'
+			: '';
 
-        // Base WHERE clause — optionally filter by category
-        $rCatWhere = $rCatId > 0
-            ? ' AND JSON_CONTAINS(`category_id`, \'' . $rCatId . '\')'
-            : '';
+		$db->query('SELECT COUNT(*) AS `cnt` FROM `streams` WHERE `type` = 1' . $rCatWhere . ' AND (`epg_id` IS NULL OR `channel_id` IS NULL OR `channel_id` = ?);', '');
+		$rTotal = intval($db->get_row()['cnt']);
 
-        $db->query('SELECT COUNT(*) AS `cnt` FROM `streams` WHERE `type` = 1' . $rCatWhere . ' AND (`epg_id` IS NULL OR `channel_id` IS NULL OR `channel_id` = ?);', '');
-        $rTotal = intval($db->get_row()['cnt']);
+		// --- Lookup 1: EPG channels by name ---
+		$db->query('SELECT `epg_id`, `channel_id`, `name`, `langs` FROM `epg_channels`;');
+		$rEpgLookup = [];
+		// Also build channel_id -> epg info map for provider cross-reference
+		$rEpgByChannelId = [];
+		foreach ($db->get_rows() as $rEpgCh) {
+			$rNorm = $fnNormalize($rEpgCh['name']);
+			$rLang = json_decode($rEpgCh['langs'] ?? '[]', true)[0] ?? '';
+			if ($rNorm !== '') {
+				$rEpgLookup[] = [
+					'epg_id'     => intval($rEpgCh['epg_id']),
+					'channel_id' => $rEpgCh['channel_id'],
+					'norm'       => $rNorm,
+					'lang'       => $rLang,
+				];
+			}
+			if (!isset($rEpgByChannelId[$rEpgCh['channel_id']])) {
+				$rEpgByChannelId[$rEpgCh['channel_id']] = [
+					'epg_id' => intval($rEpgCh['epg_id']),
+					'lang'   => $rLang,
+				];
+			}
+		}
 
-        // --- Lookup 1: EPG channels by name ---
-        $db->query('SELECT `epg_id`, `channel_id`, `name`, `langs` FROM `epg_channels`;');
-        $rEpgLookup = array();
-        // Also build channel_id -> epg info map for provider cross-reference
-        $rEpgByChannelId = array();
-        foreach ($db->get_rows() as $rEpgCh) {
-            $rNorm = $fnNormalize($rEpgCh['name']);
-            $rLang = json_decode($rEpgCh['langs'] ?? '[]', true)[0] ?? '';
-            if ($rNorm !== '') {
-                $rEpgLookup[] = array(
-                    'epg_id'     => intval($rEpgCh['epg_id']),
-                    'channel_id' => $rEpgCh['channel_id'],
-                    'norm'       => $rNorm,
-                    'lang'       => $rLang,
-                );
-            }
-            if (!isset($rEpgByChannelId[$rEpgCh['channel_id']])) {
-                $rEpgByChannelId[$rEpgCh['channel_id']] = array(
-                    'epg_id' => intval($rEpgCh['epg_id']),
-                    'lang'   => $rLang,
-                );
-            }
-        }
-
-        // --- Lookup 2: Provider streams whose channel_id exists in epg_channels ---
-        $db->query(
-            'SELECT DISTINCT `ps`.`stream_display_name`, `ps`.`channel_id` FROM `providers_streams` `ps`
+		// --- Lookup 2: Provider streams whose channel_id exists in epg_channels ---
+		$db->query(
+			'SELECT DISTINCT `ps`.`stream_display_name`, `ps`.`channel_id` FROM `providers_streams` `ps`
              INNER JOIN (SELECT DISTINCT `channel_id` FROM `epg_channels`) `ec` ON `ps`.`channel_id` = `ec`.`channel_id`
              WHERE `ps`.`type` = ? AND `ps`.`channel_id` IS NOT NULL AND `ps`.`channel_id` != ?;',
-            'live',
-            ''
-        );
-        $rProviderLookup = array();
-        foreach ($db->get_rows() as $rPs) {
-            $rNorm = $fnNormalize($rPs['stream_display_name']);
-            if ($rNorm === '') {
-                continue;
-            }
-            // Keep first occurrence per normalised name
-            if (!isset($rProviderLookup[$rNorm])) {
-                $rProviderLookup[$rNorm] = $rPs['channel_id'];
-            }
-        }
+			'live',
+			''
+		);
+		$rProviderLookup = [];
+		foreach ($db->get_rows() as $rPs) {
+			$rNorm = $fnNormalize($rPs['stream_display_name']);
+			if ($rNorm === '') {
+				continue;
+			}
+			// Keep first occurrence per normalised name
+			if (!isset($rProviderLookup[$rNorm])) {
+				$rProviderLookup[$rNorm] = $rPs['channel_id'];
+			}
+		}
 
-        // --- Batch of streams to process ---
-        $db->query(
-            'SELECT `id`, `stream_display_name` FROM `streams` WHERE `type` = 1' . $rCatWhere . ' AND `id` > ? AND (`epg_id` IS NULL OR `channel_id` IS NULL OR `channel_id` = ?) ORDER BY `id` ASC LIMIT ' . $rLimit . ';',
-            $rLastId,
-            ''
-        );
-        $rStreams    = $db->get_rows();
-        $rAssigned   = 0;
-        $rSkipped    = 0;
-        $rNextLastId = $rLastId;
+		// --- Batch of streams to process ---
+		$db->query(
+			'SELECT `id`, `stream_display_name` FROM `streams` WHERE `type` = 1' . $rCatWhere . ' AND `id` > ? AND (`epg_id` IS NULL OR `channel_id` IS NULL OR `channel_id` = ?) ORDER BY `id` ASC LIMIT ' . $rLimit . ';',
+			$rLastId,
+			''
+		);
+		$rStreams    = $db->get_rows();
+		$rAssigned   = 0;
+		$rSkipped    = 0;
+		$rNextLastId = $rLastId;
 
-        foreach ($rStreams as $rStream) {
-            $rNextLastId = max($rNextLastId, intval($rStream['id']));
-            $rNorm = $fnNormalize($rStream['stream_display_name']);
-            if ($rNorm === '') {
-                $rSkipped++;
-                continue;
-            }
+		foreach ($rStreams as $rStream) {
+			$rNextLastId = max($rNextLastId, intval($rStream['id']));
+			$rNorm = $fnNormalize($rStream['stream_display_name']);
+			if ($rNorm === '') {
+				$rSkipped++;
+				continue;
+			}
 
-            $rMatch = null;
+			$rMatch = null;
 
-            // --- Step 1: match against EPG channel names ---
-            $rBestScore = 0;
-            $rBestEpg   = null;
-            foreach ($rEpgLookup as $rEpgCh) {
-                similar_text($rNorm, $rEpgCh['norm'], $rPct);
-                if ($rPct > $rBestScore) {
-                    $rBestScore = $rPct;
-                    $rBestEpg   = $rEpgCh;
-                }
-            }
-            if ($rBestScore >= $rThreshold && $rBestEpg !== null) {
-                $rMatch = $rBestEpg;
-            }
+			// --- Step 1: match against EPG channel names ---
+			$rBestScore = 0;
+			$rBestEpg   = null;
+			foreach ($rEpgLookup as $rEpgCh) {
+				similar_text($rNorm, $rEpgCh['norm'], $rPct);
+				if ($rPct > $rBestScore) {
+					$rBestScore = $rPct;
+					$rBestEpg   = $rEpgCh;
+				}
+			}
+			if ($rBestScore >= $rThreshold && $rBestEpg !== null) {
+				$rMatch = $rBestEpg;
+			}
 
-            // --- Step 2: if no match, cross-reference via provider streams ---
-            if ($rMatch === null) {
-                $rBestScore = 0;
-                $rBestChId  = null;
-                foreach ($rProviderLookup as $rProvNorm => $rChId) {
-                    similar_text($rNorm, $rProvNorm, $rPct);
-                    if ($rPct > $rBestScore) {
-                        $rBestScore = $rPct;
-                        $rBestChId  = $rChId;
-                    }
-                }
-                if ($rBestScore >= $rThreshold && $rBestChId !== null && isset($rEpgByChannelId[$rBestChId])) {
-                    $rMatch = array(
-                        'epg_id'     => $rEpgByChannelId[$rBestChId]['epg_id'],
-                        'channel_id' => $rBestChId,
-                        'lang'       => $rEpgByChannelId[$rBestChId]['lang'],
-                    );
-                }
-            }
+			// --- Step 2: if no match, cross-reference via provider streams ---
+			if ($rMatch === null) {
+				$rBestScore = 0;
+				$rBestChId  = null;
+				foreach ($rProviderLookup as $rProvNorm => $rChId) {
+					similar_text($rNorm, $rProvNorm, $rPct);
+					if ($rPct > $rBestScore) {
+						$rBestScore = $rPct;
+						$rBestChId  = $rChId;
+					}
+				}
+				if ($rBestScore >= $rThreshold && $rBestChId !== null && isset($rEpgByChannelId[$rBestChId])) {
+					$rMatch = [
+						'epg_id'     => $rEpgByChannelId[$rBestChId]['epg_id'],
+						'channel_id' => $rBestChId,
+						'lang'       => $rEpgByChannelId[$rBestChId]['lang'],
+					];
+				}
+			}
 
-            if ($rMatch !== null) {
-                $db->query(
-                    'UPDATE `streams` SET `epg_id` = ?, `channel_id` = ?, `epg_lang` = ? WHERE `id` = ?;',
-                    $rMatch['epg_id'],
-                    $rMatch['channel_id'],
-                    $rMatch['lang'],
-                    intval($rStream['id'])
-                );
-                $rAssigned++;
-            } else {
-                $rSkipped++;
-            }
-        }
+			if ($rMatch !== null) {
+				$db->query(
+					'UPDATE `streams` SET `epg_id` = ?, `channel_id` = ?, `epg_lang` = ? WHERE `id` = ?;',
+					$rMatch['epg_id'],
+					$rMatch['channel_id'],
+					$rMatch['lang'],
+					intval($rStream['id'])
+				);
+				$rAssigned++;
+			} else {
+				$rSkipped++;
+			}
+		}
 
-        $this->json(array(
-            'status' => STATUS_SUCCESS,
-            'data'   => array(
-                'assigned'     => $rAssigned,
-                'skipped'      => $rSkipped,
-                'batch_size'   => count($rStreams),
-                'total'        => $rTotal,
-                'has_more'     => count($rStreams) === $rLimit,
-                'next_last_id' => $rNextLastId,
-            ),
-        ));
-    }
+		$this->json([
+			'status' => STATUS_SUCCESS,
+			'data'   => [
+				'assigned'     => $rAssigned,
+				'skipped'      => $rSkipped,
+				'batch_size'   => count($rStreams),
+				'total'        => $rTotal,
+				'has_more'     => count($rStreams) === $rLimit,
+				'next_last_id' => $rNextLastId,
+			],
+		]);
+	}
 
-    /** action=epg_categories — live stream categories for the auto-assign UI. */
-    public function epgCategories(): never {
-        $this->requireXhr();
+	/** action=epg_categories — live stream categories for the auto-assign UI. */
+	public function epgCategories(): never {
+		$this->requireXhr();
 
-        if (!Authorization::check('adv', 'stream_tools')) {
-            $this->json(array('status' => STATUS_FAILURE));
-        }
+		if (!Authorization::check('adv', 'stream_tools')) {
+			$this->json(['status' => STATUS_FAILURE]);
+		}
 
-        global $db;
-        $db->query('SELECT `id`, `category_name` FROM `streams_categories` WHERE `category_type` = ? ORDER BY `cat_order` ASC;', 'live');
+		global $db;
+		$db->query('SELECT `id`, `category_name` FROM `streams_categories` WHERE `category_type` = ? ORDER BY `cat_order` ASC;', 'live');
 
-        $this->json(array('status' => STATUS_SUCCESS, 'data' => $db->get_rows()));
-    }
+		$this->json(['status' => STATUS_SUCCESS, 'data' => $db->get_rows()]);
+	}
 
-    /** action=provider_import_epg — create (or find) an EPG source from a provider's xmltv. */
-    public function providerImportEpg(): never {
-        $this->requireXhr();
+	/** action=provider_import_epg — create (or find) an EPG source from a provider's xmltv. */
+	public function providerImportEpg(): never {
+		$this->requireXhr();
 
-        if (!Authorization::check('adv', 'providers')) {
-            $this->json(array('status' => STATUS_FAILURE));
-        }
+		if (!Authorization::check('adv', 'providers')) {
+			$this->json(['status' => STATUS_FAILURE]);
+		}
 
-        global $db;
-        $rProviderId = intval(RequestManager::get('provider_id') ?? 0);
+		global $db;
+		$rProviderId = intval(RequestManager::get('provider_id') ?? 0);
 
-        if ($rProviderId <= 0) {
-            $this->json(array('status' => STATUS_FAILURE, 'data' => 'Invalid provider'));
-        }
+		if ($rProviderId <= 0) {
+			$this->json(['status' => STATUS_FAILURE, 'data' => 'Invalid provider']);
+		}
 
-        $db->query('SELECT `id`, `name`, `ip`, `port`, `username`, `password`, `ssl`, `enabled` FROM `providers` WHERE `id` = ? LIMIT 1;', $rProviderId);
-        $rProv = $db->get_row();
+		$db->query('SELECT `id`, `name`, `ip`, `port`, `username`, `password`, `ssl`, `enabled` FROM `providers` WHERE `id` = ? LIMIT 1;', $rProviderId);
+		$rProv = $db->get_row();
 
-        if (!$rProv) {
-            $this->json(array('status' => STATUS_FAILURE, 'data' => 'Provider not found'));
-        }
+		if (!$rProv) {
+			$this->json(['status' => STATUS_FAILURE, 'data' => 'Provider not found']);
+		}
 
-        if (!$rProv['enabled']) {
-            $this->json(array('status' => STATUS_FAILURE, 'data' => 'Provider is disabled'));
-        }
+		if (!$rProv['enabled']) {
+			$this->json(['status' => STATUS_FAILURE, 'data' => 'Provider is disabled']);
+		}
 
-        $rScheme = $rProv['ssl'] ? 'https' : 'http';
-        $rEpgUrl = $rScheme . '://' . $rProv['ip'] . ':' . $rProv['port'] . '/xmltv.php?username=' . urlencode($rProv['username']) . '&password=' . urlencode($rProv['password']);
-        $db->query('SELECT `id` FROM `epg` WHERE `epg_file` = ? LIMIT 1;', $rEpgUrl);
-        $rExisting = $db->get_row();
+		$rScheme = $rProv['ssl'] ? 'https' : 'http';
+		$rEpgUrl = $rScheme . '://' . $rProv['ip'] . ':' . $rProv['port'] . '/xmltv.php?username=' . urlencode($rProv['username']) . '&password=' . urlencode($rProv['password']);
+		$db->query('SELECT `id` FROM `epg` WHERE `epg_file` = ? LIMIT 1;', $rEpgUrl);
+		$rExisting = $db->get_row();
 
-        if ($rExisting) {
-            $this->json(array('status' => 2, 'data' => array('id' => $rExisting['id'], 'url' => $rEpgUrl)));
-        }
+		if ($rExisting) {
+			$this->json(['status' => 2, 'data' => ['id' => $rExisting['id'], 'url' => $rEpgUrl]]);
+		}
 
-        $rRawName = $rProv['name'];
-        $rEpgName = (filter_var($rRawName, FILTER_VALIDATE_URL) ? $rProv['ip'] : $rRawName) . ' (Provider EPG)';
-        $db->query('INSERT INTO `epg` (`epg_name`, `epg_file`, `days_keep`, `last_updated`, `data`, `offset`) VALUES (?, ?, 7, 0, NULL, 0);', $rEpgName, $rEpgUrl);
-        $rNewId = $db->last_insert_id();
+		$rRawName = $rProv['name'];
+		$rEpgName = (filter_var($rRawName, FILTER_VALIDATE_URL) ? $rProv['ip'] : $rRawName) . ' (Provider EPG)';
+		$db->query('INSERT INTO `epg` (`epg_name`, `epg_file`, `days_keep`, `last_updated`, `data`, `offset`) VALUES (?, ?, 7, 0, NULL, 0);', $rEpgName, $rEpgUrl);
+		$rNewId = $db->last_insert_id();
 
-        $this->json(array('status' => STATUS_SUCCESS, 'data' => array('id' => $rNewId, 'name' => $rEpgName, 'url' => $rEpgUrl)));
-    }
+		$this->json(['status' => STATUS_SUCCESS, 'data' => ['id' => $rNewId, 'name' => $rEpgName, 'url' => $rEpgUrl]]);
+	}
 
-    /** action=get_epg — TV-guide grid (channels + timed listings) for the given streams. */
-    public function getEpg(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'manage_streams');
+	/** action=get_epg — TV-guide grid (channels + timed listings) for the given streams. */
+	public function getEpg(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'manage_streams');
 
-        global $db;
-        $rTimezone = (RequestManager::get('timezone') ?: 'Europe/London');
-        date_default_timezone_set($rTimezone);
-        $rReturn = array('Channels' => array());
-        $rChannels = array_map('intval', explode(',', RequestManager::get('channels')));
+		global $db;
+		$rTimezone = (RequestManager::get('timezone') ?: 'Europe/London');
+		date_default_timezone_set($rTimezone);
+		$rReturn = ['Channels' => []];
+		$rChannels = array_map('intval', explode(',', RequestManager::get('channels')));
 
-        if (count($rChannels) != 0) {
-            $rHours = (intval(RequestManager::get('hours')) ?: 3);
-            $rStartDate = (intval(strtotime(RequestManager::get('startdate'))) ?: time());
-            $rFinishDate = $rStartDate + $rHours * 3600;
-            $rPerUnit = floatval(100 / ($rHours * 60));
-            $rListings = array();
+		if (count($rChannels) != 0) {
+			$rHours = (intval(RequestManager::get('hours')) ?: 3);
+			$rStartDate = (intval(strtotime(RequestManager::get('startdate'))) ?: time());
+			$rFinishDate = $rStartDate + $rHours * 3600;
+			$rPerUnit = floatval(100 / ($rHours * 60));
+			$rListings = [];
 
-            $rArchiveInfo = array();
-            $db->query('SELECT `id`, `tv_archive_server_id`, `tv_archive_duration` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ');');
+			$rArchiveInfo = [];
+			$db->query('SELECT `id`, `tv_archive_server_id`, `tv_archive_duration` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ');');
 
-            if (0 < $db->num_rows()) {
-                foreach ($db->get_rows() as $rRow) {
-                    $rArchiveInfo[$rRow['id']] = $rRow;
-                }
-            }
+			if (0 < $db->num_rows()) {
+				foreach ($db->get_rows() as $rRow) {
+					$rArchiveInfo[$rRow['id']] = $rRow;
+				}
+			}
 
-            $rEPG = EpgService::getStreamsEpg($rChannels, $rStartDate, $rFinishDate);
+			$rEPG = EpgService::getStreamsEpg($rChannels, $rStartDate, $rFinishDate);
 
-            foreach ($rEPG as $rChannelID => $rEPGData) {
-                $rFullSize = 0;
+			foreach ($rEPG as $rChannelID => $rEPGData) {
+				$rFullSize = 0;
 
-                foreach ($rEPGData as $rEPGItem) {
-                    $rCapStart = ($rEPGItem['start'] < $rStartDate ? $rStartDate : $rEPGItem['start']);
-                    $rCapEnd = ($rFinishDate < $rEPGItem['end'] ? $rFinishDate : $rEPGItem['end']);
-                    $rDuration = ($rCapEnd - $rCapStart) / 60;
-                    $rArchive = null;
+				foreach ($rEPGData as $rEPGItem) {
+					$rCapStart = ($rEPGItem['start'] < $rStartDate ? $rStartDate : $rEPGItem['start']);
+					$rCapEnd = ($rFinishDate < $rEPGItem['end'] ? $rFinishDate : $rEPGItem['end']);
+					$rDuration = ($rCapEnd - $rCapStart) / 60;
+					$rArchive = null;
 
-                    if (
-                        isset($rArchiveInfo[$rChannelID])
-                        && 0 < $rArchiveInfo[$rChannelID]['tv_archive_server_id']
-                        && 0 < $rArchiveInfo[$rChannelID]['tv_archive_duration']
-                        && time() - $rArchiveInfo[$rChannelID]['tv_archive_duration'] * 86400 <= $rEPGItem['start']
-                    ) {
-                        $rArchive = array($rEPGItem['start'], intval(($rEPGItem['end'] - $rEPGItem['start']) / 60));
-                    }
+					if (
+						isset($rArchiveInfo[$rChannelID])
+						&& 0 < $rArchiveInfo[$rChannelID]['tv_archive_server_id']
+						&& 0 < $rArchiveInfo[$rChannelID]['tv_archive_duration']
+						&& time() - $rArchiveInfo[$rChannelID]['tv_archive_duration'] * 86400 <= $rEPGItem['start']
+					) {
+						$rArchive = [$rEPGItem['start'], intval(($rEPGItem['end'] - $rEPGItem['start']) / 60)];
+					}
 
-                    $rRelativeSize = round($rDuration * $rPerUnit, 2);
-                    $rFullSize += $rRelativeSize;
+					$rRelativeSize = round($rDuration * $rPerUnit, 2);
+					$rFullSize += $rRelativeSize;
 
-                    if (100 < $rFullSize) {
-                        $rRelativeSize -= $rFullSize - 100;
-                    }
+					if (100 < $rFullSize) {
+						$rRelativeSize -= $rFullSize - 100;
+					}
 
-                    $rListings[$rChannelID][] = array('ListingId' => $rEPGItem['id'], 'ChannelId' => $rChannelID, 'Title' => $rEPGItem['title'], 'RelativeSize' => $rRelativeSize, 'StartTime' => date('h:iA', $rCapStart), 'EndTime' => date('h:iA', $rCapEnd), 'Start' => $rEPGItem['start'], 'End' => $rEPGItem['end'], 'Specialisation' => 'tv', 'Archive' => $rArchive);
-                }
-            }
+					$rListings[$rChannelID][] = ['ListingId' => $rEPGItem['id'], 'ChannelId' => $rChannelID, 'Title' => $rEPGItem['title'], 'RelativeSize' => $rRelativeSize, 'StartTime' => date('h:iA', $rCapStart), 'EndTime' => date('h:iA', $rCapEnd), 'Start' => $rEPGItem['start'], 'End' => $rEPGItem['end'], 'Specialisation' => 'tv', 'Archive' => $rArchive];
+				}
+			}
 
-            $rDefaultEPG = array('ChannelId' => null, 'Title' => 'No Programme Information...', 'RelativeSize' => 100, 'StartTime' => 'Not Available', 'EndTime' => '', 'Specialisation' => 'tv', 'Archive' => null);
-            $db->query('SELECT `id`, `stream_icon`, `stream_display_name`, `tv_archive_duration`, `tv_archive_server_id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ') ORDER BY FIELD(`id`, ' . implode(',', $rChannels) . ') ASC;');
+			$rDefaultEPG = ['ChannelId' => null, 'Title' => 'No Programme Information...', 'RelativeSize' => 100, 'StartTime' => 'Not Available', 'EndTime' => '', 'Specialisation' => 'tv', 'Archive' => null];
+			$db->query('SELECT `id`, `stream_icon`, `stream_display_name`, `tv_archive_duration`, `tv_archive_server_id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ') ORDER BY FIELD(`id`, ' . implode(',', $rChannels) . ') ASC;');
 
-            foreach ($db->get_rows() as $rStream) {
-                if (0 < $rStream['tv_archive_duration'] && 0 < $rStream['tv_archive_server_id']) {
-                    $rArchive = $rStream['tv_archive_duration'];
-                } else {
-                    $rArchive = 0;
-                }
+			foreach ($db->get_rows() as $rStream) {
+				if (0 < $rStream['tv_archive_duration'] && 0 < $rStream['tv_archive_server_id']) {
+					$rArchive = $rStream['tv_archive_duration'];
+				} else {
+					$rArchive = 0;
+				}
 
-                $rDefaultArray = $rDefaultEPG;
-                $rDefaultArray['ChannelId'] = $rStream['id'];
-                $rCategoryIDs = json_decode($rStream['category_id'], true);
-                $rCategories = CategoryService::getAllByType('live');
+				$rDefaultArray = $rDefaultEPG;
+				$rDefaultArray['ChannelId'] = $rStream['id'];
+				$rCategoryIDs = json_decode($rStream['category_id'], true);
+				$rCategories = CategoryService::getAllByType('live');
 
-                if (0 < strlen(RequestManager::get('category'))) {
-                    $rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
-                } else {
-                    $rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
-                }
+				if (0 < strlen(RequestManager::get('category'))) {
+					$rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
+				} else {
+					$rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
+				}
 
-                if (1 < count($rCategoryIDs)) {
-                    $rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
-                }
+				if (1 < count($rCategoryIDs)) {
+					$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
+				}
 
-                $rReturn['Channels'][] = array('Id' => $rStream['id'], 'DisplayName' => $rStream['stream_display_name'], 'CategoryName' => $rCategory, 'Archive' => $rArchive, 'Image' => (ImageUtils::validateURL($rStream['stream_icon']) ?: ''), 'TvListings' => (($rListings[$rStream['id']] ?? array()) ?: array($rDefaultArray)));
-            }
-        }
+				$rReturn['Channels'][] = ['Id' => $rStream['id'], 'DisplayName' => $rStream['stream_display_name'], 'CategoryName' => $rCategory, 'Archive' => $rArchive, 'Image' => (ImageUtils::validateURL($rStream['stream_icon']) ?: ''), 'TvListings' => (($rListings[$rStream['id']] ?? []) ?: [$rDefaultArray])];
+			}
+		}
 
-        $this->json($rReturn);
-    }
+		$this->json($rReturn);
+	}
 
-    /** action=get_programme — single programme details + live/archive availability. */
-    public function getProgramme(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'manage_streams');
+	/** action=get_programme — single programme details + live/archive availability. */
+	public function getProgramme(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'manage_streams');
 
-        global $db;
-        $rTimezone = (RequestManager::get('timezone') ?: 'Europe/London');
-        date_default_timezone_set($rTimezone);
+		global $db;
+		$rTimezone = (RequestManager::get('timezone') ?: 'Europe/London');
+		date_default_timezone_set($rTimezone);
 
-        if (RequestManager::has('id')) {
-            $rRow = EpgService::getProgramme(RequestManager::get('stream_id'), RequestManager::get('id'));
+		if (RequestManager::has('id')) {
+			$rRow = EpgService::getProgramme(RequestManager::get('stream_id'), RequestManager::get('id'));
 
-            if ($rRow) {
-                $rArchive = $rAvailable = false;
+			if ($rRow) {
+				$rArchive = $rAvailable = false;
 
-                if (time() < $rRow['end']) {
-                    $db->query('SELECT `server_id`, `direct_source`, `monitor_pid`, `pid`, `stream_status`, `on_demand` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`id` = ? AND `server_id` IS NOT NULL;', RequestManager::get('stream_id'));
+				if (time() < $rRow['end']) {
+					$db->query('SELECT `server_id`, `direct_source`, `monitor_pid`, `pid`, `stream_status`, `on_demand` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` WHERE `streams`.`id` = ? AND `server_id` IS NOT NULL;', RequestManager::get('stream_id'));
 
-                    if (0 < $db->num_rows()) {
-                        foreach ($db->get_rows() as $rStreamRow) {
-                            if ($rStreamRow['server_id'] && !$rStreamRow['direct_source']) {
-                                $rAvailable = true;
+					if (0 < $db->num_rows()) {
+						foreach ($db->get_rows() as $rStreamRow) {
+							if ($rStreamRow['server_id'] && !$rStreamRow['direct_source']) {
+								$rAvailable = true;
 
-                                break;
-                            }
-                        }
-                    }
-                }
+								break;
+							}
+						}
+					}
+				}
 
-                $rRow['date'] = date('H:i', $rRow['start']) . ' - ' . date('H:i', $rRow['end']);
-                $this->ok(array('data' => $rRow, 'available' => $rAvailable, 'archive' => $rArchive));
-            }
-        }
+				$rRow['date'] = date('H:i', $rRow['start']) . ' - ' . date('H:i', $rRow['end']);
+				$this->ok(['data' => $rRow, 'available' => $rAvailable, 'archive' => $rArchive]);
+			}
+		}
 
-        $this->fail();
-    }
+		$this->fail();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/LineStateTrait.php b/src/Public/Controllers/Admin/Ajax/LineStateTrait.php
index ae9fdbf0..f02788c8 100644
--- a/src/Public/Controllers/Admin/Ajax/LineStateTrait.php
+++ b/src/Public/Controllers/Admin/Ajax/LineStateTrait.php
@@ -22,66 +22,65 @@ use XcVm\Domain\Stream\ConnectionTracker;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 trait LineStateTrait {
+	/**
+	 * @param array<string, mixed> $rExtra
+	 */
+	abstract protected function ok(array $rExtra = []): never;
 
-    /**
-     * @param array<string, mixed> $rExtra
-     */
-    abstract protected function ok(array $rExtra = array()): never;
+	/**
+	 * @param array<string, mixed> $rExtra
+	 */
+	abstract protected function fail(array $rExtra = []): never;
 
-    /**
-     * @param array<string, mixed> $rExtra
-     */
-    abstract protected function fail(array $rExtra = array()): never;
+	/**
+	 * Handle the enable/disable/ban/unban/kill sub-actions for a line and
+	 * terminate the request. An unhandled sub falls through to `{"result":false}`.
+	 *
+	 * @param mixed $rUserID line id the action targets
+	 */
+	private function lineStateAction(string $rSub, mixed $rUserID): never {
+		global $db;
 
-    /**
-     * Handle the enable/disable/ban/unban/kill sub-actions for a line and
-     * terminate the request. An unhandled sub falls through to `{"result":false}`.
-     *
-     * @param mixed $rUserID line id the action targets
-     */
-    private function lineStateAction(string $rSub, $rUserID): never {
-        global $db;
+		if ($rSub == 'enable') {
+			$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rUserID);
+			LineService::updateLineSignal($rUserID);
+			$this->ok();
+		}
 
-        if ($rSub == 'enable') {
-            $db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rUserID);
-            LineService::updateLineSignal($rUserID);
-            $this->ok();
-        }
+		if ($rSub == 'disable') {
+			$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rUserID);
+			LineService::updateLineSignal($rUserID);
+			$this->ok();
+		}
 
-        if ($rSub == 'disable') {
-            $db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rUserID);
-            LineService::updateLineSignal($rUserID);
-            $this->ok();
-        }
+		if ($rSub == 'ban') {
+			$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` = ?;', $rUserID);
+			LineService::updateLineSignal($rUserID);
+			$this->ok();
+		}
 
-        if ($rSub == 'ban') {
-            $db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` = ?;', $rUserID);
-            LineService::updateLineSignal($rUserID);
-            $this->ok();
-        }
+		if ($rSub == 'unban') {
+			$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` = ?;', $rUserID);
+			LineService::updateLineSignal($rUserID);
+			$this->ok();
+		}
 
-        if ($rSub == 'unban') {
-            $db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` = ?;', $rUserID);
-            LineService::updateLineSignal($rUserID);
-            $this->ok();
-        }
+		if ($rSub == 'kill') {
+			if (SettingsManager::get('redis_handler')) {
+				foreach (ConnectionTracker::getRedisConnections($rUserID, null, null, true, false, false) as $rConnection) {
+					ConnectionTracker::closeConnection($rConnection);
+				}
+			} else {
+				$db->query('SELECT * FROM `lines_live` WHERE `user_id` = ?;', $rUserID);
 
-        if ($rSub == 'kill') {
-            if (SettingsManager::get('redis_handler')) {
-                foreach (ConnectionTracker::getRedisConnections($rUserID, null, null, true, false, false) as $rConnection) {
-                    ConnectionTracker::closeConnection($rConnection);
-                }
-            } else {
-                $db->query('SELECT * FROM `lines_live` WHERE `user_id` = ?;', $rUserID);
+				foreach ($db->get_rows() as $rRow) {
+					ConnectionTracker::closeConnection($rRow);
+				}
+			}
 
-                foreach ($db->get_rows() as $rRow) {
-                    ConnectionTracker::closeConnection($rRow);
-                }
-            }
+			$this->ok();
+		}
 
-            $this->ok();
-        }
-
-        $this->fail();
-    }
+		$this->fail();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/MiscAjaxController.php b/src/Public/Controllers/Admin/Ajax/MiscAjaxController.php
index 91fd8a47..c03c9c31 100644
--- a/src/Public/Controllers/Admin/Ajax/MiscAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/MiscAjaxController.php
@@ -20,180 +20,179 @@ use XcVm\Module\Watch\WatchService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class MiscAjaxController extends BaseAjaxController {
+	/** action=process — kill a process by pid on a server (process monitor). */
+	public function process(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'process_monitor');
 
-    /** action=process — kill a process by pid on a server (process monitor). */
-    public function process(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'process_monitor');
+		ApiClient::systemRequest(RequestManager::get('server'), ['action' => 'kill_pid', 'pid' => intval(RequestManager::get('pid'))]);
 
-        ApiClient::systemRequest(RequestManager::get('server'), array('action' => 'kill_pid', 'pid' => intval(RequestManager::get('pid'))));
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=profile — delete a transcoding profile. */
+	public function profile(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'tprofiles');
 
-    /** action=profile — delete a transcoding profile. */
-    public function profile(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'tprofiles');
+		if (RequestManager::get('sub') == 'delete') {
+			StreamConfigRepository::deleteProfile(RequestManager::get('profile_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            StreamConfigRepository::deleteProfile(RequestManager::get('profile_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=reguserlist — Select2 registered-user search. */
+	public function reguserlist(): never {
+		$this->requireXhr();
+		$this->gateAny([
+			['adv', 'mng_regusers'],
+			['adv', 'manage_mag'],
+			['adv', 'manage_e2'],
+			['adv', 'edit_e2'],
+			['adv', 'add_e2'],
+			['adv', 'add_mag'],
+			['adv', 'edit_mag'],
+		]);
 
-    /** action=reguserlist — Select2 registered-user search. */
-    public function reguserlist(): never {
-        $this->requireXhr();
-        $this->gateAny(array(
-            array('adv', 'mng_regusers'),
-            array('adv', 'manage_mag'),
-            array('adv', 'manage_e2'),
-            array('adv', 'edit_e2'),
-            array('adv', 'add_e2'),
-            array('adv', 'add_mag'),
-            array('adv', 'edit_mag'),
-        ));
+		global $db;
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
 
-        global $db;
-        $rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
+		if (RequestManager::has('search')) {
+			$rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
+			$db->query('SELECT COUNT(`id`) AS `id` FROM `users` WHERE `username` LIKE ?;', '%' . RequestManager::get('search') . '%');
+			$rReturn['total_count'] = $db->get_row()['id'];
+			$db->query('SELECT `id`, `username` FROM `users` WHERE `username` LIKE ? ORDER BY `username` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%');
 
-        if (RequestManager::has('search')) {
-            $rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
-            $db->query('SELECT COUNT(`id`) AS `id` FROM `users` WHERE `username` LIKE ?;', '%' . RequestManager::get('search') . '%');
-            $rReturn['total_count'] = $db->get_row()['id'];
-            $db->query('SELECT `id`, `username` FROM `users` WHERE `username` LIKE ? ORDER BY `username` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%');
+			foreach ($db->get_rows() as $rRow) {
+				$rReturn['items'][] = ['id' => $rRow['id'], 'text' => $rRow['username']];
+			}
+		}
 
-            foreach ($db->get_rows() as $rRow) {
-                $rReturn['items'][] = array('id' => $rRow['id'], 'text' => $rRow['username']);
-            }
-        }
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
 
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
+	/** action=userlist — Select2 line / MAG / Enigma2 search. */
+	public function userlist(): never {
+		$this->requireXhr();
+		$this->gateAny([
+			['adv', 'edit_e2'],
+			['adv', 'add_e2'],
+			['adv', 'add_mag'],
+			['adv', 'edit_mag'],
+		]);
 
-    /** action=userlist — Select2 line / MAG / Enigma2 search. */
-    public function userlist(): never {
-        $this->requireXhr();
-        $this->gateAny(array(
-            array('adv', 'edit_e2'),
-            array('adv', 'add_e2'),
-            array('adv', 'add_mag'),
-            array('adv', 'edit_mag'),
-        ));
+		global $db;
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
 
-        global $db;
-        $rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
+		if (RequestManager::has('search')) {
+			$rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
+			$db->query('SELECT COUNT(`id`) AS `id` FROM `lines` WHERE `username` LIKE ? AND `is_e2` = 0 AND `is_mag` = 0;', RequestManager::get('search') . '%');
+			$rReturn['total_count'] = $db->get_row()['id'];
+			$db->query('SELECT COUNT(`device_id`) AS `id` FROM `enigma2_devices` WHERE `mac` LIKE ?;', RequestManager::get('search') . '%');
+			$rReturn['total_count'] += $db->get_row()['id'];
+			$db->query('SELECT COUNT(`mag_id`) AS `id` FROM `mag_devices` WHERE `mac` LIKE ?;', RequestManager::get('search') . '%');
+			$rReturn['total_count'] += $db->get_row()['id'];
+			$db->query('SELECT `id`, IF(`lines`.`is_mag`, `mag_devices`.`mac`, IF(`lines`.`is_e2`, `enigma2_devices`.`mac`, `lines`.`username`)) AS `username` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` WHERE `lines`.`username` LIKE ? OR `mag_devices`.`mac` LIKE ? OR `enigma2_devices`.`mac` LIKE ? ORDER BY `username` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', RequestManager::get('search') . '%', RequestManager::get('search') . '%', RequestManager::get('search') . '%');
 
-        if (RequestManager::has('search')) {
-            $rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
-            $db->query('SELECT COUNT(`id`) AS `id` FROM `lines` WHERE `username` LIKE ? AND `is_e2` = 0 AND `is_mag` = 0;', RequestManager::get('search') . '%');
-            $rReturn['total_count'] = $db->get_row()['id'];
-            $db->query('SELECT COUNT(`device_id`) AS `id` FROM `enigma2_devices` WHERE `mac` LIKE ?;', RequestManager::get('search') . '%');
-            $rReturn['total_count'] += $db->get_row()['id'];
-            $db->query('SELECT COUNT(`mag_id`) AS `id` FROM `mag_devices` WHERE `mac` LIKE ?;', RequestManager::get('search') . '%');
-            $rReturn['total_count'] += $db->get_row()['id'];
-            $db->query('SELECT `id`, IF(`lines`.`is_mag`, `mag_devices`.`mac`, IF(`lines`.`is_e2`, `enigma2_devices`.`mac`, `lines`.`username`)) AS `username` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` WHERE `lines`.`username` LIKE ? OR `mag_devices`.`mac` LIKE ? OR `enigma2_devices`.`mac` LIKE ? ORDER BY `username` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', RequestManager::get('search') . '%', RequestManager::get('search') . '%', RequestManager::get('search') . '%');
+			foreach ($db->get_rows() as $rRow) {
+				$rReturn['items'][] = ['id' => $rRow['id'], 'text' => $rRow['username']];
+			}
+		}
 
-            foreach ($db->get_rows() as $rRow) {
-                $rReturn['items'][] = array('id' => $rRow['id'], 'text' => $rRow['username']);
-            }
-        }
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
 
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
+	/** action=listdir — list media/subtitle files in a directory on a node. */
+	public function listdir(): never {
+		$this->requireXhr();
+		$this->gateAny([
+			['adv', 'add_episode'],
+			['adv', 'edit_episode'],
+			['adv', 'add_movie'],
+			['adv', 'edit_movie'],
+			['adv', 'create_channel'],
+			['adv', 'edit_cchannel'],
+			['adv', 'folder_watch_add'],
+		]);
 
-    /** action=listdir — list media/subtitle files in a directory on a node. */
-    public function listdir(): never {
-        $this->requireXhr();
-        $this->gateAny(array(
-            array('adv', 'add_episode'),
-            array('adv', 'edit_episode'),
-            array('adv', 'add_movie'),
-            array('adv', 'edit_movie'),
-            array('adv', 'create_channel'),
-            array('adv', 'edit_cchannel'),
-            array('adv', 'folder_watch_add'),
-        ));
+		if (RequestManager::get('filter') == 'video') {
+			$rFilter = ['mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts'];
+		} elseif (RequestManager::get('filter') == 'subs') {
+			$rFilter = ['srt', 'sub', 'sbv'];
+		} else {
+			$rFilter = ['mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts', 'srt', 'sub', 'sbv'];
+		}
 
-        if (RequestManager::get('filter') == 'video') {
-            $rFilter = array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts');
-        } elseif (RequestManager::get('filter') == 'subs') {
-            $rFilter = array('srt', 'sub', 'sbv');
-        } else {
-            $rFilter = array('mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts', 'srt', 'sub', 'sbv');
-        }
+		if (!(RequestManager::has('server') && RequestManager::has('dir'))) {
+			$this->fail();
+		}
 
-        if (!(RequestManager::has('server') && RequestManager::has('dir'))) {
-            $this->fail();
-        }
+		$this->ok(['data' => ApiClient::listDir(intval(RequestManager::get('server')), RequestManager::get('dir'), $rFilter)]);
+	}
 
-        $this->ok(array('data' => ApiClient::listDir(intval(RequestManager::get('server')), RequestManager::get('dir'), $rFilter)));
-    }
+	/** action=queue — delete or stop (kill + delete) a queue job. */
+	public function queue(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'streams'], ['adv', 'series'], ['adv', 'episodes']]);
 
-    /** action=queue — delete or stop (kill + delete) a queue job. */
-    public function queue(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'streams'), array('adv', 'series'), array('adv', 'episodes')));
+		global $db;
+		$rSub = RequestManager::get('sub');
+		$db->query('SELECT * FROM `queue` WHERE `id` = ?;', RequestManager::get('id'));
 
-        global $db;
-        $rSub = RequestManager::get('sub');
-        $db->query('SELECT * FROM `queue` WHERE `id` = ?;', RequestManager::get('id'));
+		if ($db->num_rows() == 1) {
+			$rRow = $db->get_row();
 
-        if ($db->num_rows() == 1) {
-            $rRow = $db->get_row();
+			if ($rSub == 'delete') {
+				$db->query('DELETE FROM `queue` WHERE `id` = ?;', RequestManager::get('id'));
+				$this->ok();
+			}
 
-            if ($rSub == 'delete') {
-                $db->query('DELETE FROM `queue` WHERE `id` = ?;', RequestManager::get('id'));
-                $this->ok();
-            }
+			if ($rSub == 'stop') {
+				if (0 < $rRow['pid']) {
+					ServerRepository::killPID($rRow['server_id'], $rRow['pid']);
+				}
 
-            if ($rSub == 'stop') {
-                if (0 < $rRow['pid']) {
-                    ServerRepository::killPID($rRow['server_id'], $rRow['pid']);
-                }
+				$db->query('DELETE FROM `queue` WHERE `id` = ?;', RequestManager::get('id'));
+				$this->ok();
+			}
+		}
 
-                $db->query('DELETE FROM `queue` WHERE `id` = ?;', RequestManager::get('id'));
-                $this->ok();
-            }
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=delete_recording — delete a DVR recording. */
+	public function deleteRecording(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_movie');
 
-    /** action=delete_recording — delete a DVR recording. */
-    public function deleteRecording(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_movie');
+		if (!(RequestManager::has('id') && 0 < intval(RequestManager::get('id')))) {
+			$this->fail();
+		}
 
-        if (!(RequestManager::has('id') && 0 < intval(RequestManager::get('id')))) {
-            $this->fail();
-        }
+		if (!class_exists(WatchService::class)) {
+			$this->fail();
+		}
 
-        if (!class_exists(WatchService::class)) {
-            $this->fail();
-        }
+		WatchService::deleteRecording(RequestManager::get('id'));
 
-        WatchService::deleteRecording(RequestManager::get('id'));
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=clear_failures — clear a stream's failure log. */
+	public function clearFailures(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'streams');
 
-    /** action=clear_failures — clear a stream's failure log. */
-    public function clearFailures(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'streams');
+		global $db;
 
-        global $db;
+		if (!(RequestManager::has('id') && 0 < intval(RequestManager::get('id')))) {
+			$this->fail();
+		}
 
-        if (!(RequestManager::has('id') && 0 < intval(RequestManager::get('id')))) {
-            $this->fail();
-        }
+		$db->query('DELETE FROM `streams_logs` WHERE `stream_id` = ?;', RequestManager::get('id'));
 
-        $db->query('DELETE FROM `streams_logs` WHERE `stream_id` = ?;', RequestManager::get('id'));
-
-        $this->ok();
-    }
+		$this->ok();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/MultiAjaxController.php b/src/Public/Controllers/Admin/Ajax/MultiAjaxController.php
index 6e3ea449..48389eec 100644
--- a/src/Public/Controllers/Admin/Ajax/MultiAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/MultiAjaxController.php
@@ -35,334 +35,333 @@ use XcVm\Domain\Vod\SeriesService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class MultiAjaxController extends BaseAjaxController {
+	/** action=multi — bulk operation over ids of a given entity type. */
+	public function multi(): never {
+		$this->requireXhr();
 
-    /** action=multi — bulk operation over ids of a given entity type. */
-    public function multi(): never {
-        $this->requireXhr();
+		$rType = RequestManager::get('type') ?? '';
+		$rRequestIDs = json_decode(RequestManager::get('ids') ?? '[]', true) ?: [];
+		$rSub = RequestManager::get('sub') ?? '';
 
-        $rType = RequestManager::get('type') ?? '';
-        $rRequestIDs = json_decode(RequestManager::get('ids') ?? '[]', true) ?: array();
-        $rSub = RequestManager::get('sub') ?? '';
+		if (count($rRequestIDs) != 0) {
+			switch ($rType) {
+				case 'line':
+					$this->handleLine($rRequestIDs, $rSub);
+				case 'active_code':
+					$this->handleActiveCode($rRequestIDs, $rSub);
+				case 'mag':
+				case 'enigma':
+					$this->handleDevices($rType, $rRequestIDs, $rSub);
+				case 'user':
+					$this->handleUser($rRequestIDs, $rSub);
+				case 'server':
+				case 'proxy':
+					$this->handleServers($rType, $rRequestIDs, $rSub);
+				case 'series':
+					$this->handleSeries($rRequestIDs, $rSub);
+				case 'stream':
+				case 'movie':
+				case 'episode':
+				case 'cchannel':
+				case 'radio':
+					$this->handleStreams($rType, $rRequestIDs, $rSub);
+			}
+		}
 
-        if (count($rRequestIDs) != 0) {
-            switch ($rType) {
-                case 'line':
-                    $this->handleLine($rRequestIDs, $rSub);
-                case 'active_code':
-                    $this->handleActiveCode($rRequestIDs, $rSub);
-                case 'mag':
-                case 'enigma':
-                    $this->handleDevices($rType, $rRequestIDs, $rSub);
-                case 'user':
-                    $this->handleUser($rRequestIDs, $rSub);
-                case 'server':
-                case 'proxy':
-                    $this->handleServers($rType, $rRequestIDs, $rSub);
-                case 'series':
-                    $this->handleSeries($rRequestIDs, $rSub);
-                case 'stream':
-                case 'movie':
-                case 'episode':
-                case 'cchannel':
-                case 'radio':
-                    $this->handleStreams($rType, $rRequestIDs, $rSub);
-            }
-        }
+		// Empty id set or an unknown type falls through to a failure response.
+		$this->fail();
+	}
 
-        // Empty id set or an unknown type falls through to a failure response.
-        $this->fail();
-    }
+	/** Bulk operations on lines. */
+	private function handleLine(array $rRequestIDs, string $rSub): never {
+		$this->gate('adv', 'edit_line');
 
-    /** Bulk operations on lines. */
-    private function handleLine(array $rRequestIDs, string $rSub): never {
-        $this->gate('adv', 'edit_line');
+		global $db;
 
-        global $db;
+		if ($rSub == 'delete') {
+			LineRepository::deleteMany($rRequestIDs);
+		} elseif ($rSub == 'enable') {
+			$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id`IN (' . $this->inList($rRequestIDs) . ');');
+			LineService::updateLinesSignal($rRequestIDs);
+		} elseif ($rSub == 'disable') {
+			$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
+			LineService::updateLinesSignal($rRequestIDs);
+		} elseif ($rSub == 'ban') {
+			$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
+			LineService::updateLinesSignal($rRequestIDs);
+		} elseif ($rSub == 'unban') {
+			$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
+			LineService::updateLinesSignal($rRequestIDs);
+		} elseif ($rSub == 'purge') {
+			$this->purgeUserConnections($rRequestIDs);
+		}
 
-        if ($rSub == 'delete') {
-            LineRepository::deleteMany($rRequestIDs);
-        } elseif ($rSub == 'enable') {
-            $db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id`IN (' . $this->inList($rRequestIDs) . ');');
-            LineService::updateLinesSignal($rRequestIDs);
-        } elseif ($rSub == 'disable') {
-            $db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
-            LineService::updateLinesSignal($rRequestIDs);
-        } elseif ($rSub == 'ban') {
-            $db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
-            LineService::updateLinesSignal($rRequestIDs);
-        } elseif ($rSub == 'unban') {
-            $db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
-            LineService::updateLinesSignal($rRequestIDs);
-        } elseif ($rSub == 'purge') {
-            $this->purgeUserConnections($rRequestIDs);
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** Bulk operations on MAG / Enigma2 devices (acting on their owning lines). */
+	private function handleDevices(string $rType, array $rRequestIDs, string $rSub): never {
+		$this->gate('adv', ($rType == 'mag') ? 'edit_mag' : 'edit_e2');
 
-    /** Bulk operations on MAG / Enigma2 devices (acting on their owning lines). */
-    private function handleDevices(string $rType, array $rRequestIDs, string $rSub): never {
-        $this->gate('adv', ($rType == 'mag') ? 'edit_mag' : 'edit_e2');
+		global $db;
+		$rUserIDs = [];
 
-        global $db;
-        $rUserIDs = array();
+		if ($rType == 'mag') {
+			$db->query('SELECT `user_id` FROM `mag_devices` WHERE `mag_id` IN (' . $this->inList($rRequestIDs) . ');');
+		} else {
+			$db->query('SELECT `user_id` FROM `enigma2_devices` WHERE `device_id` IN (' . $this->inList($rRequestIDs) . ');');
+		}
 
-        if ($rType == 'mag') {
-            $db->query('SELECT `user_id` FROM `mag_devices` WHERE `mag_id` IN (' . $this->inList($rRequestIDs) . ');');
-        } else {
-            $db->query('SELECT `user_id` FROM `enigma2_devices` WHERE `device_id` IN (' . $this->inList($rRequestIDs) . ');');
-        }
+		foreach ($db->get_Rows() as $rRow) {
+			$rUserIDs[] = $rRow['user_id'];
+		}
 
-        foreach ($db->get_Rows() as $rRow) {
-            $rUserIDs[] = $rRow['user_id'];
-        }
+		if (0 < count($rUserIDs)) {
+			if ($rSub == 'delete') {
+				if ($rType == 'mag') {
+					MagService::deleteDevices($rRequestIDs);
+				} else {
+					EnigmaService::deleteDevices($rRequestIDs);
+				}
+			} elseif ($rSub == 'enable') {
+				$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` IN (' . $this->inList($rUserIDs) . ');');
+			} elseif ($rSub == 'disable') {
+				$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` IN (' . $this->inList($rUserIDs) . ');');
+			} elseif ($rSub == 'ban') {
+				$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` IN (' . $this->inList($rUserIDs) . ');');
+			} elseif ($rSub == 'unban') {
+				$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` IN (' . $this->inList($rUserIDs) . ');');
+			} elseif ($rSub == 'purge') {
+				$this->purgeUserConnections($rUserIDs);
+			} elseif ($rSub == 'convert' && in_array($rType, ['mag', 'enigma'])) {
+				foreach ($rRequestIDs as $rDeviceID) {
+					if ($rType == 'mag') {
+						MagService::deleteDevice($rDeviceID, false, false, true);
+					} else {
+						EnigmaService::deleteDevice($rDeviceID, false, false, true);
+					}
+				}
+			}
 
-        if (0 < count($rUserIDs)) {
-            if ($rSub == 'delete') {
-                if ($rType == 'mag') {
-                    MagService::deleteDevices($rRequestIDs);
-                } else {
-                    EnigmaService::deleteDevices($rRequestIDs);
-                }
-            } elseif ($rSub == 'enable') {
-                $db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` IN (' . $this->inList($rUserIDs) . ');');
-            } elseif ($rSub == 'disable') {
-                $db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` IN (' . $this->inList($rUserIDs) . ');');
-            } elseif ($rSub == 'ban') {
-                $db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` IN (' . $this->inList($rUserIDs) . ');');
-            } elseif ($rSub == 'unban') {
-                $db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` IN (' . $this->inList($rUserIDs) . ');');
-            } elseif ($rSub == 'purge') {
-                $this->purgeUserConnections($rUserIDs);
-            } elseif ($rSub == 'convert' && in_array($rType, array('mag', 'enigma'))) {
-                foreach ($rRequestIDs as $rDeviceID) {
-                    if ($rType == 'mag') {
-                        MagService::deleteDevice($rDeviceID, false, false, true);
-                    } else {
-                        EnigmaService::deleteDevice($rDeviceID, false, false, true);
-                    }
-                }
-            }
+			LineService::updateLinesSignal($rUserIDs);
+		}
 
-            LineService::updateLinesSignal($rUserIDs);
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** Bulk operations on registered (reseller) users. */
+	private function handleUser(array $rRequestIDs, string $rSub): never {
+		$this->gate('adv', 'edit_reguser');
 
-    /** Bulk operations on registered (reseller) users. */
-    private function handleUser(array $rRequestIDs, string $rSub): never {
-        $this->gate('adv', 'edit_reguser');
+		global $db;
 
-        global $db;
+		if ($rSub == 'enable') {
+			$db->query('UPDATE `users` SET `status` = 1 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
+		} elseif ($rSub == 'disable') {
+			$db->query('UPDATE `users` SET `status` = 0 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
+		} elseif ($rSub == 'delete') {
+			UserService::deleteRegisteredUsers($rRequestIDs);
+		}
 
-        if ($rSub == 'enable') {
-            $db->query('UPDATE `users` SET `status` = 1 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
-        } elseif ($rSub == 'disable') {
-            $db->query('UPDATE `users` SET `status` = 0 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
-        } elseif ($rSub == 'delete') {
-            UserService::deleteRegisteredUsers($rRequestIDs);
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** Bulk operations on servers / proxies. */
+	private function handleServers(string $rType, array $rRequestIDs, string $rSub): never {
+		$this->gate('adv', 'edit_server');
 
-    /** Bulk operations on servers / proxies. */
-    private function handleServers(string $rType, array $rRequestIDs, string $rSub): never {
-        $this->gate('adv', 'edit_server');
+		global $db, $rServers;
 
-        global $db, $rServers;
+		if ($rType == 'server' && in_array($rSub, ['restart', 'start', 'stop'])) {
+			$rStreamMap = [];
 
-        if ($rType == 'server' && in_array($rSub, array('restart', 'start', 'stop'))) {
-            $rStreamMap = array();
+			if ($rSub == 'start') {
+				$db->query('SELECT `server_id`, `stream_id` FROM `streams_servers` WHERE `server_id` IN (' . $this->inList($rRequestIDs) . ') AND `on_demand` = 0;');
+			} else {
+				$db->query('SELECT `server_id`, `stream_id` FROM `streams_servers` WHERE `server_id` IN (' . $this->inList($rRequestIDs) . ') AND `on_demand` = 0 AND `monitor_pid` IS NOT NULL AND `monitor_pid` > 0;');
+			}
 
-            if ($rSub == 'start') {
-                $db->query('SELECT `server_id`, `stream_id` FROM `streams_servers` WHERE `server_id` IN (' . $this->inList($rRequestIDs) . ') AND `on_demand` = 0;');
-            } else {
-                $db->query('SELECT `server_id`, `stream_id` FROM `streams_servers` WHERE `server_id` IN (' . $this->inList($rRequestIDs) . ') AND `on_demand` = 0 AND `monitor_pid` IS NOT NULL AND `monitor_pid` > 0;');
-            }
+			if (0 < $db->num_rows()) {
+				foreach ($db->get_rows() as $rRow) {
+					$rStreamMap[intval($rRow['server_id'])][] = intval($rRow['stream_id']);
+				}
+			}
 
-            if (0 < $db->num_rows()) {
-                foreach ($db->get_rows() as $rRow) {
-                    $rStreamMap[intval($rRow['server_id'])][] = intval($rRow['stream_id']);
-                }
-            }
+			foreach ($rStreamMap as $rServerID => $rStreamIDs) {
+				$rStreamSub = ($rSub == 'stop') ? 'stop' : 'start';
+				ApiClient::request(['action' => 'stream', 'sub' => $rStreamSub, 'stream_ids' => $rStreamIDs, 'servers' => [$rServerID]]);
+			}
+		} elseif ($rSub == 'purge') {
+			foreach ($rRequestIDs as $rServerID) {
+				$this->purgeServerConnections($rType, $rServerID);
+			}
+		} elseif ($rSub == 'enable') {
+			$db->query('UPDATE `servers` SET `enabled` = 1 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
+		} elseif ($rSub == 'disable') {
+			$db->query('UPDATE `servers` SET `enabled` = 0 WHERE `is_main` = 0 AND `id` IN (' . $this->inList($rRequestIDs) . ');');
+		} elseif ($rSub == 'enable_proxy' && $rType == 'server') {
+			$db->query('UPDATE `servers` SET `enable_proxy` = 1 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
+		} elseif ($rSub == 'disable_proxy' && $rType == 'server') {
+			$db->query('UPDATE `servers` SET `enable_proxy` = 0 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
+		} else {
+			foreach ($rRequestIDs as $rServerID) {
+				if ($rServers[$rServerID]['is_main'] == 0) {
+					ServerRepository::deleteById($rServerID);
+				}
+			}
+		}
 
-            foreach ($rStreamMap as $rServerID => $rStreamIDs) {
-                $rStreamSub = ($rSub == 'stop') ? 'stop' : 'start';
-                ApiClient::request(array('action' => 'stream', 'sub' => $rStreamSub, 'stream_ids' => $rStreamIDs, 'servers' => array($rServerID)));
-            }
-        } elseif ($rSub == 'purge') {
-            foreach ($rRequestIDs as $rServerID) {
-                $this->purgeServerConnections($rType, $rServerID);
-            }
-        } elseif ($rSub == 'enable') {
-            $db->query('UPDATE `servers` SET `enabled` = 1 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
-        } elseif ($rSub == 'disable') {
-            $db->query('UPDATE `servers` SET `enabled` = 0 WHERE `is_main` = 0 AND `id` IN (' . $this->inList($rRequestIDs) . ');');
-        } elseif ($rSub == 'enable_proxy' && $rType == 'server') {
-            $db->query('UPDATE `servers` SET `enable_proxy` = 1 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
-        } elseif ($rSub == 'disable_proxy' && $rType == 'server') {
-            $db->query('UPDATE `servers` SET `enable_proxy` = 0 WHERE `id` IN (' . $this->inList($rRequestIDs) . ');');
-        } else {
-            foreach ($rRequestIDs as $rServerID) {
-                if ($rServers[$rServerID]['is_main'] == 0) {
-                    ServerRepository::deleteById($rServerID);
-                }
-            }
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** Bulk delete of series. */
+	private function handleSeries(array $rRequestIDs, string $rSub): never {
+		if ($rSub == 'delete') {
+			SeriesService::deleteSeriesByIds($rRequestIDs);
+		}
 
-    /** Bulk delete of series. */
-    private function handleSeries(array $rRequestIDs, string $rSub): never {
-        if ($rSub == 'delete') {
-            SeriesService::deleteSeriesByIds($rRequestIDs);
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** Bulk operations on streams / movies / episodes / created channels / radios. */
+	private function handleStreams(string $rType, array $rRequestIDs, string $rSub): never {
+		$this->gate('adv', 'edit_' . $rType);
 
-    /** Bulk operations on streams / movies / episodes / created channels / radios. */
-    private function handleStreams(string $rType, array $rRequestIDs, string $rSub): never {
-        $this->gate('adv', 'edit_' . $rType);
+		global $db;
+		$rNoServer = $rStreamMap = [];
 
-        global $db;
-        $rNoServer = $rStreamMap = array();
+		foreach ($rRequestIDs as $rStream) {
+			list($rStreamID, $rServerID) = explode('-', $rStream);
 
-        foreach ($rRequestIDs as $rStream) {
-            list($rStreamID, $rServerID) = explode('-', $rStream);
+			if (!$rServerID) {
+				$rNoServer[] = $rStreamID;
+			} else {
+				$rStreamMap[$rServerID][] = $rStreamID;
+			}
+		}
+		$rUnallocated = $rAllocated = [];
 
-            if (!$rServerID) {
-                $rNoServer[] = $rStreamID;
-            } else {
-                $rStreamMap[$rServerID][] = $rStreamID;
-            }
-        }
-        $rUnallocated = $rAllocated = array();
+		if (0 < count($rNoServer)) {
+			$db->query('SELECT `stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . $this->inList($rNoServer) . ');');
 
-        if (0 < count($rNoServer)) {
-            $db->query('SELECT `stream_id`, `server_id` FROM `streams_servers` WHERE `stream_id` IN (' . $this->inList($rNoServer) . ');');
+			foreach ($db->get_rows() as $rRow) {
+				$rStreamMap[intval($rRow['server_id'])][] = intval($rRow['stream_id']);
 
-            foreach ($db->get_rows() as $rRow) {
-                $rStreamMap[intval($rRow['server_id'])][] = intval($rRow['stream_id']);
+				if (!in_array(intval($rRow['stream_id']), $rAllocated)) {
+					$rAllocated[] = intval($rRow['stream_id']);
+				}
+			}
+		}
 
-                if (!in_array(intval($rRow['stream_id']), $rAllocated)) {
-                    $rAllocated[] = intval($rRow['stream_id']);
-                }
-            }
-        }
+		foreach ($rNoServer as $rStreamID) {
+			if (!in_array($rStreamID, $rAllocated)) {
+				$rUnallocated[] = $rStreamID;
+			}
+		}
 
-        foreach ($rNoServer as $rStreamID) {
-            if (!in_array($rStreamID, $rAllocated)) {
-                $rUnallocated[] = $rStreamID;
-            }
-        }
+		if (0 < count($rStreamMap) || $rSub == 'delete' && 0 < count($rUnallocated)) {
+			if (in_array($rSub, ['start', 'stop', 'restart'])) {
+				if ($rSub == 'restart') {
+					$rSub = 'start';
+				}
 
-        if (0 < count($rStreamMap) || $rSub == 'delete' && 0 < count($rUnallocated)) {
-            if (in_array($rSub, array('start', 'stop', 'restart'))) {
-                if ($rSub == 'restart') {
-                    $rSub = 'start';
-                }
+				foreach ($rStreamMap as $rServerID => $rStreamIDs) {
+					$rAction = in_array($rType, ['stream', 'radio', 'cchannel']) ? 'stream' : 'vod';
+					ApiClient::request(['action' => $rAction, 'sub' => $rSub, 'stream_ids' => $rStreamIDs, 'servers' => [$rServerID]]);
+				}
+			} elseif ($rSub == 'delete') {
+				foreach ($rStreamMap as $rServerID => $rStreamIDs) {
+					StreamRepository::deleteStreamsByServer($rStreamIDs, $rServerID, true);
+				}
 
-                foreach ($rStreamMap as $rServerID => $rStreamIDs) {
-                    $rAction = in_array($rType, array('stream', 'radio', 'cchannel')) ? 'stream' : 'vod';
-                    ApiClient::request(array('action' => $rAction, 'sub' => $rSub, 'stream_ids' => $rStreamIDs, 'servers' => array($rServerID)));
-                }
-            } elseif ($rSub == 'delete') {
-                foreach ($rStreamMap as $rServerID => $rStreamIDs) {
-                    StreamRepository::deleteStreamsByServer($rStreamIDs, $rServerID, true);
-                }
+				if (0 < count($rUnallocated)) {
+					StreamRepository::deleteStreams($rUnallocated, true);
+				}
+			} elseif ($rSub == 'purge') {
+				foreach ($rStreamMap as $rServerID => $rStreamIDs) {
+					if (SettingsManager::get('redis_handler')) {
+						foreach ($rStreamIDs as $rStreamID) {
+							foreach (ConnectionTracker::getRedisConnections(null, $rServerID, $rStreamID, true, false, false) as $rConnection) {
+								ConnectionTracker::closeConnection($rConnection);
+							}
+						}
+					} else {
+						$db->query('SELECT * FROM `lines_live` WHERE `server_id` = ? AND `stream_id` IN (' . $this->inList($rStreamIDs) . ');', $rServerID);
 
-                if (0 < count($rUnallocated)) {
-                    StreamRepository::deleteStreams($rUnallocated, true);
-                }
-            } elseif ($rSub == 'purge') {
-                foreach ($rStreamMap as $rServerID => $rStreamIDs) {
-                    if (SettingsManager::get('redis_handler')) {
-                        foreach ($rStreamIDs as $rStreamID) {
-                            foreach (ConnectionTracker::getRedisConnections(null, $rServerID, $rStreamID, true, false, false) as $rConnection) {
-                                ConnectionTracker::closeConnection($rConnection);
-                            }
-                        }
-                    } else {
-                        $db->query('SELECT * FROM `lines_live` WHERE `server_id` = ? AND `stream_id` IN (' . $this->inList($rStreamIDs) . ');', $rServerID);
+						foreach ($db->get_rows() as $rRow) {
+							ConnectionTracker::closeConnection($rRow);
+						}
+					}
+				}
+			}
+		}
 
-                        foreach ($db->get_rows() as $rRow) {
-                            ConnectionTracker::closeConnection($rRow);
-                        }
-                    }
-                }
-            }
-        }
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** Close all live connections for a set of line ids (redis or lines_live). */
+	private function purgeUserConnections(array $rUserIDs): void {
+		global $db;
 
-    /** Close all live connections for a set of line ids (redis or lines_live). */
-    private function purgeUserConnections(array $rUserIDs): void {
-        global $db;
+		if (SettingsManager::get('redis_handler')) {
+			foreach ($rUserIDs as $rUserID) {
+				foreach (ConnectionTracker::getRedisConnections($rUserID, null, null, true, false, false) as $rConnection) {
+					ConnectionTracker::closeConnection($rConnection);
+				}
+			}
+		} else {
+			$db->query('SELECT * FROM `lines_live` WHERE `user_id` IN (' . $this->inList($rUserIDs) . ');');
 
-        if (SettingsManager::get('redis_handler')) {
-            foreach ($rUserIDs as $rUserID) {
-                foreach (ConnectionTracker::getRedisConnections($rUserID, null, null, true, false, false) as $rConnection) {
-                    ConnectionTracker::closeConnection($rConnection);
-                }
-            }
-        } else {
-            $db->query('SELECT * FROM `lines_live` WHERE `user_id` IN (' . $this->inList($rUserIDs) . ');');
+			foreach ($db->get_rows() as $rRow) {
+				ConnectionTracker::closeConnection($rRow);
+			}
+		}
+	}
 
-            foreach ($db->get_rows() as $rRow) {
-                ConnectionTracker::closeConnection($rRow);
-            }
-        }
-    }
+	/** Close all live connections served by one server / proxy. */
+	private function purgeServerConnections(string $rType, $rServerID): void {
+		global $db;
 
-    /** Close all live connections served by one server / proxy. */
-    private function purgeServerConnections(string $rType, $rServerID): void {
-        global $db;
+		if (SettingsManager::get('redis_handler')) {
+			if ($rType == 'proxy') {
+				foreach (ServerRepository::getAll()[$rServerID]['parent_id'] as $rParentID) {
+					foreach (ConnectionTracker::getRedisConnections(null, $rParentID, null, true, false, false) as $rConnection) {
+						if ($rConnection['proxy_id'] == $rServerID) {
+							ConnectionTracker::closeConnection($rConnection);
+						}
+					}
+				}
+			} else {
+				foreach (ConnectionTracker::getRedisConnections(null, $rServerID, null, true, false, false) as $rConnection) {
+					ConnectionTracker::closeConnection($rConnection);
+				}
+			}
+		} else {
+			if ($rType == 'proxy') {
+				$db->query('SELECT * FROM `lines_live` WHERE `proxy_id` = ?;', $rServerID);
+			} else {
+				$db->query('SELECT * FROM `lines_live` WHERE `server_id` = ?;', $rServerID);
+			}
 
-        if (SettingsManager::get('redis_handler')) {
-            if ($rType == 'proxy') {
-                foreach (ServerRepository::getAll()[$rServerID]['parent_id'] as $rParentID) {
-                    foreach (ConnectionTracker::getRedisConnections(null, $rParentID, null, true, false, false) as $rConnection) {
-                        if ($rConnection['proxy_id'] == $rServerID) {
-                            ConnectionTracker::closeConnection($rConnection);
-                        }
-                    }
-                }
-            } else {
-                foreach (ConnectionTracker::getRedisConnections(null, $rServerID, null, true, false, false) as $rConnection) {
-                    ConnectionTracker::closeConnection($rConnection);
-                }
-            }
-        } else {
-            if ($rType == 'proxy') {
-                $db->query('SELECT * FROM `lines_live` WHERE `proxy_id` = ?;', $rServerID);
-            } else {
-                $db->query('SELECT * FROM `lines_live` WHERE `server_id` = ?;', $rServerID);
-            }
+			foreach ($db->get_rows() as $rRow) {
+				ConnectionTracker::closeConnection($rRow);
+			}
+		}
+	}
 
-            foreach ($db->get_rows() as $rRow) {
-                ConnectionTracker::closeConnection($rRow);
-            }
-        }
-    }
+	/** `implode(',', array_map('intval', …))` — the recurring `IN (…)` id list. */
+	private function inList(array $rIDs): string {
+		return implode(',', array_map('intval', $rIDs));
+	}
 
-    /** `implode(',', array_map('intval', …))` — the recurring `IN (…)` id list. */
-    private function inList(array $rIDs): string {
-        return implode(',', array_map('intval', $rIDs));
-    }
-
-    private function handleActiveCode(array $rRequestIDs, string $rSub): never {
-        $extra = [
-            'days' => intval(RequestManager::get('days') ?? 30),
-            'package_id' => intval(RequestManager::get('package_id') ?? 0),
-            'refund_credits' => !empty(RequestManager::get('refund_credits')),
-        ];
-        $res = ActiveCodeService::massAction($rSub, $rRequestIDs, $GLOBALS['rUserInfo'] ?? [], true, $extra);
-        echo json_encode(['result' => ($res['status'] === 'SUCCESS'), 'message' => $res['message'] ?? '']);
-        exit;
-    }
+	private function handleActiveCode(array $rRequestIDs, string $rSub): never {
+		$extra = [
+			'days' => intval(RequestManager::get('days') ?? 30),
+			'package_id' => intval(RequestManager::get('package_id') ?? 0),
+			'refund_credits' => !empty(RequestManager::get('refund_credits')),
+		];
+		$res = ActiveCodeService::massAction($rSub, $rRequestIDs, $GLOBALS['rUserInfo'] ?? [], true, $extra);
+		echo json_encode(['result' => ($res['status'] === 'SUCCESS'), 'message' => $res['message'] ?? '']);
+		exit;
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/PackageAjaxController.php b/src/Public/Controllers/Admin/Ajax/PackageAjaxController.php
index 2bff0a3e..e681c5e0 100644
--- a/src/Public/Controllers/Admin/Ajax/PackageAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/PackageAjaxController.php
@@ -27,169 +27,168 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class PackageAjaxController extends BaseAjaxController {
+	/** action=package — delete a package or toggle one of its boolean flags. */
+	public function package(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_package');
 
-    /** action=package — delete a package or toggle one of its boolean flags. */
-    public function package(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_package');
+		global $db;
+		$rSub = RequestManager::get('sub');
 
-        global $db;
-        $rSub = RequestManager::get('sub');
+		if ($rSub == 'delete') {
+			PackageService::deleteById(RequestManager::get('package_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            PackageService::deleteById(RequestManager::get('package_id'));
-            $this->ok();
-        }
+		if (in_array($rSub, ['is_trial', 'is_official', 'can_gen_mag', 'can_gen_e2', 'only_mag', 'only_e2'])) {
+			$db->query('UPDATE `users_packages` SET ? = ? WHERE `id` = ?;', $rSub, RequestManager::get('value'), RequestManager::get('package_id'));
+			$this->ok();
+		}
 
-        if (in_array($rSub, array('is_trial', 'is_official', 'can_gen_mag', 'can_gen_e2', 'only_mag', 'only_e2'))) {
-            $db->query('UPDATE `users_packages` SET ? = ? WHERE `id` = ?;', $rSub, RequestManager::get('value'), RequestManager::get('package_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=code — delete an activation code. */
+	public function code(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'add_code');
 
-    /** action=code — delete an activation code. */
-    public function code(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'add_code');
+		if (RequestManager::get('sub') == 'delete') {
+			AuthRepository::deleteCode(RequestManager::get('code_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            AuthRepository::deleteCode(RequestManager::get('code_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=hmac — delete an HMAC key. */
+	public function hmac(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'add_hmac');
 
-    /** action=hmac — delete an HMAC key. */
-    public function hmac(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'add_hmac');
+		if (RequestManager::get('sub') == 'delete') {
+			AuthRepository::deleteHMAC(RequestManager::get('hmac_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            AuthRepository::deleteHMAC(RequestManager::get('hmac_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=group — delete a member group or toggle its admin/reseller flag. */
+	public function group(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_group');
 
-    /** action=group — delete a member group or toggle its admin/reseller flag. */
-    public function group(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_group');
+		global $db;
+		$rSub = RequestManager::get('sub');
 
-        global $db;
-        $rSub = RequestManager::get('sub');
+		if ($rSub == 'delete') {
+			GroupService::deleteById(RequestManager::get('group_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            GroupService::deleteById(RequestManager::get('group_id'));
-            $this->ok();
-        }
+		if (in_array($rSub, ['is_admin', 'is_reseller'])) {
+			$db->query('UPDATE `users_groups` SET ? = ? WHERE `group_id` = ?;', $rSub, RequestManager::get('value'), RequestManager::get('group_id'));
+			$this->ok();
+		}
 
-        if (in_array($rSub, array('is_admin', 'is_reseller'))) {
-            $db->query('UPDATE `users_groups` SET ? = ? WHERE `group_id` = ?;', $rSub, RequestManager::get('value'), RequestManager::get('group_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=bouquet — delete a bouquet. */
+	public function bouquet(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_bouquet');
 
-    /** action=bouquet — delete a bouquet. */
-    public function bouquet(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_bouquet');
+		if (RequestManager::get('sub') == 'delete') {
+			BouquetService::deleteById(RequestManager::get('bouquet_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            BouquetService::deleteById(RequestManager::get('bouquet_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=category — delete a stream category. */
+	public function category(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_cat');
 
-    /** action=category — delete a stream category. */
-    public function category(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_cat');
+		if (RequestManager::get('sub') == 'delete') {
+			CategoryService::deleteById(RequestManager::get('category_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            CategoryService::deleteById(RequestManager::get('category_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=get_package — package details + resolved bouquets (with reseller overrides). */
+	public function getPackage(): never {
+		$this->requireXhr();
 
-    /** action=get_package — package details + resolved bouquets (with reseller overrides). */
-    public function getPackage(): never {
-        $this->requireXhr();
+		global $db, $rUserInfo;
+		$rOverride = json_decode($rUserInfo['override_packages'], true);
+		$db->query('SELECT `id`, `bouquets`, `official_credits` AS `cost_credits`, `official_duration`, `official_duration_in`, `max_connections`, `can_gen_mag`, `can_gen_e2`, `only_mag`, `only_e2` FROM `users_packages` WHERE `id` = ?;', RequestManager::get('package_id'));
 
-        global $db, $rUserInfo;
-        $rOverride = json_decode($rUserInfo['override_packages'], true);
-        $db->query('SELECT `id`, `bouquets`, `official_credits` AS `cost_credits`, `official_duration`, `official_duration_in`, `max_connections`, `can_gen_mag`, `can_gen_e2`, `only_mag`, `only_e2` FROM `users_packages` WHERE `id` = ?;', RequestManager::get('package_id'));
+		if ($db->num_rows() == 1) {
+			$rData = $db->get_row();
 
-        if ($db->num_rows() == 1) {
-            $rData = $db->get_row();
+			if (isset($rOverride[$rData['id']]['official_credits']) && 0 < strlen($rOverride[$rData['id']]['official_credits'])) {
+				$rData['cost_credits'] = $rOverride[$rData['id']]['official_credits'];
+			}
 
-            if (isset($rOverride[$rData['id']]['official_credits']) && 0 < strlen($rOverride[$rData['id']]['official_credits'])) {
-                $rData['cost_credits'] = $rOverride[$rData['id']]['official_credits'];
-            }
+			$rData['exp_date'] = date('Y-m-d', strtotime('+' . intval($rData['official_duration']) . ' ' . $rData['official_duration_in']));
 
-            $rData['exp_date'] = date('Y-m-d', strtotime('+' . intval($rData['official_duration']) . ' ' . $rData['official_duration_in']));
+			if (RequestManager::has('user_id') && ($rUser = UserRepository::getLineById(RequestManager::get('user_id')))) {
+				if (time() < $rUser['exp_date']) {
+					$rData['exp_date'] = date('Y-m-d', strtotime('+' . intval($rData['official_duration']) . ' ' . $rData['official_duration_in'], $rUser['exp_date']));
+				} else {
+					$rData['exp_date'] = date('Y-m-d', strtotime('+' . intval($rData['official_duration']) . ' ' . $rData['official_duration_in']));
+				}
+			}
 
-            if (RequestManager::has('user_id') && ($rUser = UserRepository::getLineById(RequestManager::get('user_id')))) {
-                if (time() < $rUser['exp_date']) {
-                    $rData['exp_date'] = date('Y-m-d', strtotime('+' . intval($rData['official_duration']) . ' ' . $rData['official_duration_in'], $rUser['exp_date']));
-                } else {
-                    $rData['exp_date'] = date('Y-m-d', strtotime('+' . intval($rData['official_duration']) . ' ' . $rData['official_duration_in']));
-                }
-            }
+			$this->ok(['bouquets' => $this->collectPackageBouquets($rData['bouquets']), 'data' => $rData]);
+		}
 
-            $this->ok(array('bouquets' => $this->collectPackageBouquets($rData['bouquets']), 'data' => $rData));
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=get_package_trial — trial package details + resolved bouquets. */
+	public function getPackageTrial(): never {
+		$this->requireXhr();
 
-    /** action=get_package_trial — trial package details + resolved bouquets. */
-    public function getPackageTrial(): never {
-        $this->requireXhr();
+		global $db;
+		$db->query('SELECT `bouquets`, `trial_credits` AS `cost_credits`, `trial_duration`, `trial_duration_in`, `max_connections`, `can_gen_mag`, `can_gen_e2`, `only_mag`, `only_e2` FROM `users_packages` WHERE `id` = ?;', RequestManager::get('package_id'));
 
-        global $db;
-        $db->query('SELECT `bouquets`, `trial_credits` AS `cost_credits`, `trial_duration`, `trial_duration_in`, `max_connections`, `can_gen_mag`, `can_gen_e2`, `only_mag`, `only_e2` FROM `users_packages` WHERE `id` = ?;', RequestManager::get('package_id'));
+		if ($db->num_rows() == 1) {
+			$rData = $db->get_row();
+			$rData['exp_date'] = date('Y-m-d', strtotime('+' . intval($rData['trial_duration']) . ' ' . $rData['trial_duration_in']));
 
-        if ($db->num_rows() == 1) {
-            $rData = $db->get_row();
-            $rData['exp_date'] = date('Y-m-d', strtotime('+' . intval($rData['trial_duration']) . ' ' . $rData['trial_duration_in']));
+			$this->ok(['bouquets' => $this->collectPackageBouquets($rData['bouquets']), 'data' => $rData]);
+		}
 
-            $this->ok(array('bouquets' => $this->collectPackageBouquets($rData['bouquets']), 'data' => $rData));
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/**
+	 * Resolve a package's `bouquets` JSON id-list into full bouquet rows.
+	 * Shared by get_package / get_package_trial (the loop was identical).
+	 *
+	 * @param mixed $rBouquetsJson JSON-encoded list of bouquet ids
+	 * @return array<int, array<string, mixed>>
+	 */
+	private function collectPackageBouquets(mixed $rBouquetsJson): array {
+		global $db;
+		$rReturn = [];
 
-    /**
-     * Resolve a package's `bouquets` JSON id-list into full bouquet rows.
-     * Shared by get_package / get_package_trial (the loop was identical).
-     *
-     * @param mixed $rBouquetsJson JSON-encoded list of bouquet ids
-     * @return array<int, array<string, mixed>>
-     */
-    private function collectPackageBouquets($rBouquetsJson): array {
-        global $db;
-        $rReturn = array();
+		foreach ((json_decode((string) $rBouquetsJson, true) ?: []) as $rBouquet) {
+			$db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rBouquet);
 
-        foreach ((json_decode((string) $rBouquetsJson, true) ?: array()) as $rBouquet) {
-            $db->query('SELECT * FROM `bouquets` WHERE `id` = ?;', $rBouquet);
+			if ($db->num_rows() == 1) {
+				$rRow = $db->get_row();
+				$rReturn[] = ['id' => $rRow['id'], 'bouquet_name' => str_replace("'", "\\'", $rRow['bouquet_name']), 'bouquet_channels' => json_decode($rRow['bouquet_channels'], true), 'bouquet_radios' => json_decode($rRow['bouquet_radios'], true), 'bouquet_movies' => json_decode($rRow['bouquet_movies'], true), 'bouquet_series' => json_decode($rRow['bouquet_series'], true)];
+			}
+		}
 
-            if ($db->num_rows() == 1) {
-                $rRow = $db->get_row();
-                $rReturn[] = array('id' => $rRow['id'], 'bouquet_name' => str_replace("'", "\\'", $rRow['bouquet_name']), 'bouquet_channels' => json_decode($rRow['bouquet_channels'], true), 'bouquet_radios' => json_decode($rRow['bouquet_radios'], true), 'bouquet_movies' => json_decode($rRow['bouquet_movies'], true), 'bouquet_series' => json_decode($rRow['bouquet_series'], true));
-            }
-        }
-
-        return $rReturn;
-    }
+		return $rReturn;
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/ProviderAjaxController.php b/src/Public/Controllers/Admin/Ajax/ProviderAjaxController.php
index 6d0c6b03..5b57a1e0 100644
--- a/src/Public/Controllers/Admin/Ajax/ProviderAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/ProviderAjaxController.php
@@ -21,59 +21,58 @@ use XcVm\Domain\Stream\ProviderService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ProviderAjaxController extends BaseAjaxController {
+	/** action=provider — delete or reload a provider. */
+	public function provider(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'streams');
 
-    /** action=provider — delete or reload a provider. */
-    public function provider(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'streams');
+		$rSub = RequestManager::get('sub');
 
-        $rSub = RequestManager::get('sub');
+		if ($rSub == 'delete') {
+			ProviderService::deleteById(RequestManager::get('id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            ProviderService::deleteById(RequestManager::get('id'));
-            $this->ok();
-        }
+		if ($rSub == 'reload') {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:providers "' . intval(RequestManager::get('id')) . '" > /dev/null 2>/dev/null &');
+			$this->ok();
+		}
 
-        if ($rSub == 'reload') {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:providers "' . intval(RequestManager::get('id')) . '" > /dev/null 2>/dev/null &');
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=provider_streams — DataTables listing of a provider's streams. */
+	public function providerStreams(): never {
+		$this->requireXhr();
 
-    /** action=provider_streams — DataTables listing of a provider's streams. */
-    public function providerStreams(): never {
-        $this->requireXhr();
+		if (!Authorization::check('adv', 'providers')) {
+			$this->json(['draw' => 1, 'recordsTotal' => 0, 'recordsFiltered' => 0, 'data' => []]);
+		}
 
-        if (!Authorization::check('adv', 'providers')) {
-            $this->json(array('draw' => 1, 'recordsTotal' => 0, 'recordsFiltered' => 0, 'data' => array()));
-        }
+		global $db;
+		$rProviderId = intval(RequestManager::get('provider_id') ?? 0);
+		$rType       = (RequestManager::get('stream_type') ?? 'live') === 'movie' ? 'movie' : 'live';
+		$rSearch     = trim(RequestManager::get('search')['value'] ?? '');
+		$rStart      = intval(RequestManager::get('start') ?? 0);
+		$rLength     = min(intval(RequestManager::get('length') ?? 100), 500);
+		$rDraw       = intval(RequestManager::get('draw') ?? 1);
 
-        global $db;
-        $rProviderId = intval(RequestManager::get('provider_id') ?? 0);
-        $rType       = (RequestManager::get('stream_type') ?? 'live') === 'movie' ? 'movie' : 'live';
-        $rSearch     = trim(RequestManager::get('search')['value'] ?? '');
-        $rStart      = intval(RequestManager::get('start') ?? 0);
-        $rLength     = min(intval(RequestManager::get('length') ?? 100), 500);
-        $rDraw       = intval(RequestManager::get('draw') ?? 1);
+		if ($rSearch !== '') {
+			$rLike = '%' . $rSearch . '%';
+			$db->query('SELECT COUNT(*) as cnt FROM `providers_streams` WHERE `provider_id` = ? AND `type` = ? AND `stream_display_name` LIKE ?;', $rProviderId, $rType, $rLike);
+			$rTotal = intval($db->get_row()['cnt'] ?? 0);
+			$db->query('SELECT `stream_id`, `category_array`, `stream_display_name`, `modified`, `stream_icon`, `channel_id` FROM `providers_streams` WHERE `provider_id` = ? AND `type` = ? AND `stream_display_name` LIKE ? ORDER BY `modified` DESC, `stream_id` ASC LIMIT ' . $rStart . ', ' . $rLength . ';', $rProviderId, $rType, $rLike);
+		} else {
+			$db->query('SELECT COUNT(*) as cnt FROM `providers_streams` WHERE `provider_id` = ? AND `type` = ?;', $rProviderId, $rType);
+			$rTotal = intval($db->get_row()['cnt'] ?? 0);
+			$db->query('SELECT `stream_id`, `category_array`, `stream_display_name`, `modified`, `stream_icon`, `channel_id` FROM `providers_streams` WHERE `provider_id` = ? AND `type` = ? ORDER BY `modified` DESC, `stream_id` ASC LIMIT ' . $rStart . ', ' . $rLength . ';', $rProviderId, $rType);
+		}
 
-        if ($rSearch !== '') {
-            $rLike = '%' . $rSearch . '%';
-            $db->query('SELECT COUNT(*) as cnt FROM `providers_streams` WHERE `provider_id` = ? AND `type` = ? AND `stream_display_name` LIKE ?;', $rProviderId, $rType, $rLike);
-            $rTotal = intval($db->get_row()['cnt'] ?? 0);
-            $db->query('SELECT `stream_id`, `category_array`, `stream_display_name`, `modified`, `stream_icon`, `channel_id` FROM `providers_streams` WHERE `provider_id` = ? AND `type` = ? AND `stream_display_name` LIKE ? ORDER BY `modified` DESC, `stream_id` ASC LIMIT ' . $rStart . ', ' . $rLength . ';', $rProviderId, $rType, $rLike);
-        } else {
-            $db->query('SELECT COUNT(*) as cnt FROM `providers_streams` WHERE `provider_id` = ? AND `type` = ?;', $rProviderId, $rType);
-            $rTotal = intval($db->get_row()['cnt'] ?? 0);
-            $db->query('SELECT `stream_id`, `category_array`, `stream_display_name`, `modified`, `stream_icon`, `channel_id` FROM `providers_streams` WHERE `provider_id` = ? AND `type` = ? ORDER BY `modified` DESC, `stream_id` ASC LIMIT ' . $rStart . ', ' . $rLength . ';', $rProviderId, $rType);
-        }
-
-        $this->json(array(
-            'draw'            => $rDraw,
-            'recordsTotal'    => $rTotal,
-            'recordsFiltered' => $rTotal,
-            'data'            => $db->get_rows(),
-        ));
-    }
+		$this->json([
+			'draw'            => $rDraw,
+			'recordsTotal'    => $rTotal,
+			'recordsFiltered' => $rTotal,
+			'data'            => $db->get_rows(),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/SearchAjaxController.php b/src/Public/Controllers/Admin/Ajax/SearchAjaxController.php
index c44026fe..172bce08 100644
--- a/src/Public/Controllers/Admin/Ajax/SearchAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/SearchAjaxController.php
@@ -31,689 +31,705 @@ use XcVm\Domain\User\GroupService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class SearchAjaxController extends BaseAjaxController {
-
-    /** action=search — global fuzzy search as structured JSON (no HTML). */
-    public function search(): never {
-        $this->requireXhr();
-
-        /** @var class-string $language */
-        global $db, $rServers;
-
-        $rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
-        $rTables = array('lines' => array('Lines', 'line?id=', '`username`, `admin_notes`, `reseller_notes`, `last_ip`, `contact`', 'id', 'username'), 'mag_devices' => array('MAG Devices', 'mag?id=', '`mac_filter`, `ip`', 'mag_id', 'mac'), 'enigma2_devices' => array('Enigma2 Devices', 'enigma?id=', '`mac_filter`, `public_ip`', 'device_id', 'mac'), 'users' => array('Users', 'user?id=', '`username`, `email`, `ip`, `notes`, `reseller_dns`', 'id', 'username'), 'streams' => array('Streams, Movies & Episodes', 'stream_view?id=', '`stream_display_name`, `stream_source`, `notes`, `channel_id`', 'id', 'stream_display_name'), 'streams_series' => array('TV Series', 'serie?id=', '`title`, `plot`, `cast`, `director`', 'id', 'title'));
-        $rLimit = 100;
-        $rTerm = strtolower(preg_replace('/[^[:alnum:][:space:]]/u', '', RequestManager::get('search')));
-        $rTermSP = strtolower(preg_replace('/[^[:alnum:][:space:]]/u', ' ', RequestManager::get('search')));
-
-        if (!empty($rTermSP)) {
-            $rItems = array();
-
-            foreach ($rTables as $rTable => $rTableInfo) {
-                if ($rTable == 'streams') {
-                    $db->query('SELECT `' . $rTable . '`.*, MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) AS `score1`, MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) AS `score2` FROM `' . $rTable . '` WHERE MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) OR `id` = ? ORDER BY `score1` + `score2` DESC LIMIT ' . $rLimit . ';', $rTermSP, $rTermSP . '*', $rTermSP . '*', intval($rTerm));
-                } else {
-                    $db->query('SELECT `' . $rTable . '`.*, MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) AS `score1`, MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) AS `score2` FROM `' . $rTable . '` WHERE MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) ORDER BY `score1` + `score2` DESC LIMIT ' . $rLimit . ';', $rTermSP, $rTermSP . '*', $rTermSP . '*');
-                }
-
-                foreach ($db->get_rows() as $rRow) {
-                    similar_text($rTerm, strtolower(preg_replace('/[^[:alnum:][:space:]]/u', '', $rRow[$rTableInfo[4]])), $rPerc);
-
-                    if ($rTable == 'streams' && $rRow['id'] == intval($rTerm)) {
-                        $rPerc = 1000;
-                    }
-
-                    if ($rTerm == strtolower(preg_replace('/[^[:alnum:][:space:]]/u', '', $rRow[$rTableInfo[4]]))) {
-                        $rPerc = 1000;
-                    }
-
-                    $rRow['score'] = $rRow['score1'] + $rRow['score2'] + $rPerc;
-                    $rRow['table'] = $rTable;
-                    $rItems[] = $rRow;
-                }
-            }
-            array_multisort(array_column($rItems, 'score'), SORT_DESC, $rItems);
-            $rItems = array_slice($rItems, 0, (intval(SettingsManager::get('search_items')) ?: 50));
-            $rStreamNameIDs = $rDeviceIDs = $rLineIDs = $rOwnerIDs = $rUserIDs = $rSeriesIDs = $rStreamIDs = array();
-
-            foreach ($rItems as $rItem) {
-                if ($rItem['table'] == 'streams') {
-                    if (0 < intval($rItem['id'])) {
-                        $rStreamIDs[] = intval($rItem['id']);
-                    }
-                } else {
-                    if ($rItem['table'] == 'streams_series') {
-                        if (0 < intval($rItem['id'])) {
-                            $rSeriesIDs[] = intval($rItem['id']);
-                        }
-                    } else {
-                        if ($rItem['table'] == 'users') {
-                            if (0 < intval($rItem['id'])) {
-                                $rUserIDs[] = intval($rItem['id']);
-                            }
-
-                            if (0 < intval($rItem['owner_id'])) {
-                                $rOwnerIDs[] = intval($rItem['owner_id']);
-                            }
-                        } else {
-                            if ($rItem['table'] == 'lines') {
-                                if (0 < intval($rItem['id'])) {
-                                    $rLineIDs[] = intval($rItem['id']);
-                                }
-
-                                if (0 < intval($rItem['member_id'])) {
-                                    $rOwnerIDs[] = intval($rItem['member_id']);
-                                }
-
-                                $rActivityArray = json_decode($rItem['last_activity_array'], true);
-
-                                if (is_array($rActivityArray) && 0 < intval($rActivityArray['stream_id'])) {
-                                    $rStreamNameIDs[] = intval($rActivityArray['stream_id']);
-                                }
-                            } else {
-                                if ($rItem['table'] == 'mag_devices' || $rItem['table'] == 'enigma2_devices') {
-                                    if (0 < intval($rItem['user_id'])) {
-                                        $rDeviceIDs[] = intval($rItem['user_id']);
-                                        $rLineIDs[] = intval($rItem['user_id']);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            $rDeviceLines = $rStreamNames = $rLinesInfo = $rOwnerNames = $rUsersCount = $rLinesCount = $rSeriesInfo = $rSeriesTitles = $rServerItems = $rServerCount = $rConnectionCount = $rLineConnectionCount = array();
-            $rDeviceIDs = AdminHelpers::confirmIDs($rDeviceIDs);
-
-            if (0 < count($rDeviceIDs)) {
-                $db->query('SELECT * FROM `lines` WHERE `id` IN (' . implode(',', $rDeviceIDs) . ');');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rDeviceLines[$rRow['id']] = $rRow;
-
-                    if (0 < intval($rRow['member_id'])) {
-                        $rOwnerIDs[] = $rRow['member_id'];
-                    }
-                }
-            }
-
-            $rStreamIDs = AdminHelpers::confirmIDs($rStreamIDs);
-
-            if (0 < count($rStreamIDs)) {
-                $db->query('SELECT `streams_episodes`.`stream_id`, `streams_series`.`id`, `streams_series`.`title` FROM `streams_episodes` LEFT JOIN `streams_series` ON `streams_series`.`id` = `streams_episodes`.`series_id` WHERE `streams_episodes`.`stream_id` IN (' . implode(',', $rStreamIDs) . ');');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rSeriesTitles[$rRow['stream_id']] = $rRow['title'];
-                }
-                $db->query('SELECT * FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ');');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rServerCount[$rRow['stream_id']] = ($rServerCount[$rRow['stream_id']] ?? 0) + 1;
-
-                    if ($rServers[$rRow['server_id']]['server_online']) {
-                        $rRow['priority'] = (0 < $rRow['pid'] ? 1 : 0);
-                    } else {
-                        $rRow['priority'] = 0;
-                    }
-
-                    $rServerItems[$rRow['stream_id']][] = $rRow;
-                }
-
-                foreach (array_keys($rServerItems) as $rStreamID) {
-                    array_multisort(array_column($rServerItems[$rStreamID], 'priority'), SORT_DESC, $rServerItems[$rStreamID]);
-                }
-
-                if (SettingsManager::get('redis_handler')) {
-                    $rConnectionCount = ConnectionTracker::getStreamConnections($rStreamIDs, true, true);
-                } else {
-                    $db->query('SELECT `stream_id`, COUNT(*) AS `count` FROM `lines_live` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ') AND `hls_end` = 0;');
-
-                    foreach ($db->get_rows() as $rRow) {
-                        $rConnectionCount[$rRow['stream_id']] = $rRow['count'];
-                    }
-                }
-            }
-
-            $rSeriesIDs = AdminHelpers::confirmIDs($rSeriesIDs);
-
-            if (0 < count($rSeriesIDs)) {
-                $db->query('SELECT `series_id`, MAX(`season_num`) AS `latest_season`, COUNT(*) AS `episodes` FROM `streams_episodes` WHERE `series_id` IN (' . implode(',', $rSeriesIDs) . ') GROUP BY `series_id`;');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rSeriesInfo[$rRow['series_id']] = array($rRow['latest_season'], $rRow['episodes']);
-                }
-            }
-
-            $rUserIDs = AdminHelpers::confirmIDs($rUserIDs);
-
-            if (0 < count($rUserIDs)) {
-                $db->query('SELECT `owner_id`, COUNT(*) AS `count` FROM `users` WHERE `owner_id` IN (' . implode(',', $rUserIDs) . ') GROUP BY `owner_id`;');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rUsersCount[$rRow['owner_id']] = $rRow['count'];
-                }
-                $db->query('SELECT `member_id`, COUNT(*) AS `count` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserIDs) . ') GROUP BY `member_id`;');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rLinesCount[$rRow['member_id']] = $rRow['count'];
-                }
-            }
-
-            $rOwnerIDs = AdminHelpers::confirmIDs($rOwnerIDs);
-
-            if (0 < count($rOwnerIDs)) {
-                $db->query('SELECT `id`, `username` FROM `users` WHERE `id` IN (' . implode(',', $rOwnerIDs) . ');');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rOwnerNames[$rRow['id']] = $rRow['username'];
-                }
-            }
-
-            $rLineIDs = AdminHelpers::confirmIDs($rLineIDs);
-
-            if (0 < count($rLineIDs)) {
-                if (SettingsManager::get('redis_handler')) {
-                    $rLineConnectionCount = ConnectionTracker::getUserConnections($rLineIDs, true);
-                    $rConnectionMap = ConnectionTracker::getFirstConnection($rLineIDs);
-                    $rLStreamIDs = array();
-
-                    foreach ($rConnectionMap as $rUserID => $rConnection) {
-                        if (!(in_array($rConnection['stream_id'], $rStreamIDs))) {
-                            $rLStreamIDs[] = intval($rConnection['stream_id']);
-                        }
-                    }
-                    $rStreamMap = array();
-
-                    if (0 < count($rLStreamIDs)) {
-                        $db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rLStreamIDs) . ');');
-
-                        foreach ($db->get_rows() as $rRow) {
-                            $rStreamMap[$rRow['id']] = $rRow['stream_display_name'];
-                        }
-                    }
-
-                    foreach ($rConnectionMap as $rUserID => $rConnection) {
-                        $rLinesInfo[$rUserID]['stream_id'] = $rConnection['stream_id'];
-                        $rLinesInfo[$rUserID]['last_active'] = $rConnection['date_start'];
-                        $rLinesInfo[$rUserID]['online'] = true;
-                        $rStreamNameIDs[] = intval($rConnection['stream_id']);
-                    }
-                    unset($rConnectionMap);
-                } else {
-                    $db->query('SELECT `lines_live`.`user_id`, `lines_live`.`stream_id`, `lines_live`.`date_start` AS `last_active`, `streams`.`stream_display_name` FROM `lines_live` LEFT JOIN `streams` ON `streams`.`id` = `lines_live`.`stream_id` INNER JOIN (SELECT `user_id`, MAX(`date_start`) AS `ts` FROM `lines_live` GROUP BY `user_id`) `maxt` ON (`lines_live`.`user_id` = `maxt`.`user_id` AND `lines_live`.`date_start` = `maxt`.`ts`) WHERE `lines_live`.`hls_end` = 0 AND `lines_live`.`user_id` IN (' . implode(',', $rLineIDs) . ');');
-
-                    foreach ($db->get_rows() as $rRow) {
-                        $rLinesInfo[$rRow['user_id']]['stream_id'] = $rRow['stream_id'];
-                        $rLinesInfo[$rRow['user_id']]['last_active'] = $rRow['last_active'];
-                        $rLinesInfo[$rRow['user_id']]['online'] = true;
-                        $rStreamNameIDs[] = intval($rRow['stream_id']);
-                    }
-                    $db->query('SELECT `user_id`, COUNT(*) AS `count` FROM `lines_live` WHERE `user_id` IN (' . implode(',', array_map('intval', $rLineIDs)) . ') AND `hls_end` = 0;');
-
-                    foreach ($db->get_rows() as $rRow) {
-                        $rLineConnectionCount[$rRow['user_id']] = $rRow['count'];
-                    }
-                }
-            }
-
-            $rStreamNameIDs = AdminHelpers::confirmIDs($rStreamNameIDs);
-
-            if (0 < count($rStreamNameIDs)) {
-                $db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', array_unique($rStreamNameIDs)) . ');');
-
-                foreach ($db->get_rows() as $rRow) {
-                    $rStreamNames[$rRow['id']] = $rRow['stream_display_name'];
-                }
-            }
-
-            $rCategories = CategoryService::getAllByType(null);
-            $rGroups = GroupService::getAll();
-
-            $rCtx = compact(
-                'rServerItems', 'rServerCount', 'rSeriesTitles', 'rConnectionCount', 'rSeriesInfo',
-                'rUsersCount', 'rLinesCount', 'rOwnerNames', 'rLinesInfo', 'rLineConnectionCount',
-                'rStreamNames', 'rDeviceLines', 'rCategories', 'rGroups', 'rTables'
-            );
-
-            foreach ($rItems as $rItem) {
-                $rReturn['items'][] = $this->buildItem($rItem, $rCtx);
-            }
-        }
-
-        $rReturn['total_count'] = count($rReturn['items']);
-
-        if ($rReturn['total_count'] == 0) {
-            $rReturn['items'][] = array('id' => 'no_results', 'url' => null, 'text' => 'No Results', 'entity' => 'no_results', 'data' => null);
-        }
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** Dispatch one search row to its per-entity structured payload. */
-    private function buildItem(array $rItem, array $rCtx): array {
-        $rTableInfo = $rCtx['rTables'][$rItem['table']];
-        $rBase = array(
-            'id' => $rItem['table'] . '#' . $rItem[$rTableInfo[3]],
-            'url' => $rTableInfo[1] . $rItem[$rTableInfo[3]],
-            'text' => $rItem[$rTableInfo[4]],
-        );
-
-        switch ($rItem['table']) {
-            case 'streams':
-                return $rBase + array('entity' => $this->streamPage(intval($rItem['type']))['entity'], 'data' => $this->buildStreamItem($rItem, $rCtx));
-            case 'streams_series':
-                return $rBase + array('entity' => 'series', 'data' => $this->buildSeriesItem($rItem, $rCtx));
-            case 'users':
-                return $rBase + array('entity' => 'user', 'data' => $this->buildUserItem($rItem, $rCtx));
-            case 'lines':
-                return $rBase + array('entity' => 'line', 'data' => $this->buildLineItem($rItem, $rCtx));
-            case 'enigma_devices':
-            case 'mag_devices':
-                return $rBase + array('entity' => ($rItem['table'] == 'mag_devices' ? 'mag' : 'enigma'), 'data' => $this->buildDeviceItem($rItem, $rCtx));
-        }
-
-        return $rBase + array('entity' => 'unknown', 'data' => null);
-    }
-
-    /** streams row -> stream/movie/channel/radio/episode payload. */
-    private function buildStreamItem(array $rItem, array $rCtx): array {
-        global $rServers;
-        $rServerItem = ($rCtx['rServerItems'][$rItem['id']][0] ?? null) ?: null;
-        $rCategoryIDs = json_decode($rItem['category_id'], true) ?: array();
-        $rProperties = json_decode($rItem['movie_properties'], true) ?: array();
-        $rLive = in_array(intval($rItem['type']), array(1, 3, 4), true);
-        $rPage = $this->streamPage(intval($rItem['type']));
-
-        if ($rItem['type'] != 5) {
-            $rTitle = $rItem['stream_display_name'];
-            $rCategory = ($rCtx['rCategories'][$rCategoryIDs[0] ?? null]['category_name'] ?? '') ?: 'No Category';
-
-            if (1 < count($rCategoryIDs)) {
-                $rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ')';
-            }
-        } else {
-            $rTitle = ($rCtx['rSeriesTitles'][$rItem['id']] ?? '') ?: 'No Series';
-            $rCategory = '';
-
-            if (stripos($rItem['stream_display_name'], $rTitle) === 0) {
-                $rCategory = ltrim(substr($rItem['stream_display_name'], strlen($rTitle)));
-
-                if (substr($rCategory, 0, 1) == '-') {
-                    $rCategory = trim(ltrim($rCategory, '-'));
-                }
-            }
-        }
-
-        $rServerID = ($rServerItem['server_id'] ?? null) ?: null;
-        $rServerName = '';
-
-        if ($rServerID) {
-            $rServerName = $rServers[$rServerID]['server_name'] ?? '';
-
-            if (1 < ($rCtx['rServerCount'][$rItem['id']] ?? 0)) {
-                $rServerName .= ' (+' . ($rCtx['rServerCount'][$rItem['id']] - 1) . ')';
-            }
-        }
-
-        $rActualStatus = $this->resolveStreamStatus($rItem, $rServerItem);
-        $rConnections = intval($rCtx['rConnectionCount'][$rItem['id']] ?? 0);
-
-        return array(
-            'layout' => $rLive ? 'live' : 'vod',
-            'title' => $rTitle,
-            'title_link' => Authorization::check('adv', 'manage_streams') ? ('stream_view?id=' . intval($rItem['id'])) : null,
-            'category' => $rCategory,
-            'server' => $rServerName,
-            'image' => $rLive
-                ? array('url' => $rItem['stream_icon'], 'size' => 96)
-                : array('url' => ($rProperties['movie_image'] ?? ''), 'size' => 512),
-            'badge' => $rLive
-                ? array('text' => strtoupper($rPage['text']), 'variant' => 'success')
-                : array('text' => strtoupper($rPage['page']), 'variant' => 'primary'),
-            'connections' => $rConnections,
-            'connections_link' => 'live_connections?stream_id=' . $rItem['id'],
-            'status' => $this->streamStatusPayload($rActualStatus, $rItem, $rServerItem),
-            'rating' => ($rItem['type'] == 2) ? $this->ratingData($rProperties['rating'] ?? 0, $rItem['year'] ?? '') : null,
-            'actions' => $this->streamActions($rItem, $rActualStatus, $rPage['page'], $rConnections),
-        );
-    }
-
-    /** streams_series row -> series payload. */
-    private function buildSeriesItem(array $rItem, array $rCtx): array {
-        $rSeriesItem = ($rCtx['rSeriesInfo'][$rItem['id']] ?? array()) ?: array();
-        $rCategoryIDs = json_decode($rItem['category_id'], true) ?: array();
-        $rCategory = ($rCtx['rCategories'][$rCategoryIDs[0] ?? null]['category_name'] ?? '') ?: 'No Category';
-
-        if (1 < count($rCategoryIDs)) {
-            $rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ')';
-        }
-
-        $rActions = array();
-
-        if (Authorization::check('adv', 'add_episode')) {
-            $rActions[] = array('kind' => 'navigate', 'target' => 'episode?sid=' . $rItem['id'], 'icon' => 'mdi-plus-circle-outline', 'title' => 'Add Episode(s)');
-        }
-
-        if (Authorization::check('adv', 'episodes')) {
-            $rActions[] = array('kind' => 'navigate', 'target' => 'episodes?series=' . $rItem['id'], 'icon' => 'mdi-eye', 'title' => 'View Episodes');
-        }
-
-        if (Authorization::check('adv', 'edit_series')) {
-            $rActions[] = array('kind' => 'navigate', 'target' => 'serie?id=' . $rItem['id'], 'icon' => 'mdi-pencil', 'title' => 'Edit');
-        }
-
-        return array(
-            'title' => $rItem['title'],
-            'category' => $rCategory,
-            'image' => array('url' => $rItem['cover'], 'size' => 512),
-            'rating' => $this->ratingData($rItem['rating'] ?? 0, $rItem['year'] ?? ''),
-            'badge' => array('text' => Translator::get('tv_series_btn'), 'variant' => 'danger'),
-            'seasons' => intval($rSeriesItem[0] ?? 0),
-            'episodes' => intval($rSeriesItem[1] ?? 0),
-            'actions' => $rActions,
-        );
-    }
-
-    /** users row -> registered-user payload. */
-    private function buildUserItem(array $rItem, array $rCtx): array {
-        $rGroup = $rCtx['rGroups'][$rItem['member_group_id']] ?? array();
-        $rIsReseller = (bool) ($rGroup['is_reseller'] ?? false);
-        $rActive = $rItem['status'] == 1;
-        $rActions = array();
-
-        if (Authorization::check('adv', 'edit_reguser')) {
-            if ($rIsReseller) {
-                $rActions[] = array('kind' => 'credits', 'id' => intval($rItem['id']), 'icon' => 'mdi-coin', 'title' => Translator::get('add_credits'));
-            }
-
-            $rActions[] = array('kind' => 'navigate', 'target' => 'user?id=' . $rItem['id'], 'icon' => 'mdi-pencil', 'title' => 'Edit');
-            $rActions[] = $rActive
-                ? array('kind' => 'api', 'entity' => 'user', 'id' => intval($rItem['id']), 'sub' => 'disable', 'icon' => 'mdi-lock', 'title' => 'Disable', 'enabled' => true)
-                : array('kind' => 'api', 'entity' => 'user', 'id' => intval($rItem['id']), 'sub' => 'enable', 'icon' => 'mdi-lock', 'title' => 'Enable', 'enabled' => true);
-        }
-
-        return array(
-            'username' => $rItem['username'],
-            'group' => $rGroup['group_name'] ?? '',
-            'owner' => ($rCtx['rOwnerNames'][$rItem['owner_id']] ?? null) ?: null,
-            'is_reseller' => $rIsReseller,
-            'credits' => $rIsReseller ? intval($rItem['credits']) : null,
-            'status' => array('label' => $rActive ? 'Active' : 'Inactive', 'variant' => $rActive ? 'info' : 'warning'),
-            'users_count' => intval($rCtx['rUsersCount'][$rItem['id']] ?? 0),
-            'lines_count' => intval($rCtx['rLinesCount'][$rItem['id']] ?? 0),
-            'badge' => array('text' => Translator::get('user_btn'), 'variant' => 'warning'),
-            'actions' => $rActions,
-        );
-    }
-
-    /** lines row -> line payload. */
-    private function buildLineItem(array $rItem, array $rCtx): array {
-        $rConn = intval($rCtx['rLineConnectionCount'][$rItem['id']] ?? 0);
-
-        return array(
-            'title' => $rItem['username'],
-            'device_type' => null,
-            'status' => $this->lineStatus($rItem),
-            'owner' => ($rCtx['rOwnerNames'][$rItem['member_id']] ?? null) ?: null,
-            'expires' => $rItem['exp_date'] ? date(SettingsManager::get('datetime_format'), $rItem['exp_date']) : null,
-            'last_active' => $this->lastActive($rItem, $rCtx),
-            'connections' => $rConn,
-            'flags' => array('restreamer' => (bool) $rItem['is_restreamer'], 'trial' => (bool) $rItem['is_trial']),
-            'badge' => array('variant' => 'pink'),
-            'actions' => $this->lineActions(intval($rItem['id']), 'line?id=' . $rItem['id'], $rItem['admin_enabled'], $rItem['enabled'], $rConn),
-        );
-    }
-
-    /** mag/enigma row -> device payload (null when the owning line is missing). */
-    private function buildDeviceItem(array $rItem, array $rCtx): ?array {
-        $rLineInfo = ($rCtx['rDeviceLines'][$rItem['user_id']] ?? null) ?: null;
-
-        if (!$rLineInfo) {
-            return null;
-        }
-
-        $rType = ($rItem['table'] == 'mag_devices' ? 'mag' : 'enigma');
-        $rConn = intval($rCtx['rLineConnectionCount'][$rLineInfo['id']] ?? 0);
-
-        return array(
-            'title' => $rItem['mac'],
-            'device_type' => $rType,
-            'status' => $this->lineStatus($rLineInfo),
-            'owner' => ($rCtx['rOwnerNames'][$rLineInfo['member_id']] ?? null) ?: null,
-            'expires' => $rLineInfo['exp_date'] ? date(SettingsManager::get('datetime_format'), $rLineInfo['exp_date']) : null,
-            'last_active' => $this->lastActive($rLineInfo, $rCtx),
-            'connections' => $rConn,
-            'flags' => array('trial' => (bool) $rLineInfo['is_trial']),
-            'badge' => array('variant' => 'pink'),
-            'actions' => $this->lineActions(intval($rLineInfo['id']), $rType . '?id=' . $rItem['id'], $rItem['admin_enabled'], $rItem['enabled'], $rConn),
-        );
-    }
-
-    /** Map a stream type to its {entity, page, text} descriptors. */
-    private function streamPage(int $rType): array {
-        switch ($rType) {
-            case 1: return array('entity' => 'stream', 'page' => 'stream', 'text' => 'stream');
-            case 2: return array('entity' => 'movie', 'page' => 'movie', 'text' => 'movie');
-            case 3: return array('entity' => 'channel', 'page' => 'created_channel', 'text' => 'channel');
-            case 4: return array('entity' => 'radio', 'page' => 'radio', 'text' => 'radio');
-            case 5: return array('entity' => 'episode', 'page' => 'episode', 'text' => 'episode');
-        }
-
-        return array('entity' => 'stream', 'page' => '', 'text' => '');
-    }
-
-    /** Resolve the stream status code (-1…10) — mirrors the legacy cascade. */
-    private function resolveStreamStatus(array $rItem, ?array $rServerItem): int {
-        if (!$rServerItem) {
-            return intval($rItem['direct_source']) == 1 ? 5 : -1;
-        }
-
-        if ($rItem['type'] == 1 || $rItem['type'] == 4) {
-            if (intval($rItem['direct_source']) == 1) {
-                return 5;
-            }
-
-            if ($rServerItem['monitor_pid']) {
-                if ($rServerItem['pid'] && 0 < $rServerItem['pid']) {
-                    return intval($rServerItem['stream_status']) == 2 ? 2 : 1;
-                }
-
-                return $rServerItem['stream_status'] == 0 ? 2 : 3;
-            }
-
-            return intval($rServerItem['on_demand']) == 1 ? 4 : 0;
-        }
-
-        if ($rItem['type'] == 2 || $rItem['type'] == 5) {
-            if (intval($rItem['direct_source']) == 1) {
-                return 5;
-            }
-
-            if (!is_null($rServerItem['pid']) && 0 < $rServerItem['pid']) {
-                if ($rServerItem['to_analyze'] == 1) {
-                    return 7;
-                }
-
-                return $rServerItem['stream_status'] == 1 ? 10 : 9;
-            }
-
-            return 8;
-        }
-
-        if ($rItem['type'] == 3) {
-            $rStatus = 0;
-
-            if ($rServerItem['monitor_pid']) {
-                if ($rServerItem['pid'] && 0 < $rServerItem['pid']) {
-                    $rStatus = intval($rServerItem['stream_status']) == 2 ? 2 : 1;
-                } else {
-                    $rStatus = $rServerItem['stream_status'] == 0 ? 2 : 3;
-                }
-            }
-
-            if (!(count(json_decode($rServerItem['cchannel_rsources'], true)) == count(json_decode($rItem['stream_source'], true)) || $rServerItem['parent_id'])) {
-                $rStatus = 6;
-            }
-
-            return $rStatus;
-        }
-
-        return 0;
-    }
-
-    /** Status cell payload: running uptime, encode progress, or a labelled badge. */
-    private function streamStatusPayload(int $rCode, array $rItem, ?array $rServerItem): array {
-        if ($rCode == 1 && $rServerItem) {
-            $rUptime = time() - intval($rServerItem['stream_started']);
-            $rText = (86400 <= $rUptime)
-                ? sprintf('%02dd %02dh %02dm', $rUptime / 86400, ($rUptime / 3600) % 24, ($rUptime / 60) % 60)
-                : sprintf('%02dh %02dm %02ds', $rUptime / 3600, ($rUptime / 60) % 60, $rUptime % 60);
-
-            return array('kind' => 'uptime', 'text' => $rText);
-        }
-
-        if ($rCode == 6 && $rServerItem) {
-            $rSources = json_decode($rItem['stream_source'], true) ?: array();
-            $rLeft = count(array_diff($rSources, json_decode($rServerItem['cchannel_rsources'], true) ?: array()));
-            $rPercent = count($rSources) ? (count($rSources) - $rLeft) / count($rSources) * 100 : 0;
-            $rEncodeInfo = json_decode($rServerItem['progress_info'] ?? '', true);
-
-            if (0 < $rLeft && isset($rEncodeInfo['cc_encode']['pct'])) {
-                $rPercent += floatval($rEncodeInfo['cc_encode']['pct']) / count($rSources);
-            }
-
-            return array('kind' => 'progress', 'percent' => intval($rPercent));
-        }
-
-        return array('kind' => 'status') + $this->statusMeta($rCode);
-    }
-
-    /** Derive {code, label, variant} for a status code from StatusBadge::search(). */
-    private function statusMeta(int $rCode): array {
-        $rHtml = StatusBadge::search($rCode);
-        preg_match('/bg-animate-(\w+)/', $rHtml, $rVariant);
-        preg_match('/>([^<]+)</', $rHtml, $rLabel);
-
-        return array('code' => $rCode, 'label' => trim($rLabel[1] ?? ''), 'variant' => $rVariant[1] ?? 'secondary');
-    }
-
-    /** Star-rating + year payload for VOD items. */
-    private function ratingData($rRating, $rYear): array {
-        $rStars = round(floatval($rRating)) / 2;
-        $rFull = (int) floor($rStars);
-        $rHalf = 0 < $rStars - $rFull;
-
-        return array(
-            'stars_full' => $rRating ? $rFull : 0,
-            'half' => $rRating ? $rHalf : false,
-            'empty' => $rRating ? 5 - ($rFull + ($rHalf ? 1 : 0)) : 0,
-            'year' => $rYear ? (string) $rYear : '',
-        );
-    }
-
-    /** Status badge for a line/device (banned/disabled/active). */
-    private function lineStatus(array $rSource): array {
-        if (!$rSource['admin_enabled']) {
-            return array('label' => 'Banned', 'variant' => 'danger');
-        }
-
-        if (!$rSource['enabled']) {
-            return array('label' => 'Disabled', 'variant' => 'warning');
-        }
-
-        return array('label' => 'Active', 'variant' => 'info');
-    }
-
-    /** Last-activity payload for a line/device. */
-    private function lastActive(array $rSource, array $rCtx): array {
-        $rInfo = $rCtx['rLinesInfo'][$rSource['id']] ?? (json_decode($rSource['last_activity_array'], true) ?? array());
-
-        if (!is_array($rInfo)) {
-            return array('online' => false, 'date' => null);
-        }
-
-        if (!empty($rInfo['online'])) {
-            return array(
-                'online' => true,
-                'stream_id' => intval($rInfo['stream_id'] ?? 0),
-                'stream_name' => $rCtx['rStreamNames'][$rInfo['stream_id'] ?? null] ?? '',
-                'online_for' => TimeUtils::secondsToTime(time() - intval($rInfo['last_active'] ?? 0)),
-            );
-        }
-
-        return array(
-            'online' => false,
-            'date' => !empty($rInfo['date_end']) ? date(SettingsManager::get('datetime_format'), $rInfo['date_end']) : null,
-        );
-    }
-
-    /**
-     * Action list for a line/device. Buttons target $rTargetId (the owning line);
-     * ban/unban + enable/disable state comes from the row's own flags.
-     *
-     * @return array<int, array<string, mixed>>
-     */
-    private function lineActions(int $rTargetId, string $rEditTarget, $rAdminEnabled, $rEnabled, int $rConnections): array {
-        if (!Authorization::check('adv', 'edit_user')) {
-            return array();
-        }
-
-        return array(
-            array('kind' => 'navigate', 'target' => $rEditTarget, 'icon' => 'mdi-pencil', 'title' => 'Edit'),
-            array('kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'kill', 'icon' => 'fa-hammer', 'title' => 'Kill Connections', 'enabled' => true),
-            $rAdminEnabled
-                ? array('kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'ban', 'icon' => 'mdi-power', 'title' => 'Ban', 'enabled' => true)
-                : array('kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'unban', 'icon' => 'mdi-power', 'title' => 'Unban', 'enabled' => true),
-            $rEnabled
-                ? array('kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'disable', 'icon' => 'mdi-lock', 'title' => 'Disable', 'enabled' => true)
-                : array('kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'enable', 'icon' => 'mdi-lock', 'title' => 'Enable', 'enabled' => true),
-            array('kind' => 'fingerprint', 'id' => $rTargetId, 'context' => 'user', 'icon' => 'mdi-fingerprint', 'enabled' => (bool) $rConnections),
-        );
-    }
-
-    /** Action list for a stream/movie/etc. row. */
-    private function streamActions(array $rItem, int $rActualStatus, string $rPage, int $rConnections): array {
-        $rId = intval($rItem['id']);
-        $rActions = array();
-
-        if (in_array(intval($rItem['type']), array(1, 3, 4), true)) {
-            if (!Authorization::check('adv', 'edit_stream')) {
-                return $rActions;
-            }
-
-            $rActions[] = array('kind' => 'navigate', 'target' => $rPage . '?id=' . $rId, 'icon' => 'mdi-pencil', 'title' => 'Edit');
-            $rRunning = in_array(intval($rActualStatus), array(1, 2, 3), true) || $rItem['on_demand'] == 1 || $rActualStatus == 5 || $rActualStatus == 7;
-
-            $rActions[] = $rRunning
-                ? array('kind' => 'api', 'entity' => 'stream', 'id' => $rId, 'sub' => 'stop', 'icon' => 'mdi-stop', 'title' => 'Stop', 'enabled' => true)
-                : array('kind' => 'api', 'entity' => 'stream', 'id' => $rId, 'sub' => 'start', 'icon' => 'mdi-play', 'title' => 'Start', 'enabled' => true);
-            $rActions[] = array('kind' => 'api', 'entity' => 'stream', 'id' => $rId, 'sub' => 'restart', 'icon' => 'mdi-refresh', 'title' => 'Restart', 'enabled' => $rRunning);
-            $rActions[] = array('kind' => 'api', 'entity' => 'stream', 'id' => $rId, 'sub' => 'purge', 'icon' => 'mdi-hammer', 'title' => 'Purge', 'enabled' => $rRunning);
-
-            if ($rItem['type'] == 1) {
-                $rActions[] = array('kind' => 'fingerprint', 'id' => $rId, 'context' => 'stream', 'icon' => 'mdi-fingerprint', 'enabled' => (bool) $rConnections);
-            }
-
-            return $rActions;
-        }
-
-        if (!Authorization::check('adv', 'edit_' . $rPage)) {
-            return $rActions;
-        }
-
-        $rActions[] = array('kind' => 'navigate', 'target' => $rPage . '?id=' . $rId, 'icon' => 'mdi-pencil', 'title' => 'Edit');
-
-        if (intval($rActualStatus) == 9) {
-            $rActions[] = array('kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'start', 'icon' => 'mdi-refresh', 'title' => 'Re-Encode', 'enabled' => true);
-        } elseif (intval($rActualStatus) == 5) {
-            $rActions[] = array('kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'stop', 'icon' => 'mdi-stop', 'title' => 'Stop', 'enabled' => false);
-        } elseif (intval($rActualStatus) == 7) {
-            $rActions[] = array('kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'stop', 'icon' => 'mdi-stop', 'title' => 'Stop Encoding', 'enabled' => true);
-        } else {
-            $rActions[] = array('kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'start', 'icon' => 'mdi-play', 'title' => 'Start Encoding', 'enabled' => true);
-        }
-
-        $rActions[] = array('kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'purge', 'icon' => 'mdi-hammer', 'title' => 'Purge', 'enabled' => true);
-
-        return $rActions;
-    }
+	/** action=search — global fuzzy search as structured JSON (no HTML). */
+	public function search(): never {
+		$this->requireXhr();
+
+		/** @var class-string $language */
+		global $db, $rServers;
+
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
+		$rTables = ['lines' => ['Lines', 'line?id=', '`username`, `admin_notes`, `reseller_notes`, `last_ip`, `contact`', 'id', 'username'], 'mag_devices' => ['MAG Devices', 'mag?id=', '`mac_filter`, `ip`', 'mag_id', 'mac'], 'enigma2_devices' => ['Enigma2 Devices', 'enigma?id=', '`mac_filter`, `public_ip`', 'device_id', 'mac'], 'users' => ['Users', 'user?id=', '`username`, `email`, `ip`, `notes`, `reseller_dns`', 'id', 'username'], 'streams' => ['Streams, Movies & Episodes', 'stream_view?id=', '`stream_display_name`, `stream_source`, `notes`, `channel_id`', 'id', 'stream_display_name'], 'streams_series' => ['TV Series', 'serie?id=', '`title`, `plot`, `cast`, `director`', 'id', 'title']];
+		$rLimit = 100;
+		$rTerm = strtolower(preg_replace('/[^[:alnum:][:space:]]/u', '', RequestManager::get('search')));
+		$rTermSP = strtolower(preg_replace('/[^[:alnum:][:space:]]/u', ' ', RequestManager::get('search')));
+
+		if (!empty($rTermSP)) {
+			$rItems = [];
+
+			foreach ($rTables as $rTable => $rTableInfo) {
+				if ($rTable == 'streams') {
+					$db->query('SELECT `' . $rTable . '`.*, MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) AS `score1`, MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) AS `score2` FROM `' . $rTable . '` WHERE MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) OR `id` = ? ORDER BY `score1` + `score2` DESC LIMIT ' . $rLimit . ';', $rTermSP, $rTermSP . '*', $rTermSP . '*', intval($rTerm));
+				} else {
+					$db->query('SELECT `' . $rTable . '`.*, MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) AS `score1`, MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) AS `score2` FROM `' . $rTable . '` WHERE MATCH(' . $rTableInfo[2] . ') AGAINST (? IN BOOLEAN MODE) ORDER BY `score1` + `score2` DESC LIMIT ' . $rLimit . ';', $rTermSP, $rTermSP . '*', $rTermSP . '*');
+				}
+
+				foreach ($db->get_rows() as $rRow) {
+					similar_text($rTerm, strtolower(preg_replace('/[^[:alnum:][:space:]]/u', '', $rRow[$rTableInfo[4]])), $rPerc);
+
+					if ($rTable == 'streams' && $rRow['id'] == intval($rTerm)) {
+						$rPerc = 1000;
+					}
+
+					if ($rTerm == strtolower(preg_replace('/[^[:alnum:][:space:]]/u', '', $rRow[$rTableInfo[4]]))) {
+						$rPerc = 1000;
+					}
+
+					$rRow['score'] = $rRow['score1'] + $rRow['score2'] + $rPerc;
+					$rRow['table'] = $rTable;
+					$rItems[] = $rRow;
+				}
+			}
+			array_multisort(array_column($rItems, 'score'), SORT_DESC, $rItems);
+			$rItems = array_slice($rItems, 0, (intval(SettingsManager::get('search_items')) ?: 50));
+			$rStreamNameIDs = $rDeviceIDs = $rLineIDs = $rOwnerIDs = $rUserIDs = $rSeriesIDs = $rStreamIDs = [];
+
+			foreach ($rItems as $rItem) {
+				if ($rItem['table'] == 'streams') {
+					if (0 < intval($rItem['id'])) {
+						$rStreamIDs[] = intval($rItem['id']);
+					}
+				} else {
+					if ($rItem['table'] == 'streams_series') {
+						if (0 < intval($rItem['id'])) {
+							$rSeriesIDs[] = intval($rItem['id']);
+						}
+					} else {
+						if ($rItem['table'] == 'users') {
+							if (0 < intval($rItem['id'])) {
+								$rUserIDs[] = intval($rItem['id']);
+							}
+
+							if (0 < intval($rItem['owner_id'])) {
+								$rOwnerIDs[] = intval($rItem['owner_id']);
+							}
+						} else {
+							if ($rItem['table'] == 'lines') {
+								if (0 < intval($rItem['id'])) {
+									$rLineIDs[] = intval($rItem['id']);
+								}
+
+								if (0 < intval($rItem['member_id'])) {
+									$rOwnerIDs[] = intval($rItem['member_id']);
+								}
+
+								$rActivityArray = json_decode($rItem['last_activity_array'], true);
+
+								if (is_array($rActivityArray) && 0 < intval($rActivityArray['stream_id'])) {
+									$rStreamNameIDs[] = intval($rActivityArray['stream_id']);
+								}
+							} else {
+								if ($rItem['table'] == 'mag_devices' || $rItem['table'] == 'enigma2_devices') {
+									if (0 < intval($rItem['user_id'])) {
+										$rDeviceIDs[] = intval($rItem['user_id']);
+										$rLineIDs[] = intval($rItem['user_id']);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			$rDeviceLines = $rStreamNames = $rLinesInfo = $rOwnerNames = $rUsersCount = $rLinesCount = $rSeriesInfo = $rSeriesTitles = $rServerItems = $rServerCount = $rConnectionCount = $rLineConnectionCount = [];
+			$rDeviceIDs = AdminHelpers::confirmIDs($rDeviceIDs);
+
+			if (0 < count($rDeviceIDs)) {
+				$db->query('SELECT * FROM `lines` WHERE `id` IN (' . implode(',', $rDeviceIDs) . ');');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rDeviceLines[$rRow['id']] = $rRow;
+
+					if (0 < intval($rRow['member_id'])) {
+						$rOwnerIDs[] = $rRow['member_id'];
+					}
+				}
+			}
+
+			$rStreamIDs = AdminHelpers::confirmIDs($rStreamIDs);
+
+			if (0 < count($rStreamIDs)) {
+				$db->query('SELECT `streams_episodes`.`stream_id`, `streams_series`.`id`, `streams_series`.`title` FROM `streams_episodes` LEFT JOIN `streams_series` ON `streams_series`.`id` = `streams_episodes`.`series_id` WHERE `streams_episodes`.`stream_id` IN (' . implode(',', $rStreamIDs) . ');');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rSeriesTitles[$rRow['stream_id']] = $rRow['title'];
+				}
+				$db->query('SELECT * FROM `streams_servers` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ');');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rServerCount[$rRow['stream_id']] = ($rServerCount[$rRow['stream_id']] ?? 0) + 1;
+
+					if ($rServers[$rRow['server_id']]['server_online']) {
+						$rRow['priority'] = (0 < $rRow['pid'] ? 1 : 0);
+					} else {
+						$rRow['priority'] = 0;
+					}
+
+					$rServerItems[$rRow['stream_id']][] = $rRow;
+				}
+
+				foreach (array_keys($rServerItems) as $rStreamID) {
+					array_multisort(array_column($rServerItems[$rStreamID], 'priority'), SORT_DESC, $rServerItems[$rStreamID]);
+				}
+
+				if (SettingsManager::get('redis_handler')) {
+					$rConnectionCount = ConnectionTracker::getStreamConnections($rStreamIDs, true, true);
+				} else {
+					$db->query('SELECT `stream_id`, COUNT(*) AS `count` FROM `lines_live` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ') AND `hls_end` = 0;');
+
+					foreach ($db->get_rows() as $rRow) {
+						$rConnectionCount[$rRow['stream_id']] = $rRow['count'];
+					}
+				}
+			}
+
+			$rSeriesIDs = AdminHelpers::confirmIDs($rSeriesIDs);
+
+			if (0 < count($rSeriesIDs)) {
+				$db->query('SELECT `series_id`, MAX(`season_num`) AS `latest_season`, COUNT(*) AS `episodes` FROM `streams_episodes` WHERE `series_id` IN (' . implode(',', $rSeriesIDs) . ') GROUP BY `series_id`;');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rSeriesInfo[$rRow['series_id']] = [$rRow['latest_season'], $rRow['episodes']];
+				}
+			}
+
+			$rUserIDs = AdminHelpers::confirmIDs($rUserIDs);
+
+			if (0 < count($rUserIDs)) {
+				$db->query('SELECT `owner_id`, COUNT(*) AS `count` FROM `users` WHERE `owner_id` IN (' . implode(',', $rUserIDs) . ') GROUP BY `owner_id`;');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rUsersCount[$rRow['owner_id']] = $rRow['count'];
+				}
+				$db->query('SELECT `member_id`, COUNT(*) AS `count` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserIDs) . ') GROUP BY `member_id`;');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rLinesCount[$rRow['member_id']] = $rRow['count'];
+				}
+			}
+
+			$rOwnerIDs = AdminHelpers::confirmIDs($rOwnerIDs);
+
+			if (0 < count($rOwnerIDs)) {
+				$db->query('SELECT `id`, `username` FROM `users` WHERE `id` IN (' . implode(',', $rOwnerIDs) . ');');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rOwnerNames[$rRow['id']] = $rRow['username'];
+				}
+			}
+
+			$rLineIDs = AdminHelpers::confirmIDs($rLineIDs);
+
+			if (0 < count($rLineIDs)) {
+				if (SettingsManager::get('redis_handler')) {
+					$rLineConnectionCount = ConnectionTracker::getUserConnections($rLineIDs, true);
+					$rConnectionMap = ConnectionTracker::getFirstConnection($rLineIDs);
+					$rLStreamIDs = [];
+
+					foreach ($rConnectionMap as $rUserID => $rConnection) {
+						if (!(in_array($rConnection['stream_id'], $rStreamIDs))) {
+							$rLStreamIDs[] = intval($rConnection['stream_id']);
+						}
+					}
+					$rStreamMap = [];
+
+					if (0 < count($rLStreamIDs)) {
+						$db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rLStreamIDs) . ');');
+
+						foreach ($db->get_rows() as $rRow) {
+							$rStreamMap[$rRow['id']] = $rRow['stream_display_name'];
+						}
+					}
+
+					foreach ($rConnectionMap as $rUserID => $rConnection) {
+						$rLinesInfo[$rUserID]['stream_id'] = $rConnection['stream_id'];
+						$rLinesInfo[$rUserID]['last_active'] = $rConnection['date_start'];
+						$rLinesInfo[$rUserID]['online'] = true;
+						$rStreamNameIDs[] = intval($rConnection['stream_id']);
+					}
+					unset($rConnectionMap);
+				} else {
+					$db->query('SELECT `lines_live`.`user_id`, `lines_live`.`stream_id`, `lines_live`.`date_start` AS `last_active`, `streams`.`stream_display_name` FROM `lines_live` LEFT JOIN `streams` ON `streams`.`id` = `lines_live`.`stream_id` INNER JOIN (SELECT `user_id`, MAX(`date_start`) AS `ts` FROM `lines_live` GROUP BY `user_id`) `maxt` ON (`lines_live`.`user_id` = `maxt`.`user_id` AND `lines_live`.`date_start` = `maxt`.`ts`) WHERE `lines_live`.`hls_end` = 0 AND `lines_live`.`user_id` IN (' . implode(',', $rLineIDs) . ');');
+
+					foreach ($db->get_rows() as $rRow) {
+						$rLinesInfo[$rRow['user_id']]['stream_id'] = $rRow['stream_id'];
+						$rLinesInfo[$rRow['user_id']]['last_active'] = $rRow['last_active'];
+						$rLinesInfo[$rRow['user_id']]['online'] = true;
+						$rStreamNameIDs[] = intval($rRow['stream_id']);
+					}
+					$db->query('SELECT `user_id`, COUNT(*) AS `count` FROM `lines_live` WHERE `user_id` IN (' . implode(',', array_map('intval', $rLineIDs)) . ') AND `hls_end` = 0;');
+
+					foreach ($db->get_rows() as $rRow) {
+						$rLineConnectionCount[$rRow['user_id']] = $rRow['count'];
+					}
+				}
+			}
+
+			$rStreamNameIDs = AdminHelpers::confirmIDs($rStreamNameIDs);
+
+			if (0 < count($rStreamNameIDs)) {
+				$db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', array_unique($rStreamNameIDs)) . ');');
+
+				foreach ($db->get_rows() as $rRow) {
+					$rStreamNames[$rRow['id']] = $rRow['stream_display_name'];
+				}
+			}
+
+			$rCategories = CategoryService::getAllByType(null);
+			$rGroups = GroupService::getAll();
+
+			$rCtx = compact(
+				'rServerItems',
+				'rServerCount',
+				'rSeriesTitles',
+				'rConnectionCount',
+				'rSeriesInfo',
+				'rUsersCount',
+				'rLinesCount',
+				'rOwnerNames',
+				'rLinesInfo',
+				'rLineConnectionCount',
+				'rStreamNames',
+				'rDeviceLines',
+				'rCategories',
+				'rGroups',
+				'rTables'
+			);
+
+			foreach ($rItems as $rItem) {
+				$rReturn['items'][] = $this->buildItem($rItem, $rCtx);
+			}
+		}
+
+		$rReturn['total_count'] = count($rReturn['items']);
+
+		if ($rReturn['total_count'] == 0) {
+			$rReturn['items'][] = ['id' => 'no_results', 'url' => null, 'text' => 'No Results', 'entity' => 'no_results', 'data' => null];
+		}
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** Dispatch one search row to its per-entity structured payload. */
+	private function buildItem(array $rItem, array $rCtx): array {
+		$rTableInfo = $rCtx['rTables'][$rItem['table']];
+		$rBase = [
+			'id' => $rItem['table'] . '#' . $rItem[$rTableInfo[3]],
+			'url' => $rTableInfo[1] . $rItem[$rTableInfo[3]],
+			'text' => $rItem[$rTableInfo[4]],
+		];
+
+		switch ($rItem['table']) {
+			case 'streams':
+				return $rBase + ['entity' => $this->streamPage(intval($rItem['type']))['entity'], 'data' => $this->buildStreamItem($rItem, $rCtx)];
+			case 'streams_series':
+				return $rBase + ['entity' => 'series', 'data' => $this->buildSeriesItem($rItem, $rCtx)];
+			case 'users':
+				return $rBase + ['entity' => 'user', 'data' => $this->buildUserItem($rItem, $rCtx)];
+			case 'lines':
+				return $rBase + ['entity' => 'line', 'data' => $this->buildLineItem($rItem, $rCtx)];
+			case 'enigma_devices':
+			case 'mag_devices':
+				return $rBase + ['entity' => ($rItem['table'] == 'mag_devices' ? 'mag' : 'enigma'), 'data' => $this->buildDeviceItem($rItem, $rCtx)];
+		}
+
+		return $rBase + ['entity' => 'unknown', 'data' => null];
+	}
+
+	/** streams row -> stream/movie/channel/radio/episode payload. */
+	private function buildStreamItem(array $rItem, array $rCtx): array {
+		global $rServers;
+		$rServerItem = ($rCtx['rServerItems'][$rItem['id']][0] ?? null) ?: null;
+		$rCategoryIDs = json_decode($rItem['category_id'], true) ?: [];
+		$rProperties = json_decode($rItem['movie_properties'], true) ?: [];
+		$rLive = in_array(intval($rItem['type']), [1, 3, 4], true);
+		$rPage = $this->streamPage(intval($rItem['type']));
+
+		if ($rItem['type'] != 5) {
+			$rTitle = $rItem['stream_display_name'];
+			$rCategory = ($rCtx['rCategories'][$rCategoryIDs[0] ?? null]['category_name'] ?? '') ?: 'No Category';
+
+			if (1 < count($rCategoryIDs)) {
+				$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ')';
+			}
+		} else {
+			$rTitle = ($rCtx['rSeriesTitles'][$rItem['id']] ?? '') ?: 'No Series';
+			$rCategory = '';
+
+			if (stripos($rItem['stream_display_name'], $rTitle) === 0) {
+				$rCategory = ltrim(substr($rItem['stream_display_name'], strlen($rTitle)));
+
+				if (substr($rCategory, 0, 1) == '-') {
+					$rCategory = trim(ltrim($rCategory, '-'));
+				}
+			}
+		}
+
+		$rServerID = ($rServerItem['server_id'] ?? null) ?: null;
+		$rServerName = '';
+
+		if ($rServerID) {
+			$rServerName = $rServers[$rServerID]['server_name'] ?? '';
+
+			if (1 < ($rCtx['rServerCount'][$rItem['id']] ?? 0)) {
+				$rServerName .= ' (+' . ($rCtx['rServerCount'][$rItem['id']] - 1) . ')';
+			}
+		}
+
+		$rActualStatus = $this->resolveStreamStatus($rItem, $rServerItem);
+		$rConnections = intval($rCtx['rConnectionCount'][$rItem['id']] ?? 0);
+
+		return [
+			'layout' => $rLive ? 'live' : 'vod',
+			'title' => $rTitle,
+			'title_link' => Authorization::check('adv', 'manage_streams') ? ('stream_view?id=' . intval($rItem['id'])) : null,
+			'category' => $rCategory,
+			'server' => $rServerName,
+			'image' => $rLive
+				? ['url' => $rItem['stream_icon'], 'size' => 96]
+				: ['url' => ($rProperties['movie_image'] ?? ''), 'size' => 512],
+			'badge' => $rLive
+				? ['text' => strtoupper($rPage['text']), 'variant' => 'success']
+				: ['text' => strtoupper($rPage['page']), 'variant' => 'primary'],
+			'connections' => $rConnections,
+			'connections_link' => 'live_connections?stream_id=' . $rItem['id'],
+			'status' => $this->streamStatusPayload($rActualStatus, $rItem, $rServerItem),
+			'rating' => ($rItem['type'] == 2) ? $this->ratingData($rProperties['rating'] ?? 0, $rItem['year'] ?? '') : null,
+			'actions' => $this->streamActions($rItem, $rActualStatus, $rPage['page'], $rConnections),
+		];
+	}
+
+	/** streams_series row -> series payload. */
+	private function buildSeriesItem(array $rItem, array $rCtx): array {
+		$rSeriesItem = ($rCtx['rSeriesInfo'][$rItem['id']] ?? []) ?: [];
+		$rCategoryIDs = json_decode($rItem['category_id'], true) ?: [];
+		$rCategory = ($rCtx['rCategories'][$rCategoryIDs[0] ?? null]['category_name'] ?? '') ?: 'No Category';
+
+		if (1 < count($rCategoryIDs)) {
+			$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ')';
+		}
+
+		$rActions = [];
+
+		if (Authorization::check('adv', 'add_episode')) {
+			$rActions[] = ['kind' => 'navigate', 'target' => 'episode?sid=' . $rItem['id'], 'icon' => 'mdi-plus-circle-outline', 'title' => 'Add Episode(s)'];
+		}
+
+		if (Authorization::check('adv', 'episodes')) {
+			$rActions[] = ['kind' => 'navigate', 'target' => 'episodes?series=' . $rItem['id'], 'icon' => 'mdi-eye', 'title' => 'View Episodes'];
+		}
+
+		if (Authorization::check('adv', 'edit_series')) {
+			$rActions[] = ['kind' => 'navigate', 'target' => 'serie?id=' . $rItem['id'], 'icon' => 'mdi-pencil', 'title' => 'Edit'];
+		}
+
+		return [
+			'title' => $rItem['title'],
+			'category' => $rCategory,
+			'image' => ['url' => $rItem['cover'], 'size' => 512],
+			'rating' => $this->ratingData($rItem['rating'] ?? 0, $rItem['year'] ?? ''),
+			'badge' => ['text' => Translator::get('tv_series_btn'), 'variant' => 'danger'],
+			'seasons' => intval($rSeriesItem[0] ?? 0),
+			'episodes' => intval($rSeriesItem[1] ?? 0),
+			'actions' => $rActions,
+		];
+	}
+
+	/** users row -> registered-user payload. */
+	private function buildUserItem(array $rItem, array $rCtx): array {
+		$rGroup = $rCtx['rGroups'][$rItem['member_group_id']] ?? [];
+		$rIsReseller = (bool) ($rGroup['is_reseller'] ?? false);
+		$rActive = $rItem['status'] == 1;
+		$rActions = [];
+
+		if (Authorization::check('adv', 'edit_reguser')) {
+			if ($rIsReseller) {
+				$rActions[] = ['kind' => 'credits', 'id' => intval($rItem['id']), 'icon' => 'mdi-coin', 'title' => Translator::get('add_credits')];
+			}
+
+			$rActions[] = ['kind' => 'navigate', 'target' => 'user?id=' . $rItem['id'], 'icon' => 'mdi-pencil', 'title' => 'Edit'];
+			$rActions[] = $rActive
+				? ['kind' => 'api', 'entity' => 'user', 'id' => intval($rItem['id']), 'sub' => 'disable', 'icon' => 'mdi-lock', 'title' => 'Disable', 'enabled' => true]
+				: ['kind' => 'api', 'entity' => 'user', 'id' => intval($rItem['id']), 'sub' => 'enable', 'icon' => 'mdi-lock', 'title' => 'Enable', 'enabled' => true];
+		}
+
+		return [
+			'username' => $rItem['username'],
+			'group' => $rGroup['group_name'] ?? '',
+			'owner' => ($rCtx['rOwnerNames'][$rItem['owner_id']] ?? null) ?: null,
+			'is_reseller' => $rIsReseller,
+			'credits' => $rIsReseller ? intval($rItem['credits']) : null,
+			'status' => ['label' => $rActive ? 'Active' : 'Inactive', 'variant' => $rActive ? 'info' : 'warning'],
+			'users_count' => intval($rCtx['rUsersCount'][$rItem['id']] ?? 0),
+			'lines_count' => intval($rCtx['rLinesCount'][$rItem['id']] ?? 0),
+			'badge' => ['text' => Translator::get('user_btn'), 'variant' => 'warning'],
+			'actions' => $rActions,
+		];
+	}
+
+	/** lines row -> line payload. */
+	private function buildLineItem(array $rItem, array $rCtx): array {
+		$rConn = intval($rCtx['rLineConnectionCount'][$rItem['id']] ?? 0);
+
+		return [
+			'title' => $rItem['username'],
+			'device_type' => null,
+			'status' => $this->lineStatus($rItem),
+			'owner' => ($rCtx['rOwnerNames'][$rItem['member_id']] ?? null) ?: null,
+			'expires' => $rItem['exp_date'] ? date(SettingsManager::get('datetime_format'), $rItem['exp_date']) : null,
+			'last_active' => $this->lastActive($rItem, $rCtx),
+			'connections' => $rConn,
+			'flags' => ['restreamer' => (bool) $rItem['is_restreamer'], 'trial' => (bool) $rItem['is_trial']],
+			'badge' => ['variant' => 'pink'],
+			'actions' => $this->lineActions(intval($rItem['id']), 'line?id=' . $rItem['id'], $rItem['admin_enabled'], $rItem['enabled'], $rConn),
+		];
+	}
+
+	/** mag/enigma row -> device payload (null when the owning line is missing). */
+	private function buildDeviceItem(array $rItem, array $rCtx): ?array {
+		$rLineInfo = ($rCtx['rDeviceLines'][$rItem['user_id']] ?? null) ?: null;
+
+		if (!$rLineInfo) {
+			return null;
+		}
+
+		$rType = ($rItem['table'] == 'mag_devices' ? 'mag' : 'enigma');
+		$rConn = intval($rCtx['rLineConnectionCount'][$rLineInfo['id']] ?? 0);
+
+		return [
+			'title' => $rItem['mac'],
+			'device_type' => $rType,
+			'status' => $this->lineStatus($rLineInfo),
+			'owner' => ($rCtx['rOwnerNames'][$rLineInfo['member_id']] ?? null) ?: null,
+			'expires' => $rLineInfo['exp_date'] ? date(SettingsManager::get('datetime_format'), $rLineInfo['exp_date']) : null,
+			'last_active' => $this->lastActive($rLineInfo, $rCtx),
+			'connections' => $rConn,
+			'flags' => ['trial' => (bool) $rLineInfo['is_trial']],
+			'badge' => ['variant' => 'pink'],
+			'actions' => $this->lineActions(intval($rLineInfo['id']), $rType . '?id=' . $rItem['id'], $rItem['admin_enabled'], $rItem['enabled'], $rConn),
+		];
+	}
+
+	/** Map a stream type to its {entity, page, text} descriptors. */
+	private function streamPage(int $rType): array {
+		switch ($rType) {
+			case 1:
+				return ['entity' => 'stream', 'page' => 'stream', 'text' => 'stream'];
+			case 2:
+				return ['entity' => 'movie', 'page' => 'movie', 'text' => 'movie'];
+			case 3:
+				return ['entity' => 'channel', 'page' => 'created_channel', 'text' => 'channel'];
+			case 4:
+				return ['entity' => 'radio', 'page' => 'radio', 'text' => 'radio'];
+			case 5:
+				return ['entity' => 'episode', 'page' => 'episode', 'text' => 'episode'];
+		}
+
+		return ['entity' => 'stream', 'page' => '', 'text' => ''];
+	}
+
+	/** Resolve the stream status code (-1…10) — mirrors the legacy cascade. */
+	private function resolveStreamStatus(array $rItem, ?array $rServerItem): int {
+		if (!$rServerItem) {
+			return intval($rItem['direct_source']) == 1 ? 5 : -1;
+		}
+
+		if ($rItem['type'] == 1 || $rItem['type'] == 4) {
+			if (intval($rItem['direct_source']) == 1) {
+				return 5;
+			}
+
+			if ($rServerItem['monitor_pid']) {
+				if ($rServerItem['pid'] && 0 < $rServerItem['pid']) {
+					return intval($rServerItem['stream_status']) == 2 ? 2 : 1;
+				}
+
+				return $rServerItem['stream_status'] == 0 ? 2 : 3;
+			}
+
+			return intval($rServerItem['on_demand']) == 1 ? 4 : 0;
+		}
+
+		if ($rItem['type'] == 2 || $rItem['type'] == 5) {
+			if (intval($rItem['direct_source']) == 1) {
+				return 5;
+			}
+
+			if (!is_null($rServerItem['pid']) && 0 < $rServerItem['pid']) {
+				if ($rServerItem['to_analyze'] == 1) {
+					return 7;
+				}
+
+				return $rServerItem['stream_status'] == 1 ? 10 : 9;
+			}
+
+			return 8;
+		}
+
+		if ($rItem['type'] == 3) {
+			$rStatus = 0;
+
+			if ($rServerItem['monitor_pid']) {
+				if ($rServerItem['pid'] && 0 < $rServerItem['pid']) {
+					$rStatus = intval($rServerItem['stream_status']) == 2 ? 2 : 1;
+				} else {
+					$rStatus = $rServerItem['stream_status'] == 0 ? 2 : 3;
+				}
+			}
+
+			if (!(count(json_decode($rServerItem['cchannel_rsources'], true)) == count(json_decode($rItem['stream_source'], true)) || $rServerItem['parent_id'])) {
+				$rStatus = 6;
+			}
+
+			return $rStatus;
+		}
+
+		return 0;
+	}
+
+	/** Status cell payload: running uptime, encode progress, or a labelled badge. */
+	private function streamStatusPayload(int $rCode, array $rItem, ?array $rServerItem): array {
+		if ($rCode == 1 && $rServerItem) {
+			$rUptime = time() - intval($rServerItem['stream_started']);
+			$rText = (86400 <= $rUptime)
+				? sprintf('%02dd %02dh %02dm', $rUptime / 86400, ($rUptime / 3600) % 24, ($rUptime / 60) % 60)
+				: sprintf('%02dh %02dm %02ds', $rUptime / 3600, ($rUptime / 60) % 60, $rUptime % 60);
+
+			return ['kind' => 'uptime', 'text' => $rText];
+		}
+
+		if ($rCode == 6 && $rServerItem) {
+			$rSources = json_decode($rItem['stream_source'], true) ?: [];
+			$rLeft = count(array_diff($rSources, json_decode($rServerItem['cchannel_rsources'], true) ?: []));
+			$rPercent = count($rSources) ? (count($rSources) - $rLeft) / count($rSources) * 100 : 0;
+			$rEncodeInfo = json_decode($rServerItem['progress_info'] ?? '', true);
+
+			if (0 < $rLeft && isset($rEncodeInfo['cc_encode']['pct'])) {
+				$rPercent += floatval($rEncodeInfo['cc_encode']['pct']) / count($rSources);
+			}
+
+			return ['kind' => 'progress', 'percent' => intval($rPercent)];
+		}
+
+		return ['kind' => 'status'] + $this->statusMeta($rCode);
+	}
+
+	/** Derive {code, label, variant} for a status code from StatusBadge::search(). */
+	private function statusMeta(int $rCode): array {
+		$rHtml = StatusBadge::search($rCode);
+		preg_match('/bg-animate-(\w+)/', $rHtml, $rVariant);
+		preg_match('/>([^<]+)</', $rHtml, $rLabel);
+
+		return ['code' => $rCode, 'label' => trim($rLabel[1] ?? ''), 'variant' => $rVariant[1] ?? 'secondary'];
+	}
+
+	/** Star-rating + year payload for VOD items. */
+	private function ratingData($rRating, $rYear): array {
+		$rStars = round(floatval($rRating)) / 2;
+		$rFull = (int) floor($rStars);
+		$rHalf = 0 < $rStars - $rFull;
+
+		return [
+			'stars_full' => $rRating ? $rFull : 0,
+			'half' => $rRating ? $rHalf : false,
+			'empty' => $rRating ? 5 - ($rFull + ($rHalf ? 1 : 0)) : 0,
+			'year' => $rYear ? (string) $rYear : '',
+		];
+	}
+
+	/** Status badge for a line/device (banned/disabled/active). */
+	private function lineStatus(array $rSource): array {
+		if (!$rSource['admin_enabled']) {
+			return ['label' => 'Banned', 'variant' => 'danger'];
+		}
+
+		if (!$rSource['enabled']) {
+			return ['label' => 'Disabled', 'variant' => 'warning'];
+		}
+
+		return ['label' => 'Active', 'variant' => 'info'];
+	}
+
+	/** Last-activity payload for a line/device. */
+	private function lastActive(array $rSource, array $rCtx): array {
+		$rInfo = $rCtx['rLinesInfo'][$rSource['id']] ?? (json_decode($rSource['last_activity_array'], true) ?? []);
+
+		if (!is_array($rInfo)) {
+			return ['online' => false, 'date' => null];
+		}
+
+		if (!empty($rInfo['online'])) {
+			return [
+				'online' => true,
+				'stream_id' => intval($rInfo['stream_id'] ?? 0),
+				'stream_name' => $rCtx['rStreamNames'][$rInfo['stream_id'] ?? null] ?? '',
+				'online_for' => TimeUtils::secondsToTime(time() - intval($rInfo['last_active'] ?? 0)),
+			];
+		}
+
+		return [
+			'online' => false,
+			'date' => !empty($rInfo['date_end']) ? date(SettingsManager::get('datetime_format'), $rInfo['date_end']) : null,
+		];
+	}
+
+	/**
+	 * Action list for a line/device. Buttons target $rTargetId (the owning line);
+	 * ban/unban + enable/disable state comes from the row's own flags.
+	 *
+	 * @return array<int, array<string, mixed>>
+	 */
+	private function lineActions(int $rTargetId, string $rEditTarget, $rAdminEnabled, $rEnabled, int $rConnections): array {
+		if (!Authorization::check('adv', 'edit_user')) {
+			return [];
+		}
+
+		return [
+			['kind' => 'navigate', 'target' => $rEditTarget, 'icon' => 'mdi-pencil', 'title' => 'Edit'],
+			['kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'kill', 'icon' => 'fa-hammer', 'title' => 'Kill Connections', 'enabled' => true],
+			$rAdminEnabled
+				? ['kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'ban', 'icon' => 'mdi-power', 'title' => 'Ban', 'enabled' => true]
+				: ['kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'unban', 'icon' => 'mdi-power', 'title' => 'Unban', 'enabled' => true],
+			$rEnabled
+				? ['kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'disable', 'icon' => 'mdi-lock', 'title' => 'Disable', 'enabled' => true]
+				: ['kind' => 'api', 'entity' => 'line', 'id' => $rTargetId, 'sub' => 'enable', 'icon' => 'mdi-lock', 'title' => 'Enable', 'enabled' => true],
+			['kind' => 'fingerprint', 'id' => $rTargetId, 'context' => 'user', 'icon' => 'mdi-fingerprint', 'enabled' => (bool) $rConnections],
+		];
+	}
+
+	/** Action list for a stream/movie/etc. row. */
+	private function streamActions(array $rItem, int $rActualStatus, string $rPage, int $rConnections): array {
+		$rId = intval($rItem['id']);
+		$rActions = [];
+
+		if (in_array(intval($rItem['type']), [1, 3, 4], true)) {
+			if (!Authorization::check('adv', 'edit_stream')) {
+				return $rActions;
+			}
+
+			$rActions[] = ['kind' => 'navigate', 'target' => $rPage . '?id=' . $rId, 'icon' => 'mdi-pencil', 'title' => 'Edit'];
+			$rRunning = in_array(intval($rActualStatus), [1, 2, 3], true) || $rItem['on_demand'] == 1 || $rActualStatus == 5 || $rActualStatus == 7;
+
+			$rActions[] = $rRunning
+				? ['kind' => 'api', 'entity' => 'stream', 'id' => $rId, 'sub' => 'stop', 'icon' => 'mdi-stop', 'title' => 'Stop', 'enabled' => true]
+				: ['kind' => 'api', 'entity' => 'stream', 'id' => $rId, 'sub' => 'start', 'icon' => 'mdi-play', 'title' => 'Start', 'enabled' => true];
+			$rActions[] = ['kind' => 'api', 'entity' => 'stream', 'id' => $rId, 'sub' => 'restart', 'icon' => 'mdi-refresh', 'title' => 'Restart', 'enabled' => $rRunning];
+			$rActions[] = ['kind' => 'api', 'entity' => 'stream', 'id' => $rId, 'sub' => 'purge', 'icon' => 'mdi-hammer', 'title' => 'Purge', 'enabled' => $rRunning];
+
+			if ($rItem['type'] == 1) {
+				$rActions[] = ['kind' => 'fingerprint', 'id' => $rId, 'context' => 'stream', 'icon' => 'mdi-fingerprint', 'enabled' => (bool) $rConnections];
+			}
+
+			return $rActions;
+		}
+
+		if (!Authorization::check('adv', 'edit_' . $rPage)) {
+			return $rActions;
+		}
+
+		$rActions[] = ['kind' => 'navigate', 'target' => $rPage . '?id=' . $rId, 'icon' => 'mdi-pencil', 'title' => 'Edit'];
+
+		if (intval($rActualStatus) == 9) {
+			$rActions[] = ['kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'start', 'icon' => 'mdi-refresh', 'title' => 'Re-Encode', 'enabled' => true];
+		} elseif (intval($rActualStatus) == 5) {
+			$rActions[] = ['kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'stop', 'icon' => 'mdi-stop', 'title' => 'Stop', 'enabled' => false];
+		} elseif (intval($rActualStatus) == 7) {
+			$rActions[] = ['kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'stop', 'icon' => 'mdi-stop', 'title' => 'Stop Encoding', 'enabled' => true];
+		} else {
+			$rActions[] = ['kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'start', 'icon' => 'mdi-play', 'title' => 'Start Encoding', 'enabled' => true];
+		}
+
+		$rActions[] = ['kind' => 'api', 'entity' => $rPage, 'id' => $rId, 'sub' => 'purge', 'icon' => 'mdi-hammer', 'title' => 'Purge', 'enabled' => true];
+
+		return $rActions;
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/ServerAjaxController.php b/src/Public/Controllers/Admin/Ajax/ServerAjaxController.php
index 5bf40993..1abba3ab 100644
--- a/src/Public/Controllers/Admin/Ajax/ServerAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/ServerAjaxController.php
@@ -29,519 +29,518 @@ use XcVm\Streaming\Health\ProcessChecker;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class ServerAjaxController extends BaseAjaxController {
+	/** action=rtmp_ip — remove an RTMP IP from the blocklist. */
+	public function rtmpIp(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'add_rtmp');
+
+		if (RequestManager::get('sub') == 'delete') {
+			BlocklistService::deleteRTMPIP(RequestManager::get('ip'));
+			$this->ok();
+		}
+
+		$this->fail();
+	}
+
+	/** action=rollback_versions — list previous releases relative to a version. */
+	public function rollbackVersions(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_server');
+
+		// Optional base version (a specific server's version); defaults to
+		// the MAIN panel version. Previous releases are resolved relative to it.
+		$rBaseVersion = trim((string) RequestManager::get('version'));
+		if (!preg_match('/^\d+\.\d+\.\d+$/', $rBaseVersion)) {
+			$rBaseVersion = XC_VM_VERSION;
+		}
+		$rVersions = [];
+
+		try {
+			$rGit = new GitHubReleases(GIT_OWNER, GIT_REPO_MAIN, UpdateChannels::main());
+			$rGit->setTimeout(15);
+			$rVersions = $rGit->getPreviousVersions($rBaseVersion, 5);
+		} catch (\Throwable) {
+			$rVersions = [];
+		}
+
+		$this->ok(['current' => $rBaseVersion, 'versions' => $rVersions]);
+	}
+
+	/** action=server — server operations (dispatches on sub). */
+	public function server(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_server');
+
+		global $db, $rServers;
+		$rSub = RequestManager::get('sub');
+
+		if ($rSub == 'delete') {
+			// Look the server up in the full list (getAll), not the online-filtered
+			// $rServers global — otherwise an offline/failed server can never be deleted.
+			$rAllServers = ServerRepository::getAll();
+			$rDeleteId = RequestManager::get('server_id');
+			if (isset($rAllServers[$rDeleteId]) && $rAllServers[$rDeleteId]['is_main'] == 0) {
+				ServerRepository::deleteById($rDeleteId);
+				$this->ok();
+			}
+
+			$this->fail();
+		}
+
+		if ($rSub == 'update') {
+			foreach ($this->normalizeServerIds() as $rID) {
+				$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rID, time(), json_encode(['action' => 'update']));
+			}
+
+			$this->ok();
+		}
+
+		if ($rSub == 'rollback') {
+			$rVersion = trim((string) RequestManager::get('version'));
+
+			if (!preg_match('/^\d+\.\d+\.\d+$/', $rVersion) || version_compare($rVersion, XC_VM_VERSION, '>=')) {
+				$this->fail(['error' => 'invalid_version']);
+			}
+
+			foreach ($this->normalizeServerIds() as $rID) {
+				$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rID, time(), json_encode(['action' => 'rollback', 'version' => $rVersion]));
+			}
+
+			$this->ok();
+		}
+
+		if ($rSub == 'enable') {
+			$db->query('UPDATE `servers` SET `enabled` = 1 WHERE `id` = ?;', RequestManager::get('server_id'));
+			$this->ok();
+		}
+
+		if ($rSub == 'disable') {
+			$db->query('UPDATE `servers` SET `enabled` = 0 WHERE `id` = ? AND `is_main` = 0;', RequestManager::get('server_id'));
+			$this->ok();
+		}
+
+		if ($rSub == 'enable_proxy') {
+			$db->query('UPDATE `servers` SET `enable_proxy` = 1 WHERE `id` = ?;', RequestManager::get('server_id'));
+			$this->ok();
+		}
+
+		if ($rSub == 'disable_proxy') {
+			$db->query('UPDATE `servers` SET `enable_proxy` = 0 WHERE `id` = ?;', RequestManager::get('server_id'));
+			$this->ok();
+		}
+
+		if ($rSub == 'kill') {
+			if (SettingsManager::get('redis_handler')) {
+				foreach (ConnectionTracker::getRedisConnections(null, RequestManager::get('server_id'), null, true, false, false) as $rConnection) {
+					ConnectionTracker::closeConnection($rConnection);
+				}
+			} else {
+				$db->query('SELECT * FROM `lines_live` WHERE `server_id` = ?;', RequestManager::get('server_id'));
+
+				foreach ($db->get_rows() as $rRow) {
+					ConnectionTracker::closeConnection($rRow);
+				}
+			}
+
+			$this->ok();
+		}
+
+		if (in_array($rSub, ['restart', 'start', 'stop'], true)) {
+			// 'restart' additionally requires an already-running monitored stream.
+			$rOnDemand = ($rSub == 'restart') ? ' AND `monitor_pid` > 0 AND `pid` > 0 AND `stream_status` = 0' : '';
+			$rSignalSub = ($rSub == 'stop') ? 'stop' : 'start';
+			$rStreamIDs = [];
+			$db->query('SELECT `stream_id` FROM `streams_servers` WHERE `server_id` = ? AND `on_demand` = 0' . $rOnDemand . ';', RequestManager::get('server_id'));
+
+			if (0 < $db->num_rows()) {
+				foreach ($db->get_rows() as $rRow) {
+					$rStreamIDs[] = intval($rRow['stream_id']);
+				}
+			}
+
+			if (0 < count($rStreamIDs)) {
+				ApiClient::request(['action' => 'stream', 'sub' => $rSignalSub, 'stream_ids' => array_values($rStreamIDs), 'servers' => [intval(RequestManager::get('server_id'))]]);
+			}
+
+			$this->ok();
+		}
+
+		$this->fail();
+	}
+
+	/** action=proxy — proxy-server operations (dispatches on sub). */
+	public function proxy(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_server');
+
+		global $db;
+		$rSub = RequestManager::get('sub');
+
+		if ($rSub == 'delete') {
+			ServerRepository::deleteById(RequestManager::get('server_id'));
+			$this->ok();
+		}
+
+		if ($rSub == 'enable') {
+			$db->query('UPDATE `servers` SET `enabled` = 1 WHERE `id` = ?;', RequestManager::get('server_id'));
+			$this->ok();
+		}
+
+		if ($rSub == 'disable') {
+			$db->query('UPDATE `servers` SET `enabled` = 0 WHERE `id` = ?;', RequestManager::get('server_id'));
+			$this->ok();
+		}
+
+		if ($rSub == 'update') {
+			$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', RequestManager::get('server_id'), time(), json_encode(['action' => 'update']));
+			$this->ok();
+		}
+
+		if ($rSub == 'kill') {
+			if (SettingsManager::get('redis_handler')) {
+				$rServerID = intval(RequestManager::get('server_id'));
+
+				foreach ((ServerRepository::getAll()[$rServerID]['parent_id'] ?? []) as $rParentID) {
+					foreach (ConnectionTracker::getRedisConnections(null, $rParentID, null, true, false, false) as $rConnection) {
+						if ($rConnection['proxy_id'] == RequestManager::get('server_id')) {
+							ConnectionTracker::closeConnection($rConnection);
+						}
+					}
+				}
+			} else {
+				$db->query('SELECT * FROM `lines_live` WHERE `proxy_id` = ?;', RequestManager::get('server_id'));
+
+				foreach ($db->get_rows() as $rRow) {
+					ConnectionTracker::closeConnection($rRow);
+				}
+			}
+
+			$this->ok();
+		}
+
+		$this->fail();
+	}
+
+	/** action=fingerprint — broadcast an overlay to the active servers. */
+	public function fingerprint(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'fingerprint');
+
+		global $db, $rServers;
+		$rData = json_decode(RequestManager::get('data'), true);
+		$rActiveServers = [];
+
+		foreach ($rServers as $rServer) {
+			$rServerError = ((360 < time() - $rServer['last_check_ago'] || $rServer['status'] == 2) && $rServer['is_main'] == 0 && $rServer['status'] != 3);
+
+			if ($rServer['status'] == 1 && !$rServerError) {
+				$rActiveServers[] = $rServer['id'];
+			}
+		}
+
+		if (0 < $rData['id'] && 0 < $rData['font_size'] && 0 < strlen($rData['font_color']) && 0 < strlen($rData['xy_offset']) && (0 < strlen($rData['message']) || $rData['type'] < 3)) {
+			if (SettingsManager::get('redis_handler')) {
+				if (isset($rData['user'])) {
+					$rRows = ConnectionTracker::getRedisConnections($rData['id'], null, null, true, false, false);
+				} else {
+					$rRows = ConnectionTracker::getRedisConnections(null, null, $rData['id'], true, false, false);
+				}
+
+				$rUserMap = $rUserIDs = [];
+
+				foreach ($rRows as $rRow) {
+					if (!in_array($rRow['user_id'], $rUserIDs)) {
+						$rUserIDs[] = intval($rRow['user_id']);
+					}
+				}
+
+				if (0 < count($rUserIDs)) {
+					$db->query('SELECT `id`, `username` FROM `lines` WHERE `id` IN (' . implode(',', $rUserIDs) . ');');
+
+					foreach ($db->get_rows() as $rRow) {
+						$rUserMap[$rRow['id']] = $rRow['username'];
+					}
+				}
+			} else {
+				if (isset($rData['user'])) {
+					$db->query('SELECT `lines_live`.`activity_id`, `lines_live`.`uuid`, `lines_live`.`user_id`, `lines_live`.`server_id`, `lines`.`username` FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `user_id` = ?;', $rData['id']);
+				} else {
+					$db->query('SELECT `lines_live`.`activity_id`, `lines_live`.`uuid`, `lines_live`.`user_id`, `lines_live`.`server_id`, `lines`.`username` FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `stream_id` = ?;', $rData['id']);
+				}
+
+				$rRows = $db->get_rows();
+			}
+
+			if (count($rRows) > 0) {
+				set_time_limit(360);
+				ini_set('max_execution_time', 360);
+				ini_set('default_socket_timeout', 15);
+
+				foreach ($rRows as $rRow) {
+					if (in_array($rRow['server_id'], $rActiveServers)) {
+						$rArray = ['font_size' => $rData['font_size'], 'font_color' => $rData['font_color'], 'xy_offset' => $rData['xy_offset'], 'message' => '', 'uuid' => $rRow['uuid']];
+
+						if ($rData['type'] == 1) {
+							$rArray['message'] = $rRow['uuid'];
+						} elseif ($rData['type'] == 2) {
+							$rArray['message'] = (SettingsManager::get('redis_handler') ? $rUserMap[$rRow['user_id']] : $rRow['username']);
+						} elseif ($rData['type'] == 3) {
+							$rArray['message'] = $rData['message'];
+						}
+
+						$rArray['action'] = 'signal_send';
+						ApiClient::systemRequest(intval($rRow['server_id']), $rArray);
+					}
+				}
+			}
+		}
+
+		$this->ok();
+	}
+
+	/** action=restart_all_services — restart services on every online server. */
+	public function restartAllServices(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'servers');
+
+		global $db, $rServers;
+
+		foreach ($rServers as $rServer) {
+			if ($rServer['server_online']) {
+				$db->query("INSERT INTO `signals`(`server_id`, `custom_data`, `time`) VALUES(?, '{\"action\": \"restart_services\"}', ?);", $rServer['id'], time());
+			}
+		}
+
+		$this->ok();
+	}
+
+	/** action=restart_services — restart services on the selected servers. */
+	public function restartServices(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_server');
+
+		global $db;
+
+		foreach ($this->normalizeServerIds() as $rID) {
+			$db->query("INSERT INTO `signals`(`server_id`, `custom_data`, `time`) VALUES(?, '{\"action\": \"restart_services\"}', ?);", $rID, time());
+		}
+
+		$this->ok();
+	}
+
+	/** action=reboot_server — reboot the selected servers. */
+	public function rebootServer(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_server');
+
+		global $db;
+
+		foreach ($this->normalizeServerIds() as $rID) {
+			$db->query("INSERT INTO `signals`(`server_id`, `custom_data`, `time`) VALUES(?, '{\"action\": \"reboot\"}', ?);", $rID, time());
+		}
+
+		$this->ok();
+	}
+
+	/** action=update_binaries — update binaries on the selected servers. */
+	public function updateBinaries(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_server');
+
+		global $db;
+
+		foreach ($this->normalizeServerIds() as $rID) {
+			$db->query("INSERT INTO `signals`(`server_id`, `custom_data`, `time`) VALUES(?, '{\"action\": \"update_binaries\"}', ?);", $rID, time());
+		}
+
+		$this->ok();
+	}
+
+	/** action=server_view — summary statistics for a server/proxy. */
+	public function serverView(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'add_server'], ['adv', 'edit_server']]);
+
+		global $db, $rServers, $rProxyServers;
+
+		if (isset($rServers[RequestManager::get('server_id')])) {
+			$rServer = $rServers[RequestManager::get('server_id')];
+		} else {
+			if (isset($rProxyServers[RequestManager::get('server_id')])) {
+				$rServer = $rProxyServers[RequestManager::get('server_id')];
+			} else {
+				$this->fail();
+			}
+		}
+
+		$rStats = ['open_connections' => 0, 'total_running_streams' => 0, 'online_users' => 0, 'offline_streams' => 0, 'gpu_info' => json_decode($rServer['gpu_info'], true), 'watchdog' => json_decode($rServer['watchdog_data'], true)];
+		$rStats['open_connections'] = ($rServer['connections'] ?: 0);
+		$rStats['online_users'] = ($rServer['users'] ?: 0);
+		$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `pid` > 0 AND `type` = 1;', $rServer['id']);
+		$rStats['total_running_streams'] = $db->get_row()['count'];
+		$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `type` = 1 AND ((`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0);', $rServer['id']);
+		$rStats['offline_streams'] = $db->get_row()['count'];
+
+		$this->ok(['data' => $rStats, 'netspeed' => (intval($rServer['network_guaranteed_speed']) ?: 1000)]);
+	}
+
+	/** action=server_stats — watchdog metrics of a server for the graphs. */
+	public function serverStats(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'add_server'], ['adv', 'edit_server']]);
+
+		global $rServers;
+		$rID = intval(RequestManager::get('id'));
+
+		if (isset($rServers[$rID])) {
+			$rWatchdog = ProcessChecker::getWatchdog($rID);
+			$rReturn = [];
+
+			foreach ($rWatchdog as $rData) {
+				$rReturn[] = ['cpu' => $rData['cpu'], 'memory' => $rData['total_mem_used_percent'], 'input' => $rData['bytes_received'], 'output' => $rData['bytes_sent'], 'date' => $rData['time']];
+			}
+
+			$this->ok(['data' => $rReturn]);
+		}
 
-    /** action=rtmp_ip — remove an RTMP IP from the blocklist. */
-    public function rtmpIp(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'add_rtmp');
-
-        if (RequestManager::get('sub') == 'delete') {
-            BlocklistService::deleteRTMPIP(RequestManager::get('ip'));
-            $this->ok();
-        }
-
-        $this->fail();
-    }
-
-    /** action=rollback_versions — list previous releases relative to a version. */
-    public function rollbackVersions(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_server');
-
-        // Optional base version (a specific server's version); defaults to
-        // the MAIN panel version. Previous releases are resolved relative to it.
-        $rBaseVersion = trim((string) RequestManager::get('version'));
-        if (!preg_match('/^\d+\.\d+\.\d+$/', $rBaseVersion)) {
-            $rBaseVersion = XC_VM_VERSION;
-        }
-        $rVersions = array();
-
-        try {
-            $rGit = new GitHubReleases(GIT_OWNER, GIT_REPO_MAIN, UpdateChannels::main());
-            $rGit->setTimeout(15);
-            $rVersions = $rGit->getPreviousVersions($rBaseVersion, 5);
-        } catch (\Throwable) {
-            $rVersions = array();
-        }
-
-        $this->ok(array('current' => $rBaseVersion, 'versions' => $rVersions));
-    }
-
-    /** action=server — server operations (dispatches on sub). */
-    public function server(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_server');
-
-        global $db, $rServers;
-        $rSub = RequestManager::get('sub');
-
-        if ($rSub == 'delete') {
-            // Look the server up in the full list (getAll), not the online-filtered
-            // $rServers global — otherwise an offline/failed server can never be deleted.
-            $rAllServers = ServerRepository::getAll();
-            $rDeleteId = RequestManager::get('server_id');
-            if (isset($rAllServers[$rDeleteId]) && $rAllServers[$rDeleteId]['is_main'] == 0) {
-                ServerRepository::deleteById($rDeleteId);
-                $this->ok();
-            }
-
-            $this->fail();
-        }
-
-        if ($rSub == 'update') {
-            foreach ($this->normalizeServerIds() as $rID) {
-                $db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rID, time(), json_encode(array('action' => 'update')));
-            }
-
-            $this->ok();
-        }
-
-        if ($rSub == 'rollback') {
-            $rVersion = trim((string) RequestManager::get('version'));
-
-            if (!preg_match('/^\d+\.\d+\.\d+$/', $rVersion) || version_compare($rVersion, XC_VM_VERSION, '>=')) {
-                $this->fail(array('error' => 'invalid_version'));
-            }
-
-            foreach ($this->normalizeServerIds() as $rID) {
-                $db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rID, time(), json_encode(array('action' => 'rollback', 'version' => $rVersion)));
-            }
-
-            $this->ok();
-        }
-
-        if ($rSub == 'enable') {
-            $db->query('UPDATE `servers` SET `enabled` = 1 WHERE `id` = ?;', RequestManager::get('server_id'));
-            $this->ok();
-        }
-
-        if ($rSub == 'disable') {
-            $db->query('UPDATE `servers` SET `enabled` = 0 WHERE `id` = ? AND `is_main` = 0;', RequestManager::get('server_id'));
-            $this->ok();
-        }
-
-        if ($rSub == 'enable_proxy') {
-            $db->query('UPDATE `servers` SET `enable_proxy` = 1 WHERE `id` = ?;', RequestManager::get('server_id'));
-            $this->ok();
-        }
-
-        if ($rSub == 'disable_proxy') {
-            $db->query('UPDATE `servers` SET `enable_proxy` = 0 WHERE `id` = ?;', RequestManager::get('server_id'));
-            $this->ok();
-        }
-
-        if ($rSub == 'kill') {
-            if (SettingsManager::get('redis_handler')) {
-                foreach (ConnectionTracker::getRedisConnections(null, RequestManager::get('server_id'), null, true, false, false) as $rConnection) {
-                    ConnectionTracker::closeConnection($rConnection);
-                }
-            } else {
-                $db->query('SELECT * FROM `lines_live` WHERE `server_id` = ?;', RequestManager::get('server_id'));
-
-                foreach ($db->get_rows() as $rRow) {
-                    ConnectionTracker::closeConnection($rRow);
-                }
-            }
-
-            $this->ok();
-        }
-
-        if (in_array($rSub, array('restart', 'start', 'stop'), true)) {
-            // 'restart' additionally requires an already-running monitored stream.
-            $rOnDemand = ($rSub == 'restart') ? ' AND `monitor_pid` > 0 AND `pid` > 0 AND `stream_status` = 0' : '';
-            $rSignalSub = ($rSub == 'stop') ? 'stop' : 'start';
-            $rStreamIDs = array();
-            $db->query('SELECT `stream_id` FROM `streams_servers` WHERE `server_id` = ? AND `on_demand` = 0' . $rOnDemand . ';', RequestManager::get('server_id'));
-
-            if (0 < $db->num_rows()) {
-                foreach ($db->get_rows() as $rRow) {
-                    $rStreamIDs[] = intval($rRow['stream_id']);
-                }
-            }
-
-            if (0 < count($rStreamIDs)) {
-                ApiClient::request(array('action' => 'stream', 'sub' => $rSignalSub, 'stream_ids' => array_values($rStreamIDs), 'servers' => array(intval(RequestManager::get('server_id')))));
-            }
-
-            $this->ok();
-        }
-
-        $this->fail();
-    }
-
-    /** action=proxy — proxy-server operations (dispatches on sub). */
-    public function proxy(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_server');
-
-        global $db;
-        $rSub = RequestManager::get('sub');
-
-        if ($rSub == 'delete') {
-            ServerRepository::deleteById(RequestManager::get('server_id'));
-            $this->ok();
-        }
-
-        if ($rSub == 'enable') {
-            $db->query('UPDATE `servers` SET `enabled` = 1 WHERE `id` = ?;', RequestManager::get('server_id'));
-            $this->ok();
-        }
-
-        if ($rSub == 'disable') {
-            $db->query('UPDATE `servers` SET `enabled` = 0 WHERE `id` = ?;', RequestManager::get('server_id'));
-            $this->ok();
-        }
-
-        if ($rSub == 'update') {
-            $db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', RequestManager::get('server_id'), time(), json_encode(array('action' => 'update')));
-            $this->ok();
-        }
-
-        if ($rSub == 'kill') {
-            if (SettingsManager::get('redis_handler')) {
-                $rServerID = intval(RequestManager::get('server_id'));
-
-                foreach ((ServerRepository::getAll()[$rServerID]['parent_id'] ?? array()) as $rParentID) {
-                    foreach (ConnectionTracker::getRedisConnections(null, $rParentID, null, true, false, false) as $rConnection) {
-                        if ($rConnection['proxy_id'] == RequestManager::get('server_id')) {
-                            ConnectionTracker::closeConnection($rConnection);
-                        }
-                    }
-                }
-            } else {
-                $db->query('SELECT * FROM `lines_live` WHERE `proxy_id` = ?;', RequestManager::get('server_id'));
-
-                foreach ($db->get_rows() as $rRow) {
-                    ConnectionTracker::closeConnection($rRow);
-                }
-            }
-
-            $this->ok();
-        }
-
-        $this->fail();
-    }
-
-    /** action=fingerprint — broadcast an overlay to the active servers. */
-    public function fingerprint(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'fingerprint');
-
-        global $db, $rServers;
-        $rData = json_decode(RequestManager::get('data'), true);
-        $rActiveServers = array();
-
-        foreach ($rServers as $rServer) {
-            $rServerError = ((360 < time() - $rServer['last_check_ago'] || $rServer['status'] == 2) && $rServer['is_main'] == 0 && $rServer['status'] != 3);
-
-            if ($rServer['status'] == 1 && !$rServerError) {
-                $rActiveServers[] = $rServer['id'];
-            }
-        }
-
-        if (0 < $rData['id'] && 0 < $rData['font_size'] && 0 < strlen($rData['font_color']) && 0 < strlen($rData['xy_offset']) && (0 < strlen($rData['message']) || $rData['type'] < 3)) {
-            if (SettingsManager::get('redis_handler')) {
-                if (isset($rData['user'])) {
-                    $rRows = ConnectionTracker::getRedisConnections($rData['id'], null, null, true, false, false);
-                } else {
-                    $rRows = ConnectionTracker::getRedisConnections(null, null, $rData['id'], true, false, false);
-                }
-
-                $rUserMap = $rUserIDs = array();
-
-                foreach ($rRows as $rRow) {
-                    if (!in_array($rRow['user_id'], $rUserIDs)) {
-                        $rUserIDs[] = intval($rRow['user_id']);
-                    }
-                }
-
-                if (0 < count($rUserIDs)) {
-                    $db->query('SELECT `id`, `username` FROM `lines` WHERE `id` IN (' . implode(',', $rUserIDs) . ');');
-
-                    foreach ($db->get_rows() as $rRow) {
-                        $rUserMap[$rRow['id']] = $rRow['username'];
-                    }
-                }
-            } else {
-                if (isset($rData['user'])) {
-                    $db->query('SELECT `lines_live`.`activity_id`, `lines_live`.`uuid`, `lines_live`.`user_id`, `lines_live`.`server_id`, `lines`.`username` FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `user_id` = ?;', $rData['id']);
-                } else {
-                    $db->query('SELECT `lines_live`.`activity_id`, `lines_live`.`uuid`, `lines_live`.`user_id`, `lines_live`.`server_id`, `lines`.`username` FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `stream_id` = ?;', $rData['id']);
-                }
-
-                $rRows = $db->get_rows();
-            }
-
-            if (count($rRows) > 0) {
-                set_time_limit(360);
-                ini_set('max_execution_time', 360);
-                ini_set('default_socket_timeout', 15);
-
-                foreach ($rRows as $rRow) {
-                    if (in_array($rRow['server_id'], $rActiveServers)) {
-                        $rArray = array('font_size' => $rData['font_size'], 'font_color' => $rData['font_color'], 'xy_offset' => $rData['xy_offset'], 'message' => '', 'uuid' => $rRow['uuid']);
-
-                        if ($rData['type'] == 1) {
-                            $rArray['message'] = $rRow['uuid'];
-                        } elseif ($rData['type'] == 2) {
-                            $rArray['message'] = (SettingsManager::get('redis_handler') ? $rUserMap[$rRow['user_id']] : $rRow['username']);
-                        } elseif ($rData['type'] == 3) {
-                            $rArray['message'] = $rData['message'];
-                        }
-
-                        $rArray['action'] = 'signal_send';
-                        ApiClient::systemRequest(intval($rRow['server_id']), $rArray);
-                    }
-                }
-            }
-        }
-
-        $this->ok();
-    }
-
-    /** action=restart_all_services — restart services on every online server. */
-    public function restartAllServices(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'servers');
-
-        global $db, $rServers;
-
-        foreach ($rServers as $rServer) {
-            if ($rServer['server_online']) {
-                $db->query("INSERT INTO `signals`(`server_id`, `custom_data`, `time`) VALUES(?, '{\"action\": \"restart_services\"}', ?);", $rServer['id'], time());
-            }
-        }
-
-        $this->ok();
-    }
-
-    /** action=restart_services — restart services on the selected servers. */
-    public function restartServices(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_server');
-
-        global $db;
-
-        foreach ($this->normalizeServerIds() as $rID) {
-            $db->query("INSERT INTO `signals`(`server_id`, `custom_data`, `time`) VALUES(?, '{\"action\": \"restart_services\"}', ?);", $rID, time());
-        }
-
-        $this->ok();
-    }
-
-    /** action=reboot_server — reboot the selected servers. */
-    public function rebootServer(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_server');
-
-        global $db;
-
-        foreach ($this->normalizeServerIds() as $rID) {
-            $db->query("INSERT INTO `signals`(`server_id`, `custom_data`, `time`) VALUES(?, '{\"action\": \"reboot\"}', ?);", $rID, time());
-        }
-
-        $this->ok();
-    }
-
-    /** action=update_binaries — update binaries on the selected servers. */
-    public function updateBinaries(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_server');
-
-        global $db;
-
-        foreach ($this->normalizeServerIds() as $rID) {
-            $db->query("INSERT INTO `signals`(`server_id`, `custom_data`, `time`) VALUES(?, '{\"action\": \"update_binaries\"}', ?);", $rID, time());
-        }
-
-        $this->ok();
-    }
-
-    /** action=server_view — summary statistics for a server/proxy. */
-    public function serverView(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'add_server'), array('adv', 'edit_server')));
-
-        global $db, $rServers, $rProxyServers;
-
-        if (isset($rServers[RequestManager::get('server_id')])) {
-            $rServer = $rServers[RequestManager::get('server_id')];
-        } else {
-            if (isset($rProxyServers[RequestManager::get('server_id')])) {
-                $rServer = $rProxyServers[RequestManager::get('server_id')];
-            } else {
-                $this->fail();
-            }
-        }
-
-        $rStats = array('open_connections' => 0, 'total_running_streams' => 0, 'online_users' => 0, 'offline_streams' => 0, 'gpu_info' => json_decode($rServer['gpu_info'], true), 'watchdog' => json_decode($rServer['watchdog_data'], true));
-        $rStats['open_connections'] = ($rServer['connections'] ?: 0);
-        $rStats['online_users'] = ($rServer['users'] ?: 0);
-        $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `pid` > 0 AND `type` = 1;', $rServer['id']);
-        $rStats['total_running_streams'] = $db->get_row()['count'];
-        $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `type` = 1 AND ((`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0);', $rServer['id']);
-        $rStats['offline_streams'] = $db->get_row()['count'];
-
-        $this->ok(array('data' => $rStats, 'netspeed' => (intval($rServer['network_guaranteed_speed']) ?: 1000)));
-    }
-
-    /** action=server_stats — watchdog metrics of a server for the graphs. */
-    public function serverStats(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'add_server'), array('adv', 'edit_server')));
-
-        global $rServers;
-        $rID = intval(RequestManager::get('id'));
-
-        if (isset($rServers[$rID])) {
-            $rWatchdog = ProcessChecker::getWatchdog($rID);
-            $rReturn = array();
-
-            foreach ($rWatchdog as $rData) {
-                $rReturn[] = array('cpu' => $rData['cpu'], 'memory' => $rData['total_mem_used_percent'], 'input' => $rData['bytes_received'], 'output' => $rData['bytes_sent'], 'date' => $rData['time']);
-            }
-
-            $this->ok(array('data' => $rReturn));
-        }
+		$this->fail();
+	}
+
+	/**
+	 * action=rtmp_kill — kill an RTMP stream. Echoes the node's raw JSON response
+	 * ({"result":…}) when present; an empty/absent body (offline node, or a
+	 * self-request that yields nothing) falls back to {"result":false} so the
+	 * page is never blank and the frontend's data.result check stays valid.
+	 */
+	public function rtmpKill(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'rtmp');
+
+		$rResult = ApiClient::systemRequest(intval(RequestManager::get('server')), ['action' => 'rtmp_kill', 'name' => RequestManager::get('name')]);
 
-        $this->fail();
-    }
-
-    /**
-     * action=rtmp_kill — kill an RTMP stream. Echoes the node's raw JSON response
-     * ({"result":…}) when present; an empty/absent body (offline node, or a
-     * self-request that yields nothing) falls back to {"result":false} so the
-     * page is never blank and the frontend's data.result check stays valid.
-     */
-    public function rtmpKill(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'rtmp');
-
-        $rResult = ApiClient::systemRequest(intval(RequestManager::get('server')), array('action' => 'rtmp_kill', 'name' => RequestManager::get('name')));
-
-        if (empty($rResult)) {
-            $this->fail();
-        }
-
-        echo $rResult;
-        exit();
-    }
-
-    /** action=install_status — install progress from the server's .install file. */
-    public function installStatus(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'add_server'), array('adv', 'edit_server')));
-
-        $rServers = ServerRepository::getAll(true);
-        $rServerID = intval(RequestManager::get('server_id'));
-        $rFilename = BIN_PATH . 'install/' . $rServerID . '.install';
-
-        if (file_exists($rFilename)) {
-            $this->ok(array('data' => trim(file_get_contents($rFilename)), 'status' => intval($rServers[$rServerID]['status'])));
-        }
-
-        $this->fail();
-    }
-
-    /** action=reinstall_server — re-run a server install from its saved params. */
-    public function reinstallServer(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'add_server'), array('adv', 'edit_server')));
-
-        global $db, $rServers;
-        $rServerID = intval(RequestManager::get('server_id'));
-
-        if ($rServers[$rServerID]['server_type'] == 0) {
-            $rType = 2;
-        } else {
-            $rType = 1;
-        }
-
-        $rFilename = BIN_PATH . 'install/' . $rServerID . '.json';
-
-        if (file_exists($rFilename)) {
-            $rParams = json_decode(file_get_contents($rFilename), true);
-            $db->query('UPDATE `servers` SET `status` = 3 WHERE `id` = ?;', $rServerID);
-
-            if (isset($rParams['http_broadcast_port'])) {
-                $rCommand = PHP_BIN . ' ' . MAIN_HOME . 'console.php server:install ' . $rType . ' ' . intval($rServerID) . ' ' . intval($rParams['ssh_port']) . ' ' . escapeshellarg($rParams['root_username']) . ' ' . escapeshellarg($rParams['root_password']) . ' ' . intval($rParams['http_broadcast_port']) . ' ' . intval($rParams['https_broadcast_port']) . ' > "' . BIN_PATH . 'install/' . intval($rServerID) . '.install" 2>/dev/null &';
-            } else {
-                $rCommand = PHP_BIN . ' ' . MAIN_HOME . 'console.php server:install ' . $rType . ' ' . intval($rServerID) . ' ' . intval($rParams['ssh_port']) . ' ' . escapeshellarg($rParams['root_username']) . ' ' . escapeshellarg($rParams['root_password']) . ' > "' . BIN_PATH . 'install/' . intval($rServerID) . '.install" 2>/dev/null &';
-            }
-
-            shell_exec($rCommand);
-
-            $this->ok();
-        }
-
-        $this->fail();
-    }
-
-    /** action=fpm_status — PHP-FPM status of a node (HTML). */
-    public function fpmStatus(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'add_server'), array('adv', 'edit_server')));
-
-        global $rServers;
-        $rData = str_replace("\n", '<br/>', ApiClient::systemRequest(RequestManager::get('server_id'), array('action' => 'fpm_status')));
-
-        if (empty($rData)) {
-            $rData = '<strong>No response from status page.</strong>';
-        } else {
-            $rInstances = intval($rServers[RequestManager::get('server_id')]['total_services']);
-
-            if ($rInstances) {
-                $rData .= '<br/><br/><strong>Results from 1 of ' . $rInstances . ' PHP-FPM instances</strong>';
-            }
-        }
-
-        $this->ok(array('data' => $rData));
-    }
-
-    /** action=update_all_servers — signal 'update' to every online server. */
-    public function updateAllServers(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'servers');
-
-        global $db, $rServers;
-
-        foreach ($rServers as $rServer) {
-            if ($rServer['server_online']) {
-                $db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(array('action' => 'update')));
-            }
-        }
-
-        $this->ok();
-    }
-
-    /** action=update_all_binaries — signal 'update_binaries' to every online server. */
-    public function updateAllBinaries(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'servers');
-
-        global $db, $rServers;
-
-        foreach ($rServers as $rServer) {
-            if ($rServer['server_online']) {
-                $db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(array('action' => 'update_binaries')));
-            }
-        }
-
-        $this->ok();
-    }
-
-    /**
-     * Normalize `server_id`: a number -> `[int]`, otherwise a JSON array of ids.
-     * This idiom recurred in server(update/rollback), restart_services,
-     * reboot_server and update_binaries.
-     *
-     * @return array<int, int|string>
-     */
-    private function normalizeServerIds(): array {
-        if (!is_numeric(RequestManager::get('server_id'))) {
-            return json_decode(RequestManager::get('server_id'), true);
-        }
-
-        return array(intval(RequestManager::get('server_id')));
-    }
+		if (empty($rResult)) {
+			$this->fail();
+		}
+
+		echo $rResult;
+		exit();
+	}
+
+	/** action=install_status — install progress from the server's .install file. */
+	public function installStatus(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'add_server'], ['adv', 'edit_server']]);
+
+		$rServers = ServerRepository::getAll(true);
+		$rServerID = intval(RequestManager::get('server_id'));
+		$rFilename = BIN_PATH . 'install/' . $rServerID . '.install';
+
+		if (file_exists($rFilename)) {
+			$this->ok(['data' => trim(file_get_contents($rFilename)), 'status' => intval($rServers[$rServerID]['status'])]);
+		}
+
+		$this->fail();
+	}
+
+	/** action=reinstall_server — re-run a server install from its saved params. */
+	public function reinstallServer(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'add_server'], ['adv', 'edit_server']]);
+
+		global $db, $rServers;
+		$rServerID = intval(RequestManager::get('server_id'));
+
+		if ($rServers[$rServerID]['server_type'] == 0) {
+			$rType = 2;
+		} else {
+			$rType = 1;
+		}
+
+		$rFilename = BIN_PATH . 'install/' . $rServerID . '.json';
+
+		if (file_exists($rFilename)) {
+			$rParams = json_decode(file_get_contents($rFilename), true);
+			$db->query('UPDATE `servers` SET `status` = 3 WHERE `id` = ?;', $rServerID);
+
+			if (isset($rParams['http_broadcast_port'])) {
+				$rCommand = PHP_BIN . ' ' . MAIN_HOME . 'console.php server:install ' . $rType . ' ' . intval($rServerID) . ' ' . intval($rParams['ssh_port']) . ' ' . escapeshellarg($rParams['root_username']) . ' ' . escapeshellarg($rParams['root_password']) . ' ' . intval($rParams['http_broadcast_port']) . ' ' . intval($rParams['https_broadcast_port']) . ' > "' . BIN_PATH . 'install/' . intval($rServerID) . '.install" 2>/dev/null &';
+			} else {
+				$rCommand = PHP_BIN . ' ' . MAIN_HOME . 'console.php server:install ' . $rType . ' ' . intval($rServerID) . ' ' . intval($rParams['ssh_port']) . ' ' . escapeshellarg($rParams['root_username']) . ' ' . escapeshellarg($rParams['root_password']) . ' > "' . BIN_PATH . 'install/' . intval($rServerID) . '.install" 2>/dev/null &';
+			}
+
+			shell_exec($rCommand);
+
+			$this->ok();
+		}
+
+		$this->fail();
+	}
+
+	/** action=fpm_status — PHP-FPM status of a node (HTML). */
+	public function fpmStatus(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'add_server'], ['adv', 'edit_server']]);
+
+		global $rServers;
+		$rData = str_replace("\n", '<br/>', ApiClient::systemRequest(RequestManager::get('server_id'), ['action' => 'fpm_status']));
+
+		if (empty($rData)) {
+			$rData = '<strong>No response from status page.</strong>';
+		} else {
+			$rInstances = intval($rServers[RequestManager::get('server_id')]['total_services']);
+
+			if ($rInstances) {
+				$rData .= '<br/><br/><strong>Results from 1 of ' . $rInstances . ' PHP-FPM instances</strong>';
+			}
+		}
+
+		$this->ok(['data' => $rData]);
+	}
+
+	/** action=update_all_servers — signal 'update' to every online server. */
+	public function updateAllServers(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'servers');
+
+		global $db, $rServers;
+
+		foreach ($rServers as $rServer) {
+			if ($rServer['server_online']) {
+				$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(['action' => 'update']));
+			}
+		}
+
+		$this->ok();
+	}
+
+	/** action=update_all_binaries — signal 'update_binaries' to every online server. */
+	public function updateAllBinaries(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'servers');
+
+		global $db, $rServers;
+
+		foreach ($rServers as $rServer) {
+			if ($rServer['server_online']) {
+				$db->query('INSERT INTO `signals`(`server_id`, `time`, `custom_data`) VALUES(?, ?, ?);', $rServer['id'], time(), json_encode(['action' => 'update_binaries']));
+			}
+		}
+
+		$this->ok();
+	}
+
+	/**
+	 * Normalize `server_id`: a number -> `[int]`, otherwise a JSON array of ids.
+	 * This idiom recurred in server(update/rollback), restart_services,
+	 * reboot_server and update_binaries.
+	 *
+	 * @return array<int, int|string>
+	 */
+	private function normalizeServerIds(): array {
+		if (!is_numeric(RequestManager::get('server_id'))) {
+			return json_decode(RequestManager::get('server_id'), true);
+		}
+
+		return [intval(RequestManager::get('server_id'))];
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/StatsAjaxController.php b/src/Public/Controllers/Admin/Ajax/StatsAjaxController.php
index 17ec5d87..9f52f67c 100644
--- a/src/Public/Controllers/Admin/Ajax/StatsAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/StatsAjaxController.php
@@ -23,431 +23,430 @@ use XcVm\Domain\Server\ServerRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class StatsAjaxController extends BaseAjaxController {
-
-    /** action=graph_stats — per-minute time-series for the dashboard graphs. */
-    public function graphStats(): never {
-        $this->requireXhr();
-
-        global $db, $rServers;
-        $rLimit = 3600;
-        $rTime = AdminHelpers::roundUpToAny(time(), 10);
-        $rNearestRange = $rTime - $rLimit;
-        $rPeriod = 60;
-        $rStatsRange = array();
-
-        foreach (range($rNearestRange, $rTime, $rPeriod) as $i) {
-            $rStatsRange[] = $i;
-        }
-        $rServerStats = array();
-
-        if (RequestManager::has('server_id')) {
-            $db->query('SELECT `server_id`, `time`, `cpu`, `iostat_info`, `total_mem_used_percent`, `connections`, `streams`, `users`, `total_users`, `bytes_received`, `bytes_sent` FROM `servers_stats` WHERE `time` >= ? AND `server_id` = ? ORDER BY `time` DESC;', $rNearestRange, RequestManager::get('server_id'));
-        } else {
-            $db->query('SELECT `server_id`, `time`, `cpu`, `iostat_info`, `total_mem_used_percent`, `connections`, `streams`, `users`, `total_users`, `bytes_received`, `bytes_sent` FROM `servers_stats` WHERE `server_id` IN (SELECT `id` FROM `servers` WHERE `server_type` = 0) AND `time` >= ? ORDER BY `time` DESC;', $rNearestRange);
-        }
-
-        foreach ($db->get_rows() as $rRow) {
-            // servers_stats may reference a server_id absent from $rServers (orphan stat
-            // row from a deleted server); empty() skips the missing-key / null-offset
-            // case without a warning — same intent: unknown or offline server -> skip.
-            if (!empty($rServers[$rRow['server_id']]['server_online'])) {
-                $rNearest = AdminHelpers::getNearest($rStatsRange, intval($rRow['time']));
-
-                if (!isset($rStatsRange[$rNearest][intval($rRow['server_id'])])) {
-                    $rServerStats[$rNearest][intval($rRow['server_id'])] = $rRow;
-                }
-            }
-        }
-
-        $rStats = array('cpu' => array(), 'memory' => array(), 'users' => array(), 'io' => array(), 'input' => array(), 'output' => array(), 'dates' => array(null, null));
-
-        foreach (array_keys($rServerStats) as $rTime) {
-            $rTotalCPU = 0;
-            $rCPUCount = 0;
-            $rTotalMem = 0;
-            $rMemCount = 0;
-            $rTotalIO = 0;
-            $rIOCount = 0;
-            $rTotalInput = 0;
-            $rTotalOutput = 0;
-            $rTotalConnections = 0;
-            $rTotalStreams = 0;
-            $rTotalUsers = 0;
-
-            if (RequestManager::has('server_id')) {
-                $rTotalUsers = $rServerStats[$rTime][RequestManager::get('server_id')]['users'] ?? 0;
-            } else {
-                $rTotalUsers = $rServerStats[$rTime][SERVER_ID]['total_users'] ?? 0;
-            }
-
-            foreach ($rServerStats[$rTime] as $rData) {
-                $rTotalCPU += $rData['cpu'];
-                $rCPUCount++;
-                $rIOStat = json_decode($rData['iostat_info'], true);
-
-                if ($rIOStat) {
-                    $rTotalIO += $rIOStat['avg-cpu']['iowait'] ?? 0;
-                    $rIOCount++;
-                }
-
-                $rTotalMem += $rData['total_mem_used_percent'];
-                $rMemCount++;
-                $rTotalConnections += $rData['connections'];
-                $rTotalStreams += $rData['streams'];
-                $rTotalInput += $rData['bytes_received'];
-                $rTotalOutput += $rData['bytes_sent'];
-            }
-
-            if (!$rStats['dates'][0] || $rTime * 1000 < $rStats['dates'][0]) {
-                $rStats['dates'][0] = $rTime * 1000;
-            }
-
-            if (!$rStats['dates'][1] || $rTime * 1000 > $rStats['dates'][1]) {
-                $rStats['dates'][1] = $rTime * 1000;
-            }
-
-            $rStats['cpu'][] = array($rTime * 1000, $rCPUCount ? round($rTotalCPU / $rCPUCount, 2) : 0);
-            $rStats['memory'][] = array($rTime * 1000, $rMemCount ? round($rTotalMem / $rMemCount, 2) : 0);
-            $rStats['io'][] = array($rTime * 1000, $rIOCount ? round($rTotalIO / $rIOCount, 2) : 0);
-            $rStats['connections'][] = array($rTime * 1000, $rTotalConnections);
-            $rStats['streams'][] = array($rTime * 1000, $rTotalStreams);
-            $rStats['users'][] = array($rTime * 1000, $rTotalUsers);
-            $rStats['input'][] = array($rTime * 1000, round($rTotalInput / 125000, 0));
-            $rStats['output'][] = array($rTime * 1000, round($rTotalOutput / 125000, 0));
-        }
-
-        $this->json($rStats, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** action=stats — dashboard summary (single server via server_id, or the whole fleet). */
-    public function stats(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'index');
-
-        global $db;
-        $rServers = ServerRepository::getAll(true);
-        $rReturn = array('cpu' => 0, 'mem' => 0, 'io' => 0, 'fs' => 0, 'uptime' => '--', 'bytes_sent' => 0, 'bytes_received' => 0, 'open_connections' => 0, 'total_connections' => 0, 'online_users' => 0, 'total_users' => 0, 'total_streams' => 0, 'total_running_streams' => 0, 'offline_streams' => 0, 'requests_per_second' => 0, 'servers' => array());
-
-        $rUptimeFallbackCache = array();
-        $getFallbackUptime = function ($rServerID) use (&$db, &$rUptimeFallbackCache) {
-            $rServerID = intval($rServerID);
-            if (array_key_exists($rServerID, $rUptimeFallbackCache)) {
-                return $rUptimeFallbackCache[$rServerID];
-            }
-            $db->query('SELECT `uptime` FROM `servers_stats` WHERE `server_id` = ? AND `uptime` IS NOT NULL AND `uptime` <> \'\'  ORDER BY `id` DESC LIMIT 1;', $rServerID);
-            $rUptimeFallbackCache[$rServerID] = (0 < $db->num_rows()) ? strval($db->get_row()['uptime']) : '';
-            return $rUptimeFallbackCache[$rServerID];
-        };
-
-        if (SettingsManager::get('redis_handler')) {
-            $rReturn['total_users'] = SettingsManager::get('total_users');
-        } else {
-            $db->query('SELECT `activity_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
-
-            if (0 < $db->num_rows()) {
-                $rReturn['total_users'] = $db->num_rows();
-            }
-        }
-
-        if (RequestManager::has('server_id')) {
-            $rServerID = intval(RequestManager::get('server_id'));
-            $rWatchDog = json_decode($rServers[$rServerID]['watchdog_data'], true);
-
-            if (!is_array($rWatchDog)) {
-                $rFallback = $getFallbackUptime($rServerID);
-
-                if ($rFallback !== '') {
-                    $rReturn['uptime'] = $rFallback;
-                }
-            } else {
-                $rWatchdogUptime = trim(strval($rWatchDog['uptime'] ?? ''));
-                $rReturn['uptime'] = $rWatchdogUptime !== '' ? $rWatchdogUptime : ($getFallbackUptime($rServerID) ?: '--');
-                $rReturn['mem'] = round($rWatchDog['total_mem_used_percent'], 0);
-                $rReturn['cpu'] = round($rWatchDog['cpu'], 0);
-
-                if (isset($rWatchDog['iostat_info'])) {
-                    $rReturn['io'] = round($rWatchDog['iostat_info']['avg-cpu']['iowait'] ?? 0, 0);
-                }
-
-                if (isset($rWatchDog['total_disk_space'])) {
-                    $rReturn['fs'] = intval(($rWatchDog['total_disk_space'] - $rWatchDog['free_disk_space']) / $rWatchDog['total_disk_space'] * 100);
-                }
-
-                $rReturn['bytes_received'] = intval($rWatchDog['bytes_received']);
-                $rReturn['bytes_sent'] = intval($rWatchDog['bytes_sent']);
-            }
-
-            $rReturn['requests_per_second'] = $rServers[$rServerID]['requests_per_second'];
-
-            if (SettingsManager::get('redis_handler')) {
-                $rReturn['open_connections'] = $rServers[$rServerID]['connections'];
-                $rReturn['online_users'] = $rServers[$rServerID]['users'];
-
-                foreach (array_keys($rServers) as $rSID) {
-                    if ($rServers[$rSID]['server_online']) {
-                        $rReturn['total_connections'] += $rServers[$rSID]['connections'];
-                    }
-                }
-            } else {
-                $db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0;', $rServerID);
-
-                if (0 < $db->num_rows()) {
-                    $rReturn['open_connections'] = $db->get_row()['count'];
-                }
-
-                $db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0;');
-
-                if (0 < $db->num_rows()) {
-                    $rReturn['total_connections'] = $db->get_row()['count'];
-                }
-
-                $db->query('SELECT `activity_id` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0 GROUP BY `user_id`;', $rServerID);
-
-                if (0 < $db->num_rows()) {
-                    $rReturn['online_users'] = $db->num_rows();
-                }
-            }
-
-            $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `stream_status` <> 2 AND `type` = 1;', $rServerID);
-
-            if (0 < $db->num_rows()) {
-                $rReturn['total_streams'] = $db->get_row()['count'];
-            }
-
-            $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `pid` > 0 AND `type` = 1;', $rServerID);
-
-            if (0 < $db->num_rows()) {
-                $rReturn['total_running_streams'] = $db->get_row()['count'];
-            }
-
-            $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `type` = 1 AND (`streams`.`direct_source` = 0 AND (`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0);', $rServerID);
-
-            if (0 < $db->num_rows()) {
-                $rReturn['offline_streams'] = $db->get_row()['count'];
-            }
-
-            $rReturn['network_guaranteed_speed'] = $rServers[$rServerID]['network_guaranteed_speed'];
-        } else {
-            $rTotalConnections = 0;
-
-            if (!SettingsManager::get('redis_handler')) {
-                $db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0;');
-                $rTotalConnections = (0 < $db->num_rows()) ? $db->get_row()['count'] : 0;
-                $db->query('SELECT `activity_id` AS `count` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
-                $db->query('SELECT `user_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
-                $rReturn['online_users'] = $db->num_rows();
-                $rReturn['open_connections'] = $rTotalConnections;
-            }
-
-            $rTotalStreams = $rOnlineStreams = $rOfflineStreams = $rOnlineUsers = $rOpenConnections = array();
-            $db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `server_id`;');
-
-            foreach ($db->get_rows() as $rRow) {
-                $rOpenConnections[intval($rRow['server_id'])] = intval($rRow['count']);
-            }
-            $db->query('SELECT `server_id`, COUNT(DISTINCT(`user_id`)) AS `count` FROM `lines_live` GROUP BY `server_id`;');
-
-            foreach ($db->get_rows() as $rRow) {
-                $rOnlineUsers[intval($rRow['server_id'])] = intval($rRow['count']);
-            }
-            $db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `stream_status` <> 2 AND `type` = 1 GROUP BY `server_id`;');
-
-            foreach ($db->get_rows() as $rRow) {
-                $rTotalStreams[intval($rRow['server_id'])] = intval($rRow['count']);
-            }
-            $db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `type` = 1 AND (`streams`.`direct_source` = 0 AND (`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0) GROUP BY `server_id`;');
-
-            foreach ($db->get_rows() as $rRow) {
-                $rOfflineStreams[intval($rRow['server_id'])] = intval($rRow['count']);
-            }
-            $db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `pid` > 0 AND `type` = 1 GROUP BY `server_id`;');
-
-            foreach ($db->get_rows() as $rRow) {
-                $rOnlineStreams[intval($rRow['server_id'])] = intval($rRow['count']);
-            }
-
-            foreach (array_keys($rServers) as $rServerID) {
-                if ($rServers[$rServerID]['server_online']) {
-                    $rArray = array();
-
-                    if (SettingsManager::get('redis_handler')) {
-                        $rArray['open_connections'] = $rServers[$rServerID]['connections'];
-                        $rReturn['open_connections'] += $rServers[$rServerID]['connections'];
-                        $rReturn['total_connections'] += $rServers[$rServerID]['connections'];
-                        $rArray['online_users'] = $rServers[$rServerID]['users'];
-                        $rReturn['online_users'] += $rServers[$rServerID]['users'];
-                        $rReturn['total_users'] += $rServers[$rServerID]['users'];
-                    } else {
-                        $rArray['open_connections'] = $rOpenConnections[$rServerID] ?? 0;
-                        $rArray['online_users']     = $rOnlineUsers[$rServerID] ?? 0;
-                        $rArray['total_connections'] = $rTotalConnections;
-                    }
-
-                    $rArray['requests_per_second'] = $rServers[$rServerID]['requests_per_second'];
-                    $rArray['total_streams'] = ($rTotalStreams[$rServerID] ?? 0);
-                    $rArray['total_running_streams'] = ($rOnlineStreams[$rServerID] ?? 0);
-                    $rArray['offline_streams'] = ($rOfflineStreams[$rServerID] ?? 0);
-                    $rArray['network_guaranteed_speed'] = $rServers[$rServerID]['network_guaranteed_speed'];
-                    $rWatchDog = json_decode($rServers[$rServerID]['watchdog_data'], true);
-
-                    if (is_array($rWatchDog)) {
-                        $rWatchdogUptime = trim(strval($rWatchDog['uptime'] ?? ''));
-                        $rArray['uptime'] = $rWatchdogUptime !== '' ? $rWatchdogUptime : ($getFallbackUptime($rServerID) ?: '--');
-                        $rArray['mem'] = round($rWatchDog['total_mem_used_percent'], 0);
-                        $rArray['cpu'] = round($rWatchDog['cpu'], 0);
-
-                        if (isset($rWatchDog['iostat_info'])) {
-                            $rArray['io'] = round($rWatchDog['iostat_info']['avg-cpu']['iowait'] ?? 0, 0);
-                        }
-
-                        if (isset($rWatchDog['total_disk_space'])) {
-                            $rArray['fs'] = intval(($rWatchDog['total_disk_space'] - $rWatchDog['free_disk_space']) / $rWatchDog['total_disk_space'] * 100);
-                        }
-
-                        $rArray['bytes_received'] = intval($rWatchDog['bytes_received']);
-                        $rArray['bytes_sent'] = intval($rWatchDog['bytes_sent']);
-                        $rReturn['bytes_received'] += intval($rWatchDog['bytes_received']);
-                        $rReturn['bytes_sent'] += intval($rWatchDog['bytes_sent']);
-                    } else {
-                        $rFallback = $getFallbackUptime($rServerID);
-                        $rArray['uptime'] = $rFallback !== '' ? $rFallback : '--';
-                    }
-
-                    $rArray['server_id'] = $rServerID;
-                    $rArray['server_type'] = $rServers[$rServerID]['server_type'];
-                    $rReturn['servers'][] = $rArray;
-                }
-            }
-
-            foreach ($rReturn['servers'] as $rServerArray) {
-                $rReturn['total_streams'] += $rServerArray['total_streams'];
-                $rReturn['total_running_streams'] += $rServerArray['total_running_streams'];
-                $rReturn['offline_streams'] += $rServerArray['offline_streams'];
-            }
-            $rReturn['online_users'] = SettingsManager::get('total_users');
-        }
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** action=header_stats — compact fleet totals for the top navbar. */
-    public function headerStats(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'index');
-
-        global $db, $rServers;
-        $rReturn = array('bytes_sent' => 0, 'bytes_received' => 0, 'total_connections' => 0, 'total_users' => 0, 'total_running_streams' => 0, 'offline_streams' => 0);
-
-        if (!SettingsManager::get('redis_handler')) {
-            $db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0;');
-
-            if (0 < $db->num_rows()) {
-                $rReturn['total_connections'] = $db->get_row()['count'];
-            }
-
-            $db->query('SELECT `activity_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
-
-            if (0 < $db->num_rows()) {
-                $rReturn['total_users'] = $db->num_rows();
-            }
-        } else {
-            $rReturn['total_users'] = SettingsManager::get('total_users');
-        }
-
-        $rOnlineCount = $rOfflineCount = array();
-        $db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `pid` > 0 AND `type` = 1 GROUP BY `server_id`;');
-
-        foreach ($db->get_rows() as $rRow) {
-            $rOnlineCount[intval($rRow['server_id'])] = intval($rRow['count']);
-        }
-        $db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `type` = 1 AND (`streams`.`direct_source` = 0 AND (`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0) GROUP BY `server_id`;');
-
-        foreach ($db->get_rows() as $rRow) {
-            $rOfflineCount[intval($rRow['server_id'])] = intval($rRow['count']);
-        }
-
-        foreach (array_keys($rServers) as $rServerID) {
-            if ($rServers[$rServerID]['server_online']) {
-                if (SettingsManager::get('redis_handler')) {
-                    $rReturn['total_connections'] += $rServers[$rServerID]['connections'];
-                }
-
-                $rReturn['total_running_streams'] += ($rOnlineCount[$rServerID] ?? 0);
-                $rReturn['offline_streams'] += ($rOfflineCount[$rServerID] ?? 0);
-                $rWatchDog = json_decode($rServers[$rServerID]['watchdog_data'], true);
-
-                if (is_array($rWatchDog)) {
-                    $rReturn['bytes_received'] += intval($rWatchDog['bytes_received']);
-                    $rReturn['bytes_sent'] += intval($rWatchDog['bytes_sent']);
-                }
-            }
-        }
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /**
-     * action=save_ui_prefs — persist the current admin's Bootstrap 5 customizer state.
-     *
-     * Body is a JSON object of whitelisted settings (theme/color/skin/layout…).
-     * Written only for the logged-in admin ($rUserInfo['id'], never a client id);
-     * read back into the shell via $rUserInfo['ui_prefs'].
-     */
-    public function saveUiPrefs(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'index');
-
-        if (($_SERVER['REQUEST_METHOD'] ?? 'GET') !== 'POST') {
-            $this->fail();
-        }
-
-        global $db, $rUserInfo;
-        if (empty($rUserInfo['id'])) {
-            $this->fail();
-        }
-
-        $rIn = json_decode((string) file_get_contents('php://input'), true);
-        if (!is_array($rIn)) {
-            $this->fail();
-        }
-
-        // Customizer "Reset" — drop the saved prefs so the panel falls back to the
-        // project defaults (XC_VM_UIDefaults) on the next load.
-        if (!empty($rIn['__reset'])) {
-            $db->query('UPDATE `users` SET `ui_prefs` = NULL WHERE `id` = ?;', intval($rUserInfo['id']));
-            $this->ok();
-        }
-
-        // Whitelist + validate — never store arbitrary keys/values.
-        $rClean = array();
-        $rEnum = static function ($rVal, array $rAllowed) {
-            return in_array($rVal, $rAllowed, true) ? $rVal : null;
-        };
-        $rBool = static function ($rVal) {
-            return ($rVal === true || $rVal === 'true') ? true : (($rVal === false || $rVal === 'false') ? false : null);
-        };
-        $rMap = array(
-            'theme'           => static fn($v) => $rEnum($v, array('light', 'dark', 'system')),
-            'skin'            => static fn($v) => in_array($v, array('default', 'bordered'), true) ? $v : null,
-            'semiDark'        => $rBool,
-            'layoutCollapsed' => $rBool,
-            'rtl'             => $rBool,
-            'navbar'          => static fn($v) => $rEnum($v, array('sticky', 'static', 'hidden')),
-            'headerType'      => static fn($v) => $rEnum($v, array('static', 'fixed')),
-            'contentLayout'   => static fn($v) => $rEnum($v, array('compact', 'wide')),
-            'color'           => static fn($v) => (is_string($v) && preg_match('/^#[0-9a-fA-F]{6}$/', $v)) ? $v : null,
-            'lang'            => static fn($v) => (is_string($v) && preg_match('/^[a-z]{2,8}$/', $v)) ? $v : null,
-        );
-        foreach ($rMap as $rKey => $rValidator) {
-            if (array_key_exists($rKey, $rIn)) {
-                $rVal = $rValidator($rIn[$rKey]);
-                if ($rVal !== null) {
-                    $rClean[$rKey] = $rVal;
-                }
-            }
-        }
-
-        $db->query('UPDATE `users` SET `ui_prefs` = ? WHERE `id` = ?;', json_encode($rClean), intval($rUserInfo['id']));
-        $this->ok();
-    }
+	/** action=graph_stats — per-minute time-series for the dashboard graphs. */
+	public function graphStats(): never {
+		$this->requireXhr();
+
+		global $db, $rServers;
+		$rLimit = 3600;
+		$rTime = AdminHelpers::roundUpToAny(time(), 10);
+		$rNearestRange = $rTime - $rLimit;
+		$rPeriod = 60;
+		$rStatsRange = [];
+
+		foreach (range($rNearestRange, $rTime, $rPeriod) as $i) {
+			$rStatsRange[] = $i;
+		}
+		$rServerStats = [];
+
+		if (RequestManager::has('server_id')) {
+			$db->query('SELECT `server_id`, `time`, `cpu`, `iostat_info`, `total_mem_used_percent`, `connections`, `streams`, `users`, `total_users`, `bytes_received`, `bytes_sent` FROM `servers_stats` WHERE `time` >= ? AND `server_id` = ? ORDER BY `time` DESC;', $rNearestRange, RequestManager::get('server_id'));
+		} else {
+			$db->query('SELECT `server_id`, `time`, `cpu`, `iostat_info`, `total_mem_used_percent`, `connections`, `streams`, `users`, `total_users`, `bytes_received`, `bytes_sent` FROM `servers_stats` WHERE `server_id` IN (SELECT `id` FROM `servers` WHERE `server_type` = 0) AND `time` >= ? ORDER BY `time` DESC;', $rNearestRange);
+		}
+
+		foreach ($db->get_rows() as $rRow) {
+			// servers_stats may reference a server_id absent from $rServers (orphan stat
+			// row from a deleted server); empty() skips the missing-key / null-offset
+			// case without a warning — same intent: unknown or offline server -> skip.
+			if (!empty($rServers[$rRow['server_id']]['server_online'])) {
+				$rNearest = AdminHelpers::getNearest($rStatsRange, intval($rRow['time']));
+
+				if (!isset($rStatsRange[$rNearest][intval($rRow['server_id'])])) {
+					$rServerStats[$rNearest][intval($rRow['server_id'])] = $rRow;
+				}
+			}
+		}
+
+		$rStats = ['cpu' => [], 'memory' => [], 'users' => [], 'io' => [], 'input' => [], 'output' => [], 'dates' => [null, null]];
+
+		foreach (array_keys($rServerStats) as $rTime) {
+			$rTotalCPU = 0;
+			$rCPUCount = 0;
+			$rTotalMem = 0;
+			$rMemCount = 0;
+			$rTotalIO = 0;
+			$rIOCount = 0;
+			$rTotalInput = 0;
+			$rTotalOutput = 0;
+			$rTotalConnections = 0;
+			$rTotalStreams = 0;
+			$rTotalUsers = 0;
+
+			if (RequestManager::has('server_id')) {
+				$rTotalUsers = $rServerStats[$rTime][RequestManager::get('server_id')]['users'] ?? 0;
+			} else {
+				$rTotalUsers = $rServerStats[$rTime][SERVER_ID]['total_users'] ?? 0;
+			}
+
+			foreach ($rServerStats[$rTime] as $rData) {
+				$rTotalCPU += $rData['cpu'];
+				$rCPUCount++;
+				$rIOStat = json_decode($rData['iostat_info'], true);
+
+				if ($rIOStat) {
+					$rTotalIO += $rIOStat['avg-cpu']['iowait'] ?? 0;
+					$rIOCount++;
+				}
+
+				$rTotalMem += $rData['total_mem_used_percent'];
+				$rMemCount++;
+				$rTotalConnections += $rData['connections'];
+				$rTotalStreams += $rData['streams'];
+				$rTotalInput += $rData['bytes_received'];
+				$rTotalOutput += $rData['bytes_sent'];
+			}
+
+			if (!$rStats['dates'][0] || $rTime * 1000 < $rStats['dates'][0]) {
+				$rStats['dates'][0] = $rTime * 1000;
+			}
+
+			if (!$rStats['dates'][1] || $rTime * 1000 > $rStats['dates'][1]) {
+				$rStats['dates'][1] = $rTime * 1000;
+			}
+
+			$rStats['cpu'][] = [$rTime * 1000, $rCPUCount ? round($rTotalCPU / $rCPUCount, 2) : 0];
+			$rStats['memory'][] = [$rTime * 1000, $rMemCount ? round($rTotalMem / $rMemCount, 2) : 0];
+			$rStats['io'][] = [$rTime * 1000, $rIOCount ? round($rTotalIO / $rIOCount, 2) : 0];
+			$rStats['connections'][] = [$rTime * 1000, $rTotalConnections];
+			$rStats['streams'][] = [$rTime * 1000, $rTotalStreams];
+			$rStats['users'][] = [$rTime * 1000, $rTotalUsers];
+			$rStats['input'][] = [$rTime * 1000, round($rTotalInput / 125000, 0)];
+			$rStats['output'][] = [$rTime * 1000, round($rTotalOutput / 125000, 0)];
+		}
+
+		$this->json($rStats, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** action=stats — dashboard summary (single server via server_id, or the whole fleet). */
+	public function stats(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'index');
+
+		global $db;
+		$rServers = ServerRepository::getAll(true);
+		$rReturn = ['cpu' => 0, 'mem' => 0, 'io' => 0, 'fs' => 0, 'uptime' => '--', 'bytes_sent' => 0, 'bytes_received' => 0, 'open_connections' => 0, 'total_connections' => 0, 'online_users' => 0, 'total_users' => 0, 'total_streams' => 0, 'total_running_streams' => 0, 'offline_streams' => 0, 'requests_per_second' => 0, 'servers' => []];
+
+		$rUptimeFallbackCache = [];
+		$getFallbackUptime = function ($rServerID) use (&$db, &$rUptimeFallbackCache) {
+			$rServerID = intval($rServerID);
+			if (array_key_exists($rServerID, $rUptimeFallbackCache)) {
+				return $rUptimeFallbackCache[$rServerID];
+			}
+			$db->query('SELECT `uptime` FROM `servers_stats` WHERE `server_id` = ? AND `uptime` IS NOT NULL AND `uptime` <> \'\'  ORDER BY `id` DESC LIMIT 1;', $rServerID);
+			$rUptimeFallbackCache[$rServerID] = (0 < $db->num_rows()) ? strval($db->get_row()['uptime']) : '';
+			return $rUptimeFallbackCache[$rServerID];
+		};
+
+		if (SettingsManager::get('redis_handler')) {
+			$rReturn['total_users'] = SettingsManager::get('total_users');
+		} else {
+			$db->query('SELECT `activity_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
+
+			if (0 < $db->num_rows()) {
+				$rReturn['total_users'] = $db->num_rows();
+			}
+		}
+
+		if (RequestManager::has('server_id')) {
+			$rServerID = intval(RequestManager::get('server_id'));
+			$rWatchDog = json_decode($rServers[$rServerID]['watchdog_data'], true);
+
+			if (!is_array($rWatchDog)) {
+				$rFallback = $getFallbackUptime($rServerID);
+
+				if ($rFallback !== '') {
+					$rReturn['uptime'] = $rFallback;
+				}
+			} else {
+				$rWatchdogUptime = trim(strval($rWatchDog['uptime'] ?? ''));
+				$rReturn['uptime'] = $rWatchdogUptime !== '' ? $rWatchdogUptime : ($getFallbackUptime($rServerID) ?: '--');
+				$rReturn['mem'] = round($rWatchDog['total_mem_used_percent'], 0);
+				$rReturn['cpu'] = round($rWatchDog['cpu'], 0);
+
+				if (isset($rWatchDog['iostat_info'])) {
+					$rReturn['io'] = round($rWatchDog['iostat_info']['avg-cpu']['iowait'] ?? 0, 0);
+				}
+
+				if (isset($rWatchDog['total_disk_space'])) {
+					$rReturn['fs'] = intval(($rWatchDog['total_disk_space'] - $rWatchDog['free_disk_space']) / $rWatchDog['total_disk_space'] * 100);
+				}
+
+				$rReturn['bytes_received'] = intval($rWatchDog['bytes_received']);
+				$rReturn['bytes_sent'] = intval($rWatchDog['bytes_sent']);
+			}
+
+			$rReturn['requests_per_second'] = $rServers[$rServerID]['requests_per_second'];
+
+			if (SettingsManager::get('redis_handler')) {
+				$rReturn['open_connections'] = $rServers[$rServerID]['connections'];
+				$rReturn['online_users'] = $rServers[$rServerID]['users'];
+
+				foreach (array_keys($rServers) as $rSID) {
+					if ($rServers[$rSID]['server_online']) {
+						$rReturn['total_connections'] += $rServers[$rSID]['connections'];
+					}
+				}
+			} else {
+				$db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0;', $rServerID);
+
+				if (0 < $db->num_rows()) {
+					$rReturn['open_connections'] = $db->get_row()['count'];
+				}
+
+				$db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0;');
+
+				if (0 < $db->num_rows()) {
+					$rReturn['total_connections'] = $db->get_row()['count'];
+				}
+
+				$db->query('SELECT `activity_id` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0 GROUP BY `user_id`;', $rServerID);
+
+				if (0 < $db->num_rows()) {
+					$rReturn['online_users'] = $db->num_rows();
+				}
+			}
+
+			$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `stream_status` <> 2 AND `type` = 1;', $rServerID);
+
+			if (0 < $db->num_rows()) {
+				$rReturn['total_streams'] = $db->get_row()['count'];
+			}
+
+			$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `pid` > 0 AND `type` = 1;', $rServerID);
+
+			if (0 < $db->num_rows()) {
+				$rReturn['total_running_streams'] = $db->get_row()['count'];
+			}
+
+			$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `type` = 1 AND (`streams`.`direct_source` = 0 AND (`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0);', $rServerID);
+
+			if (0 < $db->num_rows()) {
+				$rReturn['offline_streams'] = $db->get_row()['count'];
+			}
+
+			$rReturn['network_guaranteed_speed'] = $rServers[$rServerID]['network_guaranteed_speed'];
+		} else {
+			$rTotalConnections = 0;
+
+			if (!SettingsManager::get('redis_handler')) {
+				$db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0;');
+				$rTotalConnections = (0 < $db->num_rows()) ? $db->get_row()['count'] : 0;
+				$db->query('SELECT `activity_id` AS `count` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
+				$db->query('SELECT `user_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
+				$rReturn['online_users'] = $db->num_rows();
+				$rReturn['open_connections'] = $rTotalConnections;
+			}
+
+			$rTotalStreams = $rOnlineStreams = $rOfflineStreams = $rOnlineUsers = $rOpenConnections = [];
+			$db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `server_id`;');
+
+			foreach ($db->get_rows() as $rRow) {
+				$rOpenConnections[intval($rRow['server_id'])] = intval($rRow['count']);
+			}
+			$db->query('SELECT `server_id`, COUNT(DISTINCT(`user_id`)) AS `count` FROM `lines_live` GROUP BY `server_id`;');
+
+			foreach ($db->get_rows() as $rRow) {
+				$rOnlineUsers[intval($rRow['server_id'])] = intval($rRow['count']);
+			}
+			$db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `stream_status` <> 2 AND `type` = 1 GROUP BY `server_id`;');
+
+			foreach ($db->get_rows() as $rRow) {
+				$rTotalStreams[intval($rRow['server_id'])] = intval($rRow['count']);
+			}
+			$db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `type` = 1 AND (`streams`.`direct_source` = 0 AND (`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0) GROUP BY `server_id`;');
+
+			foreach ($db->get_rows() as $rRow) {
+				$rOfflineStreams[intval($rRow['server_id'])] = intval($rRow['count']);
+			}
+			$db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `pid` > 0 AND `type` = 1 GROUP BY `server_id`;');
+
+			foreach ($db->get_rows() as $rRow) {
+				$rOnlineStreams[intval($rRow['server_id'])] = intval($rRow['count']);
+			}
+
+			foreach (array_keys($rServers) as $rServerID) {
+				if ($rServers[$rServerID]['server_online']) {
+					$rArray = [];
+
+					if (SettingsManager::get('redis_handler')) {
+						$rArray['open_connections'] = $rServers[$rServerID]['connections'];
+						$rReturn['open_connections'] += $rServers[$rServerID]['connections'];
+						$rReturn['total_connections'] += $rServers[$rServerID]['connections'];
+						$rArray['online_users'] = $rServers[$rServerID]['users'];
+						$rReturn['online_users'] += $rServers[$rServerID]['users'];
+						$rReturn['total_users'] += $rServers[$rServerID]['users'];
+					} else {
+						$rArray['open_connections'] = $rOpenConnections[$rServerID] ?? 0;
+						$rArray['online_users']     = $rOnlineUsers[$rServerID] ?? 0;
+						$rArray['total_connections'] = $rTotalConnections;
+					}
+
+					$rArray['requests_per_second'] = $rServers[$rServerID]['requests_per_second'];
+					$rArray['total_streams'] = ($rTotalStreams[$rServerID] ?? 0);
+					$rArray['total_running_streams'] = ($rOnlineStreams[$rServerID] ?? 0);
+					$rArray['offline_streams'] = ($rOfflineStreams[$rServerID] ?? 0);
+					$rArray['network_guaranteed_speed'] = $rServers[$rServerID]['network_guaranteed_speed'];
+					$rWatchDog = json_decode($rServers[$rServerID]['watchdog_data'], true);
+
+					if (is_array($rWatchDog)) {
+						$rWatchdogUptime = trim(strval($rWatchDog['uptime'] ?? ''));
+						$rArray['uptime'] = $rWatchdogUptime !== '' ? $rWatchdogUptime : ($getFallbackUptime($rServerID) ?: '--');
+						$rArray['mem'] = round($rWatchDog['total_mem_used_percent'], 0);
+						$rArray['cpu'] = round($rWatchDog['cpu'], 0);
+
+						if (isset($rWatchDog['iostat_info'])) {
+							$rArray['io'] = round($rWatchDog['iostat_info']['avg-cpu']['iowait'] ?? 0, 0);
+						}
+
+						if (isset($rWatchDog['total_disk_space'])) {
+							$rArray['fs'] = intval(($rWatchDog['total_disk_space'] - $rWatchDog['free_disk_space']) / $rWatchDog['total_disk_space'] * 100);
+						}
+
+						$rArray['bytes_received'] = intval($rWatchDog['bytes_received']);
+						$rArray['bytes_sent'] = intval($rWatchDog['bytes_sent']);
+						$rReturn['bytes_received'] += intval($rWatchDog['bytes_received']);
+						$rReturn['bytes_sent'] += intval($rWatchDog['bytes_sent']);
+					} else {
+						$rFallback = $getFallbackUptime($rServerID);
+						$rArray['uptime'] = $rFallback !== '' ? $rFallback : '--';
+					}
+
+					$rArray['server_id'] = $rServerID;
+					$rArray['server_type'] = $rServers[$rServerID]['server_type'];
+					$rReturn['servers'][] = $rArray;
+				}
+			}
+
+			foreach ($rReturn['servers'] as $rServerArray) {
+				$rReturn['total_streams'] += $rServerArray['total_streams'];
+				$rReturn['total_running_streams'] += $rServerArray['total_running_streams'];
+				$rReturn['offline_streams'] += $rServerArray['offline_streams'];
+			}
+			$rReturn['online_users'] = SettingsManager::get('total_users');
+		}
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** action=header_stats — compact fleet totals for the top navbar. */
+	public function headerStats(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'index');
+
+		global $db, $rServers;
+		$rReturn = ['bytes_sent' => 0, 'bytes_received' => 0, 'total_connections' => 0, 'total_users' => 0, 'total_running_streams' => 0, 'offline_streams' => 0];
+
+		if (!SettingsManager::get('redis_handler')) {
+			$db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0;');
+
+			if (0 < $db->num_rows()) {
+				$rReturn['total_connections'] = $db->get_row()['count'];
+			}
+
+			$db->query('SELECT `activity_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
+
+			if (0 < $db->num_rows()) {
+				$rReturn['total_users'] = $db->num_rows();
+			}
+		} else {
+			$rReturn['total_users'] = SettingsManager::get('total_users');
+		}
+
+		$rOnlineCount = $rOfflineCount = [];
+		$db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `pid` > 0 AND `type` = 1 GROUP BY `server_id`;');
+
+		foreach ($db->get_rows() as $rRow) {
+			$rOnlineCount[intval($rRow['server_id'])] = intval($rRow['count']);
+		}
+		$db->query('SELECT `server_id`, COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `type` = 1 AND (`streams`.`direct_source` = 0 AND (`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0) GROUP BY `server_id`;');
+
+		foreach ($db->get_rows() as $rRow) {
+			$rOfflineCount[intval($rRow['server_id'])] = intval($rRow['count']);
+		}
+
+		foreach (array_keys($rServers) as $rServerID) {
+			if ($rServers[$rServerID]['server_online']) {
+				if (SettingsManager::get('redis_handler')) {
+					$rReturn['total_connections'] += $rServers[$rServerID]['connections'];
+				}
+
+				$rReturn['total_running_streams'] += ($rOnlineCount[$rServerID] ?? 0);
+				$rReturn['offline_streams'] += ($rOfflineCount[$rServerID] ?? 0);
+				$rWatchDog = json_decode($rServers[$rServerID]['watchdog_data'], true);
+
+				if (is_array($rWatchDog)) {
+					$rReturn['bytes_received'] += intval($rWatchDog['bytes_received']);
+					$rReturn['bytes_sent'] += intval($rWatchDog['bytes_sent']);
+				}
+			}
+		}
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/**
+	 * action=save_ui_prefs — persist the current admin's Bootstrap 5 customizer state.
+	 *
+	 * Body is a JSON object of whitelisted settings (theme/color/skin/layout…).
+	 * Written only for the logged-in admin ($rUserInfo['id'], never a client id);
+	 * read back into the shell via $rUserInfo['ui_prefs'].
+	 */
+	public function saveUiPrefs(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'index');
+
+		if (($_SERVER['REQUEST_METHOD'] ?? 'GET') !== 'POST') {
+			$this->fail();
+		}
+
+		global $db, $rUserInfo;
+		if (empty($rUserInfo['id'])) {
+			$this->fail();
+		}
+
+		$rIn = json_decode((string) file_get_contents('php://input'), true);
+		if (!is_array($rIn)) {
+			$this->fail();
+		}
+
+		// Customizer "Reset" — drop the saved prefs so the panel falls back to the
+		// project defaults (XC_VM_UIDefaults) on the next load.
+		if (!empty($rIn['__reset'])) {
+			$db->query('UPDATE `users` SET `ui_prefs` = NULL WHERE `id` = ?;', intval($rUserInfo['id']));
+			$this->ok();
+		}
+
+		// Whitelist + validate — never store arbitrary keys/values.
+		$rClean = [];
+		$rEnum = static function ($rVal, array $rAllowed) {
+			return in_array($rVal, $rAllowed, true) ? $rVal : null;
+		};
+		$rBool = static function ($rVal) {
+			return ($rVal === true || $rVal === 'true') ? true : (($rVal === false || $rVal === 'false') ? false : null);
+		};
+		$rMap = [
+			'theme'           => static fn($v) => $rEnum($v, ['light', 'dark', 'system']),
+			'skin'            => static fn($v) => in_array($v, ['default', 'bordered'], true) ? $v : null,
+			'semiDark'        => $rBool,
+			'layoutCollapsed' => $rBool,
+			'rtl'             => $rBool,
+			'navbar'          => static fn($v) => $rEnum($v, ['sticky', 'static', 'hidden']),
+			'headerType'      => static fn($v) => $rEnum($v, ['static', 'fixed']),
+			'contentLayout'   => static fn($v) => $rEnum($v, ['compact', 'wide']),
+			'color'           => static fn($v) => (is_string($v) && preg_match('/^#[0-9a-fA-F]{6}$/', $v)) ? $v : null,
+			'lang'            => static fn($v) => (is_string($v) && preg_match('/^[a-z]{2,8}$/', $v)) ? $v : null,
+		];
+		foreach ($rMap as $rKey => $rValidator) {
+			if (array_key_exists($rKey, $rIn)) {
+				$rVal = $rValidator($rIn[$rKey]);
+				if ($rVal !== null) {
+					$rClean[$rKey] = $rVal;
+				}
+			}
+		}
+
+		$db->query('UPDATE `users` SET `ui_prefs` = ? WHERE `id` = ?;', json_encode($rClean), intval($rUserInfo['id']));
+		$this->ok();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/StreamAjaxController.php b/src/Public/Controllers/Admin/Ajax/StreamAjaxController.php
index 5e8347cf..54865b13 100644
--- a/src/Public/Controllers/Admin/Ajax/StreamAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/StreamAjaxController.php
@@ -28,161 +28,160 @@ use XcVm\Domain\Vod\SeriesService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class StreamAjaxController extends BaseAjaxController {
+	/** action=stream — live stream control (start/stop/restart/force) + delete/kill/purge. */
+	public function stream(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_stream');
 
-    /** action=stream — live stream control (start/stop/restart/force) + delete/kill/purge. */
-    public function stream(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_stream');
+		global $db;
+		$rStreamID = intval(RequestManager::get('stream_id'));
+		$rServerID = intval(RequestManager::get('server_id'));
+		$rSub = RequestManager::get('sub');
 
-        global $db;
-        $rStreamID = intval(RequestManager::get('stream_id'));
-        $rServerID = intval(RequestManager::get('server_id'));
-        $rSub = RequestManager::get('sub');
+		if (in_array($rSub, ['start', 'stop', 'restart'])) {
+			if ($rSub == 'restart') {
+				$rSub = 'start';
+			}
 
-        if (in_array($rSub, array('start', 'stop', 'restart'))) {
-            if ($rSub == 'restart') {
-                $rSub = 'start';
-            }
+			if ($rServerID == -1) {
+				$rServerIDs = [];
+				$db->query('SELECT `server_id` FROM `streams_servers` WHERE `stream_id` = ?;', $rStreamID);
 
-            if ($rServerID == -1) {
-                $rServerIDs = array();
-                $db->query('SELECT `server_id` FROM `streams_servers` WHERE `stream_id` = ?;', $rStreamID);
+				foreach ($db->get_rows() as $rRow) {
+					$rServerIDs[] = intval($rRow['server_id']);
+				}
 
-                foreach ($db->get_rows() as $rRow) {
-                    $rServerIDs[] = intval($rRow['server_id']);
-                }
+				if (count($rServerIDs) > 0) {
+					ApiClient::request(['action' => 'stream', 'sub' => $rSub, 'stream_ids' => [$rStreamID], 'servers' => $rServerIDs]);
 
-                if (count($rServerIDs) > 0) {
-                    ApiClient::request(array('action' => 'stream', 'sub' => $rSub, 'stream_ids' => array($rStreamID), 'servers' => $rServerIDs));
+					$this->ok();
+				}
+			} else {
+				ApiClient::request(['action' => 'stream', 'sub' => $rSub, 'stream_ids' => [$rStreamID], 'servers' => [$rServerID]]);
 
-                    $this->ok();
-                }
-            } else {
-                ApiClient::request(array('action' => 'stream', 'sub' => $rSub, 'stream_ids' => array($rStreamID), 'servers' => array($rServerID)));
+				$this->ok();
+			}
 
-                $this->ok();
-            }
+			$this->fail();
+		}
 
-            $this->fail();
-        }
+		if ($rSub == 'force') {
+			$rForceID = intval(RequestManager::get('force_id'));
+			$rServerIDs = array_keys(StreamRepository::getSystemRows($rStreamID));
 
-        if ($rSub == 'force') {
-            $rForceID = intval(RequestManager::get('force_id'));
-            $rServerIDs = array_keys(StreamRepository::getSystemRows($rStreamID));
+			if (0 >= count($rServerIDs)) {
+				$this->fail();
+			}
 
-            if (0 >= count($rServerIDs)) {
-                $this->fail();
-            }
+			echo json_encode(ApiClient::asyncRequest($rServerIDs, ['action' => 'force_stream', 'stream_id' => $rStreamID, 'force_id' => $rForceID]));
 
-            echo json_encode(ApiClient::asyncRequest($rServerIDs, array('action' => 'force_stream', 'stream_id' => $rStreamID, 'force_id' => $rForceID)));
+			exit();
+		}
 
-            exit();
-        }
+		$this->streamMutation($rSub, $rStreamID, $rServerID, false);
+	}
 
-        $this->streamMutation($rSub, $rStreamID, $rServerID, false);
-    }
+	/** action=movie — VOD movie control + delete/kill/purge. */
+	public function movie(): never {
+		$this->requireXhr();
+		$this->vodAction('edit_movie');
+	}
 
-    /** action=movie — VOD movie control + delete/kill/purge. */
-    public function movie(): never {
-        $this->requireXhr();
-        $this->vodAction('edit_movie');
-    }
+	/** action=episode — VOD episode control + delete/kill/purge. */
+	public function episode(): never {
+		$this->requireXhr();
+		$this->vodAction('edit_episode');
+	}
 
-    /** action=episode — VOD episode control + delete/kill/purge. */
-    public function episode(): never {
-        $this->requireXhr();
-        $this->vodAction('edit_episode');
-    }
+	/** action=series — delete a series. */
+	public function series(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_series');
 
-    /** action=series — delete a series. */
-    public function series(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_series');
+		if (RequestManager::get('sub') == 'delete') {
+			SeriesService::deleteSeriesById(RequestManager::get('series_id'));
+			$this->ok();
+		}
 
-        if (RequestManager::get('sub') == 'delete') {
-            SeriesService::deleteSeriesById(RequestManager::get('series_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/**
+	 * Shared movie/episode handler (they differ only by permission key).
+	 * start/stop dispatch a VOD request to the node(s); everything else is a
+	 * stream mutation.
+	 */
+	private function vodAction(string $rGate): never {
+		$this->gate('adv', $rGate);
 
-    /**
-     * Shared movie/episode handler (they differ only by permission key).
-     * start/stop dispatch a VOD request to the node(s); everything else is a
-     * stream mutation.
-     */
-    private function vodAction(string $rGate): never {
-        $this->gate('adv', $rGate);
+		global $db;
+		$rStreamID = intval(RequestManager::get('stream_id'));
+		$rServerID = intval(RequestManager::get('server_id'));
+		$rSub = RequestManager::get('sub');
 
-        global $db;
-        $rStreamID = intval(RequestManager::get('stream_id'));
-        $rServerID = intval(RequestManager::get('server_id'));
-        $rSub = RequestManager::get('sub');
+		if (in_array($rSub, ['start', 'stop'])) {
+			if ($rServerID == -1) {
+				$rServerIDs = [];
+				$db->query('SELECT `server_id` FROM `streams_servers` WHERE `stream_id` = ?;', $rStreamID);
 
-        if (in_array($rSub, array('start', 'stop'))) {
-            if ($rServerID == -1) {
-                $rServerIDs = array();
-                $db->query('SELECT `server_id` FROM `streams_servers` WHERE `stream_id` = ?;', $rStreamID);
+				foreach ($db->get_rows() as $rRow) {
+					$rServerIDs[] = intval($rRow['server_id']);
+				}
 
-                foreach ($db->get_rows() as $rRow) {
-                    $rServerIDs[] = intval($rRow['server_id']);
-                }
+				if (0 < count($rServerIDs)) {
+					ApiClient::request(['action' => 'vod', 'sub' => $rSub, 'stream_ids' => [$rStreamID], 'servers' => $rServerIDs, 'force' => true]);
 
-                if (0 < count($rServerIDs)) {
-                    ApiClient::request(array('action' => 'vod', 'sub' => $rSub, 'stream_ids' => array($rStreamID), 'servers' => $rServerIDs, 'force' => true));
+					$this->ok();
+				}
+			} else {
+				ApiClient::request(['action' => 'vod', 'sub' => $rSub, 'stream_ids' => [$rStreamID], 'servers' => [$rServerID], 'force' => true]);
 
-                    $this->ok();
-                }
-            } else {
-                ApiClient::request(array('action' => 'vod', 'sub' => $rSub, 'stream_ids' => array($rStreamID), 'servers' => array($rServerID), 'force' => true));
+				$this->ok();
+			}
 
-                $this->ok();
-            }
+			$this->fail();
+		}
 
-            $this->fail();
-        }
+		$this->streamMutation($rSub, $rStreamID, $rServerID, true);
+	}
 
-        $this->streamMutation($rSub, $rStreamID, $rServerID, true);
-    }
+	/**
+	 * Shared delete/kill/purge sub-actions for stream/movie/episode. An
+	 * unhandled sub falls through to `{"result":false}`.
+	 */
+	private function streamMutation(string $rSub, int $rStreamID, int $rServerID, bool $rIsVod): never {
+		global $db;
 
-    /**
-     * Shared delete/kill/purge sub-actions for stream/movie/episode. An
-     * unhandled sub falls through to `{"result":false}`.
-     */
-    private function streamMutation(string $rSub, int $rStreamID, int $rServerID, bool $rIsVod): never {
-        global $db;
+		if ($rSub == 'delete') {
+			StreamRepository::deleteStream($rStreamID, $rServerID, $rIsVod);
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            StreamRepository::deleteStream($rStreamID, $rServerID, $rIsVod);
-            $this->ok();
-        }
+		if ($rSub == 'kill') {
+			ConnectionTracker::closeConnection(RequestManager::get('stream_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'kill') {
-            ConnectionTracker::closeConnection(RequestManager::get('stream_id'));
-            $this->ok();
-        }
+		if ($rSub == 'purge') {
+			if (SettingsManager::get('redis_handler')) {
+				foreach (ConnectionTracker::getRedisConnections(null, ($rServerID == -1 ? null : $rServerID), $rStreamID, true, false, false) as $rConnection) {
+					ConnectionTracker::closeConnection($rConnection);
+				}
+			} else {
+				if ($rServerID == -1) {
+					$db->query('SELECT * FROM `lines_live` WHERE `stream_id` = ?;', $rStreamID);
+				} else {
+					$db->query('SELECT * FROM `lines_live` WHERE `stream_id` = ? AND `server_id` = ?;', $rStreamID, $rServerID);
+				}
 
-        if ($rSub == 'purge') {
-            if (SettingsManager::get('redis_handler')) {
-                foreach (ConnectionTracker::getRedisConnections(null, ($rServerID == -1 ? null : $rServerID), $rStreamID, true, false, false) as $rConnection) {
-                    ConnectionTracker::closeConnection($rConnection);
-                }
-            } else {
-                if ($rServerID == -1) {
-                    $db->query('SELECT * FROM `lines_live` WHERE `stream_id` = ?;', $rStreamID);
-                } else {
-                    $db->query('SELECT * FROM `lines_live` WHERE `stream_id` = ? AND `server_id` = ?;', $rStreamID, $rServerID);
-                }
+				foreach ($db->get_rows() as $rRow) {
+					ConnectionTracker::closeConnection($rRow);
+				}
+			}
 
-                foreach ($db->get_rows() as $rRow) {
-                    ConnectionTracker::closeConnection($rRow);
-                }
-            }
+			$this->ok();
+		}
 
-            $this->ok();
-        }
-
-        $this->fail();
-    }
+		$this->fail();
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/StreamToolsAjaxController.php b/src/Public/Controllers/Admin/Ajax/StreamToolsAjaxController.php
index 4b917d9c..b481fcda 100644
--- a/src/Public/Controllers/Admin/Ajax/StreamToolsAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/StreamToolsAjaxController.php
@@ -26,376 +26,375 @@ use XcVm\Streaming\Codec\FfmpegPaths;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class StreamToolsAjaxController extends BaseAjaxController {
-
-    /** action=review_selection — resolve created-channel source streams for review. */
-    public function reviewSelection(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'edit_cchannel'), array('adv', 'create_channel')));
-
-        global $db;
-        $rReturn = array('streams' => array(), 'result' => true);
-
-        if (RequestManager::has('data')) {
-            foreach (RequestManager::get('data') as $rStreamID) {
-                $db->query('SELECT `id`, `stream_display_name`, `stream_source` FROM `streams` WHERE `id` = ?;', $rStreamID);
-
-                if ($db->num_rows() == 1) {
-                    $rReturn['streams'][] = $db->get_row();
-                }
-            }
-        }
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** action=review_bouquet — resolve bouquet members (streams/movies/radios/series) for review. */
-    public function reviewBouquet(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'edit_bouquet'), array('adv', 'add_bouquet')));
-
-        $rReturn = array('streams' => array(), 'movies' => array(), 'series' => array(), 'radios' => array(), 'result' => true);
-        $this->collectBouquetItems($rReturn, 'streams', 'stream', 'SELECT `id`, `stream_display_name`, `type` FROM `streams` WHERE `id` = ? AND `type` IN (1,3);');
-        $this->collectBouquetItems($rReturn, 'movies', 'movies', 'SELECT `id`, `stream_display_name`, `type` FROM `streams` WHERE `id` = ? AND `type` = 2;');
-        $this->collectBouquetItems($rReturn, 'radios', 'radios', 'SELECT `id`, `stream_display_name`, `type` FROM `streams` WHERE `id` = ? AND `type` = 4;');
-        $this->collectBouquetItems($rReturn, 'series', 'series', 'SELECT `id`, `title` FROM `streams_series` WHERE `id` = ?;');
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** action=serieslist — Select2 series search. */
-    public function serieslist(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'episodes');
-
-        global $db;
-        $rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
-
-        if (RequestManager::has('search')) {
-            $rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
-            $db->query('SELECT COUNT(`id`) AS `count` FROM `streams_series` WHERE `title` LIKE ?;', '%' . RequestManager::get('search') . '%');
-            $rReturn['total_count'] = $db->get_row()['count'];
-            $db->query('SELECT `id`, `title` FROM `streams_series` WHERE `title` LIKE ? ORDER BY `title` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%');
-
-            foreach ($db->get_rows() as $rRow) {
-                $rReturn['items'][] = array('id' => $rRow['id'], 'text' => $rRow['title']);
-            }
-        }
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** action=streamlist — Select2 stream search. */
-    public function streamlist(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'manage_mag'), array('adv', 'streams')));
-
-        global $db;
-        $rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
-
-        if (RequestManager::has('search')) {
-            $rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
-            $db->query('SELECT COUNT(`id`) AS `id` FROM `streams` WHERE `stream_display_name` LIKE ?;', '%' . RequestManager::get('search') . '%');
-            $rReturn['total_count'] = $db->get_row()['id'];
-            $db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `stream_display_name` LIKE ? ORDER BY `stream_display_name` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%');
-
-            foreach ($db->get_rows() as $rRow) {
-                $rReturn['items'][] = array('id' => $rRow['id'], 'text' => $rRow['stream_display_name']);
-            }
-        }
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** action=adaptivelist — Select2 live-stream search (id-prefixed labels). */
-    public function adaptivelist(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_stream');
-
-        global $db;
-        $rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
-
-        if (RequestManager::has('search')) {
-            $rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
-            $db->query('SELECT COUNT(`id`) AS `id` FROM `streams` WHERE (`stream_display_name` LIKE ? OR `id` LIKE ?) AND `type` = 1;', '%' . RequestManager::get('search') . '%', RequestManager::get('search') . '%');
-            $rReturn['total_count'] = $db->get_row()['id'];
-            $db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE (`stream_display_name` LIKE ? OR `id` LIKE ?) AND `type` = 1 ORDER BY `stream_display_name` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%', RequestManager::get('search') . '%');
-
-            foreach ($db->get_rows() as $rRow) {
-                $rReturn['items'][] = array('id' => $rRow['id'], 'text' => '[' . $rRow['id'] . '] ' . $rRow['stream_display_name']);
-            }
-        }
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** action=titlesync — Select2 provider-stream search grouped by provider. */
-    public function titlesync(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_stream');
-
-        global $db;
-        $rReturn = array('total_count' => 0, 'items' => array(), 'result' => true);
-
-        if (RequestManager::has('search')) {
-            $rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
-            $db->query("SELECT COUNT(`stream_id`) AS `stream_id` FROM `providers_streams` WHERE `type` = 'live' AND (`stream_display_name` LIKE ? OR `stream_id` LIKE ?);", '%' . RequestManager::get('search') . '%', RequestManager::get('search') . '%');
-            $rReturn['total_count'] = $db->get_row()['stream_id'];
-            $db->query("SELECT `providers`.`name`, `providers_streams`.`provider_id`, `providers_streams`.`stream_id`, `providers_streams`.`stream_display_name` FROM `providers_streams` LEFT JOIN `providers` ON `providers`.`id` = `providers_streams`.`provider_id` WHERE `providers_streams`.`type` = 'live' AND (`stream_display_name` LIKE ? OR `stream_id` LIKE ?) ORDER BY `stream_display_name` ASC LIMIT " . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%', RequestManager::get('search') . '%');
-            $rGroups = array();
-
-            foreach ($db->get_rows() as $rRow) {
-                $rGroups[$rRow['provider_id']][] = $rRow;
-            }
-
-            foreach ($rGroups as $rRows) {
-                $rGroup = array('text' => $rRows[0]['name'], 'children' => array());
-
-                foreach ($rRows as $rRow) {
-                    $rGroup['children'][] = array('id' => $rRow['provider_id'] . '_' . $rRow['stream_id'], 'text' => '[' . $rRow['stream_id'] . '] ' . $rRow['stream_display_name']);
-                }
-
-                $rReturn['items'][] = $rGroup;
-            }
-        }
-
-        $this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
-    }
-
-    /** action=probe_stream — probe a source URL and echo an HTML info table. */
-    public function probeStream(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'add_stream'), array('adv', 'edit_stream')));
-
-        global $rServers;
-        $rAnalyseDuration = abs(intval(SettingsManager::get('stream_max_analyze')));
-        $rTimeout = intval($rAnalyseDuration / 1000000) + SettingsManager::get('probe_extra_wait');
-        set_time_limit(intval($rTimeout));
-        ini_set('max_execution_time', intval($rTimeout));
-        ini_set('default_socket_timeout', intval($rTimeout));
-        $rServerID = SERVER_ID;
-
-        if (!empty(RequestManager::get('server')) && !empty($rServers[intval(RequestManager::get('server'))]['server_online'])) {
-            $rServerID = intval(RequestManager::get('server'));
-        }
-
-        $rStreamInfoText = "<table style='width: 380px;' class='table-data' align='center'><tbody><tr><td colspan='4'>Stream probe failed!</td></tr></tbody></table>";
-        $rStreamInfo = null;
-
-        if (!empty(RequestManager::get('url'))) {
-            $rURL = StreamUtils::parseStreamURL(RequestManager::get('url'));
-
-            if (StreamUtils::detectXC_VM($rURL) && SettingsManager::get('api_probe')) {
-                $rURLInfo = parse_url($rURL);
-                $rProbeURL = $rURLInfo['scheme'] . '://' . $rURLInfo['host'] . ((isset($rURLInfo['port']) ? ':' . $rURLInfo['port'] : '')) . '/probe/' . base64_encode($rURLInfo['path'] ?? '');
-
-                if ($rAPIInfo = json_decode(CurlClient::getURL($rProbeURL), true)) {
-                    $rStreamInfo = array();
-
-                    foreach (($rAPIInfo['codecs'] ?? array()) as $rCodec) {
-                        $rStreamInfo['streams'][] = $rCodec;
-                    }
-
-                    $rStreamInfo['container'] = $rAPIInfo['container'] ?? '';
-                }
-            }
-
-            if (!$rStreamInfo) {
-                $rProbeResult = ServerRepository::probeSource($rServerID, RequestManager::get('url'), (RequestManager::get('user_agent') ?? null), (RequestManager::get('http_proxy') ?? null), (RequestManager::get('cookies') ?? null), (RequestManager::get('headers') ?? null));
-                $rStreamInfo = $rProbeResult['data'] ?? array();
-                $rStreamInfo['container'] = $rStreamInfo['format']['format_name'] ?? '';
-            }
-        }
-
-        if (RequestManager::has('map')) {
-            echo json_encode($rStreamInfo);
-
-            exit();
-        }
-
-        if (!empty($rStreamInfo['streams']) && is_array($rStreamInfo['streams'])) {
-            $rInfo = array('width' => 0, 'height' => 0, 'vbitrate' => 0, 'vcodec' => '', 'fps' => 0, 'abitrate' => 0, 'acodec' => '');
-
-            foreach ($rStreamInfo['streams'] as $rCodec) {
-                if ($rCodec['codec_type'] == 'video') {
-                    $rInfo['width'] = intval($rCodec['width'] ?? 0);
-                    $rInfo['height'] = intval($rCodec['height'] ?? 0);
-                    $rInfo['vbitrate'] = intval($rCodec['bit_rate'] ?? 0);
-                    $rInfo['vcodec'] = $rCodec['codec_name'] ?? '';
-                    $rInfo['fps'] = intval(explode('/', $rCodec['r_frame_rate'] ?? '0/0')[0]);
-
-                    if (!$rInfo['fps']) {
-                        $rInfo['fps'] = intval(explode('/', $rCodec['avg_frame_rate'])[0]);
-                    }
-                } elseif ($rCodec['codec_type'] == 'audio') {
-                    $rInfo['abitrate'] = intval($rCodec['bit_rate'] ?? 0);
-                    $rInfo['acodec'] = $rCodec['codec_name'] ?? '';
-                }
-            }
-
-            if (0 < $rInfo['fps']) {
-                if (1000 <= $rInfo['fps']) {
-                    $rInfo['fps'] = intval($rInfo['fps'] / 1000);
-                }
-
-                $rFPS = $rInfo['fps'] . '&nbsp;FPS';
-            } else {
-                $rFPS = '--';
-            }
-
-            $rStreamInfoText = "<table class='table-data' style='width: 380px;' align='center'><tbody><tr><td class='nowrap' style='color: #20a009;width: 25%;'><i class='mdi mdi-image-size-select-large' data-name='mdi-image-size-select-large'></i></td><td class='nowrap' style='color: #20a009;'><i class='mdi mdi-video' data-name='mdi-video'></i></td><td class='nowrap' style='color: #20a009;'><i class='mdi mdi-volume-high' data-name='mdi-volume-high'></i></td><td class='nowrap' style='color: #20a009;width: 20%;'><i class='mdi mdi-layers' data-name='mdi-layers'></i></td><td class='nowrap' style='color: #" . ((strtolower($rStreamInfo['container']) == 'mpegts' ? '20a009' : 'd65656')) . ";width: 18%;'><i class='mdi " . ((strtolower($rStreamInfo['container']) == 'mpegts' ? 'mdi-check' : 'mdi-close')) . "' data-name='" . ((strtolower($rStreamInfo['container']) == 'mpegts' ? 'mdi-check' : 'mdi-close')) . "'></i></td></tr><tr><td class='nowrap'>" . $rInfo['width'] . '&nbsp;x&nbsp;' . $rInfo['height'] . "</td><td class='nowrap'>" . $rInfo['vcodec'] . "</td><td class='nowrap'>" . $rInfo['acodec'] . "</td><td class='nowrap'>" . $rFPS . "</td><td class='nowrap'>LLOD&nbsp;v3</td></tr></tbody></table>";
-        }
-
-        echo $rStreamInfoText;
-
-        exit();
-    }
-
-    /** action=check_stream — probe a stored stream or ad-hoc URL and echo an HTML info table. */
-    public function checkStream(): never {
-        $this->requireXhr();
-        $this->gateAny(array(array('adv', 'add_stream'), array('adv', 'edit_stream')));
-
-        $rAnalyseDuration = abs(intval(SettingsManager::get('stream_max_analyze')));
-        $rTimeout = intval($rAnalyseDuration / 1000000) + SettingsManager::get('probe_extra_wait');
-        set_time_limit(intval($rTimeout));
-        ini_set('max_execution_time', intval($rTimeout));
-        ini_set('default_socket_timeout', intval($rTimeout));
-
-        if (RequestManager::has('url')) {
-            $rURL = StreamUtils::parseStreamURL(RequestManager::get('url'));
-            $rUA = RequestManager::has('ua') ? ' -user_agent ' . escapeshellarg(RequestManager::get('ua')) : '';
-            $rCookie = RequestManager::has('cookie') ? ' -cookies ' . escapeshellarg(StreamUtils::fixCookie(RequestManager::get('cookie'))) : '';
-        } else {
-            $rStream = StreamRepository::getById(RequestManager::get('stream'));
-            $rStreamOptions = StreamRepository::getOptions(RequestManager::get('stream'));
-            $rUA = (0 < strlen($rStreamOptions[1]['value'])) ? ' -user_agent ' . escapeshellarg($rStreamOptions[1]['value']) : '';
-            $rCookie = RequestManager::has('cookie') ? ' -cookies ' . escapeshellarg(StreamUtils::fixCookie($rStreamOptions[17]['value'])) : '';
-            $rURL = StreamUtils::parseStreamURL(json_decode($rStream['stream_source'], true)[intval(RequestManager::get('id'))]);
-        }
-
-        if (0 < strlen($rURL)) {
-            $rStreamInfoText = "<table style='width: 300px;' class='table-data' align='center'><tbody><tr><td colspan='4'>Stream probe failed!</td></tr></tbody></table>";
-            $rStreamInfo = null;
-
-            if (StreamUtils::detectXC_VM($rURL) && SettingsManager::get('api_probe')) {
-                $rURLInfo = parse_url($rURL);
-                $rProbeURL = $rURLInfo['scheme'] . '://' . $rURLInfo['host'] . ((isset($rURLInfo['port']) ? ':' . $rURLInfo['port'] : '')) . '/probe/' . base64_encode($rURLInfo['path'] ?? '');
-
-                if ($rAPIInfo = json_decode(CurlClient::getURL($rProbeURL), true)) {
-                    $rStreamInfo = array();
-
-                    foreach (($rAPIInfo['codecs'] ?? array()) as $rCodec) {
-                        $rStreamInfo['streams'][] = $rCodec;
-                    }
-                }
-            }
-
-            if (!$rStreamInfo) {
-                $rStreamInfo = json_decode(shell_exec('timeout ' . intval($rTimeout) . ' ' . FfmpegPaths::probe() . $rUA . $rCookie . ' -v quiet -probesize 5000000 -print_format json -show_format -show_streams ' . escapeshellarg($rURL)), true);
-            }
-
-            if (0 < count($rStreamInfo['streams'])) {
-                $rInfo = array();
-
-                foreach ($rStreamInfo['streams'] as $rCodec) {
-                    if ($rCodec['codec_type'] == 'video') {
-                        $rInfo['width'] = intval($rCodec['width']);
-                        $rInfo['height'] = intval($rCodec['height']);
-                        $rInfo['vbitrate'] = intval($rCodec['bit_rate']);
-                        $rInfo['vcodec'] = $rCodec['codec_name'];
-                        $rInfo['fps'] = intval(explode('/', $rCodec['r_frame_rate'])[0]);
-
-                        if (!$rInfo['fps']) {
-                            $rInfo['fps'] = intval(explode('/', $rCodec['avg_frame_rate'])[0]);
-                        }
-                    } elseif ($rCodec['codec_type'] == 'audio') {
-                        $rInfo['abitrate'] = intval($rCodec['bit_rate']);
-                        $rInfo['acodec'] = $rCodec['codec_name'];
-                    }
-                }
-
-                if (0 < $rInfo['fps']) {
-                    if (1000 <= $rInfo['fps']) {
-                        $rInfo['fps'] = intval($rInfo['fps'] / 1000);
-                    }
-
-                    $rFPS = $rInfo['fps'] . '&nbsp;FPS';
-                } else {
-                    $rFPS = '--';
-                }
-
-                $rStreamInfoText = "<table class='table-data' style='width: 300px;' align='center'><tbody><tr><td style='color: #20a009;width: 34%;'><i class='mdi mdi-image-size-select-large' data-name='mdi-image-size-select-large'></i></td><td style='color: #20a009;width: 23%;'><i class='mdi mdi-video' data-name='mdi-video'></i></td><td style='color: #20a009;width: 23%;'><i class='mdi mdi-volume-high' data-name='mdi-volume-high'></i></td><td style='color: #20a009;width: 23%;'><i class='mdi mdi-layers' data-name='mdi-layers'></i></td></tr><tr><td class='double'>" . $rInfo['width'] . '&nbsp;x&nbsp;' . $rInfo['height'] . '</td><td>' . $rInfo['vcodec'] . '</td><td>' . $rInfo['acodec'] . '</td><td>' . $rFPS . '</td></tr></tbody></table>';
-            }
-
-            echo $rStreamInfoText;
-        }
-
-        exit();
-    }
-
-    /** action=get_episode_ids — parse episode numbers from filenames (guessit/release.py). */
-    public function getEpisodeIds(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'add_episode');
-
-        $rReturn = array();
-        $rData = json_decode(RequestManager::get('data'), true);
-
-        if (!is_array($rData)) {
-            $this->fail();
-        }
-
-        $rInput = array();
-
-        if (SettingsManager::get('parse_type') == 'guessit') {
-            foreach ($rData as $rEpisodeID => $rName) {
-                $rInput[$rEpisodeID] = pathinfo($rName)['filename'];
-            }
-
-            $rCommand = MAIN_HOME . 'bin/guess ' . escapeshellarg(json_encode($rInput));
-        } else {
-            foreach ($rData as $rEpisodeID => $rName) {
-                $rInput[$rEpisodeID] = pathinfo(str_replace('-', '_', $rName))['filename'];
-            }
-
-            $rCommand = '/usr/bin/python3 ' . MAIN_HOME . 'bin/python/release.py ' . escapeshellarg(json_encode($rInput));
-        }
-
-        $rEpisodes = json_decode(shell_exec($rCommand), true);
-
-        foreach ($rEpisodes as $rEpisodeID => $rEpisode) {
-            if (isset($rEpisode['episode'])) {
-                if (is_array($rEpisode['episode'])) {
-                    $rReturn[] = array($rEpisodeID, intval($rEpisode['episode'][0]));
-                } else {
-                    $rReturn[] = array($rEpisodeID, intval($rEpisode['episode']));
-                }
-            }
-        }
-
-        $this->ok(array('data' => $rReturn));
-    }
-
-    /**
-     * Collect bouquet member rows of one kind into $rReturn[$rReturnKey].
-     * Shared by {@see self::reviewBouquet()} across its four member kinds, which
-     * differ only in the data key, SQL and target key.
-     *
-     * @param array<string, mixed> $rReturn
-     */
-    private function collectBouquetItems(array &$rReturn, string $rReturnKey, string $rDataKey, string $rSql): void {
-        global $db;
-
-        if (!isset(RequestManager::getAll()['data'][$rDataKey])) {
-            return;
-        }
-
-        foreach (RequestManager::get('data')[$rDataKey] as $rID) {
-            $db->query($rSql, $rID);
-
-            if ($db->num_rows() == 1) {
-                $rReturn[$rReturnKey][] = $db->get_row();
-            }
-        }
-    }
+	/** action=review_selection — resolve created-channel source streams for review. */
+	public function reviewSelection(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'edit_cchannel'], ['adv', 'create_channel']]);
+
+		global $db;
+		$rReturn = ['streams' => [], 'result' => true];
+
+		if (RequestManager::has('data')) {
+			foreach (RequestManager::get('data') as $rStreamID) {
+				$db->query('SELECT `id`, `stream_display_name`, `stream_source` FROM `streams` WHERE `id` = ?;', $rStreamID);
+
+				if ($db->num_rows() == 1) {
+					$rReturn['streams'][] = $db->get_row();
+				}
+			}
+		}
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** action=review_bouquet — resolve bouquet members (streams/movies/radios/series) for review. */
+	public function reviewBouquet(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'edit_bouquet'], ['adv', 'add_bouquet']]);
+
+		$rReturn = ['streams' => [], 'movies' => [], 'series' => [], 'radios' => [], 'result' => true];
+		$this->collectBouquetItems($rReturn, 'streams', 'stream', 'SELECT `id`, `stream_display_name`, `type` FROM `streams` WHERE `id` = ? AND `type` IN (1,3);');
+		$this->collectBouquetItems($rReturn, 'movies', 'movies', 'SELECT `id`, `stream_display_name`, `type` FROM `streams` WHERE `id` = ? AND `type` = 2;');
+		$this->collectBouquetItems($rReturn, 'radios', 'radios', 'SELECT `id`, `stream_display_name`, `type` FROM `streams` WHERE `id` = ? AND `type` = 4;');
+		$this->collectBouquetItems($rReturn, 'series', 'series', 'SELECT `id`, `title` FROM `streams_series` WHERE `id` = ?;');
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** action=serieslist — Select2 series search. */
+	public function serieslist(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'episodes');
+
+		global $db;
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
+
+		if (RequestManager::has('search')) {
+			$rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
+			$db->query('SELECT COUNT(`id`) AS `count` FROM `streams_series` WHERE `title` LIKE ?;', '%' . RequestManager::get('search') . '%');
+			$rReturn['total_count'] = $db->get_row()['count'];
+			$db->query('SELECT `id`, `title` FROM `streams_series` WHERE `title` LIKE ? ORDER BY `title` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%');
+
+			foreach ($db->get_rows() as $rRow) {
+				$rReturn['items'][] = ['id' => $rRow['id'], 'text' => $rRow['title']];
+			}
+		}
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** action=streamlist — Select2 stream search. */
+	public function streamlist(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'manage_mag'], ['adv', 'streams']]);
+
+		global $db;
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
+
+		if (RequestManager::has('search')) {
+			$rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
+			$db->query('SELECT COUNT(`id`) AS `id` FROM `streams` WHERE `stream_display_name` LIKE ?;', '%' . RequestManager::get('search') . '%');
+			$rReturn['total_count'] = $db->get_row()['id'];
+			$db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `stream_display_name` LIKE ? ORDER BY `stream_display_name` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%');
+
+			foreach ($db->get_rows() as $rRow) {
+				$rReturn['items'][] = ['id' => $rRow['id'], 'text' => $rRow['stream_display_name']];
+			}
+		}
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** action=adaptivelist — Select2 live-stream search (id-prefixed labels). */
+	public function adaptivelist(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_stream');
+
+		global $db;
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
+
+		if (RequestManager::has('search')) {
+			$rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
+			$db->query('SELECT COUNT(`id`) AS `id` FROM `streams` WHERE (`stream_display_name` LIKE ? OR `id` LIKE ?) AND `type` = 1;', '%' . RequestManager::get('search') . '%', RequestManager::get('search') . '%');
+			$rReturn['total_count'] = $db->get_row()['id'];
+			$db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE (`stream_display_name` LIKE ? OR `id` LIKE ?) AND `type` = 1 ORDER BY `stream_display_name` ASC LIMIT ' . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%', RequestManager::get('search') . '%');
+
+			foreach ($db->get_rows() as $rRow) {
+				$rReturn['items'][] = ['id' => $rRow['id'], 'text' => '[' . $rRow['id'] . '] ' . $rRow['stream_display_name']];
+			}
+		}
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** action=titlesync — Select2 provider-stream search grouped by provider. */
+	public function titlesync(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_stream');
+
+		global $db;
+		$rReturn = ['total_count' => 0, 'items' => [], 'result' => true];
+
+		if (RequestManager::has('search')) {
+			$rPage = RequestManager::has('page') ? intval(RequestManager::get('page')) : 1;
+			$db->query("SELECT COUNT(`stream_id`) AS `stream_id` FROM `providers_streams` WHERE `type` = 'live' AND (`stream_display_name` LIKE ? OR `stream_id` LIKE ?);", '%' . RequestManager::get('search') . '%', RequestManager::get('search') . '%');
+			$rReturn['total_count'] = $db->get_row()['stream_id'];
+			$db->query("SELECT `providers`.`name`, `providers_streams`.`provider_id`, `providers_streams`.`stream_id`, `providers_streams`.`stream_display_name` FROM `providers_streams` LEFT JOIN `providers` ON `providers`.`id` = `providers_streams`.`provider_id` WHERE `providers_streams`.`type` = 'live' AND (`stream_display_name` LIKE ? OR `stream_id` LIKE ?) ORDER BY `stream_display_name` ASC LIMIT " . ($rPage - 1) * 100 . ', 100;', '%' . RequestManager::get('search') . '%', RequestManager::get('search') . '%');
+			$rGroups = [];
+
+			foreach ($db->get_rows() as $rRow) {
+				$rGroups[$rRow['provider_id']][] = $rRow;
+			}
+
+			foreach ($rGroups as $rRows) {
+				$rGroup = ['text' => $rRows[0]['name'], 'children' => []];
+
+				foreach ($rRows as $rRow) {
+					$rGroup['children'][] = ['id' => $rRow['provider_id'] . '_' . $rRow['stream_id'], 'text' => '[' . $rRow['stream_id'] . '] ' . $rRow['stream_display_name']];
+				}
+
+				$rReturn['items'][] = $rGroup;
+			}
+		}
+
+		$this->json($rReturn, JSON_PARTIAL_OUTPUT_ON_ERROR);
+	}
+
+	/** action=probe_stream — probe a source URL and echo an HTML info table. */
+	public function probeStream(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'add_stream'], ['adv', 'edit_stream']]);
+
+		global $rServers;
+		$rAnalyseDuration = abs(intval(SettingsManager::get('stream_max_analyze')));
+		$rTimeout = intval($rAnalyseDuration / 1000000) + SettingsManager::get('probe_extra_wait');
+		set_time_limit(intval($rTimeout));
+		ini_set('max_execution_time', intval($rTimeout));
+		ini_set('default_socket_timeout', intval($rTimeout));
+		$rServerID = SERVER_ID;
+
+		if (!empty(RequestManager::get('server')) && !empty($rServers[intval(RequestManager::get('server'))]['server_online'])) {
+			$rServerID = intval(RequestManager::get('server'));
+		}
+
+		$rStreamInfoText = "<table style='width: 380px;' class='table-data' align='center'><tbody><tr><td colspan='4'>Stream probe failed!</td></tr></tbody></table>";
+		$rStreamInfo = null;
+
+		if (!empty(RequestManager::get('url'))) {
+			$rURL = StreamUtils::parseStreamURL(RequestManager::get('url'));
+
+			if (StreamUtils::detectXC_VM($rURL) && SettingsManager::get('api_probe')) {
+				$rURLInfo = parse_url($rURL);
+				$rProbeURL = $rURLInfo['scheme'] . '://' . $rURLInfo['host'] . ((isset($rURLInfo['port']) ? ':' . $rURLInfo['port'] : '')) . '/probe/' . base64_encode($rURLInfo['path'] ?? '');
+
+				if ($rAPIInfo = json_decode(CurlClient::getURL($rProbeURL), true)) {
+					$rStreamInfo = [];
+
+					foreach (($rAPIInfo['codecs'] ?? []) as $rCodec) {
+						$rStreamInfo['streams'][] = $rCodec;
+					}
+
+					$rStreamInfo['container'] = $rAPIInfo['container'] ?? '';
+				}
+			}
+
+			if (!$rStreamInfo) {
+				$rProbeResult = ServerRepository::probeSource($rServerID, RequestManager::get('url'), (RequestManager::get('user_agent') ?? null), (RequestManager::get('http_proxy') ?? null), (RequestManager::get('cookies') ?? null), (RequestManager::get('headers') ?? null));
+				$rStreamInfo = $rProbeResult['data'] ?? [];
+				$rStreamInfo['container'] = $rStreamInfo['format']['format_name'] ?? '';
+			}
+		}
+
+		if (RequestManager::has('map')) {
+			echo json_encode($rStreamInfo);
+
+			exit();
+		}
+
+		if (!empty($rStreamInfo['streams']) && is_array($rStreamInfo['streams'])) {
+			$rInfo = ['width' => 0, 'height' => 0, 'vbitrate' => 0, 'vcodec' => '', 'fps' => 0, 'abitrate' => 0, 'acodec' => ''];
+
+			foreach ($rStreamInfo['streams'] as $rCodec) {
+				if ($rCodec['codec_type'] == 'video') {
+					$rInfo['width'] = intval($rCodec['width'] ?? 0);
+					$rInfo['height'] = intval($rCodec['height'] ?? 0);
+					$rInfo['vbitrate'] = intval($rCodec['bit_rate'] ?? 0);
+					$rInfo['vcodec'] = $rCodec['codec_name'] ?? '';
+					$rInfo['fps'] = intval(explode('/', $rCodec['r_frame_rate'] ?? '0/0')[0]);
+
+					if (!$rInfo['fps']) {
+						$rInfo['fps'] = intval(explode('/', $rCodec['avg_frame_rate'])[0]);
+					}
+				} elseif ($rCodec['codec_type'] == 'audio') {
+					$rInfo['abitrate'] = intval($rCodec['bit_rate'] ?? 0);
+					$rInfo['acodec'] = $rCodec['codec_name'] ?? '';
+				}
+			}
+
+			if (0 < $rInfo['fps']) {
+				if (1000 <= $rInfo['fps']) {
+					$rInfo['fps'] = intval($rInfo['fps'] / 1000);
+				}
+
+				$rFPS = $rInfo['fps'] . '&nbsp;FPS';
+			} else {
+				$rFPS = '--';
+			}
+
+			$rStreamInfoText = "<table class='table-data' style='width: 380px;' align='center'><tbody><tr><td class='nowrap' style='color: #20a009;width: 25%;'><i class='mdi mdi-image-size-select-large' data-name='mdi-image-size-select-large'></i></td><td class='nowrap' style='color: #20a009;'><i class='mdi mdi-video' data-name='mdi-video'></i></td><td class='nowrap' style='color: #20a009;'><i class='mdi mdi-volume-high' data-name='mdi-volume-high'></i></td><td class='nowrap' style='color: #20a009;width: 20%;'><i class='mdi mdi-layers' data-name='mdi-layers'></i></td><td class='nowrap' style='color: #" . ((strtolower($rStreamInfo['container']) == 'mpegts' ? '20a009' : 'd65656')) . ";width: 18%;'><i class='mdi " . ((strtolower($rStreamInfo['container']) == 'mpegts' ? 'mdi-check' : 'mdi-close')) . "' data-name='" . ((strtolower($rStreamInfo['container']) == 'mpegts' ? 'mdi-check' : 'mdi-close')) . "'></i></td></tr><tr><td class='nowrap'>" . $rInfo['width'] . '&nbsp;x&nbsp;' . $rInfo['height'] . "</td><td class='nowrap'>" . $rInfo['vcodec'] . "</td><td class='nowrap'>" . $rInfo['acodec'] . "</td><td class='nowrap'>" . $rFPS . "</td><td class='nowrap'>LLOD&nbsp;v3</td></tr></tbody></table>";
+		}
+
+		echo $rStreamInfoText;
+
+		exit();
+	}
+
+	/** action=check_stream — probe a stored stream or ad-hoc URL and echo an HTML info table. */
+	public function checkStream(): never {
+		$this->requireXhr();
+		$this->gateAny([['adv', 'add_stream'], ['adv', 'edit_stream']]);
+
+		$rAnalyseDuration = abs(intval(SettingsManager::get('stream_max_analyze')));
+		$rTimeout = intval($rAnalyseDuration / 1000000) + SettingsManager::get('probe_extra_wait');
+		set_time_limit(intval($rTimeout));
+		ini_set('max_execution_time', intval($rTimeout));
+		ini_set('default_socket_timeout', intval($rTimeout));
+
+		if (RequestManager::has('url')) {
+			$rURL = StreamUtils::parseStreamURL(RequestManager::get('url'));
+			$rUA = RequestManager::has('ua') ? ' -user_agent ' . escapeshellarg(RequestManager::get('ua')) : '';
+			$rCookie = RequestManager::has('cookie') ? ' -cookies ' . escapeshellarg(StreamUtils::fixCookie(RequestManager::get('cookie'))) : '';
+		} else {
+			$rStream = StreamRepository::getById(RequestManager::get('stream'));
+			$rStreamOptions = StreamRepository::getOptions(RequestManager::get('stream'));
+			$rUA = (0 < strlen($rStreamOptions[1]['value'])) ? ' -user_agent ' . escapeshellarg($rStreamOptions[1]['value']) : '';
+			$rCookie = RequestManager::has('cookie') ? ' -cookies ' . escapeshellarg(StreamUtils::fixCookie($rStreamOptions[17]['value'])) : '';
+			$rURL = StreamUtils::parseStreamURL(json_decode($rStream['stream_source'], true)[intval(RequestManager::get('id'))]);
+		}
+
+		if (0 < strlen($rURL)) {
+			$rStreamInfoText = "<table style='width: 300px;' class='table-data' align='center'><tbody><tr><td colspan='4'>Stream probe failed!</td></tr></tbody></table>";
+			$rStreamInfo = null;
+
+			if (StreamUtils::detectXC_VM($rURL) && SettingsManager::get('api_probe')) {
+				$rURLInfo = parse_url($rURL);
+				$rProbeURL = $rURLInfo['scheme'] . '://' . $rURLInfo['host'] . ((isset($rURLInfo['port']) ? ':' . $rURLInfo['port'] : '')) . '/probe/' . base64_encode($rURLInfo['path'] ?? '');
+
+				if ($rAPIInfo = json_decode(CurlClient::getURL($rProbeURL), true)) {
+					$rStreamInfo = [];
+
+					foreach (($rAPIInfo['codecs'] ?? []) as $rCodec) {
+						$rStreamInfo['streams'][] = $rCodec;
+					}
+				}
+			}
+
+			if (!$rStreamInfo) {
+				$rStreamInfo = json_decode(shell_exec('timeout ' . intval($rTimeout) . ' ' . FfmpegPaths::probe() . $rUA . $rCookie . ' -v quiet -probesize 5000000 -print_format json -show_format -show_streams ' . escapeshellarg($rURL)), true);
+			}
+
+			if (0 < count($rStreamInfo['streams'])) {
+				$rInfo = [];
+
+				foreach ($rStreamInfo['streams'] as $rCodec) {
+					if ($rCodec['codec_type'] == 'video') {
+						$rInfo['width'] = intval($rCodec['width']);
+						$rInfo['height'] = intval($rCodec['height']);
+						$rInfo['vbitrate'] = intval($rCodec['bit_rate']);
+						$rInfo['vcodec'] = $rCodec['codec_name'];
+						$rInfo['fps'] = intval(explode('/', $rCodec['r_frame_rate'])[0]);
+
+						if (!$rInfo['fps']) {
+							$rInfo['fps'] = intval(explode('/', $rCodec['avg_frame_rate'])[0]);
+						}
+					} elseif ($rCodec['codec_type'] == 'audio') {
+						$rInfo['abitrate'] = intval($rCodec['bit_rate']);
+						$rInfo['acodec'] = $rCodec['codec_name'];
+					}
+				}
+
+				if (0 < $rInfo['fps']) {
+					if (1000 <= $rInfo['fps']) {
+						$rInfo['fps'] = intval($rInfo['fps'] / 1000);
+					}
+
+					$rFPS = $rInfo['fps'] . '&nbsp;FPS';
+				} else {
+					$rFPS = '--';
+				}
+
+				$rStreamInfoText = "<table class='table-data' style='width: 300px;' align='center'><tbody><tr><td style='color: #20a009;width: 34%;'><i class='mdi mdi-image-size-select-large' data-name='mdi-image-size-select-large'></i></td><td style='color: #20a009;width: 23%;'><i class='mdi mdi-video' data-name='mdi-video'></i></td><td style='color: #20a009;width: 23%;'><i class='mdi mdi-volume-high' data-name='mdi-volume-high'></i></td><td style='color: #20a009;width: 23%;'><i class='mdi mdi-layers' data-name='mdi-layers'></i></td></tr><tr><td class='double'>" . $rInfo['width'] . '&nbsp;x&nbsp;' . $rInfo['height'] . '</td><td>' . $rInfo['vcodec'] . '</td><td>' . $rInfo['acodec'] . '</td><td>' . $rFPS . '</td></tr></tbody></table>';
+			}
+
+			echo $rStreamInfoText;
+		}
+
+		exit();
+	}
+
+	/** action=get_episode_ids — parse episode numbers from filenames (guessit/release.py). */
+	public function getEpisodeIds(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'add_episode');
+
+		$rReturn = [];
+		$rData = json_decode(RequestManager::get('data'), true);
+
+		if (!is_array($rData)) {
+			$this->fail();
+		}
+
+		$rInput = [];
+
+		if (SettingsManager::get('parse_type') == 'guessit') {
+			foreach ($rData as $rEpisodeID => $rName) {
+				$rInput[$rEpisodeID] = pathinfo($rName)['filename'];
+			}
+
+			$rCommand = MAIN_HOME . 'bin/guess ' . escapeshellarg(json_encode($rInput));
+		} else {
+			foreach ($rData as $rEpisodeID => $rName) {
+				$rInput[$rEpisodeID] = pathinfo(str_replace('-', '_', $rName))['filename'];
+			}
+
+			$rCommand = '/usr/bin/python3 ' . MAIN_HOME . 'bin/python/release.py ' . escapeshellarg(json_encode($rInput));
+		}
+
+		$rEpisodes = json_decode(shell_exec($rCommand), true);
+
+		foreach ($rEpisodes as $rEpisodeID => $rEpisode) {
+			if (isset($rEpisode['episode'])) {
+				if (is_array($rEpisode['episode'])) {
+					$rReturn[] = [$rEpisodeID, intval($rEpisode['episode'][0])];
+				} else {
+					$rReturn[] = [$rEpisodeID, intval($rEpisode['episode'])];
+				}
+			}
+		}
+
+		$this->ok(['data' => $rReturn]);
+	}
+
+	/**
+	 * Collect bouquet member rows of one kind into $rReturn[$rReturnKey].
+	 * Shared by {@see self::reviewBouquet()} across its four member kinds, which
+	 * differ only in the data key, SQL and target key.
+	 *
+	 * @param array<string, mixed> $rReturn
+	 */
+	private function collectBouquetItems(array &$rReturn, string $rReturnKey, string $rDataKey, string $rSql): void {
+		global $db;
+
+		if (!isset(RequestManager::getAll()['data'][$rDataKey])) {
+			return;
+		}
+
+		foreach (RequestManager::get('data')[$rDataKey] as $rID) {
+			$db->query($rSql, $rID);
+
+			if ($db->num_rows() == 1) {
+				$rReturn[$rReturnKey][] = $db->get_row();
+			}
+		}
+	}
 }
diff --git a/src/Public/Controllers/Admin/Ajax/UserAjaxController.php b/src/Public/Controllers/Admin/Ajax/UserAjaxController.php
index 5569a4fd..aa96f293 100644
--- a/src/Public/Controllers/Admin/Ajax/UserAjaxController.php
+++ b/src/Public/Controllers/Admin/Ajax/UserAjaxController.php
@@ -23,111 +23,110 @@ use XcVm\Domain\User\UserService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class UserAjaxController extends BaseAjaxController {
+	use LineStateTrait;
 
-    use LineStateTrait;
+	/** action=line — line operations (delete + shared line-state sub-actions). */
+	public function line(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_user');
 
-    /** action=line — line operations (delete + shared line-state sub-actions). */
-    public function line(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_user');
+		$rUserID = intval(RequestManager::get('user_id'));
+		$rSub = RequestManager::get('sub');
 
-        $rUserID = intval(RequestManager::get('user_id'));
-        $rSub = RequestManager::get('sub');
+		if ($rSub == 'delete') {
+			LineService::deleteLineById($rUserID);
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            LineService::deleteLineById($rUserID);
-            $this->ok();
-        }
+		$this->lineStateAction($rSub, $rUserID);
+	}
 
-        $this->lineStateAction($rSub, $rUserID);
-    }
+	/** action=line_activity — kill a single live connection by pid. */
+	public function lineActivity(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'connection_logs');
 
-    /** action=line_activity — kill a single live connection by pid. */
-    public function lineActivity(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'connection_logs');
+		if (RequestManager::get('sub') != 'kill') {
+			$this->fail();
+		}
 
-        if (RequestManager::get('sub') != 'kill') {
-            $this->fail();
-        }
+		ConnectionTracker::closeConnection(RequestManager::get('pid'));
 
-        ConnectionTracker::closeConnection(RequestManager::get('pid'));
+		$this->ok();
+	}
 
-        $this->ok();
-    }
+	/** action=adjust_credits — add/subtract reseller credits and log it. */
+	public function adjustCredits(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_reguser');
 
-    /** action=adjust_credits — add/subtract reseller credits and log it. */
-    public function adjustCredits(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_reguser');
+		global $db, $rUserInfo;
+		$rUser = UserRepository::getRegisteredUserById(RequestManager::get('id'));
 
-        global $db, $rUserInfo;
-        $rUser = UserRepository::getRegisteredUserById(RequestManager::get('id'));
+		if ($rUser && is_numeric(RequestManager::get('credits'))) {
+			$rCredits = intval($rUser['credits']) + intval(RequestManager::get('credits'));
 
-        if ($rUser && is_numeric(RequestManager::get('credits'))) {
-            $rCredits = intval($rUser['credits']) + intval(RequestManager::get('credits'));
+			if (0 <= $rCredits) {
+				$db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rCredits, $rUser['id']);
+				$db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rUser['id'], $rUserInfo['id'], RequestManager::get('credits'), time(), RequestManager::get('reason'));
+				$this->ok();
+			}
 
-            if (0 <= $rCredits) {
-                $db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rCredits, $rUser['id']);
-                $db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rUser['id'], $rUserInfo['id'], RequestManager::get('credits'), time(), RequestManager::get('reason'));
-                $this->ok();
-            }
+			$this->fail();
+		}
 
-            $this->fail();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=reg_user — delete/enable/disable a registered (reseller) user. */
+	public function regUser(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'edit_reguser');
 
-    /** action=reg_user — delete/enable/disable a registered (reseller) user. */
-    public function regUser(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'edit_reguser');
+		global $db, $rUserInfo;
+		$rSub = RequestManager::get('sub');
 
-        global $db, $rUserInfo;
-        $rSub = RequestManager::get('sub');
+		if ($rSub == 'delete') {
+			UserService::deleteRegisteredUser(RequestManager::get('user_id'), false, false, $rUserInfo['id']);
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            UserService::deleteRegisteredUser(RequestManager::get('user_id'), false, false, $rUserInfo['id']);
-            $this->ok();
-        }
+		if ($rSub == 'enable') {
+			$db->query('UPDATE `users` SET `status` = 1 WHERE `id` = ?;', RequestManager::get('user_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'enable') {
-            $db->query('UPDATE `users` SET `status` = 1 WHERE `id` = ?;', RequestManager::get('user_id'));
-            $this->ok();
-        }
+		if ($rSub == 'disable') {
+			$db->query('UPDATE `users` SET `status` = 0 WHERE `id` = ?;', RequestManager::get('user_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'disable') {
-            $db->query('UPDATE `users` SET `status` = 0 WHERE `id` = ?;', RequestManager::get('user_id'));
-            $this->ok();
-        }
+		$this->fail();
+	}
 
-        $this->fail();
-    }
+	/** action=ticket — delete/close/reopen a support ticket. */
+	public function ticket(): never {
+		$this->requireXhr();
+		$this->gate('adv', 'ticket');
 
-    /** action=ticket — delete/close/reopen a support ticket. */
-    public function ticket(): never {
-        $this->requireXhr();
-        $this->gate('adv', 'ticket');
+		global $db;
+		$rSub = RequestManager::get('sub');
 
-        global $db;
-        $rSub = RequestManager::get('sub');
+		if ($rSub == 'delete') {
+			TicketRepository::deleteById(RequestManager::get('ticket_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'delete') {
-            TicketRepository::deleteById(RequestManager::get('ticket_id'));
-            $this->ok();
-        }
+		if ($rSub == 'close') {
+			$db->query('UPDATE `tickets` SET `status` = 0 WHERE `id` = ?;', RequestManager::get('ticket_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'close') {
-            $db->query('UPDATE `tickets` SET `status` = 0 WHERE `id` = ?;', RequestManager::get('ticket_id'));
-            $this->ok();
-        }
+		if ($rSub == 'reopen') {
+			$db->query('UPDATE `tickets` SET `status` = 1 WHERE `id` = ?;', RequestManager::get('ticket_id'));
+			$this->ok();
+		}
 
-        if ($rSub == 'reopen') {
-            $db->query('UPDATE `tickets` SET `status` = 1 WHERE `id` = ?;', RequestManager::get('ticket_id'));
-            $this->ok();
-        }
-
-        $this->fail();
-    }
+		$this->fail();
+	}
 }
diff --git a/src/Public/Controllers/Admin/AjaxController.php b/src/Public/Controllers/Admin/AjaxController.php
index fa30e08e..9478c6a4 100644
--- a/src/Public/Controllers/Admin/AjaxController.php
+++ b/src/Public/Controllers/Admin/AjaxController.php
@@ -22,18 +22,17 @@ namespace XcVm\Public\Controllers\Admin;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class AjaxController extends BaseAdminController {
+	public function index() {
+		// Non-AJAX requests are rejected unless debug mode is on — the guard the
+		// legacy api.php applied to every action.
+		if (!defined('PHP_ERRORS') || !PHP_ERRORS) {
+			$rRequestedWith = $_SERVER['HTTP_X_REQUESTED_WITH'] ?? '';
 
-    public function index() {
-        // Non-AJAX requests are rejected unless debug mode is on — the guard the
-        // legacy api.php applied to every action.
-        if (!defined('PHP_ERRORS') || !PHP_ERRORS) {
-            $rRequestedWith = $_SERVER['HTTP_X_REQUESTED_WITH'] ?? '';
+			if (strtolower($rRequestedWith) !== 'xmlhttprequest') {
+				exit();
+			}
+		}
 
-            if (strtolower($rRequestedWith) !== 'xmlhttprequest') {
-                exit();
-            }
-        }
-
-        $this->json(array('result' => false));
-    }
+		$this->json(['result' => false]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/ArchiveController.php b/src/Public/Controllers/Admin/ArchiveController.php
index 641a5b5c..5b72adca 100644
--- a/src/Public/Controllers/Admin/ArchiveController.php
+++ b/src/Public/Controllers/Admin/ArchiveController.php
@@ -20,31 +20,31 @@ use XcVm\Module\Watch\WatchService;
  */
 
 class ArchiveController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $rRecordings = null;
-        $rStream = null;
-        $rArchive = null;
+		$rRecordings = null;
+		$rStream = null;
+		$rArchive = null;
 
-        if (RequestManager::has('id')) {
-            $rStream = StreamRepository::getById(RequestManager::get('id'));
+		if (RequestManager::has('id')) {
+			$rStream = StreamRepository::getById(RequestManager::get('id'));
 
-            if (!$rStream || $rStream['type'] != 1 || $rStream['tv_archive_duration'] == 0 || $rStream['tv_archive_server_id'] == 0) {
-                $this->redirect('archive');
-                return;
-            }
+			if (!$rStream || $rStream['type'] != 1 || $rStream['tv_archive_duration'] == 0 || $rStream['tv_archive_server_id'] == 0) {
+				$this->redirect('archive');
+				return;
+			}
 
-            $rArchive = StreamService::getArchive($rStream['id']);
-        } else {
-            // Recordings are provided by the optional watch module; empty when absent.
-            $rRecordings = class_exists(WatchService::class) ? WatchService::getRecordings() : array();
-        }
+			$rArchive = StreamService::getArchive($rStream['id']);
+		} else {
+			// Recordings are provided by the optional watch module; empty when absent.
+			$rRecordings = class_exists(WatchService::class) ? WatchService::getRecordings() : [];
+		}
 
-        $rTitle = (!is_null($rRecordings) ? 'Recordings' : 'TV Archive');
-        $this->setTitle($rTitle);
-        $this->render('archive', compact('rRecordings', 'rStream', 'rArchive'));
-    }
+		$rTitle = (!is_null($rRecordings) ? 'Recordings' : 'TV Archive');
+		$this->setTitle($rTitle);
+		$this->render('archive', compact('rRecordings', 'rStream', 'rArchive'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/AsnsController.php b/src/Public/Controllers/Admin/AsnsController.php
index 0dc4e93a..7d30d364 100644
--- a/src/Public/Controllers/Admin/AsnsController.php
+++ b/src/Public/Controllers/Admin/AsnsController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class AsnsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle("ASN's");
-        $this->render('asns');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle("ASN's");
+		$this->render('asns');
+	}
 }
diff --git a/src/Public/Controllers/Admin/BackupsController.php b/src/Public/Controllers/Admin/BackupsController.php
index e09d6072..0f3c8071 100644
--- a/src/Public/Controllers/Admin/BackupsController.php
+++ b/src/Public/Controllers/Admin/BackupsController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class BackupsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Backups');
-        $this->render('backups');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Backups');
+		$this->render('backups');
+	}
 }
diff --git a/src/Public/Controllers/Admin/BaseAdminController.php b/src/Public/Controllers/Admin/BaseAdminController.php
index 05884be1..a2c15f78 100644
--- a/src/Public/Controllers/Admin/BaseAdminController.php
+++ b/src/Public/Controllers/Admin/BaseAdminController.php
@@ -33,162 +33,160 @@ use XcVm\Core\Util\AdminHelpers;
  */
 
 class BaseAdminController {
-    /** @var string Scope: 'admin' или 'reseller' */
-    protected $scope = 'admin';
+	/** @var string Scope: 'admin' или 'reseller' */
+	protected $scope = 'admin';
 
-    /** @var string Заголовок страницы */
-    protected $title = '';
+	/** @var string Заголовок страницы */
+	protected $title = '';
 
-    /**
-     * Установить заголовок страницы ($_TITLE для legacy header).
-     */
-    protected function setTitle($title) {
-        $this->title = $title;
-        $GLOBALS['_TITLE'] = $title;
-    }
+	/**
+	 * Установить заголовок страницы ($_TITLE для legacy header).
+	 */
+	protected function setTitle($title) {
+		$this->title = $title;
+		$GLOBALS['_TITLE'] = $title;
+	}
 
-    /**
-     * Проверка общих прав доступа.
-     * При отказе — redirect на главную + exit.
-     */
-    protected function requirePermission() {
-        if (!PageAuthorization::checkPermissions()) {
-            AdminHelpers::goHome();
-            exit;
-        }
-    }
+	/**
+	 * Проверка общих прав доступа.
+	 * При отказе — redirect на главную + exit.
+	 */
+	protected function requirePermission() {
+		if (!PageAuthorization::checkPermissions()) {
+			AdminHelpers::goHome();
+			exit;
+		}
+	}
 
-    /**
-     * Проверка расширенных прав (hasPermissions).
-     * При отказе — redirect на главную + exit.
-     *
-     * @param string $type Тип прав ('adv' и т.д.)
-     * @param string $key  Ключ прав ('edit_user' и т.д.)
-     */
-    protected function requireAdvPermission($type, $key) {
-        if (!Authorization::check($type, $key)) {
-            AdminHelpers::goHome();
-            exit;
-        }
-    }
+	/**
+	 * Проверка расширенных прав (hasPermissions).
+	 * При отказе — redirect на главную + exit.
+	 *
+	 * @param string $type Тип прав ('adv' и т.д.)
+	 * @param string $key  Ключ прав ('edit_user' и т.д.)
+	 */
+	protected function requireAdvPermission(string $type, string $key) {
+		if (!Authorization::check($type, $key)) {
+			AdminHelpers::goHome();
+			exit;
+		}
+	}
 
-    /**
-     * Render: header → view → footer → scripts.
-     *
-     * @param string $view Имя view-файла (без .php), напр. 'ips'
-     * @param array  $data Данные для view (extract'd в scope)
-     */
-    protected function render($view, array $data = []) {
-        // Layout functions
-        require_once MAIN_HOME . 'Public/Views/layouts/admin.php';
-        require_once MAIN_HOME . 'Public/Views/layouts/footer.php';
+	/**
+	 * Render: header → view → footer → scripts.
+	 *
+	 * @param string $view Имя view-файла (без .php), напр. 'ips'
+	 * @param array  $data Данные для view (extract'd в scope)
+	 */
+	protected function render(string $view, array $data = []) {
+		// Layout functions
+		require_once MAIN_HOME . 'Public/Views/layouts/admin.php';
+		require_once MAIN_HOME . 'Public/Views/layouts/footer.php';
 
-        // Глобальные переменные, нужные view-шаблонам и legacy-файлам.
-        // Набор из bootstrap и functions.php, чтобы legacy body code мог их
-        // использовать. Справочные данные (страны, языки, статусы, темы и т.п.)
-        // вьюхи теперь получают напрямую через XcVm\Core\Reference\* и enum'ы.
-        $viewGlobals = [
-            // Core rendering
-            'db',
-            'rSettings',
-            'rMobile',
-            'rUserInfo',
-            'rPermissions',
-            '_TITLE',
-            '_STATUS',
-            '_PAGE',
-            'rRequest',
-            // Servers
-            'rServers',
-            'allServers',
-            'rProxyServers',
-            'rServerError',
-            'allServersHealthy',
-            'updateRequired',
-            // Locale
-            'allowedLangs',
-            // Devices
-            'rTimezones',
-            // Misc from bootstrap
-            'rDetect',
-            'rTimeout',
-            'rProtocol',
-            // Reseller-specific
-            'rGenTrials',
-        ];
-        foreach ($viewGlobals as $_g) {
-            if (array_key_exists($_g, $GLOBALS) && !array_key_exists($_g, $data)) {
-                $data[$_g] = $GLOBALS[$_g];
-            }
-        }
-        unset($_g);
+		// Глобальные переменные, нужные view-шаблонам и legacy-файлам.
+		// Набор из bootstrap и functions.php, чтобы legacy body code мог их
+		// использовать. Справочные данные (страны, языки, статусы, темы и т.п.)
+		// вьюхи теперь получают напрямую через XcVm\Core\Reference\* и enum'ы.
+		$viewGlobals = [
+			// Core rendering
+			'db',
+			'rSettings',
+			'rMobile',
+			'rUserInfo',
+			'rPermissions',
+			'_TITLE',
+			'_STATUS',
+			'_PAGE',
+			'rRequest',
+			// Servers
+			'rServers',
+			'allServers',
+			'rProxyServers',
+			'rServerError',
+			'allServersHealthy',
+			'updateRequired',
+			// Locale
+			'allowedLangs',
+			// Devices
+			'rTimezones',
+			// Misc from bootstrap
+			'rDetect',
+			'rTimeout',
+			'rProtocol',
+			// Reseller-specific
+			'rGenTrials',
+		];
+		foreach ($viewGlobals as $_g) {
+			if (array_key_exists($_g, $GLOBALS) && !array_key_exists($_g, $data)) {
+				$data[$_g] = $GLOBALS[$_g];
+			}
+		}
+		unset($_g);
 
-        // Translator FQCN for legacy views' `$language::get(...)` calls
-        // (replaces the former bootstrap-set global $language).
-        $data['language'] ??= Translator::class;
+		// Translator FQCN for legacy views' `$language::get(...)` calls
+		// (replaces the former bootstrap-set global $language).
+		$data['language'] ??= Translator::class;
 
-        extract($data, EXTR_SKIP);
+		extract($data, EXTR_SKIP);
 
-        $__viewsDir = MAIN_HOME . 'Public/Views/' . $this->scope . '/';
+		$__viewsDir = MAIN_HOME . 'Public/Views/' . $this->scope . '/';
 
-        // 1. Header
-        renderUnifiedLayoutHeader($this->scope);
+		// 1. Header
+		renderUnifiedLayoutHeader($this->scope);
 
-        // Header may define new globals (e.g. reseller header sets rGenTrials)
-        foreach ($viewGlobals as $_g) {
-            if (!isset($$_g) && array_key_exists($_g, $GLOBALS)) {
-                $$_g = $GLOBALS[$_g];
-            }
-        }
-        unset($_g);
+		// Header may define new globals (e.g. reseller header sets rGenTrials)
+		foreach ($viewGlobals as $_g) {
+			if (!isset($$_g) && array_key_exists($_g, $GLOBALS)) {
+				$$_g = $GLOBALS[$_g];
+			}
+		}
+		unset($_g);
 
-        // 2. View content
-        $__viewFile = $__viewsDir . $view . '.php';
+		// 2. View content
+		$__viewFile = $__viewsDir . $view . '.php';
 
-        if (file_exists($__viewFile)) {
-            require $__viewFile;
-        }
-    }
+		if (file_exists($__viewFile)) {
+			require $__viewFile;
+		}
+	}
 
-    /**
-     * JSON-ответ.
-     */
-    protected function json(array $data, $code = 200) {
-        http_response_code($code);
-        header('Content-Type: application/json');
-        echo json_encode($data);
-        exit;
-    }
+	/**
+	 * JSON-ответ.
+	 */
+	protected function json(array $data, $code = 200) {
+		http_response_code($code);
+		header('Content-Type: application/json');
+		echo json_encode($data);
+		exit;
+	}
 
-    /**
-     * Редирект.
-     */
-    protected function redirect($url) {
-        header('Location: ' . $url);
-        exit;
-    }
+	/**
+	 * Редирект.
+	 */
+	protected function redirect($url) {
+		header('Location: ' . $url);
+		exit;
+	}
 
-    /**
-     * Получить параметр запроса (GET/POST/RequestManager::getAll()).
-     *
-     * @param string $key
-     * @param mixed  $default
-     * @return mixed
-     */
-    protected function input($key, $default = null) {
-        // Приоритет: RequestManager → $_REQUEST
-        if (RequestManager::has($key)) {
-            return RequestManager::get($key);
-        }
-        return isset($_REQUEST[$key]) ? $_REQUEST[$key] : $default;
-    }
+	/**
+	 * Получить параметр запроса (GET/POST/RequestManager::getAll()).
+	 *
+	 * @return mixed
+	 */
+	protected function input(string $key, mixed $default = null) {
+		// Приоритет: RequestManager → $_REQUEST
+		if (RequestManager::has($key)) {
+			return RequestManager::get($key);
+		}
+		return isset($_REQUEST[$key]) ? $_REQUEST[$key] : $default;
+	}
 
-    /**
-     * Получить текущий статус из запроса (?status=...).
-     *
-     * @return mixed|null
-     */
-    protected function getStatus() {
-        return isset($GLOBALS['_STATUS']) ? $GLOBALS['_STATUS'] : $this->input('status');
-    }
+	/**
+	 * Получить текущий статус из запроса (?status=...).
+	 *
+	 * @return mixed|null
+	 */
+	protected function getStatus() {
+		return isset($GLOBALS['_STATUS']) ? $GLOBALS['_STATUS'] : $this->input('status');
+	}
 }
diff --git a/src/Public/Controllers/Admin/BouquetController.php b/src/Public/Controllers/Admin/BouquetController.php
index 0bf155bb..ab99ca80 100644
--- a/src/Public/Controllers/Admin/BouquetController.php
+++ b/src/Public/Controllers/Admin/BouquetController.php
@@ -26,78 +26,78 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class BouquetController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Bouquets');
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Bouquets');
 
-        $rBouquetArr = null;
-        $rNames = [];
-        $rSeriesNames = [];
-        $rBouquetChannels = [];
-        $rBouquetMovies = [];
-        $rBouquetRadios = [];
-        $rBouquetSeries = [];
+		$rBouquetArr = null;
+		$rNames = [];
+		$rSeriesNames = [];
+		$rBouquetChannels = [];
+		$rBouquetMovies = [];
+		$rBouquetRadios = [];
+		$rBouquetSeries = [];
 
-        // Загрузка букета для редактирования
-        $editId = $this->input('id');
-        $duplicateId = $this->input('duplicate');
+		// Загрузка букета для редактирования
+		$editId = $this->input('id');
+		$duplicateId = $this->input('duplicate');
 
-        if ($editId !== null) {
-            $rBouquetArr = BouquetService::getById($editId);
-        } elseif ($duplicateId !== null) {
-            $rBouquetArr = BouquetService::getById($duplicateId);
-            if ($rBouquetArr) {
-                $rBouquetArr['bouquet_name'] .= ' - Copy';
-                unset($rBouquetArr['id']);
-            }
-        }
+		if ($editId !== null) {
+			$rBouquetArr = BouquetService::getById($editId);
+		} elseif ($duplicateId !== null) {
+			$rBouquetArr = BouquetService::getById($duplicateId);
+			if ($rBouquetArr) {
+				$rBouquetArr['bouquet_name'] .= ' - Copy';
+				unset($rBouquetArr['id']);
+			}
+		}
 
-        // Разбор связанного контента
-        if ($rBouquetArr) {
-            $rBouquetChannels = json_decode($rBouquetArr['bouquet_channels'], true) ?: [];
-            $rBouquetMovies = json_decode($rBouquetArr['bouquet_movies'], true) ?: [];
-            $rBouquetRadios = json_decode($rBouquetArr['bouquet_radios'], true) ?: [];
-            $rBouquetSeries = json_decode($rBouquetArr['bouquet_series'], true) ?: [];
+		// Разбор связанного контента
+		if ($rBouquetArr) {
+			$rBouquetChannels = json_decode($rBouquetArr['bouquet_channels'], true) ?: [];
+			$rBouquetMovies = json_decode($rBouquetArr['bouquet_movies'], true) ?: [];
+			$rBouquetRadios = json_decode($rBouquetArr['bouquet_radios'], true) ?: [];
+			$rBouquetSeries = json_decode($rBouquetArr['bouquet_series'], true) ?: [];
 
-            // Имена потоков/фильмов/радио
-            $rRequiredIDs = AdminHelpers::confirmIDs(array_merge($rBouquetChannels, $rBouquetMovies, $rBouquetRadios));
+			// Имена потоков/фильмов/радио
+			$rRequiredIDs = AdminHelpers::confirmIDs(array_merge($rBouquetChannels, $rBouquetMovies, $rBouquetRadios));
 
-            if (count($rRequiredIDs) > 0) {
-                global $db;
-                $db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rRequiredIDs) . ');');
-                foreach ($db->get_rows() as $rRow) {
-                    $rNames[$rRow['id']] = $rRow['stream_display_name'];
-                }
-            }
+			if (count($rRequiredIDs) > 0) {
+				global $db;
+				$db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rRequiredIDs) . ');');
+				foreach ($db->get_rows() as $rRow) {
+					$rNames[$rRow['id']] = $rRow['stream_display_name'];
+				}
+			}
 
-            // Имена сериалов
-            if (count($rBouquetSeries) > 0) {
-                global $db;
-                $db->query('SELECT `id`, `title` FROM `streams_series` WHERE `id` IN (' . implode(',', $rBouquetSeries) . ');');
-                foreach ($db->get_rows() as $rRow) {
-                    $rSeriesNames[$rRow['id']] = $rRow['title'];
-                }
-            }
-        }
+			// Имена сериалов
+			if (count($rBouquetSeries) > 0) {
+				global $db;
+				$db->query('SELECT `id`, `title` FROM `streams_series` WHERE `id` IN (' . implode(',', $rBouquetSeries) . ');');
+				foreach ($db->get_rows() as $rRow) {
+					$rSeriesNames[$rRow['id']] = $rRow['title'];
+				}
+			}
+		}
 
-        // Категории для вкладок
-        $liveCategories = CategoryService::getAllByType('live');
-        $movieCategories = CategoryService::getAllByType('movie');
-        $seriesCategories = CategoryService::getAllByType('series');
-        $radioCategories = CategoryService::getAllByType('radio');
+		// Категории для вкладок
+		$liveCategories = CategoryService::getAllByType('live');
+		$movieCategories = CategoryService::getAllByType('movie');
+		$seriesCategories = CategoryService::getAllByType('series');
+		$radioCategories = CategoryService::getAllByType('radio');
 
-        $this->render('bouquet', [
-            'rBouquetArr'       => $rBouquetArr,
-            'rNames'            => $rNames,
-            'rSeriesNames'      => $rSeriesNames,
-            'rBouquetChannels'  => $rBouquetChannels,
-            'rBouquetMovies'    => $rBouquetMovies,
-            'rBouquetRadios'    => $rBouquetRadios,
-            'rBouquetSeries'    => $rBouquetSeries,
-            'liveCategories'    => $liveCategories,
-            'movieCategories'   => $movieCategories,
-            'seriesCategories'  => $seriesCategories,
-            'radioCategories'   => $radioCategories,
-        ]);
-    }
+		$this->render('bouquet', [
+			'rBouquetArr'       => $rBouquetArr,
+			'rNames'            => $rNames,
+			'rSeriesNames'      => $rSeriesNames,
+			'rBouquetChannels'  => $rBouquetChannels,
+			'rBouquetMovies'    => $rBouquetMovies,
+			'rBouquetRadios'    => $rBouquetRadios,
+			'rBouquetSeries'    => $rBouquetSeries,
+			'liveCategories'    => $liveCategories,
+			'movieCategories'   => $movieCategories,
+			'seriesCategories'  => $seriesCategories,
+			'radioCategories'   => $radioCategories,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/BouquetListController.php b/src/Public/Controllers/Admin/BouquetListController.php
index 05d6c8ec..444d5b01 100644
--- a/src/Public/Controllers/Admin/BouquetListController.php
+++ b/src/Public/Controllers/Admin/BouquetListController.php
@@ -22,12 +22,12 @@ use XcVm\Domain\Bouquet\BouquetService;
  */
 
 class BouquetListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Bouquets');
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Bouquets');
 
-        $rBouquets = BouquetService::getAllSimple();
+		$rBouquets = BouquetService::getAllSimple();
 
-        $this->render('bouquets', compact('rBouquets'));
-    }
+		$this->render('bouquets', compact('rBouquets'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/BouquetOrderController.php b/src/Public/Controllers/Admin/BouquetOrderController.php
index ac7134bb..91eed038 100644
--- a/src/Public/Controllers/Admin/BouquetOrderController.php
+++ b/src/Public/Controllers/Admin/BouquetOrderController.php
@@ -22,14 +22,14 @@ use XcVm\Domain\Bouquet\BouquetService;
  */
 
 class BouquetOrderController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Bouquet Order');
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Bouquet Order');
 
-        $bouquets = BouquetService::getAllSimple();
+		$bouquets = BouquetService::getAllSimple();
 
-        $this->render('bouquet_order', [
-            'bouquets' => $bouquets,
-        ]);
-    }
+		$this->render('bouquet_order', [
+			'bouquets' => $bouquets,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/BouquetSortController.php b/src/Public/Controllers/Admin/BouquetSortController.php
index da83b638..8189f89f 100644
--- a/src/Public/Controllers/Admin/BouquetSortController.php
+++ b/src/Public/Controllers/Admin/BouquetSortController.php
@@ -24,82 +24,82 @@ use XcVm\Domain\Bouquet\BouquetService;
  */
 
 class BouquetSortController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $bouquetId = $this->input('id');
-        $rBouquet = $bouquetId ? BouquetService::getById($bouquetId) : null;
+		$bouquetId = $this->input('id');
+		$rBouquet = $bouquetId ? BouquetService::getById($bouquetId) : null;
 
-        if (!$rBouquet) {
-            AdminHelpers::goHome();
-            exit;
-        }
+		if (!$rBouquet) {
+			AdminHelpers::goHome();
+			exit;
+		}
 
-        $this->setTitle('Bouquet Sort');
+		$this->setTitle('Bouquet Sort');
 
-        global $db;
+		global $db;
 
-        $rListings = ['stream' => [], 'movie' => [], 'radio' => [], 'series' => []];
-        $rOrdered = ['stream' => [], 'movie' => [], 'radio' => [], 'series' => []];
+		$rListings = ['stream' => [], 'movie' => [], 'radio' => [], 'series' => []];
+		$rOrdered = ['stream' => [], 'movie' => [], 'radio' => [], 'series' => []];
 
-        $rChannels = array_map('intval', json_decode($rBouquet['bouquet_channels'], true) ?: []);
-        $rMovies = array_map('intval', json_decode($rBouquet['bouquet_movies'], true) ?: []);
-        $rSeries = array_map('intval', json_decode($rBouquet['bouquet_series'], true) ?: []);
-        $rRadios = array_map('intval', json_decode($rBouquet['bouquet_radios'], true) ?: []);
+		$rChannels = array_map('intval', json_decode($rBouquet['bouquet_channels'], true) ?: []);
+		$rMovies = array_map('intval', json_decode($rBouquet['bouquet_movies'], true) ?: []);
+		$rSeries = array_map('intval', json_decode($rBouquet['bouquet_series'], true) ?: []);
+		$rRadios = array_map('intval', json_decode($rBouquet['bouquet_radios'], true) ?: []);
 
-        if (count($rChannels) > 0) {
-            $db->query('SELECT `streams`.`id`, `streams`.`type`, `streams`.`category_id`, `streams`.`stream_display_name` FROM `streams` WHERE `streams`.`type` IN (1,3) AND `streams`.`id` IN (' . implode(',', array_map('intval', $rChannels)) . ');');
-            foreach ($db->get_rows() as $row) {
-                $rListings['stream'][intval($row['id'])] = $row;
-            }
-        }
+		if (count($rChannels) > 0) {
+			$db->query('SELECT `streams`.`id`, `streams`.`type`, `streams`.`category_id`, `streams`.`stream_display_name` FROM `streams` WHERE `streams`.`type` IN (1,3) AND `streams`.`id` IN (' . implode(',', array_map('intval', $rChannels)) . ');');
+			foreach ($db->get_rows() as $row) {
+				$rListings['stream'][intval($row['id'])] = $row;
+			}
+		}
 
-        if (count($rMovies) > 0) {
-            $db->query('SELECT `streams`.`id`, `streams`.`type`, `streams`.`category_id`, `streams`.`stream_display_name` FROM `streams` WHERE `streams`.`type` = 2 AND `streams`.`id` IN (' . implode(',', array_map('intval', $rMovies)) . ');');
-            foreach ($db->get_rows() as $row) {
-                $rListings['movie'][intval($row['id'])] = $row;
-            }
-        }
+		if (count($rMovies) > 0) {
+			$db->query('SELECT `streams`.`id`, `streams`.`type`, `streams`.`category_id`, `streams`.`stream_display_name` FROM `streams` WHERE `streams`.`type` = 2 AND `streams`.`id` IN (' . implode(',', array_map('intval', $rMovies)) . ');');
+			foreach ($db->get_rows() as $row) {
+				$rListings['movie'][intval($row['id'])] = $row;
+			}
+		}
 
-        if (count($rRadios) > 0) {
-            $db->query('SELECT `streams`.`id`, `streams`.`type`, `streams`.`category_id`, `streams`.`stream_display_name` FROM `streams` WHERE `streams`.`type` = 4 AND `streams`.`id` IN (' . implode(',', array_map('intval', $rRadios)) . ');');
-            foreach ($db->get_rows() as $row) {
-                $rListings['radio'][intval($row['id'])] = $row;
-            }
-        }
+		if (count($rRadios) > 0) {
+			$db->query('SELECT `streams`.`id`, `streams`.`type`, `streams`.`category_id`, `streams`.`stream_display_name` FROM `streams` WHERE `streams`.`type` = 4 AND `streams`.`id` IN (' . implode(',', array_map('intval', $rRadios)) . ');');
+			foreach ($db->get_rows() as $row) {
+				$rListings['radio'][intval($row['id'])] = $row;
+			}
+		}
 
-        if (count($rSeries) > 0) {
-            $db->query('SELECT `streams_series`.`id`, `streams_series`.`category_id`, `streams_series`.`title` FROM `streams_series` WHERE `streams_series`.`id` IN (' . implode(',', array_map('intval', $rSeries)) . ');');
-            foreach ($db->get_rows() as $row) {
-                $rListings['series'][intval($row['id'])] = $row;
-            }
-        }
+		if (count($rSeries) > 0) {
+			$db->query('SELECT `streams_series`.`id`, `streams_series`.`category_id`, `streams_series`.`title` FROM `streams_series` WHERE `streams_series`.`id` IN (' . implode(',', array_map('intval', $rSeries)) . ');');
+			foreach ($db->get_rows() as $row) {
+				$rListings['series'][intval($row['id'])] = $row;
+			}
+		}
 
-        // Сохранение порядка из JSON
-        foreach ($rChannels as $id) {
-            if (isset($rListings['stream'][$id])) {
-                $rOrdered['stream'][] = $rListings['stream'][$id];
-            }
-        }
-        foreach ($rMovies as $id) {
-            if (isset($rListings['movie'][$id])) {
-                $rOrdered['movie'][] = $rListings['movie'][$id];
-            }
-        }
-        foreach ($rRadios as $id) {
-            if (isset($rListings['radio'][$id])) {
-                $rOrdered['radio'][] = $rListings['radio'][$id];
-            }
-        }
-        foreach ($rSeries as $id) {
-            if (isset($rListings['series'][$id])) {
-                $rOrdered['series'][] = $rListings['series'][$id];
-            }
-        }
+		// Сохранение порядка из JSON
+		foreach ($rChannels as $id) {
+			if (isset($rListings['stream'][$id])) {
+				$rOrdered['stream'][] = $rListings['stream'][$id];
+			}
+		}
+		foreach ($rMovies as $id) {
+			if (isset($rListings['movie'][$id])) {
+				$rOrdered['movie'][] = $rListings['movie'][$id];
+			}
+		}
+		foreach ($rRadios as $id) {
+			if (isset($rListings['radio'][$id])) {
+				$rOrdered['radio'][] = $rListings['radio'][$id];
+			}
+		}
+		foreach ($rSeries as $id) {
+			if (isset($rListings['series'][$id])) {
+				$rOrdered['series'][] = $rListings['series'][$id];
+			}
+		}
 
-        $this->render('bouquet_sort', [
-            'rBouquet' => $rBouquet,
-            'rOrdered' => $rOrdered,
-        ]);
-    }
+		$this->render('bouquet_sort', [
+			'rBouquet' => $rBouquet,
+			'rOrdered' => $rOrdered,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/CacheController.php b/src/Public/Controllers/Admin/CacheController.php
index a12383b0..b09055d2 100644
--- a/src/Public/Controllers/Admin/CacheController.php
+++ b/src/Public/Controllers/Admin/CacheController.php
@@ -18,13 +18,13 @@ use XcVm\Core\Config\SettingsRepository;
  */
 
 class CacheController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        SettingsManager::set(SettingsRepository::getAll(true));
-        $GLOBALS['rSettings'] = SettingsManager::getAll();
+		SettingsManager::set(SettingsRepository::getAll(true));
+		$GLOBALS['rSettings'] = SettingsManager::getAll();
 
-        $this->setTitle('Cache & \Redis Settings');
-        $this->render('cache');
-    }
+		$this->setTitle('Cache & \Redis Settings');
+		$this->render('cache');
+	}
 }
diff --git a/src/Public/Controllers/Admin/ChannelOrderController.php b/src/Public/Controllers/Admin/ChannelOrderController.php
index 4d382b92..250345e5 100644
--- a/src/Public/Controllers/Admin/ChannelOrderController.php
+++ b/src/Public/Controllers/Admin/ChannelOrderController.php
@@ -17,44 +17,44 @@ use XcVm\Core\Http\RequestManager;
  */
 
 class ChannelOrderController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $rOverride = RequestManager::has('override');
-        $rOrdered = array('stream' => array(), 'movie' => array(), 'series' => array(), 'radio' => array());
-        $db->query('SELECT COUNT(`id`) AS `count` FROM `streams`;');
-        $rCount = $db->get_row()['count'];
+		$rOverride = RequestManager::has('override');
+		$rOrdered = ['stream' => [], 'movie' => [], 'series' => [], 'radio' => []];
+		$db->query('SELECT COUNT(`id`) AS `count` FROM `streams`;');
+		$rCount = $db->get_row()['count'];
 
-        if (!($rCount <= 50000 || $rOverride)) {
-        } else {
-            $db->query('SELECT `id`, `type`, `stream_display_name`, `category_id` FROM `streams` ORDER BY `order` ASC, `stream_display_name` ASC;');
+		if (!($rCount <= 50000 || $rOverride)) {
+		} else {
+			$db->query('SELECT `id`, `type`, `stream_display_name`, `category_id` FROM `streams` ORDER BY `order` ASC, `stream_display_name` ASC;');
 
-            if (0 >= $db->num_rows()) {
-            } else {
-                foreach ($db->get_rows() as $rRow) {
-                    if ($rRow['type'] == 1 || $rRow['type'] == 3) {
-                        $rOrdered['stream'][] = $rRow;
-                    } else {
-                        if ($rRow['type'] == 2) {
-                            $rOrdered['movie'][] = $rRow;
-                        } else {
-                            if ($rRow['type'] == 4) {
-                                $rOrdered['radio'][] = $rRow;
-                            } else {
-                                if ($rRow['type'] != 5) {
-                                } else {
-                                    $rOrdered['series'][] = $rRow;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
+			if (0 >= $db->num_rows()) {
+			} else {
+				foreach ($db->get_rows() as $rRow) {
+					if ($rRow['type'] == 1 || $rRow['type'] == 3) {
+						$rOrdered['stream'][] = $rRow;
+					} else {
+						if ($rRow['type'] == 2) {
+							$rOrdered['movie'][] = $rRow;
+						} else {
+							if ($rRow['type'] == 4) {
+								$rOrdered['radio'][] = $rRow;
+							} else {
+								if ($rRow['type'] != 5) {
+								} else {
+									$rOrdered['series'][] = $rRow;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
 
-        $this->setTitle('Channel Order');
-        $this->render('channel_order', compact('rOverride', 'rOrdered', 'rCount'));
-    }
+		$this->setTitle('Channel Order');
+		$this->render('channel_order', compact('rOverride', 'rOrdered', 'rCount'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ClientLogController.php b/src/Public/Controllers/Admin/ClientLogController.php
index c6d91eee..1885d101 100644
--- a/src/Public/Controllers/Admin/ClientLogController.php
+++ b/src/Public/Controllers/Admin/ClientLogController.php
@@ -15,8 +15,8 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class ClientLogController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->render('client_logs');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->render('client_logs');
+	}
 }
diff --git a/src/Public/Controllers/Admin/CodeController.php b/src/Public/Controllers/Admin/CodeController.php
index 9fc5d471..0e532323 100644
--- a/src/Public/Controllers/Admin/CodeController.php
+++ b/src/Public/Controllers/Admin/CodeController.php
@@ -22,15 +22,15 @@ use XcVm\Core\Auth\AuthRepository;
  */
 
 class CodeController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $this->setTitle('Access Codes');
+		$this->setTitle('Access Codes');
 
-        $codes = AuthRepository::getAllCodes();
+		$codes = AuthRepository::getAllCodes();
 
-        $this->render('codes', [
-            'codes' => $codes,
-        ]);
-    }
+		$this->render('codes', [
+			'codes' => $codes,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/CodeEditController.php b/src/Public/Controllers/Admin/CodeEditController.php
index 1ce1cf89..71ee43b0 100644
--- a/src/Public/Controllers/Admin/CodeEditController.php
+++ b/src/Public/Controllers/Admin/CodeEditController.php
@@ -19,19 +19,19 @@ use XcVm\Core\Auth\AuthRepository;
  */
 
 class CodeEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rCode = null;
-        $id = $this->input('id');
-        if ($id !== null) {
-            $rCode = AuthRepository::getCodeById($id);
-            if (!$rCode) {
-                exit();
-            }
-        }
+		$rCode = null;
+		$id = $this->input('id');
+		if ($id !== null) {
+			$rCode = AuthRepository::getCodeById($id);
+			if (!$rCode) {
+				exit();
+			}
+		}
 
-        $this->setTitle('Access Code');
-        $this->render('code', compact('rCode'));
-    }
+		$this->setTitle('Access Code');
+		$this->render('code', compact('rCode'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/CreatedChannelController.php b/src/Public/Controllers/Admin/CreatedChannelController.php
index 9524e573..d94cd1b9 100644
--- a/src/Public/Controllers/Admin/CreatedChannelController.php
+++ b/src/Public/Controllers/Admin/CreatedChannelController.php
@@ -21,99 +21,99 @@ use XcVm\Domain\Stream\StreamRepository;
  */
 
 class CreatedChannelController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db, $rServers;
+		global $db, $rServers;
 
-        $rCategories = CategoryService::getAllByType('live');
-        $rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
+		$rCategories = CategoryService::getAllByType('live');
+		$rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
 
-        if (!RequestManager::has('id')) {
-            $rChannel = null;
-        } else {
-            $rChannel = StreamRepository::getById(RequestManager::get('id'));
+		if (!RequestManager::has('id')) {
+			$rChannel = null;
+		} else {
+			$rChannel = StreamRepository::getById(RequestManager::get('id'));
 
-            if (!$rChannel || $rChannel['type'] != 3) {
-                AdminHelpers::goHome();
-            }
-        }
+			if (!$rChannel || $rChannel['type'] != 3) {
+				AdminHelpers::goHome();
+			}
+		}
 
-        $rOnDemand = [];
-        $rProperties = null;
-        $rChannelSys = null;
-        $rServerTree = [
-            [
-                'id' => 'source',
-                'parent' => '#',
-                'text' => "<span class='badge bg-success'>Online</span>",
-                'icon' => 'icon-base ti tabler-player-play',
-                'state' => ['opened' => true]
-            ],
-            [
-                'id' => 'offline',
-                'parent' => '#',
-                'text' => "<span class='badge bg-secondary'>Offline</span>",
-                'icon' => 'icon-base ti tabler-player-stop',
-                'state' => ['opened' => true]
-            ]
-        ];
+		$rOnDemand = [];
+		$rProperties = null;
+		$rChannelSys = null;
+		$rServerTree = [
+			[
+				'id' => 'source',
+				'parent' => '#',
+				'text' => "<span class='badge bg-success'>Online</span>",
+				'icon' => 'icon-base ti tabler-player-play',
+				'state' => ['opened' => true]
+			],
+			[
+				'id' => 'offline',
+				'parent' => '#',
+				'text' => "<span class='badge bg-secondary'>Offline</span>",
+				'icon' => 'icon-base ti tabler-player-stop',
+				'state' => ['opened' => true]
+			]
+		];
 
-        if (isset($rChannel)) {
-            $rProperties = json_decode($rChannel['movie_properties'], true);
+		if (isset($rChannel)) {
+			$rProperties = json_decode($rChannel['movie_properties'], true);
 
-            if (!$rProperties) {
-                $rProperties = ['type' => $rChannel['series_no'] > 0 ? 0 : 1];
-            }
+			if (!$rProperties) {
+				$rProperties = ['type' => $rChannel['series_no'] > 0 ? 0 : 1];
+			}
 
-            $rChannelSys = StreamRepository::getSystemRows(RequestManager::get('id'));
+			$rChannelSys = StreamRepository::getSystemRows(RequestManager::get('id'));
 
-            foreach ($rServers as $rServer) {
-                if (isset($rChannelSys[intval($rServer['id'])])) {
-                    $rParent = $rChannelSys[intval($rServer['id'])]['parent_id'] != 0
-                        ? intval($rChannelSys[intval($rServer['id'])]['parent_id'])
-                        : (!$rChannelSys[intval($rServer['id'])]['on_demand'] ? 'source' : null);
-                } else {
-                    $rParent = 'offline';
-                }
+			foreach ($rServers as $rServer) {
+				if (isset($rChannelSys[intval($rServer['id'])])) {
+					$rParent = $rChannelSys[intval($rServer['id'])]['parent_id'] != 0
+						? intval($rChannelSys[intval($rServer['id'])]['parent_id'])
+						: (!$rChannelSys[intval($rServer['id'])]['on_demand'] ? 'source' : null);
+				} else {
+					$rParent = 'offline';
+				}
 
-                if ($rParent !== null) {
-                    $rServerTree[] = [
-                        'id' => $rServer['id'],
-                        'parent' => $rParent,
-                        'text' => $rServer['server_name'],
-                        'icon' => 'icon-base ti tabler-server',
-                        'state' => ['opened' => true]
-                    ];
-                }
-            }
-        } else {
-            foreach ($rServers as $rServer) {
-                $rServerTree[] = [
-                    'id' => $rServer['id'],
-                    'parent' => 'offline',
-                    'text' => $rServer['server_name'],
-                    'icon' => 'icon-base ti tabler-server',
-                    'state' => ['opened' => true]
-                ];
-            }
-        }
+				if ($rParent !== null) {
+					$rServerTree[] = [
+						'id' => $rServer['id'],
+						'parent' => $rParent,
+						'text' => $rServer['server_name'],
+						'icon' => 'icon-base ti tabler-server',
+						'state' => ['opened' => true]
+					];
+				}
+			}
+		} else {
+			foreach ($rServers as $rServer) {
+				$rServerTree[] = [
+					'id' => $rServer['id'],
+					'parent' => 'offline',
+					'text' => $rServer['server_name'],
+					'icon' => 'icon-base ti tabler-server',
+					'state' => ['opened' => true]
+				];
+			}
+		}
 
-        // The load-balancer server tree is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The load-balancer server tree is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Created Channel');
-        $this->render('created_channel', compact(
-            'rCategories',
-            'rTranscodeProfiles',
-            'rChannel',
-            'rOnDemand',
-            'rServerTree',
-            'rProperties',
-            'rChannelSys'
-        ));
-    }
+		$this->setTitle('Created Channel');
+		$this->render('created_channel', compact(
+			'rCategories',
+			'rTranscodeProfiles',
+			'rChannel',
+			'rOnDemand',
+			'rServerTree',
+			'rProperties',
+			'rChannelSys'
+		));
+	}
 }
diff --git a/src/Public/Controllers/Admin/CreatedChannelListController.php b/src/Public/Controllers/Admin/CreatedChannelListController.php
index 7ebe48d7..cd57926a 100644
--- a/src/Public/Controllers/Admin/CreatedChannelListController.php
+++ b/src/Public/Controllers/Admin/CreatedChannelListController.php
@@ -15,10 +15,10 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class CreatedChannelListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $this->setTitle('Created Channels');
-        $this->render('created_channels');
-    }
+		$this->setTitle('Created Channels');
+		$this->render('created_channels');
+	}
 }
diff --git a/src/Public/Controllers/Admin/CreatedChannelMassController.php b/src/Public/Controllers/Admin/CreatedChannelMassController.php
index 71e1847f..36a2330f 100644
--- a/src/Public/Controllers/Admin/CreatedChannelMassController.php
+++ b/src/Public/Controllers/Admin/CreatedChannelMassController.php
@@ -18,23 +18,23 @@ use XcVm\Domain\Stream\StreamConfigRepository;
  */
 
 class CreatedChannelMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $rServers;
+		global $rServers;
 
-        $rCategories = CategoryService::getAllByType('live');
-        $rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
-        $rServerTree = array(
-            array('id' => 'source', 'parent' => '#', 'text' => "<strong class='btn btn-success waves-effect waves-light btn-xs'>Active</strong>", 'icon' => 'mdi mdi-play', 'state' => array('opened' => true)),
-            array('id' => 'offline', 'parent' => '#', 'text' => "<strong class='btn btn-secondary waves-effect waves-light btn-xs'>Offline</strong>", 'icon' => 'mdi mdi-stop', 'state' => array('opened' => true))
-        );
+		$rCategories = CategoryService::getAllByType('live');
+		$rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<strong class='btn btn-success waves-effect waves-light btn-xs'>Active</strong>", 'icon' => 'mdi mdi-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<strong class='btn btn-secondary waves-effect waves-light btn-xs'>Offline</strong>", 'icon' => 'mdi mdi-stop', 'state' => ['opened' => true]]
+		];
 
-        foreach ($rServers as $rServer) {
-            $rServerTree[] = array('id' => intval($rServer['id']), 'parent' => 'offline', 'text' => htmlspecialchars($rServer['server_name']), 'icon' => 'mdi mdi-server-network', 'state' => array('opened' => true));
-        }
+		foreach ($rServers as $rServer) {
+			$rServerTree[] = ['id' => intval($rServer['id']), 'parent' => 'offline', 'text' => htmlspecialchars($rServer['server_name']), 'icon' => 'mdi mdi-server-network', 'state' => ['opened' => true]];
+		}
 
-        $this->setTitle('Mass Edit Channels');
-        $this->render('created_channel_mass', compact('rCategories', 'rTranscodeProfiles', 'rServerTree'));
-    }
+		$this->setTitle('Mass Edit Channels');
+		$this->render('created_channel_mass', compact('rCategories', 'rTranscodeProfiles', 'rServerTree'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/CreditLogsController.php b/src/Public/Controllers/Admin/CreditLogsController.php
index 938bae59..4ffb83b2 100644
--- a/src/Public/Controllers/Admin/CreditLogsController.php
+++ b/src/Public/Controllers/Admin/CreditLogsController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class CreditLogsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Credit Logs');
-        $this->render('credit_logs');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Credit Logs');
+		$this->render('credit_logs');
+	}
 }
diff --git a/src/Public/Controllers/Admin/DashboardController.php b/src/Public/Controllers/Admin/DashboardController.php
index 2d26b98c..7d47028c 100644
--- a/src/Public/Controllers/Admin/DashboardController.php
+++ b/src/Public/Controllers/Admin/DashboardController.php
@@ -24,168 +24,168 @@ use XcVm\Core\Reference\GeoReference;
  */
 
 class DashboardController extends BaseAdminController {
-    public function index() {
-        global $db, $rUserInfo, $rServers;
+	public function index() {
+		global $db, $rUserInfo, $rServers;
 
-        $rCountryCodes = GeoReference::countryCodes();
+		$rCountryCodes = GeoReference::countryCodes();
 
-        // Theme colour map
-        if (Theme::fromId($rUserInfo['theme'])->isDark()) {
-            $rColours = array(1 => array('secondary', '#7e8e9d', '#ffffff'), 2 => array('secondary', '#7e8e9d', '#ffffff'), 3 => array('secondary', '#7e8e9d', '#ffffff'), 4 => array('secondary', '#7e8e9d', '#ffffff'));
-            $rColourMap = array(array('#7e8e9d', 'bg-map-dark-1'), array('#6c7b8a', 'bg-map-dark-2'), array('#5a6977', 'bg-map-dark-3'), array('#485765', 'bg-map-dark-4'), array('#374654', 'bg-map-dark-5'), array('#273643', 'bg-map-dark-6'));
-        } else {
-            $rColours = array(1 => array('purple', '#675db7', '#675db7'), 2 => array('success', '#23b397', '#23b397'), 3 => array('pink', '#e36498', '#e36498'), 4 => array('info', '#56C3D6', '#56C3D6'));
-            $rColourMap = array(array('#23b397', 'bg-success'), array('#56c2d6', 'bg-info'), array('#5089de', 'bg-primary'), array('#675db7', 'bg-purple'), array('#e36498', 'bg-pink'), array('#98a6ad', 'bg-secondary'));
-        }
+		// Theme colour map
+		if (Theme::fromId($rUserInfo['theme'])->isDark()) {
+			$rColours = [1 => ['secondary', '#7e8e9d', '#ffffff'], 2 => ['secondary', '#7e8e9d', '#ffffff'], 3 => ['secondary', '#7e8e9d', '#ffffff'], 4 => ['secondary', '#7e8e9d', '#ffffff']];
+			$rColourMap = [['#7e8e9d', 'bg-map-dark-1'], ['#6c7b8a', 'bg-map-dark-2'], ['#5a6977', 'bg-map-dark-3'], ['#485765', 'bg-map-dark-4'], ['#374654', 'bg-map-dark-5'], ['#273643', 'bg-map-dark-6']];
+		} else {
+			$rColours = [1 => ['purple', '#675db7', '#675db7'], 2 => ['success', '#23b397', '#23b397'], 3 => ['pink', '#e36498', '#e36498'], 4 => ['info', '#56C3D6', '#56C3D6']];
+			$rColourMap = [['#23b397', 'bg-success'], ['#56c2d6', 'bg-info'], ['#5089de', 'bg-primary'], ['#675db7', 'bg-purple'], ['#e36498', 'bg-pink'], ['#98a6ad', 'bg-secondary']];
+		}
 
-        // Server ID validation
-        if (!RequestManager::has('server_id') || isset($rServers[RequestManager::get('server_id')])) {
-        } else {
-            $this->redirect('dashboard');
-            return;
-        }
+		// Server ID validation
+		if (!RequestManager::has('server_id') || isset($rServers[RequestManager::get('server_id')])) {
+		} else {
+			$this->redirect('dashboard');
+			return;
+		}
 
-        // Connection map
-        $rConnectionMap = array();
-        $rConnectionCount = 0;
+		// Connection map
+		$rConnectionMap = [];
+		$rConnectionCount = 0;
 
-        if (RequestManager::has('server_id')) {
-            $db->query('SELECT `geoip_country_code`, COUNT(`geoip_country_code`) AS `count` FROM `lines_activity` WHERE (`server_id` = ? OR `proxy_id` = ?) GROUP BY `geoip_country_code` ORDER BY `count` DESC;', intval(RequestManager::get('server_id')), intval(RequestManager::get('server_id')));
-        } else {
-            $db->query('SELECT `geoip_country_code`, COUNT(`geoip_country_code`) AS `count` FROM `lines_activity` GROUP BY `geoip_country_code` ORDER BY `count` DESC;');
-        }
+		if (RequestManager::has('server_id')) {
+			$db->query('SELECT `geoip_country_code`, COUNT(`geoip_country_code`) AS `count` FROM `lines_activity` WHERE (`server_id` = ? OR `proxy_id` = ?) GROUP BY `geoip_country_code` ORDER BY `count` DESC;', intval(RequestManager::get('server_id')), intval(RequestManager::get('server_id')));
+		} else {
+			$db->query('SELECT `geoip_country_code`, COUNT(`geoip_country_code`) AS `count` FROM `lines_activity` GROUP BY `geoip_country_code` ORDER BY `count` DESC;');
+		}
 
-        if (0 >= $db->num_rows()) {
-        } else {
-            $i = 0;
-            foreach ($db->get_rows() as $rRow) {
-                if ($i < count($rColourMap)) {
-                    $rRow['colour'] = $rColourMap[$i];
-                } else {
-                    $rRow['colour'] = $rColourMap[count($rColourMap) - 1];
-                }
-                if (isset($rCountryCodes[$rRow['geoip_country_code']])) {
-                    $rRow['name'] = $rCountryCodes[$rRow['geoip_country_code']];
-                } else {
-                    $rRow['name'] = 'Unknown Country';
-                }
-                $rConnectionCount += $rRow['count'];
-                $rConnectionMap[] = $rRow;
-                $i++;
-            }
-        }
+		if (0 >= $db->num_rows()) {
+		} else {
+			$i = 0;
+			foreach ($db->get_rows() as $rRow) {
+				if ($i < count($rColourMap)) {
+					$rRow['colour'] = $rColourMap[$i];
+				} else {
+					$rRow['colour'] = $rColourMap[count($rColourMap) - 1];
+				}
+				if (isset($rCountryCodes[$rRow['geoip_country_code']])) {
+					$rRow['name'] = $rCountryCodes[$rRow['geoip_country_code']];
+				} else {
+					$rRow['name'] = 'Unknown Country';
+				}
+				$rConnectionCount += $rRow['count'];
+				$rConnectionMap[] = $rRow;
+				$i++;
+			}
+		}
 
-        // Server stats (when no server filter)
-        $rServerStats = array();
-        if (!RequestManager::has('server_id')) {
-            $rLimit = 3600;
-            $rTime = time();
-            $rNearestRange = $rTime - $rLimit;
-            $db->query('SELECT * FROM `servers_stats` WHERE `time` >= ? ORDER BY `time` ASC;', $rNearestRange);
-            if (0 < $db->num_rows()) {
-                foreach ($db->get_rows() as $rRow) {
-                    // {x: epoch-ms, y: cpu%} so the sparkline tooltip shows the
-                    // real sample time instead of a bare point index.
-                    $rServerStats[intval($rRow['server_id'])][] = [
-                        'x' => intval($rRow['time']) * 1000,
-                        'y' => floatval($rRow['cpu']),
-                    ];
-                }
-            }
-        }
+		// Server stats (when no server filter)
+		$rServerStats = [];
+		if (!RequestManager::has('server_id')) {
+			$rLimit = 3600;
+			$rTime = time();
+			$rNearestRange = $rTime - $rLimit;
+			$db->query('SELECT * FROM `servers_stats` WHERE `time` >= ? ORDER BY `time` ASC;', $rNearestRange);
+			if (0 < $db->num_rows()) {
+				foreach ($db->get_rows() as $rRow) {
+					// {x: epoch-ms, y: cpu%} so the sparkline tooltip shows the
+					// real sample time instead of a bare point index.
+					$rServerStats[intval($rRow['server_id'])][] = [
+						'x' => intval($rRow['time']) * 1000,
+						'y' => floatval($rRow['cpu']),
+					];
+				}
+			}
+		}
 
-        $rOrderedServers = $rServers;
-        array_multisort(array_column($rOrderedServers, 'order'), SORT_ASC, $rOrderedServers);
+		$rOrderedServers = $rServers;
+		array_multisort(array_column($rOrderedServers, 'order'), SORT_ASC, $rOrderedServers);
 
-        // Service-status timeline items (prepared here so the view stays free of
-        // DB / filesystem probes). Each item: ['state', 'title', 'text'].
-        $rStatusItems = $this->buildStatusItems($db, $rOrderedServers);
+		// Service-status timeline items (prepared here so the view stays free of
+		// DB / filesystem probes). Each item: ['state', 'title', 'text'].
+		$rStatusItems = $this->buildStatusItems($db, $rOrderedServers);
 
-        // The Bootstrap 5 dashboard renders CPU/network/connection charts with ApexCharts,
-        // and (when enabled and there is data) a jsvectormap world map.
-        $rVendors = ['apexcharts'];
-        if (SettingsManager::get('save_closed_connection') && SettingsManager::get('dashboard_map') && $rConnectionCount > 0) {
-            $rVendors[] = 'jsvectormap';
-        }
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            $rVendors
-        )));
+		// The Bootstrap 5 dashboard renders CPU/network/connection charts with ApexCharts,
+		// and (when enabled and there is data) a jsvectormap world map.
+		$rVendors = ['apexcharts'];
+		if (SettingsManager::get('save_closed_connection') && SettingsManager::get('dashboard_map') && $rConnectionCount > 0) {
+			$rVendors[] = 'jsvectormap';
+		}
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			$rVendors
+		)));
 
-        $this->setTitle('Dashboard');
-        $this->render('dashboard', compact(
-            'rColours',
-            'rColourMap',
-            'rConnectionMap',
-            'rConnectionCount',
-            'rServerStats',
-            'rOrderedServers',
-            'rStatusItems'
-        ));
-    }
+		$this->setTitle('Dashboard');
+		$this->render('dashboard', compact(
+			'rColours',
+			'rColourMap',
+			'rConnectionMap',
+			'rConnectionCount',
+			'rServerStats',
+			'rOrderedServers',
+			'rStatusItems'
+		));
+	}
 
-    /**
-     * Build the "Service Status" timeline the dashboard shows.
-     *
-     * Runs the health probes (MariaDB JSON support, schema watermark, root-cron
-     * freshness, per-server xc_fanout watchdog) that used to live inline in the
-     * view. Returns an ordered list of ['state' => 'danger|warning|dark',
-     * 'title' => string, 'text' => string(html)]; empty when all checks pass and
-     * the caller renders the "no issues" item.
-     *
-     * @param array<int,array<string,mixed>> $orderedServers
-     * @return array<int,array{state:string,title:string,text:string}>
-     */
-    private function buildStatusItems($db, array $orderedServers): array {
-        $items = [];
-        $bin = defined('PHP_BIN') ? PHP_BIN : 'php';
+	/**
+	 * Build the "Service Status" timeline the dashboard shows.
+	 *
+	 * Runs the health probes (MariaDB JSON support, schema watermark, root-cron
+	 * freshness, per-server xc_fanout watchdog) that used to live inline in the
+	 * view. Returns an ordered list of ['state' => 'danger|warning|dark',
+	 * 'title' => string, 'text' => string(html)]; empty when all checks pass and
+	 * the caller renders the "no issues" item.
+	 *
+	 * @param array<int,array<string,mixed>> $orderedServers
+	 * @return array<int,array{state:string,title:string,text:string}>
+	 */
+	private function buildStatusItems($db, array $orderedServers): array {
+		$items = [];
+		$bin = defined('PHP_BIN') ? PHP_BIN : 'php';
 
-        $binRepl = ['{bin}' => htmlspecialchars($bin)];
+		$binRepl = ['{bin}' => htmlspecialchars($bin)];
 
-        try {
-            $db->dbh->query("SELECT JSON_CONTAINS('0', 0, '$') AS `json_test`;");
-        } catch (\Throwable $e) {
-            $items[] = [
-                'state' => 'danger',
-                'title' => Translator::get('dashboard_status_mariadb_title'),
-                'text'  => Translator::get('dashboard_status_mariadb_text'),
-            ];
-        }
+		try {
+			$db->dbh->query("SELECT JSON_CONTAINS('0', 0, '$') AS `json_test`;");
+		} catch (\Throwable $e) {
+			$items[] = [
+				'state' => 'danger',
+				'title' => Translator::get('dashboard_status_mariadb_title'),
+				'text'  => Translator::get('dashboard_status_mariadb_text'),
+			];
+		}
 
-        if (empty(SettingsManager::get('status_uuid')) || SettingsManager::get('status_uuid') != md5(XC_VM_VERSION)) {
-            $items[] = [
-                'state' => 'warning',
-                'title' => Translator::get('dashboard_status_db_incomplete_title'),
-                'text'  => Translator::get('dashboard_status_db_incomplete_text', $binRepl),
-            ];
-        }
+		if (empty(SettingsManager::get('status_uuid')) || SettingsManager::get('status_uuid') != md5(XC_VM_VERSION)) {
+			$items[] = [
+				'state' => 'warning',
+				'title' => Translator::get('dashboard_status_db_incomplete_title'),
+				'text'  => Translator::get('dashboard_status_db_incomplete_text', $binRepl),
+			];
+		}
 
-        if (!file_exists(CONFIG_PATH . 'signals.last') || time() - filemtime(CONFIG_PATH . 'signals.last') > 600) {
-            $items[] = [
-                'state' => 'dark',
-                'title' => Translator::get('dashboard_status_crons_title'),
-                'text'  => Translator::get('dashboard_status_crons_text', $binRepl),
-            ];
-        }
+		if (!file_exists(CONFIG_PATH . 'signals.last') || time() - filemtime(CONFIG_PATH . 'signals.last') > 600) {
+			$items[] = [
+				'state' => 'dark',
+				'title' => Translator::get('dashboard_status_crons_title'),
+				'text'  => Translator::get('dashboard_status_crons_text', $binRepl),
+			];
+		}
 
-        // xc_fanout live-delivery daemon — flag any reporting server where it is down.
-        $multi = count($orderedServers) > 1;
-        foreach ($orderedServers as $srv) {
-            $wd = json_decode($srv['watchdog_data'] ?? '{}', true) ?: [];
-            $fresh = (time() - intval($srv['last_check_ago'] ?? 0)) < 60;
-            if ($fresh && isset($wd['fanout']['running']) && !$wd['fanout']['running']) {
-                $title = Translator::get('dashboard_status_fanout_title');
-                if ($multi) {
-                    $title .= ' ' . Translator::get('dashboard_status_fanout_on') . ' ' . htmlspecialchars($srv['server_name']);
-                }
-                $items[] = [
-                    'state' => 'danger',
-                    'title' => $title,
-                    'text'  => Translator::get('dashboard_status_fanout_text', $binRepl),
-                ];
-            }
-        }
+		// xc_fanout live-delivery daemon — flag any reporting server where it is down.
+		$multi = count($orderedServers) > 1;
+		foreach ($orderedServers as $srv) {
+			$wd = json_decode($srv['watchdog_data'] ?? '{}', true) ?: [];
+			$fresh = (time() - intval($srv['last_check_ago'] ?? 0)) < 60;
+			if ($fresh && isset($wd['fanout']['running']) && !$wd['fanout']['running']) {
+				$title = Translator::get('dashboard_status_fanout_title');
+				if ($multi) {
+					$title .= ' ' . Translator::get('dashboard_status_fanout_on') . ' ' . htmlspecialchars($srv['server_name']);
+				}
+				$items[] = [
+					'state' => 'danger',
+					'title' => $title,
+					'text'  => Translator::get('dashboard_status_fanout_text', $binRepl),
+				];
+			}
+		}
 
-        return $items;
-    }
+		return $items;
+	}
 }
diff --git a/src/Public/Controllers/Admin/EditProfileController.php b/src/Public/Controllers/Admin/EditProfileController.php
index 811d10d6..191dd1c7 100644
--- a/src/Public/Controllers/Admin/EditProfileController.php
+++ b/src/Public/Controllers/Admin/EditProfileController.php
@@ -16,8 +16,8 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class EditProfileController extends BaseAdminController {
-    public function index() {
-        $this->setTitle('Edit Profile');
-        $this->render('edit_profile');
-    }
+	public function index() {
+		$this->setTitle('Edit Profile');
+		$this->render('edit_profile');
+	}
 }
diff --git a/src/Public/Controllers/Admin/EnigmaController.php b/src/Public/Controllers/Admin/EnigmaController.php
index ccfa8d84..fdcc850c 100644
--- a/src/Public/Controllers/Admin/EnigmaController.php
+++ b/src/Public/Controllers/Admin/EnigmaController.php
@@ -18,22 +18,22 @@ use XcVm\Domain\Device\EnigmaService;
  */
 
 class EnigmaController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rDevice = null;
-        if (RequestManager::has('id')) {
-            $rDevice = EnigmaService::getById(RequestManager::get('id'));
-            if (!$rDevice['user_id']) {
-                exit();
-            }
-        }
+		$rDevice = null;
+		if (RequestManager::has('id')) {
+			$rDevice = EnigmaService::getById(RequestManager::get('id'));
+			if (!$rDevice['user_id']) {
+				exit();
+			}
+		}
 
-        if (isset($rDevice) && !isset($rDevice['user'])) {
-            $rDevice['user'] = array('bouquet' => array());
-        }
+		if (isset($rDevice) && !isset($rDevice['user'])) {
+			$rDevice['user'] = ['bouquet' => []];
+		}
 
-        $this->setTitle('Enigma Device');
-        $this->render('enigma', compact('rDevice'));
-    }
+		$this->setTitle('Enigma Device');
+		$this->render('enigma', compact('rDevice'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/EnigmaMassController.php b/src/Public/Controllers/Admin/EnigmaMassController.php
index ba5c059e..e76265c1 100644
--- a/src/Public/Controllers/Admin/EnigmaMassController.php
+++ b/src/Public/Controllers/Admin/EnigmaMassController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class EnigmaMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Mass Edit Devices');
-        $this->render('enigma_mass');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Mass Edit Devices');
+		$this->render('enigma_mass');
+	}
 }
diff --git a/src/Public/Controllers/Admin/EnigmasController.php b/src/Public/Controllers/Admin/EnigmasController.php
index 15a6b3a8..1ba1bb21 100644
--- a/src/Public/Controllers/Admin/EnigmasController.php
+++ b/src/Public/Controllers/Admin/EnigmasController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class EnigmasController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Enigma Devices');
-        $this->render('enigmas');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Enigma Devices');
+		$this->render('enigmas');
+	}
 }
diff --git a/src/Public/Controllers/Admin/EpgController.php b/src/Public/Controllers/Admin/EpgController.php
index 854e2373..3bc1d619 100644
--- a/src/Public/Controllers/Admin/EpgController.php
+++ b/src/Public/Controllers/Admin/EpgController.php
@@ -18,16 +18,16 @@ use XcVm\Domain\Epg\EpgService;
  */
 
 class EpgController extends BaseAdminController {
-    public function index() {
-        $rEPGArr = null;
-        if (RequestManager::has('id')) {
-            $rEPGArr = EpgService::getById(RequestManager::get('id'));
-            if (!$rEPGArr) {
-                exit();
-            }
-        }
+	public function index() {
+		$rEPGArr = null;
+		if (RequestManager::has('id')) {
+			$rEPGArr = EpgService::getById(RequestManager::get('id'));
+			if (!$rEPGArr) {
+				exit();
+			}
+		}
 
-        $this->setTitle('EPG');
-        $this->render('epg', compact('rEPGArr'));
-    }
+		$this->setTitle('EPG');
+		$this->render('epg', compact('rEPGArr'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/EpgListController.php b/src/Public/Controllers/Admin/EpgListController.php
index 99ff8bc7..3ca6a894 100644
--- a/src/Public/Controllers/Admin/EpgListController.php
+++ b/src/Public/Controllers/Admin/EpgListController.php
@@ -23,14 +23,14 @@ use XcVm\Domain\Epg\EpgService;
  */
 
 class EpgListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('EPG Files');
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('EPG Files');
 
-        $epgs = EpgService::getAll();
+		$epgs = EpgService::getAll();
 
-        $this->render('epgs', [
-            'epgs' => $epgs,
-        ]);
-    }
+		$this->render('epgs', [
+			'epgs' => $epgs,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/EpgViewController.php b/src/Public/Controllers/Admin/EpgViewController.php
index 1dd16bfe..b1f6ec52 100644
--- a/src/Public/Controllers/Admin/EpgViewController.php
+++ b/src/Public/Controllers/Admin/EpgViewController.php
@@ -18,81 +18,81 @@ use XcVm\Core\Http\RequestManager;
  */
 
 class EpgViewController extends BaseAdminController {
-    public function index() {
-        global $db, $rMobile;
+	public function index() {
+		global $db, $rMobile;
 
-        $this->requirePermission();
+		$this->requirePermission();
 
-        if ($rMobile) {
-            header('Location: dashboard');
-            exit;
-        }
+		if ($rMobile) {
+			header('Location: dashboard');
+			exit;
+		}
 
-        $rPageInt = max(intval(RequestManager::get('page')), 1);
-        $rLimit = max(intval(RequestManager::get('entries')), SettingsManager::get('default_entries'));
-        $rStart = ($rPageInt - 1) * $rLimit;
-        $rWhere = $rWhereV = array();
-        $rWhere[] = '`type` = 1 AND `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL';
+		$rPageInt = max(intval(RequestManager::get('page')), 1);
+		$rLimit = max(intval(RequestManager::get('entries')), SettingsManager::get('default_entries'));
+		$rStart = ($rPageInt - 1) * $rLimit;
+		$rWhere = $rWhereV = [];
+		$rWhere[] = '`type` = 1 AND `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL';
 
-        if (RequestManager::has('category') && intval(RequestManager::get('category')) > 0) {
-            $rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
-            $rWhereV[] = json_encode(intval(RequestManager::get('category')));
-        }
+		if (RequestManager::has('category') && intval(RequestManager::get('category')) > 0) {
+			$rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
+			$rWhereV[] = json_encode(intval(RequestManager::get('category')));
+		}
 
-        if (!empty(RequestManager::get('search'))) {
-            $rWhere[] = '(`stream_display_name` LIKE ? OR `id` LIKE ?)';
-            $rWhereV[] = '%' . RequestManager::get('search') . '%';
-            $rWhereV[] = RequestManager::get('search');
-        }
+		if (!empty(RequestManager::get('search'))) {
+			$rWhere[] = '(`stream_display_name` LIKE ? OR `id` LIKE ?)';
+			$rWhereV[] = '%' . RequestManager::get('search') . '%';
+			$rWhereV[] = RequestManager::get('search');
+		}
 
-        $rWhereString = (count($rWhere) > 0) ? 'WHERE ' . implode(' AND ', $rWhere) : '';
+		$rWhereString = (count($rWhere) > 0) ? 'WHERE ' . implode(' AND ', $rWhere) : '';
 
-        $rOrderBy = '`stream_display_name` ASC';
-        $rOrder = ['name' => '`stream_display_name` ASC', 'added' => '`added` DESC'];
-        if (!empty(RequestManager::get('sort')) && isset($rOrder[RequestManager::get('sort')])) {
-            $rOrderBy = $rOrder[RequestManager::get('sort')];
-        } else {
-            // Honour the configured "Channel Sorting Type" like the playlists and
-            // the reseller guide do: manual => the `order` column, otherwise the
-            // cached bouquet channel order. Without this the guide fell back to
-            // alphabetical and ignored the manual order entirely.
-            $rChannelOrder = array();
-            if (file_exists(CACHE_TMP_PATH . 'channel_order')) {
-                $rChannelOrder = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'channel_order')) ?: array();
-            }
-            if (SettingsManager::get('channel_number_type') != 'manual' && count($rChannelOrder) > 0) {
-                $rOrderBy = 'FIELD(`id`,' . implode(',', array_map('intval', $rChannelOrder)) . ')';
-            } else {
-                $rOrderBy = '`order` ASC';
-            }
-        }
+		$rOrderBy = '`stream_display_name` ASC';
+		$rOrder = ['name' => '`stream_display_name` ASC', 'added' => '`added` DESC'];
+		if (!empty(RequestManager::get('sort')) && isset($rOrder[RequestManager::get('sort')])) {
+			$rOrderBy = $rOrder[RequestManager::get('sort')];
+		} else {
+			// Honour the configured "Channel Sorting Type" like the playlists and
+			// the reseller guide do: manual => the `order` column, otherwise the
+			// cached bouquet channel order. Without this the guide fell back to
+			// alphabetical and ignored the manual order entirely.
+			$rChannelOrder = [];
+			if (file_exists(CACHE_TMP_PATH . 'channel_order')) {
+				$rChannelOrder = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'channel_order')) ?: [];
+			}
+			if (SettingsManager::get('channel_number_type') != 'manual' && count($rChannelOrder) > 0) {
+				$rOrderBy = 'FIELD(`id`,' . implode(',', array_map('intval', $rChannelOrder)) . ')';
+			} else {
+				$rOrderBy = '`order` ASC';
+			}
+		}
 
-        $rStreamIDs = array();
-        $db->query('SELECT COUNT(`id`) AS `count` FROM `streams` ' . $rWhereString . ';', ...$rWhereV);
-        $rCount = $db->get_row()['count'];
-        $db->query('SELECT `id` FROM `streams` ' . $rWhereString . ' ORDER BY ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';', ...$rWhereV);
+		$rStreamIDs = [];
+		$db->query('SELECT COUNT(`id`) AS `count` FROM `streams` ' . $rWhereString . ';', ...$rWhereV);
+		$rCount = $db->get_row()['count'];
+		$db->query('SELECT `id` FROM `streams` ' . $rWhereString . ' ORDER BY ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';', ...$rWhereV);
 
-        foreach ($db->get_rows() as $rRow) {
-            $rStreamIDs[] = $rRow['id'];
-        }
-        $rPages = ceil($rCount / $rLimit);
-        $rPagination = array();
+		foreach ($db->get_rows() as $rRow) {
+			$rStreamIDs[] = $rRow['id'];
+		}
+		$rPages = ceil($rCount / $rLimit);
+		$rPagination = [];
 
-        foreach (range(max($rPageInt - 2, 1), min($rPageInt + 2, $rPages)) as $i) {
-            $rPagination[] = $i;
-        }
+		foreach (range(max($rPageInt - 2, 1), min($rPageInt + 2, $rPages)) as $i) {
+			$rPagination[] = $i;
+		}
 
-        $this->setTitle('TV Guide');
-        $this->render('epg_view', compact(
-            'rPageInt',
-            'rLimit',
-            'rStart',
-            'rStreamIDs',
-            'rCount',
-            'rPages',
-            'rPagination',
-            'rWhereString',
-            'rOrderBy'
-        ));
-    }
+		$this->setTitle('TV Guide');
+		$this->render('epg_view', compact(
+			'rPageInt',
+			'rLimit',
+			'rStart',
+			'rStreamIDs',
+			'rCount',
+			'rPages',
+			'rPagination',
+			'rWhereString',
+			'rOrderBy'
+		));
+	}
 }
diff --git a/src/Public/Controllers/Admin/EpisodeController.php b/src/Public/Controllers/Admin/EpisodeController.php
index 7c9961e6..21fe38b5 100644
--- a/src/Public/Controllers/Admin/EpisodeController.php
+++ b/src/Public/Controllers/Admin/EpisodeController.php
@@ -20,78 +20,78 @@ use XcVm\Domain\Vod\SeriesService;
  */
 
 class EpisodeController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db, $rServers;
+		global $db, $rServers;
 
-        // Resolve series_id from episode if not provided
-        if (!empty(RequestManager::get('id')) && empty(RequestManager::get('sid'))) {
-            $db->query('SELECT `series_id` FROM `streams_episodes` WHERE `stream_id` = ?;', intval(RequestManager::get('id')));
-            if ($db->num_rows() > 0) {
-                RequestManager::update('sid', intval($db->get_row()['series_id']));
-            }
-        }
+		// Resolve series_id from episode if not provided
+		if (!empty(RequestManager::get('id')) && empty(RequestManager::get('sid'))) {
+			$db->query('SELECT `series_id` FROM `streams_episodes` WHERE `stream_id` = ?;', intval(RequestManager::get('id')));
+			if ($db->num_rows() > 0) {
+				RequestManager::update('sid', intval($db->get_row()['series_id']));
+			}
+		}
 
-        if (!($rSeriesArr = SeriesService::getById(RequestManager::get('sid') ?? null))) {
-            $this->redirect('series');
-            return;
-        }
+		if (!($rSeriesArr = SeriesService::getById(RequestManager::get('sid') ?? null))) {
+			$this->redirect('series');
+			return;
+		}
 
-        $rEpisode = null;
-        $rStreamSys = [];
+		$rEpisode = null;
+		$rStreamSys = [];
 
-        if (RequestManager::has('id')) {
-            $rEpisode = StreamRepository::getById(RequestManager::get('id'));
-            if (!$rEpisode || $rEpisode['type'] != 5) {
-                $this->redirect('episodes');
-                return;
-            }
-        }
+		if (RequestManager::has('id')) {
+			$rEpisode = StreamRepository::getById(RequestManager::get('id'));
+			if (!$rEpisode || $rEpisode['type'] != 5) {
+				$this->redirect('episodes');
+				return;
+			}
+		}
 
-        $rServerTree = [
-            ['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Active</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
-            ['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
-        ];
-        $rMulti = false;
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Active</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
+		];
+		$rMulti = false;
 
-        if (isset($rEpisode)) {
-            $db->query('SELECT `season_num`, `episode_num` FROM `streams_episodes` WHERE `stream_id` = ?;', $rEpisode['id']);
-            if ($db->num_rows() > 0) {
-                $rRow = $db->get_row();
-                $rEpisode['episode'] = intval($rRow['episode_num']);
-                $rEpisode['season'] = intval($rRow['season_num']);
-            } else {
-                $rEpisode['episode'] = 0;
-                $rEpisode['season'] = 0;
-            }
+		if (isset($rEpisode)) {
+			$db->query('SELECT `season_num`, `episode_num` FROM `streams_episodes` WHERE `stream_id` = ?;', $rEpisode['id']);
+			if ($db->num_rows() > 0) {
+				$rRow = $db->get_row();
+				$rEpisode['episode'] = intval($rRow['episode_num']);
+				$rEpisode['season'] = intval($rRow['season_num']);
+			} else {
+				$rEpisode['episode'] = 0;
+				$rEpisode['season'] = 0;
+			}
 
-            $rEpisode['properties'] = json_decode($rEpisode['movie_properties'], true);
-            $rStreamSys = StreamRepository::getSystemRows(RequestManager::get('id'));
+			$rEpisode['properties'] = json_decode($rEpisode['movie_properties'], true);
+			$rStreamSys = StreamRepository::getSystemRows(RequestManager::get('id'));
 
-            foreach ($rServers as $rServer) {
-                $rParent = isset($rStreamSys[intval($rServer['id'])]) ? 'source' : 'offline';
-                $rServerTree[] = ['id' => $rServer['id'], 'parent' => $rParent, 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-            }
-        } else {
-            if (!Authorization::check('adv', 'add_episode')) {
-                exit();
-            }
-            foreach ($rServers as $rServer) {
-                $rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-            }
-            if (RequestManager::has('multi') && Authorization::check('adv', 'import_episodes')) {
-                $rMulti = true;
-            }
-        }
+			foreach ($rServers as $rServer) {
+				$rParent = isset($rStreamSys[intval($rServer['id'])]) ? 'source' : 'offline';
+				$rServerTree[] = ['id' => $rServer['id'], 'parent' => $rParent, 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+			}
+		} else {
+			if (!Authorization::check('adv', 'add_episode')) {
+				exit();
+			}
+			foreach ($rServers as $rServer) {
+				$rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+			}
+			if (RequestManager::has('multi') && Authorization::check('adv', 'import_episodes')) {
+				$rMulti = true;
+			}
+		}
 
-        // The load-balancer server tree on this form is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The load-balancer server tree on this form is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Episode');
-        $this->render('episode', compact('rSeriesArr', 'rEpisode', 'rServerTree', 'rStreamSys', 'rMulti'));
-    }
+		$this->setTitle('Episode');
+		$this->render('episode', compact('rSeriesArr', 'rEpisode', 'rServerTree', 'rStreamSys', 'rMulti'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/EpisodeListController.php b/src/Public/Controllers/Admin/EpisodeListController.php
index 1415191f..c3b1b412 100644
--- a/src/Public/Controllers/Admin/EpisodeListController.php
+++ b/src/Public/Controllers/Admin/EpisodeListController.php
@@ -15,24 +15,24 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class EpisodeListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $rAudioCodecs = $rVideoCodecs = [];
+		$rAudioCodecs = $rVideoCodecs = [];
 
-        $db->query('SELECT DISTINCT(`audio_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `audio_codec` IS NOT NULL AND `type` = 5 ORDER BY `audio_codec` ASC;');
-        foreach ($db->get_rows() as $rRow) {
-            $rAudioCodecs[] = $rRow['audio_codec'];
-        }
+		$db->query('SELECT DISTINCT(`audio_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `audio_codec` IS NOT NULL AND `type` = 5 ORDER BY `audio_codec` ASC;');
+		foreach ($db->get_rows() as $rRow) {
+			$rAudioCodecs[] = $rRow['audio_codec'];
+		}
 
-        $db->query('SELECT DISTINCT(`video_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `video_codec` IS NOT NULL AND `type` = 5 ORDER BY `video_codec` ASC;');
-        foreach ($db->get_rows() as $rRow) {
-            $rVideoCodecs[] = $rRow['video_codec'];
-        }
+		$db->query('SELECT DISTINCT(`video_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `video_codec` IS NOT NULL AND `type` = 5 ORDER BY `video_codec` ASC;');
+		foreach ($db->get_rows() as $rRow) {
+			$rVideoCodecs[] = $rRow['video_codec'];
+		}
 
-        $this->setTitle('Episodes');
-        $this->render('episodes', compact('rAudioCodecs', 'rVideoCodecs'));
-    }
+		$this->setTitle('Episodes');
+		$this->render('episodes', compact('rAudioCodecs', 'rVideoCodecs'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/EpisodeMassController.php b/src/Public/Controllers/Admin/EpisodeMassController.php
index 5c573bbd..317a7426 100644
--- a/src/Public/Controllers/Admin/EpisodeMassController.php
+++ b/src/Public/Controllers/Admin/EpisodeMassController.php
@@ -17,22 +17,22 @@ use XcVm\Domain\Vod\SeriesService;
  */
 
 class EpisodeMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $rServers;
+		global $rServers;
 
-        $rSeries = SeriesService::getAll();
-        $rServerTree = [
-            ['id' => 'source', 'parent' => '#', 'text' => "<strong class='btn btn-success waves-effect waves-light btn-xs'>Active</strong>", 'icon' => 'mdi mdi-play', 'state' => ['opened' => true]],
-            ['id' => 'offline', 'parent' => '#', 'text' => "<strong class='btn btn-secondary waves-effect waves-light btn-xs'>Offline</strong>", 'icon' => 'mdi mdi-stop', 'state' => ['opened' => true]],
-        ];
+		$rSeries = SeriesService::getAll();
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<strong class='btn btn-success waves-effect waves-light btn-xs'>Active</strong>", 'icon' => 'mdi mdi-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<strong class='btn btn-secondary waves-effect waves-light btn-xs'>Offline</strong>", 'icon' => 'mdi mdi-stop', 'state' => ['opened' => true]],
+		];
 
-        foreach ($rServers as $rServer) {
-            $rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'mdi mdi-server-network', 'state' => ['opened' => true]];
-        }
+		foreach ($rServers as $rServer) {
+			$rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'mdi mdi-server-network', 'state' => ['opened' => true]];
+		}
 
-        $this->setTitle('Mass Edit Episodes');
-        $this->render('episodes_mass', compact('rSeries', 'rServerTree'));
-    }
+		$this->setTitle('Mass Edit Episodes');
+		$this->render('episodes_mass', compact('rSeries', 'rServerTree'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/FingerprintController.php b/src/Public/Controllers/Admin/FingerprintController.php
index 13265fd8..3b76a42d 100644
--- a/src/Public/Controllers/Admin/FingerprintController.php
+++ b/src/Public/Controllers/Admin/FingerprintController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class FingerprintController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Fingerprint Stream');
-        $this->render('fingerprint');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Fingerprint Stream');
+		$this->render('fingerprint');
+	}
 }
diff --git a/src/Public/Controllers/Admin/GroupController.php b/src/Public/Controllers/Admin/GroupController.php
index 9935f6ec..7b727fe1 100644
--- a/src/Public/Controllers/Admin/GroupController.php
+++ b/src/Public/Controllers/Admin/GroupController.php
@@ -22,15 +22,15 @@ use XcVm\Domain\User\GroupService;
  */
 
 class GroupController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $this->setTitle('Groups');
+		$this->setTitle('Groups');
 
-        $groups = GroupService::getAll();
+		$groups = GroupService::getAll();
 
-        $this->render('groups', [
-            'groups' => $groups,
-        ]);
-    }
+		$this->render('groups', [
+			'groups' => $groups,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/GroupEditController.php b/src/Public/Controllers/Admin/GroupEditController.php
index ce769889..e5f65c3b 100644
--- a/src/Public/Controllers/Admin/GroupEditController.php
+++ b/src/Public/Controllers/Admin/GroupEditController.php
@@ -20,50 +20,50 @@ use XcVm\Domain\User\GroupService;
  */
 
 class GroupEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $rGroup = null;
-        $rGroupIDs = [];
-        $rPackageIDs = [];
-        $rNotice = '';
+		$rGroup = null;
+		$rGroupIDs = [];
+		$rPackageIDs = [];
+		$rNotice = '';
 
-        $id = $this->input('id');
-        if ($id !== null) {
-            $rGroup = GroupService::getById($id);
-            if (!$rGroup) {
-                AdminHelpers::goHome();
-                return;
-            }
-        }
+		$id = $this->input('id');
+		if ($id !== null) {
+			$rGroup = GroupService::getById($id);
+			if (!$rGroup) {
+				AdminHelpers::goHome();
+				return;
+			}
+		}
 
-        if (isset($rGroup)) {
-            $db->query("SELECT `id` FROM `users_packages` WHERE JSON_CONTAINS(`groups`, ?, '\$');", $rGroup['group_id']);
-            foreach ($db->get_rows() as $rRow) {
-                $rPackageIDs[] = $rRow['id'];
-            }
-            $rGroupIDs = json_decode($rGroup['subresellers'], true) ?: [];
+		if (isset($rGroup)) {
+			$db->query("SELECT `id` FROM `users_packages` WHERE JSON_CONTAINS(`groups`, ?, '\$');", $rGroup['group_id']);
+			foreach ($db->get_rows() as $rRow) {
+				$rPackageIDs[] = $rRow['id'];
+			}
+			$rGroupIDs = json_decode($rGroup['subresellers'], true) ?: [];
 
-            // XSS sanitization of notice_html
-            $rNotice = html_entity_decode($rGroup['notice_html']);
-            $rNotice = preg_replace('#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*+>#i', '', $rNotice);
-            $rNotice = preg_replace('#</*\\w+:\\w[^>]*+>#i', '', $rNotice);
-            $rNotice = str_replace(array('&amp;', '&lt;', '&gt;'), array('&amp;amp;', '&amp;lt;', '&amp;gt;'), $rNotice);
-            $rNotice = preg_replace('/(&#*\\w+)[\\x00-\\x20]+;/u', '$1;', $rNotice);
-            $rNotice = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $rNotice);
-            $rNotice = html_entity_decode($rNotice, ENT_COMPAT, 'UTF-8');
-            $rNotice = preg_replace("#(<[^>]+?[\\x00-\\x20\"'])(?:on|xmlns)[^>]*+[>\\b]?#iu", '$1>', $rNotice);
-            $rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=[\\x00-\\x20]*([`'\"]*)[\\x00-\\x20]*j[\\x00-\\x20]*a[\\x00-\\x20]*v[\\x00-\\x20]*a[\\x00-\\x20]*s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:#iu", '$1=$2nojavascript...', $rNotice);
-            $rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=(['\"]*)[\\x00-\\x20]*v[\\x00-\\x20]*b[\\x00-\\x20]*s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:#iu", '$1=$2novbscript...', $rNotice);
-            $rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=(['\"]*)[\\x00-\\x20]*-moz-binding[\\x00-\\x20]*:#u", '$1=$2nomozbinding...', $rNotice);
-            $rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?expression[\\x00-\\x20]*\\([^>]*+>#i", '$1>', $rNotice);
-            $rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?behaviour[\\x00-\\x20]*\\([^>]*+>#i", '$1>', $rNotice);
-            $rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:*[^>]*+>#iu", '$1>', $rNotice);
-        }
+			// XSS sanitization of notice_html
+			$rNotice = html_entity_decode($rGroup['notice_html']);
+			$rNotice = preg_replace('#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*+>#i', '', $rNotice);
+			$rNotice = preg_replace('#</*\\w+:\\w[^>]*+>#i', '', $rNotice);
+			$rNotice = str_replace(['&amp;', '&lt;', '&gt;'], ['&amp;amp;', '&amp;lt;', '&amp;gt;'], $rNotice);
+			$rNotice = preg_replace('/(&#*\\w+)[\\x00-\\x20]+;/u', '$1;', $rNotice);
+			$rNotice = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $rNotice);
+			$rNotice = html_entity_decode($rNotice, ENT_COMPAT, 'UTF-8');
+			$rNotice = preg_replace("#(<[^>]+?[\\x00-\\x20\"'])(?:on|xmlns)[^>]*+[>\\b]?#iu", '$1>', $rNotice);
+			$rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=[\\x00-\\x20]*([`'\"]*)[\\x00-\\x20]*j[\\x00-\\x20]*a[\\x00-\\x20]*v[\\x00-\\x20]*a[\\x00-\\x20]*s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:#iu", '$1=$2nojavascript...', $rNotice);
+			$rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=(['\"]*)[\\x00-\\x20]*v[\\x00-\\x20]*b[\\x00-\\x20]*s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:#iu", '$1=$2novbscript...', $rNotice);
+			$rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=(['\"]*)[\\x00-\\x20]*-moz-binding[\\x00-\\x20]*:#u", '$1=$2nomozbinding...', $rNotice);
+			$rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?expression[\\x00-\\x20]*\\([^>]*+>#i", '$1>', $rNotice);
+			$rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?behaviour[\\x00-\\x20]*\\([^>]*+>#i", '$1>', $rNotice);
+			$rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:*[^>]*+>#iu", '$1>', $rNotice);
+		}
 
-        $this->setTitle('Group');
-        $this->render('group', compact('rGroup', 'rGroupIDs', 'rPackageIDs', 'rNotice'));
-    }
+		$this->setTitle('Group');
+		$this->render('group', compact('rGroup', 'rGroupIDs', 'rPackageIDs', 'rNotice'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/HmacController.php b/src/Public/Controllers/Admin/HmacController.php
index 323eabe7..20c97a94 100644
--- a/src/Public/Controllers/Admin/HmacController.php
+++ b/src/Public/Controllers/Admin/HmacController.php
@@ -22,15 +22,15 @@ use XcVm\Core\Auth\AuthRepository;
  */
 
 class HmacController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $this->setTitle('HMAC Keys');
+		$this->setTitle('HMAC Keys');
 
-        $hmacs = AuthRepository::getAllHMAC();
+		$hmacs = AuthRepository::getAllHMAC();
 
-        $this->render('hmacs', [
-            'hmacs' => $hmacs,
-        ]);
-    }
+		$this->render('hmacs', [
+			'hmacs' => $hmacs,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/HmacEditController.php b/src/Public/Controllers/Admin/HmacEditController.php
index 50608647..6c363326 100644
--- a/src/Public/Controllers/Admin/HmacEditController.php
+++ b/src/Public/Controllers/Admin/HmacEditController.php
@@ -19,19 +19,19 @@ use XcVm\Core\Auth\AuthRepository;
  */
 
 class HmacEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rHMAC = null;
-        $id = $this->input('id');
-        if ($id !== null) {
-            $rHMAC = AuthRepository::getHMACById($id);
-            if (!$rHMAC) {
-                exit();
-            }
-        }
+		$rHMAC = null;
+		$id = $this->input('id');
+		if ($id !== null) {
+			$rHMAC = AuthRepository::getHMACById($id);
+			if (!$rHMAC) {
+				exit();
+			}
+		}
 
-        $this->setTitle('HMAC Key');
-        $this->render('hmac', compact('rHMAC'));
-    }
+		$this->setTitle('HMAC Key');
+		$this->render('hmac', compact('rHMAC'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/IpController.php b/src/Public/Controllers/Admin/IpController.php
index e6f37aec..40121144 100644
--- a/src/Public/Controllers/Admin/IpController.php
+++ b/src/Public/Controllers/Admin/IpController.php
@@ -22,22 +22,22 @@ use XcVm\Domain\Security\BlocklistService;
  */
 
 class IpController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        global $db;
+	public function index() {
+		$this->requirePermission();
+		global $db;
 
-        // Обработка flush перед рендером
-        if ($this->input('flush') !== null) {
-            BlocklistService::flushIPs();
-            $this->redirect('./ips?status=' . STATUS_FLUSH);
-        }
+		// Обработка flush перед рендером
+		if ($this->input('flush') !== null) {
+			BlocklistService::flushIPs();
+			$this->redirect('./ips?status=' . STATUS_FLUSH);
+		}
 
-        $this->setTitle("Blocked IP's");
+		$this->setTitle("Blocked IP's");
 
-        $ips = BlocklistService::getBlockedIPsSimple();
+		$ips = BlocklistService::getBlockedIPsSimple();
 
-        $this->render('ips', [
-            'ips' => $ips,
-        ]);
-    }
+		$this->render('ips', [
+			'ips' => $ips,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/IpEditController.php b/src/Public/Controllers/Admin/IpEditController.php
index d9848fff..da1b8469 100644
--- a/src/Public/Controllers/Admin/IpEditController.php
+++ b/src/Public/Controllers/Admin/IpEditController.php
@@ -17,9 +17,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class IpEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Blocked IP');
-        $this->render('ip');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Blocked IP');
+		$this->render('ip');
+	}
 }
diff --git a/src/Public/Controllers/Admin/IspController.php b/src/Public/Controllers/Admin/IspController.php
index 0e294963..8a5285ea 100644
--- a/src/Public/Controllers/Admin/IspController.php
+++ b/src/Public/Controllers/Admin/IspController.php
@@ -22,15 +22,15 @@ use XcVm\Domain\Security\BlocklistService;
  */
 
 class IspController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $this->setTitle("Blocked ISP's");
+		$this->setTitle("Blocked ISP's");
 
-        $isps = BlocklistService::getAllISPs();
+		$isps = BlocklistService::getAllISPs();
 
-        $this->render('isps', [
-            'isps' => $isps,
-        ]);
-    }
+		$this->render('isps', [
+			'isps' => $isps,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/IspEditController.php b/src/Public/Controllers/Admin/IspEditController.php
index 6381ca0d..da907052 100644
--- a/src/Public/Controllers/Admin/IspEditController.php
+++ b/src/Public/Controllers/Admin/IspEditController.php
@@ -19,16 +19,16 @@ use XcVm\Domain\Security\BlocklistService;
  */
 
 class IspEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rISPArr = null;
-        $id = $this->input('id');
-        if ($id !== null) {
-            $rISPArr = BlocklistService::getISPById($id);
-        }
+		$rISPArr = null;
+		$id = $this->input('id');
+		if ($id !== null) {
+			$rISPArr = BlocklistService::getISPById($id);
+		}
 
-        $this->setTitle('Blocked ISP');
-        $this->render('isp', compact('rISPArr'));
-    }
+		$this->setTitle('Blocked ISP');
+		$this->render('isp', compact('rISPArr'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/LineActivityController.php b/src/Public/Controllers/Admin/LineActivityController.php
index 5dc559e0..bba2d997 100644
--- a/src/Public/Controllers/Admin/LineActivityController.php
+++ b/src/Public/Controllers/Admin/LineActivityController.php
@@ -19,27 +19,27 @@ use XcVm\Domain\User\UserRepository;
  */
 
 class LineActivityController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $data = [];
+		$data = [];
 
-        if (RequestManager::has('user_id')) {
-            $rSearchUser = UserRepository::getLineById(RequestManager::get('user_id'));
-            if ($rSearchUser) {
-                $data['rSearchUser'] = $rSearchUser;
-            }
-        }
+		if (RequestManager::has('user_id')) {
+			$rSearchUser = UserRepository::getLineById(RequestManager::get('user_id'));
+			if ($rSearchUser) {
+				$data['rSearchUser'] = $rSearchUser;
+			}
+		}
 
-        if (RequestManager::has('stream_id')) {
-            $rSearchStream = StreamRepository::getById(RequestManager::get('stream_id'));
-            if ($rSearchStream) {
-                $data['rSearchStream'] = $rSearchStream;
-            }
-        }
+		if (RequestManager::has('stream_id')) {
+			$rSearchStream = StreamRepository::getById(RequestManager::get('stream_id'));
+			if ($rSearchStream) {
+				$data['rSearchStream'] = $rSearchStream;
+			}
+		}
 
-        $this->render('line_activity', $data);
-    }
+		$this->render('line_activity', $data);
+	}
 }
diff --git a/src/Public/Controllers/Admin/LineController.php b/src/Public/Controllers/Admin/LineController.php
index fbbf1873..fa1e0f1b 100644
--- a/src/Public/Controllers/Admin/LineController.php
+++ b/src/Public/Controllers/Admin/LineController.php
@@ -20,50 +20,50 @@ use XcVm\Domain\User\UserRepository;
  */
 
 class LineController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $db = $GLOBALS['db'];
+		$db = $GLOBALS['db'];
 
-        if (RequestManager::has('id')) {
-            $rLine = UserRepository::getLineById(RequestManager::get('id'));
+		if (RequestManager::has('id')) {
+			$rLine = UserRepository::getLineById(RequestManager::get('id'));
 
-            if (!$rLine || !Authorization::check('adv', 'edit_user')) {
-                AdminHelpers::goHome();
-            }
+			if (!$rLine || !Authorization::check('adv', 'edit_user')) {
+				AdminHelpers::goHome();
+			}
 
-            if ($rLine['is_mag']) {
-                $db->query('SELECT `mag_id` FROM `mag_devices` WHERE `user_id` = ?;', $rLine['id']);
-                if ($db->num_rows() > 0) {
-                    header('Location: mag?id=' . intval($db->get_row()['mag_id']));
-                    exit;
-                } else {
-                    AdminHelpers::goHome();
-                }
-            }
+			if ($rLine['is_mag']) {
+				$db->query('SELECT `mag_id` FROM `mag_devices` WHERE `user_id` = ?;', $rLine['id']);
+				if ($db->num_rows() > 0) {
+					header('Location: mag?id=' . intval($db->get_row()['mag_id']));
+					exit;
+				} else {
+					AdminHelpers::goHome();
+				}
+			}
 
-            if ($rLine['is_e2']) {
-                $db->query('SELECT `device_id` FROM `enigma2_devices` WHERE `user_id` = ?;', $rLine['id']);
-                if ($db->num_rows() > 0) {
-                    header('Location: enigma?id=' . intval($db->get_row()['device_id']));
-                    exit;
-                } else {
-                    AdminHelpers::goHome();
-                }
-            }
-        } else {
-            if (!Authorization::check('adv', 'add_user')) {
-                AdminHelpers::goHome();
-            }
-            $rLine = null;
-        }
+			if ($rLine['is_e2']) {
+				$db->query('SELECT `device_id` FROM `enigma2_devices` WHERE `user_id` = ?;', $rLine['id']);
+				if ($db->num_rows() > 0) {
+					header('Location: enigma?id=' . intval($db->get_row()['device_id']));
+					exit;
+				} else {
+					AdminHelpers::goHome();
+				}
+			}
+		} else {
+			if (!Authorization::check('adv', 'add_user')) {
+				AdminHelpers::goHome();
+			}
+			$rLine = null;
+		}
 
-        $rRegisteredUsers = UserRepository::getRegisteredUsers();
+		$rRegisteredUsers = UserRepository::getRegisteredUsers();
 
-        $data = ['rRegisteredUsers' => $rRegisteredUsers];
-        if ($rLine) {
-            $data['rLine'] = $rLine;
-        }
-        $this->render('line', $data);
-    }
+		$data = ['rRegisteredUsers' => $rRegisteredUsers];
+		if ($rLine) {
+			$data['rLine'] = $rLine;
+		}
+		$this->render('line', $data);
+	}
 }
diff --git a/src/Public/Controllers/Admin/LineIpsController.php b/src/Public/Controllers/Admin/LineIpsController.php
index 86000800..635e19dd 100644
--- a/src/Public/Controllers/Admin/LineIpsController.php
+++ b/src/Public/Controllers/Admin/LineIpsController.php
@@ -17,12 +17,12 @@ use XcVm\Core\Http\RequestManager;
  */
 
 class LineIpsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rRange = intval(RequestManager::get('range') ?? 0);
-        $rLineIPs = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'lines_per_ip')) ?: [];
+		$rRange = intval(RequestManager::get('range') ?? 0);
+		$rLineIPs = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'lines_per_ip')) ?: [];
 
-        $this->render('line_ips', compact('rRange', 'rLineIPs'));
-    }
+		$this->render('line_ips', compact('rRange', 'rLineIPs'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/LineListController.php b/src/Public/Controllers/Admin/LineListController.php
index def68f6a..e8eddc30 100644
--- a/src/Public/Controllers/Admin/LineListController.php
+++ b/src/Public/Controllers/Admin/LineListController.php
@@ -15,8 +15,8 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class LineListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->render('lines');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->render('lines');
+	}
 }
diff --git a/src/Public/Controllers/Admin/LineMassController.php b/src/Public/Controllers/Admin/LineMassController.php
index d14607cd..c1ff5c1f 100644
--- a/src/Public/Controllers/Admin/LineMassController.php
+++ b/src/Public/Controllers/Admin/LineMassController.php
@@ -15,8 +15,8 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class LineMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->render('line_mass');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->render('line_mass');
+	}
 }
diff --git a/src/Public/Controllers/Admin/LiveConnectionsController.php b/src/Public/Controllers/Admin/LiveConnectionsController.php
index ec982fe9..d33621e5 100644
--- a/src/Public/Controllers/Admin/LiveConnectionsController.php
+++ b/src/Public/Controllers/Admin/LiveConnectionsController.php
@@ -19,23 +19,23 @@ use XcVm\Domain\User\UserRepository;
  */
 
 class LiveConnectionsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $rSearchUser = null;
-        $rSearchStream = null;
+		$rSearchUser = null;
+		$rSearchStream = null;
 
-        if (RequestManager::has('user_id')) {
-            $rSearchUser = UserRepository::getLineById(RequestManager::get('user_id'));
-        }
+		if (RequestManager::has('user_id')) {
+			$rSearchUser = UserRepository::getLineById(RequestManager::get('user_id'));
+		}
 
-        if (RequestManager::has('stream_id')) {
-            $rSearchStream = StreamRepository::getById(RequestManager::get('stream_id'));
-        }
+		if (RequestManager::has('stream_id')) {
+			$rSearchStream = StreamRepository::getById(RequestManager::get('stream_id'));
+		}
 
-        $this->setTitle('Live Connections');
-        $this->render('live_connections', compact('rSearchUser', 'rSearchStream'));
-    }
+		$this->setTitle('Live Connections');
+		$this->render('live_connections', compact('rSearchUser', 'rSearchStream'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/LoginLogController.php b/src/Public/Controllers/Admin/LoginLogController.php
index 4086474f..f2a94537 100644
--- a/src/Public/Controllers/Admin/LoginLogController.php
+++ b/src/Public/Controllers/Admin/LoginLogController.php
@@ -20,9 +20,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class LoginLogController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Login Logs');
-        $this->render('login_logs');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Login Logs');
+		$this->render('login_logs');
+	}
 }
diff --git a/src/Public/Controllers/Admin/MagController.php b/src/Public/Controllers/Admin/MagController.php
index d96c601c..c6c315ca 100644
--- a/src/Public/Controllers/Admin/MagController.php
+++ b/src/Public/Controllers/Admin/MagController.php
@@ -18,22 +18,22 @@ use XcVm\Domain\Device\MagService;
  */
 
 class MagController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rDevice = null;
-        if (RequestManager::has('id')) {
-            $rDevice = MagService::getById(RequestManager::get('id'));
-            if (!$rDevice['user_id']) {
-                exit();
-            }
-        }
+		$rDevice = null;
+		if (RequestManager::has('id')) {
+			$rDevice = MagService::getById(RequestManager::get('id'));
+			if (!$rDevice['user_id']) {
+				exit();
+			}
+		}
 
-        if (isset($rDevice) && !isset($rDevice['user'])) {
-            $rDevice['user'] = array('bouquet' => array());
-        }
+		if (isset($rDevice) && !isset($rDevice['user'])) {
+			$rDevice['user'] = ['bouquet' => []];
+		}
 
-        $this->setTitle('MAG Device');
-        $this->render('mag', compact('rDevice'));
-    }
+		$this->setTitle('MAG Device');
+		$this->render('mag', compact('rDevice'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/MagEventController.php b/src/Public/Controllers/Admin/MagEventController.php
index 29acbe43..199242aa 100644
--- a/src/Public/Controllers/Admin/MagEventController.php
+++ b/src/Public/Controllers/Admin/MagEventController.php
@@ -20,9 +20,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class MagEventController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('MAG Events');
-        $this->render('mag_events');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('MAG Events');
+		$this->render('mag_events');
+	}
 }
diff --git a/src/Public/Controllers/Admin/MagMassController.php b/src/Public/Controllers/Admin/MagMassController.php
index 29b282f5..c1f723ae 100644
--- a/src/Public/Controllers/Admin/MagMassController.php
+++ b/src/Public/Controllers/Admin/MagMassController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class MagMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Mass Edit Devices');
-        $this->render('mag_mass');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Mass Edit Devices');
+		$this->render('mag_mass');
+	}
 }
diff --git a/src/Public/Controllers/Admin/MagsController.php b/src/Public/Controllers/Admin/MagsController.php
index c108600e..48be16f2 100644
--- a/src/Public/Controllers/Admin/MagsController.php
+++ b/src/Public/Controllers/Admin/MagsController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class MagsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('MAG Devices');
-        $this->render('mags');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('MAG Devices');
+		$this->render('mags');
+	}
 }
diff --git a/src/Public/Controllers/Admin/MagscanSettingsController.php b/src/Public/Controllers/Admin/MagscanSettingsController.php
index 62260b6b..576c3ab9 100644
--- a/src/Public/Controllers/Admin/MagscanSettingsController.php
+++ b/src/Public/Controllers/Admin/MagscanSettingsController.php
@@ -18,10 +18,10 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class MagscanSettingsController extends BaseAdminController {
-    public function index(): void {
-        $this->requirePermission();
+	public function index(): void {
+		$this->requirePermission();
 
-        $this->setTitle('MAGSCAN Settings');
-        $this->render('magscan_settings');
-    }
+		$this->setTitle('MAGSCAN Settings');
+		$this->render('magscan_settings');
+	}
 }
diff --git a/src/Public/Controllers/Admin/MassDeleteController.php b/src/Public/Controllers/Admin/MassDeleteController.php
index d65fb0ca..bc8797ba 100644
--- a/src/Public/Controllers/Admin/MassDeleteController.php
+++ b/src/Public/Controllers/Admin/MassDeleteController.php
@@ -15,13 +15,13 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class MassDeleteController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        set_time_limit(0);
-        ini_set('max_execution_time', 0);
+		set_time_limit(0);
+		ini_set('max_execution_time', 0);
 
-        $this->setTitle('Mass Delete');
-        $this->render('mass_delete');
-    }
+		$this->setTitle('Mass Delete');
+		$this->render('mass_delete');
+	}
 }
diff --git a/src/Public/Controllers/Admin/ModulesController.php b/src/Public/Controllers/Admin/ModulesController.php
index 450a200e..ee1649a1 100644
--- a/src/Public/Controllers/Admin/ModulesController.php
+++ b/src/Public/Controllers/Admin/ModulesController.php
@@ -15,178 +15,178 @@ use XcVm\Core\Module\ModuleUpdateChecker;
  * @package XC_VM_Public_Controllers_Admin
  */
 class ModulesController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $manager = new ModuleManager(container: ServiceContainer::getInstance());
-        $flash = null;
+		$manager = new ModuleManager(container: ServiceContainer::getInstance());
+		$flash = null;
 
-        if (strtoupper($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'POST') {
-            $isAjax = !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
-                && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest';
+		if (strtoupper($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'POST') {
+			$isAjax = !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
+				&& strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest';
 
-            try {
-                $action = (string) $this->input('module_action', '');
-                $name = (string) $this->input('module_name', '');
+			try {
+				$action = (string) $this->input('module_action', '');
+				$name = (string) $this->input('module_name', '');
 
-                switch ($action) {
-                    case 'install':
-                        $manager->installModule($name);
-                        $flash = ['type' => 'success', 'message' => 'Module installed: ' . $name];
-                        break;
+				switch ($action) {
+					case 'install':
+						$manager->installModule($name);
+						$flash = ['type' => 'success', 'message' => 'Module installed: ' . $name];
+						break;
 
-                    case 'uninstall':
-                        $manager->uninstallModule($name);
-                        $flash = ['type' => 'warning', 'message' => 'Module uninstalled: ' . $name];
-                        break;
+					case 'uninstall':
+						$manager->uninstallModule($name);
+						$flash = ['type' => 'warning', 'message' => 'Module uninstalled: ' . $name];
+						break;
 
-                    case 'delete':
-                        $manager->deleteModule($name);
-                        $flash = ['type' => 'warning', 'message' => 'Module deleted: ' . $name];
-                        break;
+					case 'delete':
+						$manager->deleteModule($name);
+						$flash = ['type' => 'warning', 'message' => 'Module deleted: ' . $name];
+						break;
 
-                    case 'enable':
-                        $manager->setEnabled($name, true);
-                        $flash = ['type' => 'success', 'message' => 'Module enabled: ' . $name];
-                        break;
+					case 'enable':
+						$manager->setEnabled($name, true);
+						$flash = ['type' => 'success', 'message' => 'Module enabled: ' . $name];
+						break;
 
-                    case 'disable':
-                        $manager->setEnabled($name, false);
-                        $flash = ['type' => 'warning', 'message' => 'Module disabled: ' . $name];
-                        break;
+					case 'disable':
+						$manager->setEnabled($name, false);
+						$flash = ['type' => 'warning', 'message' => 'Module disabled: ' . $name];
+						break;
 
-                    case 'update':
-                        $newVersion = $manager->updateModuleFromSource($name);
-                        $flash = $newVersion !== null
-                            ? ['type' => 'success', 'message' => 'Module updated: ' . $name . ' -> ' . $newVersion]
-                            : ['type' => 'info', 'message' => 'Nothing newer at the source for ' . $name . ' — already up to date.'];
-                        break;
+					case 'update':
+						$newVersion = $manager->updateModuleFromSource($name);
+						$flash = $newVersion !== null
+							? ['type' => 'success', 'message' => 'Module updated: ' . $name . ' -> ' . $newVersion]
+							: ['type' => 'info', 'message' => 'Nothing newer at the source for ' . $name . ' — already up to date.'];
+						break;
 
-                    case 'platform_install':
-                        $slug = trim((string) $this->input('module_slug', ''));
-                        $key  = (string) (SettingsManager::get('platform_api_key') ?? '');
+					case 'platform_install':
+						$slug = trim((string) $this->input('module_slug', ''));
+						$key  = (string) (SettingsManager::get('platform_api_key') ?? '');
 
-                        if ($key === '') {
-                            throw new \RuntimeException('Set the platform API key before installing from the store.');
-                        }
-                        if ($slug === '') {
-                            throw new \RuntimeException('Module slug is required.');
-                        }
+						if ($key === '') {
+							throw new \RuntimeException('Set the platform API key before installing from the store.');
+						}
+						if ($slug === '') {
+							throw new \RuntimeException('Module slug is required.');
+						}
 
-                        // Always install the latest approved version (resolved by the
-                        // extension from the platform).
-                        $manager->downloadFromPlatform($slug, '', $key);
-                        $flash = ['type' => 'success', 'message' => 'Module installed from store (latest): ' . $slug];
-                        break;
+						// Always install the latest approved version (resolved by the
+						// extension from the platform).
+						$manager->downloadFromPlatform($slug, '', $key);
+						$flash = ['type' => 'success', 'message' => 'Module installed from store (latest): ' . $slug];
+						break;
 
-                    case 'platform_rollback':
-                        $key = (string) (SettingsManager::get('platform_api_key') ?? '');
-                        if ($key === '') {
-                            throw new \RuntimeException('Set the platform API key before rolling back.');
-                        }
-                        $manager->rollbackFromPlatform($name, $key);
-                        $flash = ['type' => 'success', 'message' => 'Module rolled back to previous version: ' . $name];
-                        break;
+					case 'platform_rollback':
+						$key = (string) (SettingsManager::get('platform_api_key') ?? '');
+						if ($key === '') {
+							throw new \RuntimeException('Set the platform API key before rolling back.');
+						}
+						$manager->rollbackFromPlatform($name, $key);
+						$flash = ['type' => 'success', 'message' => 'Module rolled back to previous version: ' . $name];
+						break;
 
-                    case 'renew_license':
-                        $key = (string) (SettingsManager::get('platform_api_key') ?? '');
-                        if ($key === '') {
-                            throw new \RuntimeException('Set the platform API key before renewing the license.');
-                        }
-                        if ($manager->renewModuleLicense($name, $key)) {
-                            $flash = ['type' => 'success', 'message' => 'License renewed for: ' . $name];
-                        } else {
-                            $flash = ['type' => 'warning', 'message' => 'License not renewed for ' . $name . ' (platform licensing off, not entitled, or no server data).'];
-                        }
-                        break;
+					case 'renew_license':
+						$key = (string) (SettingsManager::get('platform_api_key') ?? '');
+						if ($key === '') {
+							throw new \RuntimeException('Set the platform API key before renewing the license.');
+						}
+						if ($manager->renewModuleLicense($name, $key)) {
+							$flash = ['type' => 'success', 'message' => 'License renewed for: ' . $name];
+						} else {
+							$flash = ['type' => 'warning', 'message' => 'License not renewed for ' . $name . ' (platform licensing off, not entitled, or no server data).'];
+						}
+						break;
 
-                    case 'check_updates':
-                        // Same pass as ModuleUpdatesCronJob, triggered on demand:
-                        // resolve the latest version from each installed module's
-                        // declared source and record/clear available_version.
-                        $checker = new ModuleUpdateChecker();
-                        $found = [];
-                        $failed = [];
-                        $skipped = 0;
-                        $checked = 0;
+					case 'check_updates':
+						// Same pass as ModuleUpdatesCronJob, triggered on demand:
+						// resolve the latest version from each installed module's
+						// declared source and record/clear available_version.
+						$checker = new ModuleUpdateChecker();
+						$found = [];
+						$failed = [];
+						$skipped = 0;
+						$checked = 0;
 
-                        foreach ($manager->listModules() as $module) {
-                            // Not installed → nothing to compare against; the table
-                            // shows Install for these, not Update.
-                            if (($module['installed_version'] ?? '') === '') {
-                                $skipped++;
-                                continue;
-                            }
+						foreach ($manager->listModules() as $module) {
+							// Not installed → nothing to compare against; the table
+							// shows Install for these, not Update.
+							if (($module['installed_version'] ?? '') === '') {
+								$skipped++;
+								continue;
+							}
 
-                            $checked++;
-                            $installed = (string) $module['installed_version'];
-                            $latest = $checker->latestAvailable($module);
+							$checked++;
+							$installed = (string) $module['installed_version'];
+							$latest = $checker->latestAvailable($module);
 
-                            if ($latest !== null && version_compare($latest, $installed, '>')) {
-                                $manager->recordAvailableVersion($module['name'], $latest);
-                                $found[] = $module['name'] . ' (' . $installed . ' -> ' . $latest . ')';
-                            } elseif ($checker->lastError() !== null) {
-                                // Source unreachable (e.g. GitHub API rate limit) —
-                                // report it and keep any previously recorded flag
-                                // instead of wiping it on a transient failure.
-                                $failed[] = $module['name'] . ': ' . $checker->lastError();
-                            } else {
-                                $manager->recordAvailableVersion($module['name'], null);
-                            }
-                        }
+							if ($latest !== null && version_compare($latest, $installed, '>')) {
+								$manager->recordAvailableVersion($module['name'], $latest);
+								$found[] = $module['name'] . ' (' . $installed . ' -> ' . $latest . ')';
+							} elseif ($checker->lastError() !== null) {
+								// Source unreachable (e.g. GitHub API rate limit) —
+								// report it and keep any previously recorded flag
+								// instead of wiping it on a transient failure.
+								$failed[] = $module['name'] . ': ' . $checker->lastError();
+							} else {
+								$manager->recordAvailableVersion($module['name'], null);
+							}
+						}
 
-                        $parts = [];
-                        if ($found) {
-                            $parts[] = 'Updates available: ' . implode(', ', $found) . '.';
-                        }
-                        if ($failed) {
-                            $parts[] = 'Could not check ' . implode('; ', $failed) . '.';
-                        }
-                        if (!$parts) {
-                            $parts[] = 'All installed modules are up to date (' . $checked . ' checked'
-                                . ($skipped ? ', ' . $skipped . ' not installed — skipped' : '') . ').';
-                        }
+						$parts = [];
+						if ($found) {
+							$parts[] = 'Updates available: ' . implode(', ', $found) . '.';
+						}
+						if ($failed) {
+							$parts[] = 'Could not check ' . implode('; ', $failed) . '.';
+						}
+						if (!$parts) {
+							$parts[] = 'All installed modules are up to date (' . $checked . ' checked'
+								. ($skipped ? ', ' . $skipped . ' not installed — skipped' : '') . ').';
+						}
 
-                        $flash = [
-                            'type'    => $found ? 'success' : ($failed ? 'warning' : 'info'),
-                            'message' => implode(' ', $parts),
-                        ];
-                        break;
+						$flash = [
+							'type'    => $found ? 'success' : ($failed ? 'warning' : 'info'),
+							'message' => implode(' ', $parts),
+						];
+						break;
 
-                    case 'upload_install':
-                        if (!isset($_FILES['module_zip']) || !is_array($_FILES['module_zip'])) {
-                            throw new \RuntimeException('Zip file was not uploaded.');
-                        }
+					case 'upload_install':
+						if (!isset($_FILES['module_zip']) || !is_array($_FILES['module_zip'])) {
+							throw new \RuntimeException('Zip file was not uploaded.');
+						}
 
-                        if ((int) ($_FILES['module_zip']['error'] ?? UPLOAD_ERR_NO_FILE) !== UPLOAD_ERR_OK) {
-                            throw new \RuntimeException('Upload failed.');
-                        }
+						if ((int) ($_FILES['module_zip']['error'] ?? UPLOAD_ERR_NO_FILE) !== UPLOAD_ERR_OK) {
+							throw new \RuntimeException('Upload failed.');
+						}
 
-                        $tmp = (string) ($_FILES['module_zip']['tmp_name'] ?? '');
-                        if ($tmp === '' || !is_uploaded_file($tmp)) {
-                            throw new \RuntimeException('Uploaded file is invalid.');
-                        }
+						$tmp = (string) ($_FILES['module_zip']['tmp_name'] ?? '');
+						if ($tmp === '' || !is_uploaded_file($tmp)) {
+							throw new \RuntimeException('Uploaded file is invalid.');
+						}
 
-                        $installedName = $manager->uploadAndInstall($tmp);
-                        $flash = ['type' => 'success', 'message' => 'Module uploaded and installed: ' . $installedName];
-                        break;
-                }
-            } catch (\Throwable $e) {
-                $flash = ['type' => 'danger', 'message' => $e->getMessage()];
-            }
+						$installedName = $manager->uploadAndInstall($tmp);
+						$flash = ['type' => 'success', 'message' => 'Module uploaded and installed: ' . $installedName];
+						break;
+				}
+			} catch (\Throwable $e) {
+				$flash = ['type' => 'danger', 'message' => $e->getMessage()];
+			}
 
-            if ($isAjax) {
-                header('Content-Type: application/json');
-                exit(json_encode($flash ?: ['type' => 'info', 'message' => 'No action taken']));
-            }
-        }
+			if ($isAjax) {
+				header('Content-Type: application/json');
+				exit(json_encode($flash ?: ['type' => 'info', 'message' => 'No action taken']));
+			}
+		}
 
-        $modules = $manager->listModules();
+		$modules = $manager->listModules();
 
-        $this->setTitle('Modules');
-        $this->render('modules', [
-            'modules' => $modules,
-            'moduleFlash' => $flash,
-        ]);
-    }
+		$this->setTitle('Modules');
+		$this->render('modules', [
+			'modules' => $modules,
+			'moduleFlash' => $flash,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/MovieController.php b/src/Public/Controllers/Admin/MovieController.php
index 0ce05b0f..0f21e460 100644
--- a/src/Public/Controllers/Admin/MovieController.php
+++ b/src/Public/Controllers/Admin/MovieController.php
@@ -20,89 +20,89 @@ use XcVm\Domain\Stream\StreamRepository;
  */
 
 class MovieController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db, $rServers;
+		global $db, $rServers;
 
-        $rCategories = CategoryService::getAllByType('movie');
-        $rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
+		$rCategories = CategoryService::getAllByType('movie');
+		$rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
 
-        if (RequestManager::has('id')) {
-            $rMovie = StreamRepository::getById(RequestManager::get('id'));
-            if (!$rMovie || $rMovie['type'] != 2) {
-                $this->redirect('movies');
-                return;
-            }
-        }
+		if (RequestManager::has('id')) {
+			$rMovie = StreamRepository::getById(RequestManager::get('id'));
+			if (!$rMovie || $rMovie['type'] != 2) {
+				$this->redirect('movies');
+				return;
+			}
+		}
 
-        $rServerTree = [
-            ['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Active</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
-            ['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
-        ];
-        $activeStreamingServers = [];
-        $rMovie = null;
-        $rStreamSys = [];
-        $rMovieSource = [''];
-        $rSource = '';
-        $rPathSources = '';
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Active</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
+		];
+		$activeStreamingServers = [];
+		$rMovie = null;
+		$rStreamSys = [];
+		$rMovieSource = [''];
+		$rSource = '';
+		$rPathSources = '';
 
-        if (RequestManager::has('id')) {
-            $rMovie = StreamRepository::getById(RequestManager::get('id'));
-            if (!$rMovie || $rMovie['type'] != 2) {
-                $this->redirect('movies');
-                return;
-            }
-            $rMovie['properties'] = json_decode($rMovie['movie_properties'], true);
-            $rStreamSys = StreamRepository::getSystemRows(RequestManager::get('id'));
+		if (RequestManager::has('id')) {
+			$rMovie = StreamRepository::getById(RequestManager::get('id'));
+			if (!$rMovie || $rMovie['type'] != 2) {
+				$this->redirect('movies');
+				return;
+			}
+			$rMovie['properties'] = json_decode($rMovie['movie_properties'], true);
+			$rStreamSys = StreamRepository::getSystemRows(RequestManager::get('id'));
 
-            $streamSourceJson = $rMovie['stream_source'] ?? '';
-            $rMovieSource = json_decode($streamSourceJson, true);
-            if (!is_array($rMovieSource)) {
-                $rMovieSource = [''];
-            }
-            $rSource = $rMovieSource[0] ?? '';
-            if (str_starts_with($rSource, 's:')) {
-                $parts = explode(':', $rSource, 3);
-                $rPathSources = (count($parts) >= 3) ? urldecode($parts[2]) : '';
-            } else {
-                $rPathSources = $rSource;
-            }
+			$streamSourceJson = $rMovie['stream_source'] ?? '';
+			$rMovieSource = json_decode($streamSourceJson, true);
+			if (!is_array($rMovieSource)) {
+				$rMovieSource = [''];
+			}
+			$rSource = $rMovieSource[0] ?? '';
+			if (str_starts_with($rSource, 's:')) {
+				$parts = explode(':', $rSource, 3);
+				$rPathSources = (count($parts) >= 3) ? urldecode($parts[2]) : '';
+			} else {
+				$rPathSources = $rSource;
+			}
 
-            foreach ($rServers as $rServer) {
-                if (($rServer['direct_source'] ?? 0) == 0 && ($rServer['stream_status'] ?? 0) == 1) {
-                    $activeStreamingServers[] = intval($rServer['id']);
-                }
-                if (isset($rStreamSys[intval($rServer['id'])])) {
-                    $rParent = 'source';
-                } else {
-                    $rParent = 'offline';
-                }
-                $rServerTree[] = ['id' => $rServer['id'], 'parent' => $rParent, 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-            }
-        } else {
-            foreach ($rServers as $rServer) {
-                $rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-            }
-        }
+			foreach ($rServers as $rServer) {
+				if (($rServer['direct_source'] ?? 0) == 0 && ($rServer['stream_status'] ?? 0) == 1) {
+					$activeStreamingServers[] = intval($rServer['id']);
+				}
+				if (isset($rStreamSys[intval($rServer['id'])])) {
+					$rParent = 'source';
+				} else {
+					$rParent = 'offline';
+				}
+				$rServerTree[] = ['id' => $rServer['id'], 'parent' => $rParent, 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+			}
+		} else {
+			foreach ($rServers as $rServer) {
+				$rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+			}
+		}
 
-        // The load-balancer server tree on this form is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The load-balancer server tree on this form is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Movie');
-        $this->render('movie', compact(
-            'rCategories',
-            'rTranscodeProfiles',
-            'rMovie',
-            'rServerTree',
-            'activeStreamingServers',
-            'rStreamSys',
-            'rMovieSource',
-            'rSource',
-            'rPathSources'
-        ));
-    }
+		$this->setTitle('Movie');
+		$this->render('movie', compact(
+			'rCategories',
+			'rTranscodeProfiles',
+			'rMovie',
+			'rServerTree',
+			'activeStreamingServers',
+			'rStreamSys',
+			'rMovieSource',
+			'rSource',
+			'rPathSources'
+		));
+	}
 }
diff --git a/src/Public/Controllers/Admin/MovieListController.php b/src/Public/Controllers/Admin/MovieListController.php
index 74972157..9a974477 100644
--- a/src/Public/Controllers/Admin/MovieListController.php
+++ b/src/Public/Controllers/Admin/MovieListController.php
@@ -17,24 +17,24 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class MovieListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rCategories = CategoryService::getAllByType('movie');
-        $rAudioCodecs = $rVideoCodecs = [];
+		$rCategories = CategoryService::getAllByType('movie');
+		$rAudioCodecs = $rVideoCodecs = [];
 
-        global $db;
-        $db->query('SELECT DISTINCT(`audio_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `audio_codec` IS NOT NULL AND `type` = 2 ORDER BY `audio_codec` ASC;');
-        foreach ($db->get_rows() as $rRow) {
-            $rAudioCodecs[] = $rRow['audio_codec'];
-        }
+		global $db;
+		$db->query('SELECT DISTINCT(`audio_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `audio_codec` IS NOT NULL AND `type` = 2 ORDER BY `audio_codec` ASC;');
+		foreach ($db->get_rows() as $rRow) {
+			$rAudioCodecs[] = $rRow['audio_codec'];
+		}
 
-        $db->query('SELECT DISTINCT(`video_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `video_codec` IS NOT NULL AND `type` = 2 ORDER BY `video_codec` ASC;');
-        foreach ($db->get_rows() as $rRow) {
-            $rVideoCodecs[] = $rRow['video_codec'];
-        }
+		$db->query('SELECT DISTINCT(`video_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `video_codec` IS NOT NULL AND `type` = 2 ORDER BY `video_codec` ASC;');
+		foreach ($db->get_rows() as $rRow) {
+			$rVideoCodecs[] = $rRow['video_codec'];
+		}
 
-        $this->setTitle('Movies');
-        $this->render('movies', compact('rCategories', 'rAudioCodecs', 'rVideoCodecs'));
-    }
+		$this->setTitle('Movies');
+		$this->render('movies', compact('rCategories', 'rAudioCodecs', 'rVideoCodecs'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/MovieMassController.php b/src/Public/Controllers/Admin/MovieMassController.php
index fed8b626..caf465cf 100644
--- a/src/Public/Controllers/Admin/MovieMassController.php
+++ b/src/Public/Controllers/Admin/MovieMassController.php
@@ -20,41 +20,41 @@ use XcVm\Domain\Vod\MovieService;
  */
 
 class MovieMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $rServers;
+		global $rServers;
 
-        $rCategories = CategoryService::getAllByType('movie');
+		$rCategories = CategoryService::getAllByType('movie');
 
-        if (RequestManager::has('submit_stream')) {
-            $rReturn = MovieService::massEdit(RequestManager::getAll());
-            $_STATUS = $rReturn['status'];
-            $GLOBALS['_STATUS'] = $_STATUS;
+		if (RequestManager::has('submit_stream')) {
+			$rReturn = MovieService::massEdit(RequestManager::getAll());
+			$_STATUS = $rReturn['status'];
+			$GLOBALS['_STATUS'] = $_STATUS;
 
-            if ($_STATUS == 0) {
-                header('Location: ./movies_mass?status=0');
-                exit();
-            }
-        }
+			if ($_STATUS == 0) {
+				header('Location: ./movies_mass?status=0');
+				exit();
+			}
+		}
 
-        $rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
-        $rServerTree = [
-            ['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Online</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
-            ['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
-        ];
+		$rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Online</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
+		];
 
-        foreach ($rServers as $rServer) {
-            $rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-        }
+		foreach ($rServers as $rServer) {
+			$rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+		}
 
-        // The load-balancer server tree on this page is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The load-balancer server tree on this page is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Mass Edit Movies');
-        $this->render('movie_mass', compact('rCategories', 'rTranscodeProfiles', 'rServerTree'));
-    }
+		$this->setTitle('Mass Edit Movies');
+		$this->render('movie_mass', compact('rCategories', 'rTranscodeProfiles', 'rServerTree'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/MysqlSyslogController.php b/src/Public/Controllers/Admin/MysqlSyslogController.php
index 58d47a9e..33fb839e 100644
--- a/src/Public/Controllers/Admin/MysqlSyslogController.php
+++ b/src/Public/Controllers/Admin/MysqlSyslogController.php
@@ -20,9 +20,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class MysqlSyslogController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('System Logs');
-        $this->render('mysql_syslog');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('System Logs');
+		$this->render('mysql_syslog');
+	}
 }
diff --git a/src/Public/Controllers/Admin/OndemandController.php b/src/Public/Controllers/Admin/OndemandController.php
index abc68376..6b9aaeec 100644
--- a/src/Public/Controllers/Admin/OndemandController.php
+++ b/src/Public/Controllers/Admin/OndemandController.php
@@ -15,8 +15,8 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class OndemandController extends BaseAdminController {
-    public function index() {
-        $this->setTitle('On-Demand Scanner');
-        $this->render('ondemand');
-    }
+	public function index() {
+		$this->setTitle('On-Demand Scanner');
+		$this->render('ondemand');
+	}
 }
diff --git a/src/Public/Controllers/Admin/PackageController.php b/src/Public/Controllers/Admin/PackageController.php
index a366e3dd..ac571165 100644
--- a/src/Public/Controllers/Admin/PackageController.php
+++ b/src/Public/Controllers/Admin/PackageController.php
@@ -22,19 +22,19 @@ use XcVm\Domain\Line\PackageService;
  */
 
 class PackageController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $this->setTitle('Packages');
+		$this->setTitle('Packages');
 
-        $allPackages = PackageService::getAll();
-        // Фильтруем addon-пакеты (показываем только обычные)
-        $packages = array_filter($allPackages, function ($p) {
-            return empty($p['is_addon']);
-        });
+		$allPackages = PackageService::getAll();
+		// Фильтруем addon-пакеты (показываем только обычные)
+		$packages = array_filter($allPackages, function ($p) {
+			return empty($p['is_addon']);
+		});
 
-        $this->render('packages', [
-            'packages' => $packages,
-        ]);
-    }
+		$this->render('packages', [
+			'packages' => $packages,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/PackageEditController.php b/src/Public/Controllers/Admin/PackageEditController.php
index 9999b200..77c4db10 100644
--- a/src/Public/Controllers/Admin/PackageEditController.php
+++ b/src/Public/Controllers/Admin/PackageEditController.php
@@ -20,22 +20,22 @@ use XcVm\Domain\Line\PackageService;
  */
 
 class PackageEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rPackage = null;
-        $id = $this->input('id');
-        if ($id !== null) {
-            $rPackage = PackageService::getById($id);
-            if (!$rPackage) {
-                AdminHelpers::goHome();
-                return;
-            }
-        }
+		$rPackage = null;
+		$id = $this->input('id');
+		if ($id !== null) {
+			$rPackage = PackageService::getById($id);
+			if (!$rPackage) {
+				AdminHelpers::goHome();
+				return;
+			}
+		}
 
-        $rCountries = array(array('id' => '', 'name' => 'Off'), array('id' => 'A1', 'name' => 'Anonymous Proxy'), array('id' => 'A2', 'name' => 'Satellite Provider'), array('id' => 'O1', 'name' => 'Other Country'), array('id' => 'AF', 'name' => 'Afghanistan'), array('id' => 'AX', 'name' => 'Aland Islands'), array('id' => 'AL', 'name' => 'Albania'), array('id' => 'DZ', 'name' => 'Algeria'), array('id' => 'AS', 'name' => 'American Samoa'), array('id' => 'AD', 'name' => 'Andorra'), array('id' => 'AO', 'name' => 'Angola'), array('id' => 'AI', 'name' => 'Anguilla'), array('id' => 'AQ', 'name' => 'Antarctica'), array('id' => 'AG', 'name' => 'Antigua And Barbuda'), array('id' => 'AR', 'name' => 'Argentina'), array('id' => 'AM', 'name' => 'Armenia'), array('id' => 'AW', 'name' => 'Aruba'), array('id' => 'AU', 'name' => 'Australia'), array('id' => 'AT', 'name' => 'Austria'), array('id' => 'AZ', 'name' => 'Azerbaijan'), array('id' => 'BS', 'name' => 'Bahamas'), array('id' => 'BH', 'name' => 'Bahrain'), array('id' => 'BD', 'name' => 'Bangladesh'), array('id' => 'BB', 'name' => 'Barbados'), array('id' => 'BY', 'name' => 'Belarus'), array('id' => 'BE', 'name' => 'Belgium'), array('id' => 'BZ', 'name' => 'Belize'), array('id' => 'BJ', 'name' => 'Benin'), array('id' => 'BM', 'name' => 'Bermuda'), array('id' => 'BT', 'name' => 'Bhutan'), array('id' => 'BO', 'name' => 'Bolivia'), array('id' => 'BA', 'name' => 'Bosnia And Herzegovina'), array('id' => 'BW', 'name' => 'Botswana'), array('id' => 'BV', 'name' => 'Bouvet Island'), array('id' => 'BR', 'name' => 'Brazil'), array('id' => 'IO', 'name' => 'British Indian Ocean Territory'), array('id' => 'BN', 'name' => 'Brunei Darussalam'), array('id' => 'BG', 'name' => 'Bulgaria'), array('id' => 'BF', 'name' => 'Burkina Faso'), array('id' => 'BI', 'name' => 'Burundi'), array('id' => 'KH', 'name' => 'Cambodia'), array('id' => 'CM', 'name' => 'Cameroon'), array('id' => 'CA', 'name' => 'Canada'), array('id' => 'CV', 'name' => 'Cape Verde'), array('id' => 'KY', 'name' => 'Cayman Islands'), array('id' => 'CF', 'name' => 'Central African Republic'), array('id' => 'TD', 'name' => 'Chad'), array('id' => 'CL', 'name' => 'Chile'), array('id' => 'CN', 'name' => 'China'), array('id' => 'CX', 'name' => 'Christmas Island'), array('id' => 'CC', 'name' => 'Cocos (Keeling) Islands'), array('id' => 'CO', 'name' => 'Colombia'), array('id' => 'KM', 'name' => 'Comoros'), array('id' => 'CG', 'name' => 'Congo'), array('id' => 'CD', 'name' => 'Congo, Democratic Republic'), array('id' => 'CK', 'name' => 'Cook Islands'), array('id' => 'CR', 'name' => 'Costa Rica'), array('id' => 'CI', 'name' => "Cote D'Ivoire"), array('id' => 'HR', 'name' => 'Croatia'), array('id' => 'CU', 'name' => 'Cuba'), array('id' => 'CY', 'name' => 'Cyprus'), array('id' => 'CZ', 'name' => 'Czech Republic'), array('id' => 'DK', 'name' => 'Denmark'), array('id' => 'DJ', 'name' => 'Djibouti'), array('id' => 'DM', 'name' => 'Dominica'), array('id' => 'DO', 'name' => 'Dominican Republic'), array('id' => 'EC', 'name' => 'Ecuador'), array('id' => 'EG', 'name' => 'Egypt'), array('id' => 'SV', 'name' => 'El Salvador'), array('id' => 'GQ', 'name' => 'Equatorial Guinea'), array('id' => 'ER', 'name' => 'Eritrea'), array('id' => 'EE', 'name' => 'Estonia'), array('id' => 'ET', 'name' => 'Ethiopia'), array('id' => 'FK', 'name' => 'Falkland Islands (Malvinas)'), array('id' => 'FO', 'name' => 'Faroe Islands'), array('id' => 'FJ', 'name' => 'Fiji'), array('id' => 'FI', 'name' => 'Finland'), array('id' => 'FR', 'name' => 'France'), array('id' => 'GF', 'name' => 'French Guiana'), array('id' => 'PF', 'name' => 'French Polynesia'), array('id' => 'TF', 'name' => 'French Southern Territories'), array('id' => 'MK', 'name' => 'Fyrom'), array('id' => 'GA', 'name' => 'Gabon'), array('id' => 'GM', 'name' => 'Gambia'), array('id' => 'GE', 'name' => 'Georgia'), array('id' => 'DE', 'name' => 'Germany'), array('id' => 'GH', 'name' => 'Ghana'), array('id' => 'GI', 'name' => 'Gibraltar'), array('id' => 'GR', 'name' => 'Greece'), array('id' => 'GL', 'name' => 'Greenland'), array('id' => 'GD', 'name' => 'Grenada'), array('id' => 'GP', 'name' => 'Guadeloupe'), array('id' => 'GU', 'name' => 'Guam'), array('id' => 'GT', 'name' => 'Guatemala'), array('id' => 'GG', 'name' => 'Guernsey'), array('id' => 'GN', 'name' => 'Guinea'), array('id' => 'GW', 'name' => 'Guinea-Bissau'), array('id' => 'GY', 'name' => 'Guyana'), array('id' => 'HT', 'name' => 'Haiti'), array('id' => 'HM', 'name' => 'Heard Island & Mcdonald Islands'), array('id' => 'VA', 'name' => 'Holy See (Vatican City State)'), array('id' => 'HN', 'name' => 'Honduras'), array('id' => 'HK', 'name' => 'Hong Kong'), array('id' => 'HU', 'name' => 'Hungary'), array('id' => 'IS', 'name' => 'Iceland'), array('id' => 'IN', 'name' => 'India'), array('id' => 'ID', 'name' => 'Indonesia'), array('id' => 'IR', 'name' => 'Iran, Islamic Republic Of'), array('id' => 'IQ', 'name' => 'Iraq'), array('id' => 'IE', 'name' => 'Ireland'), array('id' => 'IM', 'name' => 'Isle Of Man'), array('id' => 'IL', 'name' => 'Israel'), array('id' => 'IT', 'name' => 'Italy'), array('id' => 'JM', 'name' => 'Jamaica'), array('id' => 'JP', 'name' => 'Japan'), array('id' => 'JE', 'name' => 'Jersey'), array('id' => 'JO', 'name' => 'Jordan'), array('id' => 'KZ', 'name' => 'Kazakhstan'), array('id' => 'KE', 'name' => 'Kenya'), array('id' => 'KI', 'name' => 'Kiribati'), array('id' => 'KR', 'name' => 'Korea'), array('id' => 'KW', 'name' => 'Kuwait'), array('id' => 'KG', 'name' => 'Kyrgyzstan'), array('id' => 'LA', 'name' => "Lao People's Democratic Republic"), array('id' => 'LV', 'name' => 'Latvia'), array('id' => 'LB', 'name' => 'Lebanon'), array('id' => 'LS', 'name' => 'Lesotho'), array('id' => 'LR', 'name' => 'Liberia'), array('id' => 'LY', 'name' => 'Libyan Arab Jamahiriya'), array('id' => 'LI', 'name' => 'Liechtenstein'), array('id' => 'LT', 'name' => 'Lithuania'), array('id' => 'LU', 'name' => 'Luxembourg'), array('id' => 'MO', 'name' => 'Macao'), array('id' => 'MG', 'name' => 'Madagascar'), array('id' => 'MW', 'name' => 'Malawi'), array('id' => 'MY', 'name' => 'Malaysia'), array('id' => 'MV', 'name' => 'Maldives'), array('id' => 'ML', 'name' => 'Mali'), array('id' => 'MT', 'name' => 'Malta'), array('id' => 'MH', 'name' => 'Marshall Islands'), array('id' => 'MQ', 'name' => 'Martinique'), array('id' => 'MR', 'name' => 'Mauritania'), array('id' => 'MU', 'name' => 'Mauritius'), array('id' => 'YT', 'name' => 'Mayotte'), array('id' => 'MX', 'name' => 'Mexico'), array('id' => 'FM', 'name' => 'Micronesia, Federated States Of'), array('id' => 'MD', 'name' => 'Moldova'), array('id' => 'MC', 'name' => 'Monaco'), array('id' => 'MN', 'name' => 'Mongolia'), array('id' => 'ME', 'name' => 'Montenegro'), array('id' => 'MS', 'name' => 'Montserrat'), array('id' => 'MA', 'name' => 'Morocco'), array('id' => 'MZ', 'name' => 'Mozambique'), array('id' => 'MM', 'name' => 'Myanmar'), array('id' => 'NA', 'name' => 'Namibia'), array('id' => 'NR', 'name' => 'Nauru'), array('id' => 'NP', 'name' => 'Nepal'), array('id' => 'NL', 'name' => 'Netherlands'), array('id' => 'AN', 'name' => 'Netherlands Antilles'), array('id' => 'NC', 'name' => 'New Caledonia'), array('id' => 'NZ', 'name' => 'New Zealand'), array('id' => 'NI', 'name' => 'Nicaragua'), array('id' => 'NE', 'name' => 'Niger'), array('id' => 'NG', 'name' => 'Nigeria'), array('id' => 'NU', 'name' => 'Niue'), array('id' => 'NF', 'name' => 'Norfolk Island'), array('id' => 'MP', 'name' => 'Northern Mariana Islands'), array('id' => 'NO', 'name' => 'Norway'), array('id' => 'OM', 'name' => 'Oman'), array('id' => 'PK', 'name' => 'Pakistan'), array('id' => 'PW', 'name' => 'Palau'), array('id' => 'PS', 'name' => 'Palestinian Territory, Occupied'), array('id' => 'PA', 'name' => 'Panama'), array('id' => 'PG', 'name' => 'Papua New Guinea'), array('id' => 'PY', 'name' => 'Paraguay'), array('id' => 'PE', 'name' => 'Peru'), array('id' => 'PH', 'name' => 'Philippines'), array('id' => 'PN', 'name' => 'Pitcairn'), array('id' => 'PL', 'name' => 'Poland'), array('id' => 'PT', 'name' => 'Portugal'), array('id' => 'PR', 'name' => 'Puerto Rico'), array('id' => 'QA', 'name' => 'Qatar'), array('id' => 'RE', 'name' => 'Reunion'), array('id' => 'RO', 'name' => 'Romania'), array('id' => 'RU', 'name' => 'Russian Federation'), array('id' => 'RW', 'name' => 'Rwanda'), array('id' => 'BL', 'name' => 'Saint Barthelemy'), array('id' => 'SH', 'name' => 'Saint Helena'), array('id' => 'KN', 'name' => 'Saint Kitts And Nevis'), array('id' => 'LC', 'name' => 'Saint Lucia'), array('id' => 'MF', 'name' => 'Saint Martin'), array('id' => 'PM', 'name' => 'Saint Pierre And Miquelon'), array('id' => 'VC', 'name' => 'Saint Vincent And Grenadines'), array('id' => 'WS', 'name' => 'Samoa'), array('id' => 'SM', 'name' => 'San Marino'), array('id' => 'ST', 'name' => 'Sao Tome And Principe'), array('id' => 'SA', 'name' => 'Saudi Arabia'), array('id' => 'SN', 'name' => 'Senegal'), array('id' => 'RS', 'name' => 'Serbia'), array('id' => 'SC', 'name' => 'Seychelles'), array('id' => 'SL', 'name' => 'Sierra Leone'), array('id' => 'SG', 'name' => 'Singapore'), array('id' => 'SK', 'name' => 'Slovakia'), array('id' => 'SI', 'name' => 'Slovenia'), array('id' => 'SB', 'name' => 'Solomon Islands'), array('id' => 'SO', 'name' => 'Somalia'), array('id' => 'ZA', 'name' => 'South Africa'), array('id' => 'GS', 'name' => 'South Georgia And Sandwich Isl.'), array('id' => 'ES', 'name' => 'Spain'), array('id' => 'LK', 'name' => 'Sri Lanka'), array('id' => 'SD', 'name' => 'Sudan'), array('id' => 'SR', 'name' => 'Suriname'), array('id' => 'SJ', 'name' => 'Svalbard And Jan Mayen'), array('id' => 'SZ', 'name' => 'Swaziland'), array('id' => 'SE', 'name' => 'Sweden'), array('id' => 'CH', 'name' => 'Switzerland'), array('id' => 'SY', 'name' => 'Syrian Arab Republic'), array('id' => 'TW', 'name' => 'Taiwan'), array('id' => 'TJ', 'name' => 'Tajikistan'), array('id' => 'TZ', 'name' => 'Tanzania'), array('id' => 'TH', 'name' => 'Thailand'), array('id' => 'TL', 'name' => 'Timor-Leste'), array('id' => 'TG', 'name' => 'Togo'), array('id' => 'TK', 'name' => 'Tokelau'), array('id' => 'TO', 'name' => 'Tonga'), array('id' => 'TT', 'name' => 'Trinidad And Tobago'), array('id' => 'TN', 'name' => 'Tunisia'), array('id' => 'TR', 'name' => 'Turkey'), array('id' => 'TM', 'name' => 'Turkmenistan'), array('id' => 'TC', 'name' => 'Turks And Caicos Islands'), array('id' => 'TV', 'name' => 'Tuvalu'), array('id' => 'UG', 'name' => 'Uganda'), array('id' => 'UA', 'name' => 'Ukraine'), array('id' => 'AE', 'name' => 'United Arab Emirates'), array('id' => 'GB', 'name' => 'United Kingdom'), array('id' => 'US', 'name' => 'United States'), array('id' => 'UM', 'name' => 'United States Outlying Islands'), array('id' => 'UY', 'name' => 'Uruguay'), array('id' => 'UZ', 'name' => 'Uzbekistan'), array('id' => 'VU', 'name' => 'Vanuatu'), array('id' => 'VE', 'name' => 'Venezuela'), array('id' => 'VN', 'name' => 'Viet Nam'), array('id' => 'VG', 'name' => 'Virgin Islands, British'), array('id' => 'VI', 'name' => 'Virgin Islands, U.S.'), array('id' => 'WF', 'name' => 'Wallis And Futuna'), array('id' => 'EH', 'name' => 'Western Sahara'), array('id' => 'YE', 'name' => 'Yemen'), array('id' => 'ZM', 'name' => 'Zambia'), array('id' => 'ZW', 'name' => 'Zimbabwe'));
+		$rCountries = [['id' => '', 'name' => 'Off'], ['id' => 'A1', 'name' => 'Anonymous Proxy'], ['id' => 'A2', 'name' => 'Satellite Provider'], ['id' => 'O1', 'name' => 'Other Country'], ['id' => 'AF', 'name' => 'Afghanistan'], ['id' => 'AX', 'name' => 'Aland Islands'], ['id' => 'AL', 'name' => 'Albania'], ['id' => 'DZ', 'name' => 'Algeria'], ['id' => 'AS', 'name' => 'American Samoa'], ['id' => 'AD', 'name' => 'Andorra'], ['id' => 'AO', 'name' => 'Angola'], ['id' => 'AI', 'name' => 'Anguilla'], ['id' => 'AQ', 'name' => 'Antarctica'], ['id' => 'AG', 'name' => 'Antigua And Barbuda'], ['id' => 'AR', 'name' => 'Argentina'], ['id' => 'AM', 'name' => 'Armenia'], ['id' => 'AW', 'name' => 'Aruba'], ['id' => 'AU', 'name' => 'Australia'], ['id' => 'AT', 'name' => 'Austria'], ['id' => 'AZ', 'name' => 'Azerbaijan'], ['id' => 'BS', 'name' => 'Bahamas'], ['id' => 'BH', 'name' => 'Bahrain'], ['id' => 'BD', 'name' => 'Bangladesh'], ['id' => 'BB', 'name' => 'Barbados'], ['id' => 'BY', 'name' => 'Belarus'], ['id' => 'BE', 'name' => 'Belgium'], ['id' => 'BZ', 'name' => 'Belize'], ['id' => 'BJ', 'name' => 'Benin'], ['id' => 'BM', 'name' => 'Bermuda'], ['id' => 'BT', 'name' => 'Bhutan'], ['id' => 'BO', 'name' => 'Bolivia'], ['id' => 'BA', 'name' => 'Bosnia And Herzegovina'], ['id' => 'BW', 'name' => 'Botswana'], ['id' => 'BV', 'name' => 'Bouvet Island'], ['id' => 'BR', 'name' => 'Brazil'], ['id' => 'IO', 'name' => 'British Indian Ocean Territory'], ['id' => 'BN', 'name' => 'Brunei Darussalam'], ['id' => 'BG', 'name' => 'Bulgaria'], ['id' => 'BF', 'name' => 'Burkina Faso'], ['id' => 'BI', 'name' => 'Burundi'], ['id' => 'KH', 'name' => 'Cambodia'], ['id' => 'CM', 'name' => 'Cameroon'], ['id' => 'CA', 'name' => 'Canada'], ['id' => 'CV', 'name' => 'Cape Verde'], ['id' => 'KY', 'name' => 'Cayman Islands'], ['id' => 'CF', 'name' => 'Central African Republic'], ['id' => 'TD', 'name' => 'Chad'], ['id' => 'CL', 'name' => 'Chile'], ['id' => 'CN', 'name' => 'China'], ['id' => 'CX', 'name' => 'Christmas Island'], ['id' => 'CC', 'name' => 'Cocos (Keeling) Islands'], ['id' => 'CO', 'name' => 'Colombia'], ['id' => 'KM', 'name' => 'Comoros'], ['id' => 'CG', 'name' => 'Congo'], ['id' => 'CD', 'name' => 'Congo, Democratic Republic'], ['id' => 'CK', 'name' => 'Cook Islands'], ['id' => 'CR', 'name' => 'Costa Rica'], ['id' => 'CI', 'name' => "Cote D'Ivoire"], ['id' => 'HR', 'name' => 'Croatia'], ['id' => 'CU', 'name' => 'Cuba'], ['id' => 'CY', 'name' => 'Cyprus'], ['id' => 'CZ', 'name' => 'Czech Republic'], ['id' => 'DK', 'name' => 'Denmark'], ['id' => 'DJ', 'name' => 'Djibouti'], ['id' => 'DM', 'name' => 'Dominica'], ['id' => 'DO', 'name' => 'Dominican Republic'], ['id' => 'EC', 'name' => 'Ecuador'], ['id' => 'EG', 'name' => 'Egypt'], ['id' => 'SV', 'name' => 'El Salvador'], ['id' => 'GQ', 'name' => 'Equatorial Guinea'], ['id' => 'ER', 'name' => 'Eritrea'], ['id' => 'EE', 'name' => 'Estonia'], ['id' => 'ET', 'name' => 'Ethiopia'], ['id' => 'FK', 'name' => 'Falkland Islands (Malvinas)'], ['id' => 'FO', 'name' => 'Faroe Islands'], ['id' => 'FJ', 'name' => 'Fiji'], ['id' => 'FI', 'name' => 'Finland'], ['id' => 'FR', 'name' => 'France'], ['id' => 'GF', 'name' => 'French Guiana'], ['id' => 'PF', 'name' => 'French Polynesia'], ['id' => 'TF', 'name' => 'French Southern Territories'], ['id' => 'MK', 'name' => 'Fyrom'], ['id' => 'GA', 'name' => 'Gabon'], ['id' => 'GM', 'name' => 'Gambia'], ['id' => 'GE', 'name' => 'Georgia'], ['id' => 'DE', 'name' => 'Germany'], ['id' => 'GH', 'name' => 'Ghana'], ['id' => 'GI', 'name' => 'Gibraltar'], ['id' => 'GR', 'name' => 'Greece'], ['id' => 'GL', 'name' => 'Greenland'], ['id' => 'GD', 'name' => 'Grenada'], ['id' => 'GP', 'name' => 'Guadeloupe'], ['id' => 'GU', 'name' => 'Guam'], ['id' => 'GT', 'name' => 'Guatemala'], ['id' => 'GG', 'name' => 'Guernsey'], ['id' => 'GN', 'name' => 'Guinea'], ['id' => 'GW', 'name' => 'Guinea-Bissau'], ['id' => 'GY', 'name' => 'Guyana'], ['id' => 'HT', 'name' => 'Haiti'], ['id' => 'HM', 'name' => 'Heard Island & Mcdonald Islands'], ['id' => 'VA', 'name' => 'Holy See (Vatican City State)'], ['id' => 'HN', 'name' => 'Honduras'], ['id' => 'HK', 'name' => 'Hong Kong'], ['id' => 'HU', 'name' => 'Hungary'], ['id' => 'IS', 'name' => 'Iceland'], ['id' => 'IN', 'name' => 'India'], ['id' => 'ID', 'name' => 'Indonesia'], ['id' => 'IR', 'name' => 'Iran, Islamic Republic Of'], ['id' => 'IQ', 'name' => 'Iraq'], ['id' => 'IE', 'name' => 'Ireland'], ['id' => 'IM', 'name' => 'Isle Of Man'], ['id' => 'IL', 'name' => 'Israel'], ['id' => 'IT', 'name' => 'Italy'], ['id' => 'JM', 'name' => 'Jamaica'], ['id' => 'JP', 'name' => 'Japan'], ['id' => 'JE', 'name' => 'Jersey'], ['id' => 'JO', 'name' => 'Jordan'], ['id' => 'KZ', 'name' => 'Kazakhstan'], ['id' => 'KE', 'name' => 'Kenya'], ['id' => 'KI', 'name' => 'Kiribati'], ['id' => 'KR', 'name' => 'Korea'], ['id' => 'KW', 'name' => 'Kuwait'], ['id' => 'KG', 'name' => 'Kyrgyzstan'], ['id' => 'LA', 'name' => "Lao People's Democratic Republic"], ['id' => 'LV', 'name' => 'Latvia'], ['id' => 'LB', 'name' => 'Lebanon'], ['id' => 'LS', 'name' => 'Lesotho'], ['id' => 'LR', 'name' => 'Liberia'], ['id' => 'LY', 'name' => 'Libyan Arab Jamahiriya'], ['id' => 'LI', 'name' => 'Liechtenstein'], ['id' => 'LT', 'name' => 'Lithuania'], ['id' => 'LU', 'name' => 'Luxembourg'], ['id' => 'MO', 'name' => 'Macao'], ['id' => 'MG', 'name' => 'Madagascar'], ['id' => 'MW', 'name' => 'Malawi'], ['id' => 'MY', 'name' => 'Malaysia'], ['id' => 'MV', 'name' => 'Maldives'], ['id' => 'ML', 'name' => 'Mali'], ['id' => 'MT', 'name' => 'Malta'], ['id' => 'MH', 'name' => 'Marshall Islands'], ['id' => 'MQ', 'name' => 'Martinique'], ['id' => 'MR', 'name' => 'Mauritania'], ['id' => 'MU', 'name' => 'Mauritius'], ['id' => 'YT', 'name' => 'Mayotte'], ['id' => 'MX', 'name' => 'Mexico'], ['id' => 'FM', 'name' => 'Micronesia, Federated States Of'], ['id' => 'MD', 'name' => 'Moldova'], ['id' => 'MC', 'name' => 'Monaco'], ['id' => 'MN', 'name' => 'Mongolia'], ['id' => 'ME', 'name' => 'Montenegro'], ['id' => 'MS', 'name' => 'Montserrat'], ['id' => 'MA', 'name' => 'Morocco'], ['id' => 'MZ', 'name' => 'Mozambique'], ['id' => 'MM', 'name' => 'Myanmar'], ['id' => 'NA', 'name' => 'Namibia'], ['id' => 'NR', 'name' => 'Nauru'], ['id' => 'NP', 'name' => 'Nepal'], ['id' => 'NL', 'name' => 'Netherlands'], ['id' => 'AN', 'name' => 'Netherlands Antilles'], ['id' => 'NC', 'name' => 'New Caledonia'], ['id' => 'NZ', 'name' => 'New Zealand'], ['id' => 'NI', 'name' => 'Nicaragua'], ['id' => 'NE', 'name' => 'Niger'], ['id' => 'NG', 'name' => 'Nigeria'], ['id' => 'NU', 'name' => 'Niue'], ['id' => 'NF', 'name' => 'Norfolk Island'], ['id' => 'MP', 'name' => 'Northern Mariana Islands'], ['id' => 'NO', 'name' => 'Norway'], ['id' => 'OM', 'name' => 'Oman'], ['id' => 'PK', 'name' => 'Pakistan'], ['id' => 'PW', 'name' => 'Palau'], ['id' => 'PS', 'name' => 'Palestinian Territory, Occupied'], ['id' => 'PA', 'name' => 'Panama'], ['id' => 'PG', 'name' => 'Papua New Guinea'], ['id' => 'PY', 'name' => 'Paraguay'], ['id' => 'PE', 'name' => 'Peru'], ['id' => 'PH', 'name' => 'Philippines'], ['id' => 'PN', 'name' => 'Pitcairn'], ['id' => 'PL', 'name' => 'Poland'], ['id' => 'PT', 'name' => 'Portugal'], ['id' => 'PR', 'name' => 'Puerto Rico'], ['id' => 'QA', 'name' => 'Qatar'], ['id' => 'RE', 'name' => 'Reunion'], ['id' => 'RO', 'name' => 'Romania'], ['id' => 'RU', 'name' => 'Russian Federation'], ['id' => 'RW', 'name' => 'Rwanda'], ['id' => 'BL', 'name' => 'Saint Barthelemy'], ['id' => 'SH', 'name' => 'Saint Helena'], ['id' => 'KN', 'name' => 'Saint Kitts And Nevis'], ['id' => 'LC', 'name' => 'Saint Lucia'], ['id' => 'MF', 'name' => 'Saint Martin'], ['id' => 'PM', 'name' => 'Saint Pierre And Miquelon'], ['id' => 'VC', 'name' => 'Saint Vincent And Grenadines'], ['id' => 'WS', 'name' => 'Samoa'], ['id' => 'SM', 'name' => 'San Marino'], ['id' => 'ST', 'name' => 'Sao Tome And Principe'], ['id' => 'SA', 'name' => 'Saudi Arabia'], ['id' => 'SN', 'name' => 'Senegal'], ['id' => 'RS', 'name' => 'Serbia'], ['id' => 'SC', 'name' => 'Seychelles'], ['id' => 'SL', 'name' => 'Sierra Leone'], ['id' => 'SG', 'name' => 'Singapore'], ['id' => 'SK', 'name' => 'Slovakia'], ['id' => 'SI', 'name' => 'Slovenia'], ['id' => 'SB', 'name' => 'Solomon Islands'], ['id' => 'SO', 'name' => 'Somalia'], ['id' => 'ZA', 'name' => 'South Africa'], ['id' => 'GS', 'name' => 'South Georgia And Sandwich Isl.'], ['id' => 'ES', 'name' => 'Spain'], ['id' => 'LK', 'name' => 'Sri Lanka'], ['id' => 'SD', 'name' => 'Sudan'], ['id' => 'SR', 'name' => 'Suriname'], ['id' => 'SJ', 'name' => 'Svalbard And Jan Mayen'], ['id' => 'SZ', 'name' => 'Swaziland'], ['id' => 'SE', 'name' => 'Sweden'], ['id' => 'CH', 'name' => 'Switzerland'], ['id' => 'SY', 'name' => 'Syrian Arab Republic'], ['id' => 'TW', 'name' => 'Taiwan'], ['id' => 'TJ', 'name' => 'Tajikistan'], ['id' => 'TZ', 'name' => 'Tanzania'], ['id' => 'TH', 'name' => 'Thailand'], ['id' => 'TL', 'name' => 'Timor-Leste'], ['id' => 'TG', 'name' => 'Togo'], ['id' => 'TK', 'name' => 'Tokelau'], ['id' => 'TO', 'name' => 'Tonga'], ['id' => 'TT', 'name' => 'Trinidad And Tobago'], ['id' => 'TN', 'name' => 'Tunisia'], ['id' => 'TR', 'name' => 'Turkey'], ['id' => 'TM', 'name' => 'Turkmenistan'], ['id' => 'TC', 'name' => 'Turks And Caicos Islands'], ['id' => 'TV', 'name' => 'Tuvalu'], ['id' => 'UG', 'name' => 'Uganda'], ['id' => 'UA', 'name' => 'Ukraine'], ['id' => 'AE', 'name' => 'United Arab Emirates'], ['id' => 'GB', 'name' => 'United Kingdom'], ['id' => 'US', 'name' => 'United States'], ['id' => 'UM', 'name' => 'United States Outlying Islands'], ['id' => 'UY', 'name' => 'Uruguay'], ['id' => 'UZ', 'name' => 'Uzbekistan'], ['id' => 'VU', 'name' => 'Vanuatu'], ['id' => 'VE', 'name' => 'Venezuela'], ['id' => 'VN', 'name' => 'Viet Nam'], ['id' => 'VG', 'name' => 'Virgin Islands, British'], ['id' => 'VI', 'name' => 'Virgin Islands, U.S.'], ['id' => 'WF', 'name' => 'Wallis And Futuna'], ['id' => 'EH', 'name' => 'Western Sahara'], ['id' => 'YE', 'name' => 'Yemen'], ['id' => 'ZM', 'name' => 'Zambia'], ['id' => 'ZW', 'name' => 'Zimbabwe']];
 
-        $this->setTitle('Package');
-        $this->render('package', compact('rPackage', 'rCountries'));
-    }
+		$this->setTitle('Package');
+		$this->render('package', compact('rPackage', 'rCountries'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/PanelLogController.php b/src/Public/Controllers/Admin/PanelLogController.php
index faad5825..609359da 100644
--- a/src/Public/Controllers/Admin/PanelLogController.php
+++ b/src/Public/Controllers/Admin/PanelLogController.php
@@ -20,9 +20,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class PanelLogController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Panel Errors');
-        $this->render('panel_logs');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Panel Errors');
+		$this->render('panel_logs');
+	}
 }
diff --git a/src/Public/Controllers/Admin/PlexAddController.php b/src/Public/Controllers/Admin/PlexAddController.php
index b7331281..fcc934b0 100644
--- a/src/Public/Controllers/Admin/PlexAddController.php
+++ b/src/Public/Controllers/Admin/PlexAddController.php
@@ -18,25 +18,25 @@ use XcVm\Domain\Stream\StreamRepository;
  */
 
 class PlexAddController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rFolder = null;
-        $id = $this->input('id');
-        if (isset($id)) {
-            $rFolder = StreamRepository::getWatchFolder($id);
-            if (!$rFolder) {
-                $this->redirect('plex');
-                return;
-            }
-        }
+		$rFolder = null;
+		$id = $this->input('id');
+		if (isset($id)) {
+			$rFolder = StreamRepository::getWatchFolder($id);
+			if (!$rFolder) {
+				$this->redirect('plex');
+				return;
+			}
+		}
 
-        $rBouquets = BouquetService::getAllSimple();
-        if (!is_array($rBouquets)) {
-            $rBouquets = [];
-        }
+		$rBouquets = BouquetService::getAllSimple();
+		if (!is_array($rBouquets)) {
+			$rBouquets = [];
+		}
 
-        $this->setTitle('Add Library');
-        $this->render('plex_add', compact('rFolder', 'rBouquets'));
-    }
+		$this->setTitle('Add Library');
+		$this->render('plex_add', compact('rFolder', 'rBouquets'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ProcessMonitorController.php b/src/Public/Controllers/Admin/ProcessMonitorController.php
index e8aa0215..8a6ce6a8 100644
--- a/src/Public/Controllers/Admin/ProcessMonitorController.php
+++ b/src/Public/Controllers/Admin/ProcessMonitorController.php
@@ -20,33 +20,33 @@ use XcVm\Domain\Stream\StreamRepository;
  */
 
 class ProcessMonitorController extends BaseAdminController {
-    public function index() {
-        global $rServers;
+	public function index() {
+		global $rServers;
 
-        $this->requirePermission();
+		$this->requirePermission();
 
-        if (!RequestManager::has('server') || !isset($rServers[RequestManager::get('server')])) {
-            RequestManager::update('server', SERVER_ID);
-        }
+		if (!RequestManager::has('server') || !isset($rServers[RequestManager::get('server')])) {
+			RequestManager::update('server', SERVER_ID);
+		}
 
-        if (RequestManager::has('clear')) {
-            ServerRepository::freeTemp(RequestManager::get('server'));
-            header('Location: ./process_monitor?server=' . RequestManager::get('server'));
-            exit();
-        }
+		if (RequestManager::has('clear')) {
+			ServerRepository::freeTemp(RequestManager::get('server'));
+			header('Location: ./process_monitor?server=' . RequestManager::get('server'));
+			exit();
+		}
 
-        if (RequestManager::has('clear_s')) {
-            ServerRepository::freeStreams(RequestManager::get('server'));
-            header('Location: ./process_monitor?server=' . RequestManager::get('server'));
-            exit();
-        }
+		if (RequestManager::has('clear_s')) {
+			ServerRepository::freeStreams(RequestManager::get('server'));
+			header('Location: ./process_monitor?server=' . RequestManager::get('server'));
+			exit();
+		}
 
-        $rStreams = StreamRepository::getPIDs(RequestManager::get('server')) ?: array();
-        $rFS = ServerRepository::getFreeSpace(RequestManager::get('server')) ?: array();
-        $rProcesses = DiagnosticsService::getPIDs(RequestManager::get('server')) ?: array();
-        $rStatus = array('D' => 'Uninterruptible Sleep', 'I' => 'Idle', 'R' => 'Running', 'S' => 'Interruptible Sleep', 'T' => 'Stopped', 'W' => 'Paging', 'X' => 'Dead', 'Z' => 'Zombie');
+		$rStreams = StreamRepository::getPIDs(RequestManager::get('server')) ?: [];
+		$rFS = ServerRepository::getFreeSpace(RequestManager::get('server')) ?: [];
+		$rProcesses = DiagnosticsService::getPIDs(RequestManager::get('server')) ?: [];
+		$rStatus = ['D' => 'Uninterruptible Sleep', 'I' => 'Idle', 'R' => 'Running', 'S' => 'Interruptible Sleep', 'T' => 'Stopped', 'W' => 'Paging', 'X' => 'Dead', 'Z' => 'Zombie'];
 
-        $this->setTitle('Process Monitor');
-        $this->render('process_monitor', compact('rStreams', 'rFS', 'rProcesses', 'rStatus'));
-    }
+		$this->setTitle('Process Monitor');
+		$this->render('process_monitor', compact('rStreams', 'rFS', 'rProcesses', 'rStatus'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ProfileController.php b/src/Public/Controllers/Admin/ProfileController.php
index 04382d56..061d2491 100644
--- a/src/Public/Controllers/Admin/ProfileController.php
+++ b/src/Public/Controllers/Admin/ProfileController.php
@@ -17,12 +17,12 @@ use XcVm\Domain\Stream\StreamConfigRepository;
  */
 
 class ProfileController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Transcoding Profiles');
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Transcoding Profiles');
 
-        $this->render('profiles', [
-            'profiles' => StreamConfigRepository::getTranscodeProfiles(),
-        ]);
-    }
+		$this->render('profiles', [
+			'profiles' => StreamConfigRepository::getTranscodeProfiles(),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/ProfileEditController.php b/src/Public/Controllers/Admin/ProfileEditController.php
index 18419bb3..1b29c7bc 100644
--- a/src/Public/Controllers/Admin/ProfileEditController.php
+++ b/src/Public/Controllers/Admin/ProfileEditController.php
@@ -20,50 +20,50 @@ use XcVm\Domain\Stream\StreamConfigRepository;
  */
 
 class ProfileEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $rServers;
+		global $rServers;
 
-        $rProfileArr = null;
-        $rProfileOptions = null;
+		$rProfileArr = null;
+		$rProfileOptions = null;
 
-        $id = $this->input('id');
-        if ($id !== null) {
-            $rProfileArr = StreamConfigRepository::getTranscodeProfile($id);
-            if (!$rProfileArr) {
-                AdminHelpers::goHome();
-                return;
-            }
-        }
+		$id = $this->input('id');
+		if ($id !== null) {
+			$rProfileArr = StreamConfigRepository::getTranscodeProfile($id);
+			if (!$rProfileArr) {
+				AdminHelpers::goHome();
+				return;
+			}
+		}
 
-        if (isset($rProfileArr)) {
-            $rProfileOptions = json_decode($rProfileArr['profile_options'], true);
+		if (isset($rProfileArr)) {
+			$rProfileOptions = json_decode($rProfileArr['profile_options'], true);
 
-            if ($rProfileOptions['software_decoding']) {
-                if (isset($rProfileOptions[9])) {
-                    $rProfileOptions['gpu']['resize'] = str_replace(':', 'x', $rProfileOptions[9]['val']);
-                }
-                $rProfileOptions['gpu']['deint'] = intval(isset($rProfileOptions[17]));
-            } else {
-                if (isset($rProfileOptions['gpu']['resize'])) {
-                    $rProfileOptions[9]['val'] = str_replace('x', ':', $rProfileOptions['gpu']['resize']);
-                }
-                $rProfileOptions[17]['val'] = 0 < intval($rProfileOptions['gpu']['deint']);
-            }
-        }
+			if ($rProfileOptions['software_decoding']) {
+				if (isset($rProfileOptions[9])) {
+					$rProfileOptions['gpu']['resize'] = str_replace(':', 'x', $rProfileOptions[9]['val']);
+				}
+				$rProfileOptions['gpu']['deint'] = intval(isset($rProfileOptions[17]));
+			} else {
+				if (isset($rProfileOptions['gpu']['resize'])) {
+					$rProfileOptions[9]['val'] = str_replace('x', ':', $rProfileOptions['gpu']['resize']);
+				}
+				$rProfileOptions[17]['val'] = 0 < intval($rProfileOptions['gpu']['deint']);
+			}
+		}
 
-        $rDevices = array('Off');
-        foreach ($rServers as $rServer) {
-            $rServer['gpu_info'] = json_decode($rServer['gpu_info'], true);
-            if (isset($rServer['gpu_info']['gpus'])) {
-                foreach ($rServer['gpu_info']['gpus'] as $rGPUID => $rGPU) {
-                    $rDevices[$rServer['id'] . '_' . $rGPUID] = $rServer['server_name'] . ' - ' . $rGPU['name'];
-                }
-            }
-        }
+		$rDevices = ['Off'];
+		foreach ($rServers as $rServer) {
+			$rServer['gpu_info'] = json_decode($rServer['gpu_info'], true);
+			if (isset($rServer['gpu_info']['gpus'])) {
+				foreach ($rServer['gpu_info']['gpus'] as $rGPUID => $rGPU) {
+					$rDevices[$rServer['id'] . '_' . $rGPUID] = $rServer['server_name'] . ' - ' . $rGPU['name'];
+				}
+			}
+		}
 
-        $this->setTitle('Transcoding Profile');
-        $this->render('profile', compact('rProfileArr', 'rProfileOptions', 'rDevices'));
-    }
+		$this->setTitle('Transcoding Profile');
+		$this->render('profile', compact('rProfileArr', 'rProfileOptions', 'rDevices'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ProviderController.php b/src/Public/Controllers/Admin/ProviderController.php
index 7a121e64..046c5518 100644
--- a/src/Public/Controllers/Admin/ProviderController.php
+++ b/src/Public/Controllers/Admin/ProviderController.php
@@ -17,12 +17,12 @@ use XcVm\Domain\Stream\ProviderService;
  */
 
 class ProviderController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Stream Providers');
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Stream Providers');
 
-        $this->render('providers', [
-            'providers' => ProviderService::getAll(),
-        ]);
-    }
+		$this->render('providers', [
+			'providers' => ProviderService::getAll(),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/ProviderEditController.php b/src/Public/Controllers/Admin/ProviderEditController.php
index e12e0b30..10e6270f 100644
--- a/src/Public/Controllers/Admin/ProviderEditController.php
+++ b/src/Public/Controllers/Admin/ProviderEditController.php
@@ -19,19 +19,19 @@ use XcVm\Domain\Stream\ProviderService;
  */
 
 class ProviderEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rProvider = null;
-        $id = $this->input('id');
-        if ($id !== null) {
-            $rProvider = ProviderService::getById($id);
-            if (!$rProvider) {
-                exit();
-            }
-        }
+		$rProvider = null;
+		$id = $this->input('id');
+		if ($id !== null) {
+			$rProvider = ProviderService::getById($id);
+			if (!$rProvider) {
+				exit();
+			}
+		}
 
-        $this->setTitle('Stream Provider');
-        $this->render('provider', compact('rProvider'));
-    }
+		$this->setTitle('Stream Provider');
+		$this->render('provider', compact('rProvider'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ProxiesController.php b/src/Public/Controllers/Admin/ProxiesController.php
index 4ae88a2a..fd4a707b 100644
--- a/src/Public/Controllers/Admin/ProxiesController.php
+++ b/src/Public/Controllers/Admin/ProxiesController.php
@@ -17,12 +17,12 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class ProxiesController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rServers = ServerRepository::getAll(true);
+		$rServers = ServerRepository::getAll(true);
 
-        $this->setTitle('Proxy Servers');
-        $this->render('proxies', compact('rServers'));
-    }
+		$this->setTitle('Proxy Servers');
+		$this->render('proxies', compact('rServers'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ProxyController.php b/src/Public/Controllers/Admin/ProxyController.php
index 39c1ff09..b67a69a7 100644
--- a/src/Public/Controllers/Admin/ProxyController.php
+++ b/src/Public/Controllers/Admin/ProxyController.php
@@ -17,25 +17,25 @@ use XcVm\Core\Http\RequestManager;
  */
 
 class ProxyController extends BaseAdminController {
-    public function index() {
-        global $rProxyServers;
+	public function index() {
+		global $rProxyServers;
 
-        $this->requirePermission();
+		$this->requirePermission();
 
-        if (RequestManager::has('id') && isset($rProxyServers[RequestManager::get('id')])) {
-            $rServerArr = $rProxyServers[RequestManager::get('id')];
-            if ($rServerArr['server_type'] != 1) {
-                $this->redirect('proxies');
-                return;
-            }
-        } else {
-            $this->redirect('proxies');
-            return;
-        }
+		if (RequestManager::has('id') && isset($rProxyServers[RequestManager::get('id')])) {
+			$rServerArr = $rProxyServers[RequestManager::get('id')];
+			if ($rServerArr['server_type'] != 1) {
+				$this->redirect('proxies');
+				return;
+			}
+		} else {
+			$this->redirect('proxies');
+			return;
+		}
 
-        $rCountries = array(array('id' => 'ALL', 'name' => 'All Countries'), array('id' => 'A1', 'name' => 'Anonymous Proxy'), array('id' => 'A2', 'name' => 'Satellite Provider'), array('id' => 'O1', 'name' => 'Other Country'), array('id' => 'AF', 'name' => 'Afghanistan'), array('id' => 'AX', 'name' => 'Aland Islands'), array('id' => 'AL', 'name' => 'Albania'), array('id' => 'DZ', 'name' => 'Algeria'), array('id' => 'AS', 'name' => 'American Samoa'), array('id' => 'AD', 'name' => 'Andorra'), array('id' => 'AO', 'name' => 'Angola'), array('id' => 'AI', 'name' => 'Anguilla'), array('id' => 'AQ', 'name' => 'Antarctica'), array('id' => 'AG', 'name' => 'Antigua And Barbuda'), array('id' => 'AR', 'name' => 'Argentina'), array('id' => 'AM', 'name' => 'Armenia'), array('id' => 'AW', 'name' => 'Aruba'), array('id' => 'AU', 'name' => 'Australia'), array('id' => 'AT', 'name' => 'Austria'), array('id' => 'AZ', 'name' => 'Azerbaijan'), array('id' => 'BS', 'name' => 'Bahamas'), array('id' => 'BH', 'name' => 'Bahrain'), array('id' => 'BD', 'name' => 'Bangladesh'), array('id' => 'BB', 'name' => 'Barbados'), array('id' => 'BY', 'name' => 'Belarus'), array('id' => 'BE', 'name' => 'Belgium'), array('id' => 'BZ', 'name' => 'Belize'), array('id' => 'BJ', 'name' => 'Benin'), array('id' => 'BM', 'name' => 'Bermuda'), array('id' => 'BT', 'name' => 'Bhutan'), array('id' => 'BO', 'name' => 'Bolivia'), array('id' => 'BA', 'name' => 'Bosnia And Herzegovina'), array('id' => 'BW', 'name' => 'Botswana'), array('id' => 'BV', 'name' => 'Bouvet Island'), array('id' => 'BR', 'name' => 'Brazil'), array('id' => 'IO', 'name' => 'British Indian Ocean Territory'), array('id' => 'BN', 'name' => 'Brunei Darussalam'), array('id' => 'BG', 'name' => 'Bulgaria'), array('id' => 'BF', 'name' => 'Burkina Faso'), array('id' => 'BI', 'name' => 'Burundi'), array('id' => 'KH', 'name' => 'Cambodia'), array('id' => 'CM', 'name' => 'Cameroon'), array('id' => 'CA', 'name' => 'Canada'), array('id' => 'CV', 'name' => 'Cape Verde'), array('id' => 'KY', 'name' => 'Cayman Islands'), array('id' => 'CF', 'name' => 'Central African Republic'), array('id' => 'TD', 'name' => 'Chad'), array('id' => 'CL', 'name' => 'Chile'), array('id' => 'CN', 'name' => 'China'), array('id' => 'CX', 'name' => 'Christmas Island'), array('id' => 'CC', 'name' => 'Cocos (Keeling) Islands'), array('id' => 'CO', 'name' => 'Colombia'), array('id' => 'KM', 'name' => 'Comoros'), array('id' => 'CG', 'name' => 'Congo'), array('id' => 'CD', 'name' => 'Congo, Democratic Republic'), array('id' => 'CK', 'name' => 'Cook Islands'), array('id' => 'CR', 'name' => 'Costa Rica'), array('id' => 'CI', 'name' => "Cote D'Ivoire"), array('id' => 'HR', 'name' => 'Croatia'), array('id' => 'CU', 'name' => 'Cuba'), array('id' => 'CY', 'name' => 'Cyprus'), array('id' => 'CZ', 'name' => 'Czech Republic'), array('id' => 'DK', 'name' => 'Denmark'), array('id' => 'DJ', 'name' => 'Djibouti'), array('id' => 'DM', 'name' => 'Dominica'), array('id' => 'DO', 'name' => 'Dominican Republic'), array('id' => 'EC', 'name' => 'Ecuador'), array('id' => 'EG', 'name' => 'Egypt'), array('id' => 'SV', 'name' => 'El Salvador'), array('id' => 'GQ', 'name' => 'Equatorial Guinea'), array('id' => 'ER', 'name' => 'Eritrea'), array('id' => 'EE', 'name' => 'Estonia'), array('id' => 'ET', 'name' => 'Ethiopia'), array('id' => 'FK', 'name' => 'Falkland Islands (Malvinas)'), array('id' => 'FO', 'name' => 'Faroe Islands'), array('id' => 'FJ', 'name' => 'Fiji'), array('id' => 'FI', 'name' => 'Finland'), array('id' => 'FR', 'name' => 'France'), array('id' => 'GF', 'name' => 'French Guiana'), array('id' => 'PF', 'name' => 'French Polynesia'), array('id' => 'TF', 'name' => 'French Southern Territories'), array('id' => 'MK', 'name' => 'Fyrom'), array('id' => 'GA', 'name' => 'Gabon'), array('id' => 'GM', 'name' => 'Gambia'), array('id' => 'GE', 'name' => 'Georgia'), array('id' => 'DE', 'name' => 'Germany'), array('id' => 'GH', 'name' => 'Ghana'), array('id' => 'GI', 'name' => 'Gibraltar'), array('id' => 'GR', 'name' => 'Greece'), array('id' => 'GL', 'name' => 'Greenland'), array('id' => 'GD', 'name' => 'Grenada'), array('id' => 'GP', 'name' => 'Guadeloupe'), array('id' => 'GU', 'name' => 'Guam'), array('id' => 'GT', 'name' => 'Guatemala'), array('id' => 'GG', 'name' => 'Guernsey'), array('id' => 'GN', 'name' => 'Guinea'), array('id' => 'GW', 'name' => 'Guinea-Bissau'), array('id' => 'GY', 'name' => 'Guyana'), array('id' => 'HT', 'name' => 'Haiti'), array('id' => 'HM', 'name' => 'Heard Island & Mcdonald Islands'), array('id' => 'VA', 'name' => 'Holy See (Vatican City State)'), array('id' => 'HN', 'name' => 'Honduras'), array('id' => 'HK', 'name' => 'Hong Kong'), array('id' => 'HU', 'name' => 'Hungary'), array('id' => 'IS', 'name' => 'Iceland'), array('id' => 'IN', 'name' => 'India'), array('id' => 'ID', 'name' => 'Indonesia'), array('id' => 'IR', 'name' => 'Iran, Islamic Republic Of'), array('id' => 'IQ', 'name' => 'Iraq'), array('id' => 'IE', 'name' => 'Ireland'), array('id' => 'IM', 'name' => 'Isle Of Man'), array('id' => 'IL', 'name' => 'Israel'), array('id' => 'IT', 'name' => 'Italy'), array('id' => 'JM', 'name' => 'Jamaica'), array('id' => 'JP', 'name' => 'Japan'), array('id' => 'JE', 'name' => 'Jersey'), array('id' => 'JO', 'name' => 'Jordan'), array('id' => 'KZ', 'name' => 'Kazakhstan'), array('id' => 'KE', 'name' => 'Kenya'), array('id' => 'KI', 'name' => 'Kiribati'), array('id' => 'KR', 'name' => 'Korea'), array('id' => 'KW', 'name' => 'Kuwait'), array('id' => 'KG', 'name' => 'Kyrgyzstan'), array('id' => 'LA', 'name' => "Lao People's Democratic Republic"), array('id' => 'LV', 'name' => 'Latvia'), array('id' => 'LB', 'name' => 'Lebanon'), array('id' => 'LS', 'name' => 'Lesotho'), array('id' => 'LR', 'name' => 'Liberia'), array('id' => 'LY', 'name' => 'Libyan Arab Jamahiriya'), array('id' => 'LI', 'name' => 'Liechtenstein'), array('id' => 'LT', 'name' => 'Lithuania'), array('id' => 'LU', 'name' => 'Luxembourg'), array('id' => 'MO', 'name' => 'Macao'), array('id' => 'MG', 'name' => 'Madagascar'), array('id' => 'MW', 'name' => 'Malawi'), array('id' => 'MY', 'name' => 'Malaysia'), array('id' => 'MV', 'name' => 'Maldives'), array('id' => 'ML', 'name' => 'Mali'), array('id' => 'MT', 'name' => 'Malta'), array('id' => 'MH', 'name' => 'Marshall Islands'), array('id' => 'MQ', 'name' => 'Martinique'), array('id' => 'MR', 'name' => 'Mauritania'), array('id' => 'MU', 'name' => 'Mauritius'), array('id' => 'YT', 'name' => 'Mayotte'), array('id' => 'MX', 'name' => 'Mexico'), array('id' => 'FM', 'name' => 'Micronesia, Federated States Of'), array('id' => 'MD', 'name' => 'Moldova'), array('id' => 'MC', 'name' => 'Monaco'), array('id' => 'MN', 'name' => 'Mongolia'), array('id' => 'ME', 'name' => 'Montenegro'), array('id' => 'MS', 'name' => 'Montserrat'), array('id' => 'MA', 'name' => 'Morocco'), array('id' => 'MZ', 'name' => 'Mozambique'), array('id' => 'MM', 'name' => 'Myanmar'), array('id' => 'NA', 'name' => 'Namibia'), array('id' => 'NR', 'name' => 'Nauru'), array('id' => 'NP', 'name' => 'Nepal'), array('id' => 'NL', 'name' => 'Netherlands'), array('id' => 'AN', 'name' => 'Netherlands Antilles'), array('id' => 'NC', 'name' => 'New Caledonia'), array('id' => 'NZ', 'name' => 'New Zealand'), array('id' => 'NI', 'name' => 'Nicaragua'), array('id' => 'NE', 'name' => 'Niger'), array('id' => 'NG', 'name' => 'Nigeria'), array('id' => 'NU', 'name' => 'Niue'), array('id' => 'NF', 'name' => 'Norfolk Island'), array('id' => 'MP', 'name' => 'Northern Mariana Islands'), array('id' => 'NO', 'name' => 'Norway'), array('id' => 'OM', 'name' => 'Oman'), array('id' => 'PK', 'name' => 'Pakistan'), array('id' => 'PW', 'name' => 'Palau'), array('id' => 'PS', 'name' => 'Palestinian Territory, Occupied'), array('id' => 'PA', 'name' => 'Panama'), array('id' => 'PG', 'name' => 'Papua New Guinea'), array('id' => 'PY', 'name' => 'Paraguay'), array('id' => 'PE', 'name' => 'Peru'), array('id' => 'PH', 'name' => 'Philippines'), array('id' => 'PN', 'name' => 'Pitcairn'), array('id' => 'PL', 'name' => 'Poland'), array('id' => 'PT', 'name' => 'Portugal'), array('id' => 'PR', 'name' => 'Puerto Rico'), array('id' => 'QA', 'name' => 'Qatar'), array('id' => 'RE', 'name' => 'Reunion'), array('id' => 'RO', 'name' => 'Romania'), array('id' => 'RU', 'name' => 'Russian Federation'), array('id' => 'RW', 'name' => 'Rwanda'), array('id' => 'BL', 'name' => 'Saint Barthelemy'), array('id' => 'SH', 'name' => 'Saint Helena'), array('id' => 'KN', 'name' => 'Saint Kitts And Nevis'), array('id' => 'LC', 'name' => 'Saint Lucia'), array('id' => 'MF', 'name' => 'Saint Martin'), array('id' => 'PM', 'name' => 'Saint Pierre And Miquelon'), array('id' => 'VC', 'name' => 'Saint Vincent And Grenadines'), array('id' => 'WS', 'name' => 'Samoa'), array('id' => 'SM', 'name' => 'San Marino'), array('id' => 'ST', 'name' => 'Sao Tome And Principe'), array('id' => 'SA', 'name' => 'Saudi Arabia'), array('id' => 'SN', 'name' => 'Senegal'), array('id' => 'RS', 'name' => 'Serbia'), array('id' => 'SC', 'name' => 'Seychelles'), array('id' => 'SL', 'name' => 'Sierra Leone'), array('id' => 'SG', 'name' => 'Singapore'), array('id' => 'SK', 'name' => 'Slovakia'), array('id' => 'SI', 'name' => 'Slovenia'), array('id' => 'SB', 'name' => 'Solomon Islands'), array('id' => 'SO', 'name' => 'Somalia'), array('id' => 'ZA', 'name' => 'South Africa'), array('id' => 'GS', 'name' => 'South Georgia And Sandwich Isl.'), array('id' => 'ES', 'name' => 'Spain'), array('id' => 'LK', 'name' => 'Sri Lanka'), array('id' => 'SD', 'name' => 'Sudan'), array('id' => 'SR', 'name' => 'Suriname'), array('id' => 'SJ', 'name' => 'Svalbard And Jan Mayen'), array('id' => 'SZ', 'name' => 'Swaziland'), array('id' => 'SE', 'name' => 'Sweden'), array('id' => 'CH', 'name' => 'Switzerland'), array('id' => 'SY', 'name' => 'Syrian Arab Republic'), array('id' => 'TW', 'name' => 'Taiwan'), array('id' => 'TJ', 'name' => 'Tajikistan'), array('id' => 'TZ', 'name' => 'Tanzania'), array('id' => 'TH', 'name' => 'Thailand'), array('id' => 'TL', 'name' => 'Timor-Leste'), array('id' => 'TG', 'name' => 'Togo'), array('id' => 'TK', 'name' => 'Tokelau'), array('id' => 'TO', 'name' => 'Tonga'), array('id' => 'TT', 'name' => 'Trinidad And Tobago'), array('id' => 'TN', 'name' => 'Tunisia'), array('id' => 'TR', 'name' => 'Turkey'), array('id' => 'TM', 'name' => 'Turkmenistan'), array('id' => 'TC', 'name' => 'Turks And Caicos Islands'), array('id' => 'TV', 'name' => 'Tuvalu'), array('id' => 'UG', 'name' => 'Uganda'), array('id' => 'UA', 'name' => 'Ukraine'), array('id' => 'AE', 'name' => 'United Arab Emirates'), array('id' => 'GB', 'name' => 'United Kingdom'), array('id' => 'US', 'name' => 'United States'), array('id' => 'UM', 'name' => 'United States Outlying Islands'), array('id' => 'UY', 'name' => 'Uruguay'), array('id' => 'UZ', 'name' => 'Uzbekistan'), array('id' => 'VU', 'name' => 'Vanuatu'), array('id' => 'VE', 'name' => 'Venezuela'), array('id' => 'VN', 'name' => 'Viet Nam'), array('id' => 'VG', 'name' => 'Virgin Islands, British'), array('id' => 'VI', 'name' => 'Virgin Islands, U.S.'), array('id' => 'WF', 'name' => 'Wallis And Futuna'), array('id' => 'EH', 'name' => 'Western Sahara'), array('id' => 'YE', 'name' => 'Yemen'), array('id' => 'ZM', 'name' => 'Zambia'), array('id' => 'ZW', 'name' => 'Zimbabwe'));
+		$rCountries = [['id' => 'ALL', 'name' => 'All Countries'], ['id' => 'A1', 'name' => 'Anonymous Proxy'], ['id' => 'A2', 'name' => 'Satellite Provider'], ['id' => 'O1', 'name' => 'Other Country'], ['id' => 'AF', 'name' => 'Afghanistan'], ['id' => 'AX', 'name' => 'Aland Islands'], ['id' => 'AL', 'name' => 'Albania'], ['id' => 'DZ', 'name' => 'Algeria'], ['id' => 'AS', 'name' => 'American Samoa'], ['id' => 'AD', 'name' => 'Andorra'], ['id' => 'AO', 'name' => 'Angola'], ['id' => 'AI', 'name' => 'Anguilla'], ['id' => 'AQ', 'name' => 'Antarctica'], ['id' => 'AG', 'name' => 'Antigua And Barbuda'], ['id' => 'AR', 'name' => 'Argentina'], ['id' => 'AM', 'name' => 'Armenia'], ['id' => 'AW', 'name' => 'Aruba'], ['id' => 'AU', 'name' => 'Australia'], ['id' => 'AT', 'name' => 'Austria'], ['id' => 'AZ', 'name' => 'Azerbaijan'], ['id' => 'BS', 'name' => 'Bahamas'], ['id' => 'BH', 'name' => 'Bahrain'], ['id' => 'BD', 'name' => 'Bangladesh'], ['id' => 'BB', 'name' => 'Barbados'], ['id' => 'BY', 'name' => 'Belarus'], ['id' => 'BE', 'name' => 'Belgium'], ['id' => 'BZ', 'name' => 'Belize'], ['id' => 'BJ', 'name' => 'Benin'], ['id' => 'BM', 'name' => 'Bermuda'], ['id' => 'BT', 'name' => 'Bhutan'], ['id' => 'BO', 'name' => 'Bolivia'], ['id' => 'BA', 'name' => 'Bosnia And Herzegovina'], ['id' => 'BW', 'name' => 'Botswana'], ['id' => 'BV', 'name' => 'Bouvet Island'], ['id' => 'BR', 'name' => 'Brazil'], ['id' => 'IO', 'name' => 'British Indian Ocean Territory'], ['id' => 'BN', 'name' => 'Brunei Darussalam'], ['id' => 'BG', 'name' => 'Bulgaria'], ['id' => 'BF', 'name' => 'Burkina Faso'], ['id' => 'BI', 'name' => 'Burundi'], ['id' => 'KH', 'name' => 'Cambodia'], ['id' => 'CM', 'name' => 'Cameroon'], ['id' => 'CA', 'name' => 'Canada'], ['id' => 'CV', 'name' => 'Cape Verde'], ['id' => 'KY', 'name' => 'Cayman Islands'], ['id' => 'CF', 'name' => 'Central African Republic'], ['id' => 'TD', 'name' => 'Chad'], ['id' => 'CL', 'name' => 'Chile'], ['id' => 'CN', 'name' => 'China'], ['id' => 'CX', 'name' => 'Christmas Island'], ['id' => 'CC', 'name' => 'Cocos (Keeling) Islands'], ['id' => 'CO', 'name' => 'Colombia'], ['id' => 'KM', 'name' => 'Comoros'], ['id' => 'CG', 'name' => 'Congo'], ['id' => 'CD', 'name' => 'Congo, Democratic Republic'], ['id' => 'CK', 'name' => 'Cook Islands'], ['id' => 'CR', 'name' => 'Costa Rica'], ['id' => 'CI', 'name' => "Cote D'Ivoire"], ['id' => 'HR', 'name' => 'Croatia'], ['id' => 'CU', 'name' => 'Cuba'], ['id' => 'CY', 'name' => 'Cyprus'], ['id' => 'CZ', 'name' => 'Czech Republic'], ['id' => 'DK', 'name' => 'Denmark'], ['id' => 'DJ', 'name' => 'Djibouti'], ['id' => 'DM', 'name' => 'Dominica'], ['id' => 'DO', 'name' => 'Dominican Republic'], ['id' => 'EC', 'name' => 'Ecuador'], ['id' => 'EG', 'name' => 'Egypt'], ['id' => 'SV', 'name' => 'El Salvador'], ['id' => 'GQ', 'name' => 'Equatorial Guinea'], ['id' => 'ER', 'name' => 'Eritrea'], ['id' => 'EE', 'name' => 'Estonia'], ['id' => 'ET', 'name' => 'Ethiopia'], ['id' => 'FK', 'name' => 'Falkland Islands (Malvinas)'], ['id' => 'FO', 'name' => 'Faroe Islands'], ['id' => 'FJ', 'name' => 'Fiji'], ['id' => 'FI', 'name' => 'Finland'], ['id' => 'FR', 'name' => 'France'], ['id' => 'GF', 'name' => 'French Guiana'], ['id' => 'PF', 'name' => 'French Polynesia'], ['id' => 'TF', 'name' => 'French Southern Territories'], ['id' => 'MK', 'name' => 'Fyrom'], ['id' => 'GA', 'name' => 'Gabon'], ['id' => 'GM', 'name' => 'Gambia'], ['id' => 'GE', 'name' => 'Georgia'], ['id' => 'DE', 'name' => 'Germany'], ['id' => 'GH', 'name' => 'Ghana'], ['id' => 'GI', 'name' => 'Gibraltar'], ['id' => 'GR', 'name' => 'Greece'], ['id' => 'GL', 'name' => 'Greenland'], ['id' => 'GD', 'name' => 'Grenada'], ['id' => 'GP', 'name' => 'Guadeloupe'], ['id' => 'GU', 'name' => 'Guam'], ['id' => 'GT', 'name' => 'Guatemala'], ['id' => 'GG', 'name' => 'Guernsey'], ['id' => 'GN', 'name' => 'Guinea'], ['id' => 'GW', 'name' => 'Guinea-Bissau'], ['id' => 'GY', 'name' => 'Guyana'], ['id' => 'HT', 'name' => 'Haiti'], ['id' => 'HM', 'name' => 'Heard Island & Mcdonald Islands'], ['id' => 'VA', 'name' => 'Holy See (Vatican City State)'], ['id' => 'HN', 'name' => 'Honduras'], ['id' => 'HK', 'name' => 'Hong Kong'], ['id' => 'HU', 'name' => 'Hungary'], ['id' => 'IS', 'name' => 'Iceland'], ['id' => 'IN', 'name' => 'India'], ['id' => 'ID', 'name' => 'Indonesia'], ['id' => 'IR', 'name' => 'Iran, Islamic Republic Of'], ['id' => 'IQ', 'name' => 'Iraq'], ['id' => 'IE', 'name' => 'Ireland'], ['id' => 'IM', 'name' => 'Isle Of Man'], ['id' => 'IL', 'name' => 'Israel'], ['id' => 'IT', 'name' => 'Italy'], ['id' => 'JM', 'name' => 'Jamaica'], ['id' => 'JP', 'name' => 'Japan'], ['id' => 'JE', 'name' => 'Jersey'], ['id' => 'JO', 'name' => 'Jordan'], ['id' => 'KZ', 'name' => 'Kazakhstan'], ['id' => 'KE', 'name' => 'Kenya'], ['id' => 'KI', 'name' => 'Kiribati'], ['id' => 'KR', 'name' => 'Korea'], ['id' => 'KW', 'name' => 'Kuwait'], ['id' => 'KG', 'name' => 'Kyrgyzstan'], ['id' => 'LA', 'name' => "Lao People's Democratic Republic"], ['id' => 'LV', 'name' => 'Latvia'], ['id' => 'LB', 'name' => 'Lebanon'], ['id' => 'LS', 'name' => 'Lesotho'], ['id' => 'LR', 'name' => 'Liberia'], ['id' => 'LY', 'name' => 'Libyan Arab Jamahiriya'], ['id' => 'LI', 'name' => 'Liechtenstein'], ['id' => 'LT', 'name' => 'Lithuania'], ['id' => 'LU', 'name' => 'Luxembourg'], ['id' => 'MO', 'name' => 'Macao'], ['id' => 'MG', 'name' => 'Madagascar'], ['id' => 'MW', 'name' => 'Malawi'], ['id' => 'MY', 'name' => 'Malaysia'], ['id' => 'MV', 'name' => 'Maldives'], ['id' => 'ML', 'name' => 'Mali'], ['id' => 'MT', 'name' => 'Malta'], ['id' => 'MH', 'name' => 'Marshall Islands'], ['id' => 'MQ', 'name' => 'Martinique'], ['id' => 'MR', 'name' => 'Mauritania'], ['id' => 'MU', 'name' => 'Mauritius'], ['id' => 'YT', 'name' => 'Mayotte'], ['id' => 'MX', 'name' => 'Mexico'], ['id' => 'FM', 'name' => 'Micronesia, Federated States Of'], ['id' => 'MD', 'name' => 'Moldova'], ['id' => 'MC', 'name' => 'Monaco'], ['id' => 'MN', 'name' => 'Mongolia'], ['id' => 'ME', 'name' => 'Montenegro'], ['id' => 'MS', 'name' => 'Montserrat'], ['id' => 'MA', 'name' => 'Morocco'], ['id' => 'MZ', 'name' => 'Mozambique'], ['id' => 'MM', 'name' => 'Myanmar'], ['id' => 'NA', 'name' => 'Namibia'], ['id' => 'NR', 'name' => 'Nauru'], ['id' => 'NP', 'name' => 'Nepal'], ['id' => 'NL', 'name' => 'Netherlands'], ['id' => 'AN', 'name' => 'Netherlands Antilles'], ['id' => 'NC', 'name' => 'New Caledonia'], ['id' => 'NZ', 'name' => 'New Zealand'], ['id' => 'NI', 'name' => 'Nicaragua'], ['id' => 'NE', 'name' => 'Niger'], ['id' => 'NG', 'name' => 'Nigeria'], ['id' => 'NU', 'name' => 'Niue'], ['id' => 'NF', 'name' => 'Norfolk Island'], ['id' => 'MP', 'name' => 'Northern Mariana Islands'], ['id' => 'NO', 'name' => 'Norway'], ['id' => 'OM', 'name' => 'Oman'], ['id' => 'PK', 'name' => 'Pakistan'], ['id' => 'PW', 'name' => 'Palau'], ['id' => 'PS', 'name' => 'Palestinian Territory, Occupied'], ['id' => 'PA', 'name' => 'Panama'], ['id' => 'PG', 'name' => 'Papua New Guinea'], ['id' => 'PY', 'name' => 'Paraguay'], ['id' => 'PE', 'name' => 'Peru'], ['id' => 'PH', 'name' => 'Philippines'], ['id' => 'PN', 'name' => 'Pitcairn'], ['id' => 'PL', 'name' => 'Poland'], ['id' => 'PT', 'name' => 'Portugal'], ['id' => 'PR', 'name' => 'Puerto Rico'], ['id' => 'QA', 'name' => 'Qatar'], ['id' => 'RE', 'name' => 'Reunion'], ['id' => 'RO', 'name' => 'Romania'], ['id' => 'RU', 'name' => 'Russian Federation'], ['id' => 'RW', 'name' => 'Rwanda'], ['id' => 'BL', 'name' => 'Saint Barthelemy'], ['id' => 'SH', 'name' => 'Saint Helena'], ['id' => 'KN', 'name' => 'Saint Kitts And Nevis'], ['id' => 'LC', 'name' => 'Saint Lucia'], ['id' => 'MF', 'name' => 'Saint Martin'], ['id' => 'PM', 'name' => 'Saint Pierre And Miquelon'], ['id' => 'VC', 'name' => 'Saint Vincent And Grenadines'], ['id' => 'WS', 'name' => 'Samoa'], ['id' => 'SM', 'name' => 'San Marino'], ['id' => 'ST', 'name' => 'Sao Tome And Principe'], ['id' => 'SA', 'name' => 'Saudi Arabia'], ['id' => 'SN', 'name' => 'Senegal'], ['id' => 'RS', 'name' => 'Serbia'], ['id' => 'SC', 'name' => 'Seychelles'], ['id' => 'SL', 'name' => 'Sierra Leone'], ['id' => 'SG', 'name' => 'Singapore'], ['id' => 'SK', 'name' => 'Slovakia'], ['id' => 'SI', 'name' => 'Slovenia'], ['id' => 'SB', 'name' => 'Solomon Islands'], ['id' => 'SO', 'name' => 'Somalia'], ['id' => 'ZA', 'name' => 'South Africa'], ['id' => 'GS', 'name' => 'South Georgia And Sandwich Isl.'], ['id' => 'ES', 'name' => 'Spain'], ['id' => 'LK', 'name' => 'Sri Lanka'], ['id' => 'SD', 'name' => 'Sudan'], ['id' => 'SR', 'name' => 'Suriname'], ['id' => 'SJ', 'name' => 'Svalbard And Jan Mayen'], ['id' => 'SZ', 'name' => 'Swaziland'], ['id' => 'SE', 'name' => 'Sweden'], ['id' => 'CH', 'name' => 'Switzerland'], ['id' => 'SY', 'name' => 'Syrian Arab Republic'], ['id' => 'TW', 'name' => 'Taiwan'], ['id' => 'TJ', 'name' => 'Tajikistan'], ['id' => 'TZ', 'name' => 'Tanzania'], ['id' => 'TH', 'name' => 'Thailand'], ['id' => 'TL', 'name' => 'Timor-Leste'], ['id' => 'TG', 'name' => 'Togo'], ['id' => 'TK', 'name' => 'Tokelau'], ['id' => 'TO', 'name' => 'Tonga'], ['id' => 'TT', 'name' => 'Trinidad And Tobago'], ['id' => 'TN', 'name' => 'Tunisia'], ['id' => 'TR', 'name' => 'Turkey'], ['id' => 'TM', 'name' => 'Turkmenistan'], ['id' => 'TC', 'name' => 'Turks And Caicos Islands'], ['id' => 'TV', 'name' => 'Tuvalu'], ['id' => 'UG', 'name' => 'Uganda'], ['id' => 'UA', 'name' => 'Ukraine'], ['id' => 'AE', 'name' => 'United Arab Emirates'], ['id' => 'GB', 'name' => 'United Kingdom'], ['id' => 'US', 'name' => 'United States'], ['id' => 'UM', 'name' => 'United States Outlying Islands'], ['id' => 'UY', 'name' => 'Uruguay'], ['id' => 'UZ', 'name' => 'Uzbekistan'], ['id' => 'VU', 'name' => 'Vanuatu'], ['id' => 'VE', 'name' => 'Venezuela'], ['id' => 'VN', 'name' => 'Viet Nam'], ['id' => 'VG', 'name' => 'Virgin Islands, British'], ['id' => 'VI', 'name' => 'Virgin Islands, U.S.'], ['id' => 'WF', 'name' => 'Wallis And Futuna'], ['id' => 'EH', 'name' => 'Western Sahara'], ['id' => 'YE', 'name' => 'Yemen'], ['id' => 'ZM', 'name' => 'Zambia'], ['id' => 'ZW', 'name' => 'Zimbabwe']];
 
-        $this->setTitle('Edit Proxy');
-        $this->render('proxy', compact('rServerArr', 'rCountries'));
-    }
+		$this->setTitle('Edit Proxy');
+		$this->render('proxy', compact('rServerArr', 'rCountries'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/QueueController.php b/src/Public/Controllers/Admin/QueueController.php
index da65d1e0..041be0f2 100644
--- a/src/Public/Controllers/Admin/QueueController.php
+++ b/src/Public/Controllers/Admin/QueueController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class QueueController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Encoding Queue');
-        $this->render('queue');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Encoding Queue');
+		$this->render('queue');
+	}
 }
diff --git a/src/Public/Controllers/Admin/QuickToolsController.php b/src/Public/Controllers/Admin/QuickToolsController.php
index 4801fbe4..630bf41d 100644
--- a/src/Public/Controllers/Admin/QuickToolsController.php
+++ b/src/Public/Controllers/Admin/QuickToolsController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class QuickToolsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Quick Tools');
-        $this->render('quick_tools');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Quick Tools');
+		$this->render('quick_tools');
+	}
 }
diff --git a/src/Public/Controllers/Admin/RadioController.php b/src/Public/Controllers/Admin/RadioController.php
index b4cea99f..f37416d0 100644
--- a/src/Public/Controllers/Admin/RadioController.php
+++ b/src/Public/Controllers/Admin/RadioController.php
@@ -20,88 +20,88 @@ use XcVm\Domain\Stream\StreamRepository;
  */
 
 class RadioController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db, $rServers;
+		global $db, $rServers;
 
-        if (RequestManager::has('id')) {
-            $rStation = StreamRepository::getById(RequestManager::get('id'));
-            if (!$rStation || $rStation['type'] != 4) {
-                AdminHelpers::goHome();
-            }
-        }
+		if (RequestManager::has('id')) {
+			$rStation = StreamRepository::getById(RequestManager::get('id'));
+			if (!$rStation || $rStation['type'] != 4) {
+				AdminHelpers::goHome();
+			}
+		}
 
-        $rStation = null;
-        $rStationOptions = null;
-        $rStationSys = null;
-        $rOnDemand = array();
-        $rStationArguments = StreamConfigRepository::getStreamArguments();
-        $rServerTree = array(
-            array(
-                'id' => 'source',
-                'parent' => '#',
-                'text' => "<span class='badge bg-success'>Online</span>",
-                'icon' => 'icon-base ti tabler-player-play',
-                'state' => array('opened' => true)
-            ),
-            array(
-                'id' => 'offline',
-                'parent' => '#',
-                'text' => "<span class='badge bg-secondary'>Offline</span>",
-                'icon' => 'icon-base ti tabler-player-stop',
-                'state' => array('opened' => true)
-            )
-        );
+		$rStation = null;
+		$rStationOptions = null;
+		$rStationSys = null;
+		$rOnDemand = [];
+		$rStationArguments = StreamConfigRepository::getStreamArguments();
+		$rServerTree = [
+			[
+				'id' => 'source',
+				'parent' => '#',
+				'text' => "<span class='badge bg-success'>Online</span>",
+				'icon' => 'icon-base ti tabler-player-play',
+				'state' => ['opened' => true]
+			],
+			[
+				'id' => 'offline',
+				'parent' => '#',
+				'text' => "<span class='badge bg-secondary'>Offline</span>",
+				'icon' => 'icon-base ti tabler-player-stop',
+				'state' => ['opened' => true]
+			]
+		];
 
-        if (isset($rStation)) {
-            $rStationOptions = StreamRepository::getOptions(RequestManager::get('id'));
-            $rStationSys = StreamRepository::getSystemRows(RequestManager::get('id'));
+		if (isset($rStation)) {
+			$rStationOptions = StreamRepository::getOptions(RequestManager::get('id'));
+			$rStationSys = StreamRepository::getSystemRows(RequestManager::get('id'));
 
-            foreach ($rServers as $rServer) {
-                if (isset($rStationSys[intval($rServer['id'])])) {
-                    $rParent = ($rStationSys[intval($rServer['id'])]['parent_id'] != 0) ? intval($rStationSys[intval($rServer['id'])]['parent_id']) : 'source';
-                    if ($rStationSys[intval($rServer['id'])]['on_demand']) {
-                        $rOnDemand[] = intval($rServer['id']);
-                    }
-                } else {
-                    $rParent = 'offline';
-                }
+			foreach ($rServers as $rServer) {
+				if (isset($rStationSys[intval($rServer['id'])])) {
+					$rParent = ($rStationSys[intval($rServer['id'])]['parent_id'] != 0) ? intval($rStationSys[intval($rServer['id'])]['parent_id']) : 'source';
+					if ($rStationSys[intval($rServer['id'])]['on_demand']) {
+						$rOnDemand[] = intval($rServer['id']);
+					}
+				} else {
+					$rParent = 'offline';
+				}
 
-                $rServerTree[] = array(
-                    'id' => $rServer['id'],
-                    'parent' => $rParent,
-                    'text' => $rServer['server_name'],
-                    'icon' => 'icon-base ti tabler-server',
-                    'state' => array('opened' => true)
-                );
-            }
-        } else {
-            foreach ($rServers as $rServer) {
-                $rServerTree[] = array(
-                    'id' => $rServer['id'],
-                    'parent' => 'offline',
-                    'text' => $rServer['server_name'],
-                    'icon' => 'icon-base ti tabler-server',
-                    'state' => array('opened' => true)
-                );
-            }
-        }
+				$rServerTree[] = [
+					'id' => $rServer['id'],
+					'parent' => $rParent,
+					'text' => $rServer['server_name'],
+					'icon' => 'icon-base ti tabler-server',
+					'state' => ['opened' => true]
+				];
+			}
+		} else {
+			foreach ($rServers as $rServer) {
+				$rServerTree[] = [
+					'id' => $rServer['id'],
+					'parent' => 'offline',
+					'text' => $rServer['server_name'],
+					'icon' => 'icon-base ti tabler-server',
+					'state' => ['opened' => true]
+				];
+			}
+		}
 
-        // The load-balancer server tree on this form is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The load-balancer server tree on this form is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Radio Stations');
-        $this->render('radio', compact(
-            'rStation',
-            'rOnDemand',
-            'rStationArguments',
-            'rServerTree',
-            'rStationOptions',
-            'rStationSys'
-        ));
-    }
+		$this->setTitle('Radio Stations');
+		$this->render('radio', compact(
+			'rStation',
+			'rOnDemand',
+			'rStationArguments',
+			'rServerTree',
+			'rStationOptions',
+			'rStationSys'
+		));
+	}
 }
diff --git a/src/Public/Controllers/Admin/RadioListController.php b/src/Public/Controllers/Admin/RadioListController.php
index ab0dae3f..c67acdd5 100644
--- a/src/Public/Controllers/Admin/RadioListController.php
+++ b/src/Public/Controllers/Admin/RadioListController.php
@@ -17,12 +17,12 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class RadioListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rCategories = CategoryService::getAllByType('radio');
+		$rCategories = CategoryService::getAllByType('radio');
 
-        $this->setTitle('Radio Stations');
-        $this->render('radios', compact('rCategories'));
-    }
+		$this->setTitle('Radio Stations');
+		$this->render('radios', compact('rCategories'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/RadioMassController.php b/src/Public/Controllers/Admin/RadioMassController.php
index f59df7fe..27c12490 100644
--- a/src/Public/Controllers/Admin/RadioMassController.php
+++ b/src/Public/Controllers/Admin/RadioMassController.php
@@ -17,28 +17,28 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class RadioMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $rServers;
+		global $rServers;
 
-        $rCategories = CategoryService::getAllByType('radio');
-        $rServerTree = array(
-            array('id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Online</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => array('opened' => true)),
-            array('id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => array('opened' => true))
-        );
+		$rCategories = CategoryService::getAllByType('radio');
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Online</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]]
+		];
 
-        foreach ($rServers as $rServer) {
-            $rServerTree[] = array('id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => array('opened' => true));
-        }
+		foreach ($rServers as $rServer) {
+			$rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+		}
 
-        // The load-balancer server tree on this page is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The load-balancer server tree on this page is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Mass Edit Stations');
-        $this->render('radio_mass', compact('rCategories', 'rServerTree'));
-    }
+		$this->setTitle('Mass Edit Stations');
+		$this->render('radio_mass', compact('rCategories', 'rServerTree'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/RecordController.php b/src/Public/Controllers/Admin/RecordController.php
index 45827059..601b0517 100644
--- a/src/Public/Controllers/Admin/RecordController.php
+++ b/src/Public/Controllers/Admin/RecordController.php
@@ -20,66 +20,66 @@ use XcVm\Domain\Stream\StreamRepository;
  */
 
 class RecordController extends BaseAdminController {
-    public function index() {
-        global $db;
+	public function index() {
+		global $db;
 
-        $this->requirePermission();
+		$this->requirePermission();
 
-        $rAvailableServers = $rServers = array();
-        $rStream = $rProgramme = $rBitrate = null;
-        $rRequestData = RequestManager::getAll();
+		$rAvailableServers = $rServers = [];
+		$rStream = $rProgramme = $rBitrate = null;
+		$rRequestData = RequestManager::getAll();
 
-        if (isset($rRequestData['id'])) {
-            $rStream = StreamRepository::getById($rRequestData['id']);
-            $rProgramme = EpgService::getProgramme($rRequestData['id'], $rRequestData['programme']);
+		if (isset($rRequestData['id'])) {
+			$rStream = StreamRepository::getById($rRequestData['id']);
+			$rProgramme = EpgService::getProgramme($rRequestData['id'], $rRequestData['programme']);
 
-            if ($rStream && $rStream['type'] == 1 && $rProgramme) {
-            } else {
-                $this->redirect('record');
-                return;
-            }
-        } else {
-            if (isset($rRequestData['archive'])) {
-                $rArchive = json_decode(base64_decode($rRequestData['archive']), true);
-                $rStream = StreamRepository::getById($rArchive['stream_id']);
-                $rProgramme = array('start' => $rArchive['start'], 'end' => $rArchive['end'], 'title' => $rArchive['title'], 'description' => $rArchive['description'], 'archive' => true);
+			if ($rStream && $rStream['type'] == 1 && $rProgramme) {
+			} else {
+				$this->redirect('record');
+				return;
+			}
+		} else {
+			if (isset($rRequestData['archive'])) {
+				$rArchive = json_decode(base64_decode($rRequestData['archive']), true);
+				$rStream = StreamRepository::getById($rArchive['stream_id']);
+				$rProgramme = ['start' => $rArchive['start'], 'end' => $rArchive['end'], 'title' => $rArchive['title'], 'description' => $rArchive['description'], 'archive' => true];
 
-                if ($rStream && $rStream['type'] == 1 && $rProgramme) {
-                } else {
-                    $this->redirect('record');
-                    return;
-                }
-            } else {
-                if (!isset($rRequestData['stream_id'])) {
-                } else {
-                    $rStream = StreamRepository::getById($rRequestData['stream_id']);
-                    $rProgramme = array('start' => strtotime($rRequestData['start_date']), 'end' => strtotime($rRequestData['start_date']) + intval($rRequestData['duration']) * 60, 'title' => '', 'description' => '');
+				if ($rStream && $rStream['type'] == 1 && $rProgramme) {
+				} else {
+					$this->redirect('record');
+					return;
+				}
+			} else {
+				if (!isset($rRequestData['stream_id'])) {
+				} else {
+					$rStream = StreamRepository::getById($rRequestData['stream_id']);
+					$rProgramme = ['start' => strtotime($rRequestData['start_date']), 'end' => strtotime($rRequestData['start_date']) + intval($rRequestData['duration']) * 60, 'title' => '', 'description' => ''];
 
-                    if (!(!$rStream || $rStream['type'] != 1 || !$rProgramme || $rProgramme['end'] < time())) {
-                    } else {
-                        header('Location: record');
-                    }
-                }
-            }
-        }
+					if (!(!$rStream || $rStream['type'] != 1 || !$rProgramme || $rProgramme['end'] < time())) {
+					} else {
+						header('Location: record');
+					}
+				}
+			}
+		}
 
-        if ($rStream) {
-            $db->query('SELECT `server_id`, `bitrate` FROM `streams_servers` WHERE `stream_id` = ?;', $rStream['id']);
+		if ($rStream) {
+			$db->query('SELECT `server_id`, `bitrate` FROM `streams_servers` WHERE `stream_id` = ?;', $rStream['id']);
 
-            foreach ($db->get_rows() as $rRow) {
-                $rAvailableServers[] = $rRow['server_id'];
-                if (!(!$rBitrate && $rRow['bitrate'] || $rRow['bitrate'] && $rBitrate < $rRow['bitrate'])) {
-                } else {
-                    $rBitrate = $rRow['bitrate'];
-                }
-            }
-        }
+			foreach ($db->get_rows() as $rRow) {
+				$rAvailableServers[] = $rRow['server_id'];
+				if (!(!$rBitrate && $rRow['bitrate'] || $rRow['bitrate'] && $rBitrate < $rRow['bitrate'])) {
+				} else {
+					$rBitrate = $rRow['bitrate'];
+				}
+			}
+		}
 
-        if (is_array($rProgramme) && !isset($rProgramme['archive'])) {
-            $rProgramme['archive'] = false;
-        }
+		if (is_array($rProgramme) && !isset($rProgramme['archive'])) {
+			$rProgramme['archive'] = false;
+		}
 
-        $this->setTitle('Record');
-        $this->render('record', compact('rStream', 'rProgramme', 'rAvailableServers', 'rBitrate'));
-    }
+		$this->setTitle('Record');
+		$this->render('record', compact('rStream', 'rProgramme', 'rAvailableServers', 'rBitrate'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/RestreamLogController.php b/src/Public/Controllers/Admin/RestreamLogController.php
index 10efe99e..48314a72 100644
--- a/src/Public/Controllers/Admin/RestreamLogController.php
+++ b/src/Public/Controllers/Admin/RestreamLogController.php
@@ -20,9 +20,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class RestreamLogController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Restream Detection Logs');
-        $this->render('restream_logs');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Restream Detection Logs');
+		$this->render('restream_logs');
+	}
 }
diff --git a/src/Public/Controllers/Admin/ReviewController.php b/src/Public/Controllers/Admin/ReviewController.php
index 36b4ab72..86159bc3 100644
--- a/src/Public/Controllers/Admin/ReviewController.php
+++ b/src/Public/Controllers/Admin/ReviewController.php
@@ -19,20 +19,20 @@ use XcVm\Core\Http\RequestManager;
  */
 
 class ReviewController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rType = RequestManager::has('type') ? intval(RequestManager::get('type')) : 1;
-        $rCategorySet = [];
-        $rLogoSet = [];
+		$rType = RequestManager::has('type') ? intval(RequestManager::get('type')) : 1;
+		$rCategorySet = [];
+		$rLogoSet = [];
 
-        // The import server tree on this page is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The import server tree on this page is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Review');
-        $this->render('review', compact('rType', 'rCategorySet', 'rLogoSet'));
-    }
+		$this->setTitle('Review');
+		$this->render('review', compact('rType', 'rCategorySet', 'rLogoSet'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/RtmpIpController.php b/src/Public/Controllers/Admin/RtmpIpController.php
index 884547e0..c12c2d1b 100644
--- a/src/Public/Controllers/Admin/RtmpIpController.php
+++ b/src/Public/Controllers/Admin/RtmpIpController.php
@@ -17,13 +17,13 @@ use XcVm\Domain\Security\BlocklistService;
  */
 
 class RtmpIpController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        global $db;
-        $this->setTitle("RTMP IP's");
+	public function index() {
+		$this->requirePermission();
+		global $db;
+		$this->setTitle("RTMP IP's");
 
-        $this->render('rtmp_ips', [
-            'ips' => BlocklistService::getRTMPIPsSimple(),
-        ]);
-    }
+		$this->render('rtmp_ips', [
+			'ips' => BlocklistService::getRTMPIPsSimple(),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/RtmpIpEditController.php b/src/Public/Controllers/Admin/RtmpIpEditController.php
index 48b56003..beed0b0f 100644
--- a/src/Public/Controllers/Admin/RtmpIpEditController.php
+++ b/src/Public/Controllers/Admin/RtmpIpEditController.php
@@ -20,20 +20,20 @@ use XcVm\Domain\Security\BlocklistService;
  */
 
 class RtmpIpEditController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rIPArr = null;
-        $id = $this->input('id');
-        if ($id !== null) {
-            $rIPArr = BlocklistService::getRTMPIPById($id);
-            if (!$rIPArr) {
-                AdminHelpers::goHome();
-                return;
-            }
-        }
+		$rIPArr = null;
+		$id = $this->input('id');
+		if ($id !== null) {
+			$rIPArr = BlocklistService::getRTMPIPById($id);
+			if (!$rIPArr) {
+				AdminHelpers::goHome();
+				return;
+			}
+		}
 
-        $this->setTitle('RTMP IP');
-        $this->render('rtmp_ip', compact('rIPArr'));
-    }
+		$this->setTitle('RTMP IP');
+		$this->render('rtmp_ip', compact('rIPArr'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/RtmpMonitorController.php b/src/Public/Controllers/Admin/RtmpMonitorController.php
index 3066e5aa..9615564d 100644
--- a/src/Public/Controllers/Admin/RtmpMonitorController.php
+++ b/src/Public/Controllers/Admin/RtmpMonitorController.php
@@ -18,18 +18,18 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class RtmpMonitorController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $rServers;
+		global $rServers;
 
-        if (!RequestManager::has('server') || !isset($rServers[RequestManager::get('server')])) {
-            RequestManager::update('server', SERVER_ID);
-        }
+		if (!RequestManager::has('server') || !isset($rServers[RequestManager::get('server')])) {
+			RequestManager::update('server', SERVER_ID);
+		}
 
-        $rRTMPInfo = ServerRepository::getRTMPStats(RequestManager::get('server'));
+		$rRTMPInfo = ServerRepository::getRTMPStats(RequestManager::get('server'));
 
-        $this->setTitle('RTMP Monitor');
-        $this->render('rtmp_monitor', compact('rRTMPInfo'));
-    }
+		$this->setTitle('RTMP Monitor');
+		$this->render('rtmp_monitor', compact('rRTMPInfo'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/SerieController.php b/src/Public/Controllers/Admin/SerieController.php
index 924617d9..b36a27d1 100644
--- a/src/Public/Controllers/Admin/SerieController.php
+++ b/src/Public/Controllers/Admin/SerieController.php
@@ -19,41 +19,41 @@ use XcVm\Domain\Vod\SeriesService;
  */
 
 class SerieController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $rServers;
+		global $rServers;
 
-        $rSeriesArr = null;
-        if (RequestManager::has('id') && !($rSeriesArr = SeriesService::getById(RequestManager::get('id')))) {
-            $this->redirect('series');
-            return;
-        }
+		$rSeriesArr = null;
+		if (RequestManager::has('id') && !($rSeriesArr = SeriesService::getById(RequestManager::get('id')))) {
+			$this->redirect('series');
+			return;
+		}
 
-        if (isset($rSeriesArr) && RequestManager::has('import')) {
-            unset(RequestManager::getAll()['import']);
-        }
+		if (isset($rSeriesArr) && RequestManager::has('import')) {
+			unset(RequestManager::getAll()['import']);
+		}
 
-        $rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
+		$rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
 
-        $rServerTree = [
-            ['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Active</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
-            ['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
-        ];
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Active</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
+		];
 
-        foreach ($rServers as $rServer) {
-            $rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-        }
+		foreach ($rServers as $rServer) {
+			$rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+		}
 
-        // The import flow's server tree is driven by jstree.
-        if (RequestManager::has('import')) {
-            $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-                (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-                ['jstree']
-            )));
-        }
+		// The import flow's server tree is driven by jstree.
+		if (RequestManager::has('import')) {
+			$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+				(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+				['jstree']
+			)));
+		}
 
-        $this->setTitle('TV Series');
-        $this->render('serie', compact('rSeriesArr', 'rTranscodeProfiles', 'rServerTree'));
-    }
+		$this->setTitle('TV Series');
+		$this->render('serie', compact('rSeriesArr', 'rTranscodeProfiles', 'rServerTree'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/SeriesListController.php b/src/Public/Controllers/Admin/SeriesListController.php
index 73dad0f2..d660c901 100644
--- a/src/Public/Controllers/Admin/SeriesListController.php
+++ b/src/Public/Controllers/Admin/SeriesListController.php
@@ -17,12 +17,12 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class SeriesListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rCategories = CategoryService::getAllByType('series');
+		$rCategories = CategoryService::getAllByType('series');
 
-        $this->setTitle('TV Series');
-        $this->render('series', compact('rCategories'));
-    }
+		$this->setTitle('TV Series');
+		$this->render('series', compact('rCategories'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/SeriesMassController.php b/src/Public/Controllers/Admin/SeriesMassController.php
index 9ab96b9b..a134810b 100644
--- a/src/Public/Controllers/Admin/SeriesMassController.php
+++ b/src/Public/Controllers/Admin/SeriesMassController.php
@@ -17,12 +17,12 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class SeriesMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rCategories = CategoryService::getAllByType('series');
+		$rCategories = CategoryService::getAllByType('series');
 
-        $this->setTitle('Mass Edit Series');
-        $this->render('series_mass', compact('rCategories'));
-    }
+		$this->setTitle('Mass Edit Series');
+		$this->render('series_mass', compact('rCategories'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ServerController.php b/src/Public/Controllers/Admin/ServerController.php
index a94c5cd2..c3999d8e 100644
--- a/src/Public/Controllers/Admin/ServerController.php
+++ b/src/Public/Controllers/Admin/ServerController.php
@@ -21,69 +21,69 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class ServerController extends BaseAdminController {
-    public function index(): void {
-        $this->requirePermission();
+	public function index(): void {
+		$this->requirePermission();
 
-        global $allServers;
+		global $allServers;
 
-        $id = $this->input('id');
-        if (!$id || !isset($allServers[$id])) {
-            $this->redirect('servers');
-            return;
-        }
+		$id = $this->input('id');
+		if (!$id || !isset($allServers[$id])) {
+			$this->redirect('servers');
+			return;
+		}
 
-        $rServerArr = $allServers[$id];
+		$rServerArr = $allServers[$id];
 
-        // Watchdog / CPU cores
-        $rWatchdog = !empty($rServerArr['watchdog_data']) ? json_decode($rServerArr['watchdog_data'], true) : [];
-        $rServiceMax = max(4, intval($rWatchdog['cpu_cores'] ?? 0) ?: 16);
+		// Watchdog / CPU cores
+		$rWatchdog = !empty($rServerArr['watchdog_data']) ? json_decode($rServerArr['watchdog_data'], true) : [];
+		$rServiceMax = max(4, intval($rWatchdog['cpu_cores'] ?? 0) ?: 16);
 
-        // Interfaces
-        $rInterfaces = !empty($rServerArr['interfaces']) ? json_decode($rServerArr['interfaces'], true) : [];
-        if (count($rInterfaces) === 0) {
-            $rInterfaces = ['eth0'];
-        }
+		// Interfaces
+		$rInterfaces = !empty($rServerArr['interfaces']) ? json_decode($rServerArr['interfaces'], true) : [];
+		if (count($rInterfaces) === 0) {
+			$rInterfaces = ['eth0'];
+		}
 
-        // Certificate
-        $rCertificate = !empty($rServerArr['certbot_ssl']) ? json_decode($rServerArr['certbot_ssl'], true) : [];
-        $rCertValid = false;
-        if (isset($rCertificate['expiration'])) {
-            $rHasCert = true;
-            if (time() < $rCertificate['expiration']) {
-                $rCertValid = true;
-            }
-            $rExpiration = date(SettingsManager::get('datetime_format'), $rCertificate['expiration']);
-        } else {
-            $rHasCert = false;
-            $rExpiration = 'No Certificate Installed';
-        }
+		// Certificate
+		$rCertificate = !empty($rServerArr['certbot_ssl']) ? json_decode($rServerArr['certbot_ssl'], true) : [];
+		$rCertValid = false;
+		if (isset($rCertificate['expiration'])) {
+			$rHasCert = true;
+			if (time() < $rCertificate['expiration']) {
+				$rCertValid = true;
+			}
+			$rExpiration = date(SettingsManager::get('datetime_format'), $rCertificate['expiration']);
+		} else {
+			$rHasCert = false;
+			$rExpiration = 'No Certificate Installed';
+		}
 
-        // Free space
-        $rFS = ServerRepository::getFreeSpace($rServerArr['id']);
-        $rMounted = false;
-        foreach ($rFS as $rMount) {
-            if ($rMount['mount'] === rtrim(STREAMS_PATH, '/')) {
-                $rMounted = true;
-                break;
-            }
-        }
+		// Free space
+		$rFS = ServerRepository::getFreeSpace($rServerArr['id']);
+		$rMounted = false;
+		foreach ($rFS as $rMount) {
+			if ($rMount['mount'] === rtrim(STREAMS_PATH, '/')) {
+				$rMounted = true;
+				break;
+			}
+		}
 
-        // SSL Log
-        $rSSLLog = ServerRepository::getSSLLog($rServerArr['id']);
+		// SSL Log
+		$rSSLLog = ServerRepository::getSSLLog($rServerArr['id']);
 
-        $this->setTitle('Edit Server');
-        $this->render('server', compact(
-            'rServerArr',
-            'rWatchdog',
-            'rServiceMax',
-            'rInterfaces',
-            'rCertificate',
-            'rCertValid',
-            'rHasCert',
-            'rExpiration',
-            'rFS',
-            'rMounted',
-            'rSSLLog'
-        ));
-    }
+		$this->setTitle('Edit Server');
+		$this->render('server', compact(
+			'rServerArr',
+			'rWatchdog',
+			'rServiceMax',
+			'rInterfaces',
+			'rCertificate',
+			'rCertValid',
+			'rHasCert',
+			'rExpiration',
+			'rFS',
+			'rMounted',
+			'rSSLLog'
+		));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ServerInstallController.php b/src/Public/Controllers/Admin/ServerInstallController.php
index a1c9c8c4..10266e2c 100644
--- a/src/Public/Controllers/Admin/ServerInstallController.php
+++ b/src/Public/Controllers/Admin/ServerInstallController.php
@@ -21,31 +21,31 @@ use XcVm\Core\Http\RequestManager;
  */
 
 class ServerInstallController extends BaseAdminController {
-    public function index(): void {
-        $this->requirePermission();
+	public function index(): void {
+		$this->requirePermission();
 
-        global $allServers, $rProxyServers;
+		global $allServers, $rProxyServers;
 
-        $rType = RequestManager::has('proxy') ? 1 : 2;
-        $rServerArr = null;
+		$rType = RequestManager::has('proxy') ? 1 : 2;
+		$rServerArr = null;
 
-        if ($this->input('id')) {
-            $id = intval($this->input('id'));
-            if ($rType === 1) {
-                $rServerArr = $rProxyServers[$id] ?? null;
-            } else {
-                $rServerArr = $allServers[$id] ?? null;
-            }
+		if ($this->input('id')) {
+			$id = intval($this->input('id'));
+			if ($rType === 1) {
+				$rServerArr = $rProxyServers[$id] ?? null;
+			} else {
+				$rServerArr = $allServers[$id] ?? null;
+			}
 
-            if (!$rServerArr) {
-                $this->redirect('servers');
-                return;
-            }
-        }
+			if (!$rServerArr) {
+				$this->redirect('servers');
+				return;
+			}
+		}
 
-        $title = ($rType === 1) ? 'Install Proxy' : 'Install Server';
-        $this->setTitle($title);
+		$title = ($rType === 1) ? 'Install Proxy' : 'Install Server';
+		$this->setTitle($title);
 
-        $this->render('server_install', compact('rType', 'rServerArr'));
-    }
+		$this->render('server_install', compact('rType', 'rServerArr'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ServerListController.php b/src/Public/Controllers/Admin/ServerListController.php
index 10e4bf7b..0d602f8a 100644
--- a/src/Public/Controllers/Admin/ServerListController.php
+++ b/src/Public/Controllers/Admin/ServerListController.php
@@ -21,11 +21,11 @@ use XcVm\Domain\Server\ServerRepository;
  */
 
 class ServerListController extends BaseAdminController {
-    public function index(): void {
-        $this->requirePermission();
-        $this->setTitle('Servers');
+	public function index(): void {
+		$this->requirePermission();
+		$this->setTitle('Servers');
 
-        $rServers = ServerRepository::getAll(true);
-        $this->render('servers', compact('rServers'));
-    }
+		$rServers = ServerRepository::getAll(true);
+		$this->render('servers', compact('rServers'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ServerOrderController.php b/src/Public/Controllers/Admin/ServerOrderController.php
index b1a64ab7..854c8ca2 100644
--- a/src/Public/Controllers/Admin/ServerOrderController.php
+++ b/src/Public/Controllers/Admin/ServerOrderController.php
@@ -15,15 +15,15 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class ServerOrderController extends BaseAdminController {
-    public function index() {
-        global $rServers;
+	public function index() {
+		global $rServers;
 
-        $this->requirePermission();
+		$this->requirePermission();
 
-        $rOrderedServers = $rServers;
-        array_multisort(array_column($rOrderedServers, 'order'), SORT_ASC, $rOrderedServers);
+		$rOrderedServers = $rServers;
+		array_multisort(array_column($rOrderedServers, 'order'), SORT_ASC, $rOrderedServers);
 
-        $this->setTitle('Server Order');
-        $this->render('server_order', compact('rOrderedServers'));
-    }
+		$this->setTitle('Server Order');
+		$this->render('server_order', compact('rOrderedServers'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/ServerViewController.php b/src/Public/Controllers/Admin/ServerViewController.php
index 7bdb67c3..65816021 100644
--- a/src/Public/Controllers/Admin/ServerViewController.php
+++ b/src/Public/Controllers/Admin/ServerViewController.php
@@ -24,90 +24,90 @@ use XcVm\Streaming\Health\ProcessChecker;
  */
 
 class ServerViewController extends BaseAdminController {
-    public function index(): void {
-        $this->requirePermission();
+	public function index(): void {
+		$this->requirePermission();
 
-        global $allServers, $rProxyServers, $db;
+		global $allServers, $rProxyServers, $db;
 
-        $id = $this->input('id');
-        if (!$id) {
-            exit();
-        }
+		$id = $this->input('id');
+		if (!$id) {
+			exit();
+		}
 
-        // Read the server fresh (bypass the 10s file cache) so this detail page always
-        // reflects the true current status — otherwise a just-started install (status 3)
-        // or a failure (status 4) can be hidden behind a stale cached status.
-        $rFreshServers = ServerRepository::getAll(true);
-        if (isset($rFreshServers[$id])) {
-            $rServer = $rFreshServers[$id];
-        } elseif (isset($allServers[$id])) {
-            $rServer = $allServers[$id];
-        } elseif (isset($rProxyServers[$id])) {
-            $rServer = $rProxyServers[$id];
-        } else {
-            exit();
-        }
+		// Read the server fresh (bypass the 10s file cache) so this detail page always
+		// reflects the true current status — otherwise a just-started install (status 3)
+		// or a failure (status 4) can be hidden behind a stale cached status.
+		$rFreshServers = ServerRepository::getAll(true);
+		if (isset($rFreshServers[$id])) {
+			$rServer = $rFreshServers[$id];
+		} elseif (isset($allServers[$id])) {
+			$rServer = $allServers[$id];
+		} elseif (isset($rProxyServers[$id])) {
+			$rServer = $rProxyServers[$id];
+		} else {
+			exit();
+		}
 
-        // Watchdog data
-        $rWatchdog = json_decode($rServer['watchdog_data'], true);
-        $rServer['gpu_info'] = json_decode($rServer['gpu_info'], true);
+		// Watchdog data
+		$rWatchdog = json_decode($rServer['watchdog_data'], true);
+		$rServer['gpu_info'] = json_decode($rServer['gpu_info'], true);
 
-        // Stats for charts
-        $rStats = [
-            'cpu'    => [],
-            'memory' => [],
-            'io'     => [],
-            'input'  => [],
-            'output' => [],
-            'dates'  => [null, null],
-        ];
+		// Stats for charts
+		$rStats = [
+			'cpu'    => [],
+			'memory' => [],
+			'io'     => [],
+			'input'  => [],
+			'output' => [],
+			'dates'  => [null, null],
+		];
 
-        foreach (ProcessChecker::getWatchdog($rServer['id']) as $rData) {
-            if (!$rStats['dates'][0] || $rData['time'] * 1000 <= $rStats['dates'][0]) {
-                $rStats['dates'][0] = $rData['time'] * 1000;
-            }
-            if (!$rStats['dates'][1] || $rData['time'] * 1000 >= $rStats['dates'][1]) {
-                $rStats['dates'][1] = $rData['time'] * 1000;
-            }
+		foreach (ProcessChecker::getWatchdog($rServer['id']) as $rData) {
+			if (!$rStats['dates'][0] || $rData['time'] * 1000 <= $rStats['dates'][0]) {
+				$rStats['dates'][0] = $rData['time'] * 1000;
+			}
+			if (!$rStats['dates'][1] || $rData['time'] * 1000 >= $rStats['dates'][1]) {
+				$rStats['dates'][1] = $rData['time'] * 1000;
+			}
 
-            $rStats['cpu'][]    = [$rData['time'] * 1000, floatval(rtrim($rData['cpu'], '%'))];
-            $rStats['memory'][] = [$rData['time'] * 1000, floatval(rtrim($rData['total_mem_used_percent'], '%'))];
-            $rStats['io'][]     = [$rData['time'] * 1000, floatval(json_decode($rData['iostat_info'], true)['avg-cpu']['iowait'] ?? 0)];
-            $rStats['input'][]  = [$rData['time'] * 1000, round($rData['bytes_received'] / 125000, 0)];
-            $rStats['output'][] = [$rData['time'] * 1000, round($rData['bytes_sent'] / 125000, 0)];
-        }
+			$rStats['cpu'][]    = [$rData['time'] * 1000, floatval(rtrim($rData['cpu'], '%'))];
+			$rStats['memory'][] = [$rData['time'] * 1000, floatval(rtrim($rData['total_mem_used_percent'], '%'))];
+			$rStats['io'][]     = [$rData['time'] * 1000, floatval(json_decode($rData['iostat_info'], true)['avg-cpu']['iowait'] ?? 0)];
+			$rStats['input'][]  = [$rData['time'] * 1000, round($rData['bytes_received'] / 125000, 0)];
+			$rStats['output'][] = [$rData['time'] * 1000, round($rData['bytes_sent'] / 125000, 0)];
+		}
 
-        // Certificate
-        $rCertificate = json_decode($rServer['certbot_ssl'], true);
-        $rCertValid = false;
-        if (!empty($rCertificate['expiration'])) {
-            $rHasCert = true;
-            if (time() < $rCertificate['expiration']) {
-                $rCertValid = true;
-            }
-            $rExpiration = date(SettingsManager::get('datetime_format'), $rCertificate['expiration']);
-        } else {
-            $rHasCert = false;
-            $rExpiration = 'No Certificate Installed';
-        }
+		// Certificate
+		$rCertificate = json_decode($rServer['certbot_ssl'], true);
+		$rCertValid = false;
+		if (!empty($rCertificate['expiration'])) {
+			$rHasCert = true;
+			if (time() < $rCertificate['expiration']) {
+				$rCertValid = true;
+			}
+			$rExpiration = date(SettingsManager::get('datetime_format'), $rCertificate['expiration']);
+		} else {
+			$rHasCert = false;
+			$rExpiration = 'No Certificate Installed';
+		}
 
-        $title = ($rServer['server_type'] == 0) ? 'View Server' : 'View Proxy';
-        $this->setTitle($title);
+		$title = ($rServer['server_type'] == 0) ? 'View Server' : 'View Proxy';
+		$this->setTitle($title);
 
-        // The Resources / Network tabs draw ApexCharts; request the vendor for the new-UI shell.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['apexcharts']
-        )));
+		// The Resources / Network tabs draw ApexCharts; request the vendor for the new-UI shell.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['apexcharts']
+		)));
 
-        $this->render('server_view', compact(
-            'rServer',
-            'rWatchdog',
-            'rStats',
-            'rCertificate',
-            'rCertValid',
-            'rHasCert',
-            'rExpiration'
-        ));
-    }
+		$this->render('server_view', compact(
+			'rServer',
+			'rWatchdog',
+			'rStats',
+			'rCertificate',
+			'rCertValid',
+			'rHasCert',
+			'rExpiration'
+		));
+	}
 }
diff --git a/src/Public/Controllers/Admin/SessionController.php b/src/Public/Controllers/Admin/SessionController.php
index 365ed9c6..3d4df8ef 100644
--- a/src/Public/Controllers/Admin/SessionController.php
+++ b/src/Public/Controllers/Admin/SessionController.php
@@ -13,36 +13,36 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class SessionController extends BaseAdminController {
-    private const SESSION_TIMEOUT_MINUTES = 60;
+	private const SESSION_TIMEOUT_MINUTES = 60;
 
-    public function index() {
-        if (!defined('TMP_PATH')) {
-            define('TMP_PATH', '/home/xc_vm/tmp/');
-        }
+	public function index() {
+		if (!defined('TMP_PATH')) {
+			define('TMP_PATH', '/home/xc_vm/tmp/');
+		}
 
-        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
-            session_start();
-        }
+		if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
+			session_start();
+		}
 
-        if (
-            isset($_SESSION['hash'], $_SESSION['last_activity'])
-            && (time() - $_SESSION['last_activity']) > self::SESSION_TIMEOUT_MINUTES * 60
-        ) {
-            foreach (['hash', 'ip', 'code', 'verify', 'last_activity'] as $rKey) {
-                unset($_SESSION[$rKey]);
-            }
-            if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
-                session_start();
-            }
-        }
+		if (
+			isset($_SESSION['hash'], $_SESSION['last_activity'])
+			&& (time() - $_SESSION['last_activity']) > self::SESSION_TIMEOUT_MINUTES * 60
+		) {
+			foreach (['hash', 'ip', 'code', 'verify', 'last_activity'] as $rKey) {
+				unset($_SESSION[$rKey]);
+			}
+			if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
+				session_start();
+			}
+		}
 
-        if (!isset($_SESSION['hash'])) {
-            exit(json_encode(['result' => false]));
-        }
+		if (!isset($_SESSION['hash'])) {
+			exit(json_encode(['result' => false]));
+		}
 
-        $_SESSION['last_activity'] = time();
-        session_write_close();
+		$_SESSION['last_activity'] = time();
+		session_write_close();
 
-        exit(json_encode(['result' => true]));
-    }
+		exit(json_encode(['result' => true]));
+	}
 }
diff --git a/src/Public/Controllers/Admin/SettingsController.php b/src/Public/Controllers/Admin/SettingsController.php
index 3d703207..6b3318d3 100644
--- a/src/Public/Controllers/Admin/SettingsController.php
+++ b/src/Public/Controllers/Admin/SettingsController.php
@@ -23,83 +23,83 @@ use XcVm\Domain\Stream\StreamConfigRepository;
  */
 
 class SettingsController extends BaseAdminController {
-    public function index(): void {
-        $this->requirePermission();
-        Response::noCache();
+	public function index(): void {
+		$this->requirePermission();
+		Response::noCache();
 
-        $rSettings = SettingsManager::getAll();
-        $rStreamArguments = StreamConfigRepository::getStreamArguments();
+		$rSettings = SettingsManager::getAll();
+		$rStreamArguments = StreamConfigRepository::getStreamArguments();
 
-        $versionData = json_decode(@file_get_contents(BIN_PATH . 'maxmind/version.json'), true) ?: [];
-        $GeoLite2 = $versionData['geolite2_version'] ?? 'N/A';
-        $GeoISP   = $versionData['geoisp_version'] ?? 'N/A';
-        $Nginx    = trim(shell_exec(BIN_PATH . 'nginx/sbin/nginx -v 2>&1 | cut -d\'/\' -f2') ?: '');
-        $rUpdate  = json_decode((string) ($rSettings['update_data'] ?? ''), true) ?: [];
+		$versionData = json_decode(@file_get_contents(BIN_PATH . 'maxmind/version.json'), true) ?: [];
+		$GeoLite2 = $versionData['geolite2_version'] ?? 'N/A';
+		$GeoISP   = $versionData['geoisp_version'] ?? 'N/A';
+		$Nginx    = trim(shell_exec(BIN_PATH . 'nginx/sbin/nginx -v 2>&1 | cut -d\'/\' -f2') ?: '');
+		$rUpdate  = json_decode((string) ($rSettings['update_data'] ?? ''), true) ?: [];
 
-        $binVersionData = json_decode(@file_get_contents(BIN_PATH . 'bin_version.json'), true) ?: [];
-        $BinVersion = $binVersionData['release'] ?? 'N/A';
-        $BinOS = self::resolveOsLabel($binVersionData);
+		$binVersionData = json_decode(@file_get_contents(BIN_PATH . 'bin_version.json'), true) ?: [];
+		$BinVersion = $binVersionData['release'] ?? 'N/A';
+		$BinOS = self::resolveOsLabel($binVersionData);
 
-        // xc_fanout daemon (`-version`), xcvm_core extension marker and yt-dlp — Info tab.
-        $rFanoutBin = BIN_PATH . 'xc_fanout/xc_fanout';
-        $FanoutVersion = (is_file($rFanoutBin) && is_executable($rFanoutBin))
-            ? (ltrim(trim((string) shell_exec(escapeshellarg($rFanoutBin) . ' -version 2>/dev/null')), 'vV') ?: 'N/A')
-            : 'N/A';
+		// xc_fanout daemon (`-version`), xcvm_core extension marker and yt-dlp — Info tab.
+		$rFanoutBin = BIN_PATH . 'xc_fanout/xc_fanout';
+		$FanoutVersion = (is_file($rFanoutBin) && is_executable($rFanoutBin))
+			? (ltrim(trim((string) shell_exec(escapeshellarg($rFanoutBin) . ' -version 2>/dev/null')), 'vV') ?: 'N/A')
+			: 'N/A';
 
-        $rCoreVerFile = rtrim((string) ini_get('extension_dir'), '/') . '/xcvm_core.version';
-        $XcvmCoreVersion = is_file($rCoreVerFile)
-            ? (trim((string) file_get_contents($rCoreVerFile)) ?: 'N/A')
-            : (extension_loaded('xcvm_core') ? (phpversion('xcvm_core') ?: 'N/A') : 'N/A');
+		$rCoreVerFile = rtrim((string) ini_get('extension_dir'), '/') . '/xcvm_core.version';
+		$XcvmCoreVersion = is_file($rCoreVerFile)
+			? (trim((string) file_get_contents($rCoreVerFile)) ?: 'N/A')
+			: (extension_loaded('xcvm_core') ? (phpversion('xcvm_core') ?: 'N/A') : 'N/A');
 
-        $YtDlpVersion = (is_file(YOUTUBE_BIN) && is_executable(YOUTUBE_BIN))
-            ? (trim((string) shell_exec(escapeshellarg(YOUTUBE_BIN) . ' --version 2>/dev/null')) ?: 'N/A')
-            : 'N/A';
+		$YtDlpVersion = (is_file(YOUTUBE_BIN) && is_executable(YOUTUBE_BIN))
+			? (trim((string) shell_exec(escapeshellarg(YOUTUBE_BIN) . ' --version 2>/dev/null')) ?: 'N/A')
+			: 'N/A';
 
-        $this->setTitle('Settings');
-        $this->render('settings', compact(
-            'rSettings',
-            'rStreamArguments',
-            'GeoLite2',
-            'GeoISP',
-            'Nginx',
-            'BinVersion',
-            'BinOS',
-            'rUpdate',
-            'FanoutVersion',
-            'XcvmCoreVersion',
-            'YtDlpVersion'
-        ));
-    }
+		$this->setTitle('Settings');
+		$this->render('settings', compact(
+			'rSettings',
+			'rStreamArguments',
+			'GeoLite2',
+			'GeoISP',
+			'Nginx',
+			'BinVersion',
+			'BinOS',
+			'rUpdate',
+			'FanoutVersion',
+			'XcvmCoreVersion',
+			'YtDlpVersion'
+		));
+	}
 
-    /**
-     * Build the OS label for the Versions tab.
-     *
-     * Prefers the distribution recorded in bin_version.json (set by
-     * update_binaries.sh). When that metadata is missing or still holds the
-     * seed "unknown" placeholder, falls back to the running host's
-     * /etc/os-release so the tab never shows "unknown unknown".
-     *
-     * @param array<string,mixed> $binVersionData
-     */
-    private static function resolveOsLabel(array $binVersionData): string {
-        $dist    = trim((string) ($binVersionData['distribution'] ?? ''));
-        $version = trim((string) ($binVersionData['distribution_version'] ?? ''));
+	/**
+	 * Build the OS label for the Versions tab.
+	 *
+	 * Prefers the distribution recorded in bin_version.json (set by
+	 * update_binaries.sh). When that metadata is missing or still holds the
+	 * seed "unknown" placeholder, falls back to the running host's
+	 * /etc/os-release so the tab never shows "unknown unknown".
+	 *
+	 * @param array<string,mixed> $binVersionData
+	 */
+	private static function resolveOsLabel(array $binVersionData): string {
+		$dist    = trim((string) ($binVersionData['distribution'] ?? ''));
+		$version = trim((string) ($binVersionData['distribution_version'] ?? ''));
 
-        if ($dist !== '' && strcasecmp($dist, 'unknown') !== 0) {
-            return ucfirst($dist) . ($version !== '' && strcasecmp($version, 'unknown') !== 0 ? ' ' . $version : '');
-        }
+		if ($dist !== '' && strcasecmp($dist, 'unknown') !== 0) {
+			return ucfirst($dist) . ($version !== '' && strcasecmp($version, 'unknown') !== 0 ? ' ' . $version : '');
+		}
 
-        $osRelease = @parse_ini_file('/etc/os-release');
-        if (is_array($osRelease)) {
-            if (!empty($osRelease['PRETTY_NAME'])) {
-                return (string) $osRelease['PRETTY_NAME'];
-            }
-            $label = trim((string) ($osRelease['NAME'] ?? '') . ' ' . (string) ($osRelease['VERSION_ID'] ?? ''));
-            if ($label !== '') {
-                return $label;
-            }
-        }
+		$osRelease = @parse_ini_file('/etc/os-release');
+		if (is_array($osRelease)) {
+			if (!empty($osRelease['PRETTY_NAME'])) {
+				return (string) $osRelease['PRETTY_NAME'];
+			}
+			$label = trim((string) ($osRelease['NAME'] ?? '') . ' ' . (string) ($osRelease['VERSION_ID'] ?? ''));
+			if ($label !== '') {
+				return $label;
+			}
+		}
 
-        return 'N/A';
-    }
+		return 'N/A';
+	}
 }
diff --git a/src/Public/Controllers/Admin/SettingsPlexController.php b/src/Public/Controllers/Admin/SettingsPlexController.php
index 1932bba5..f5d58e8b 100644
--- a/src/Public/Controllers/Admin/SettingsPlexController.php
+++ b/src/Public/Controllers/Admin/SettingsPlexController.php
@@ -21,15 +21,15 @@ use XcVm\Domain\Bouquet\BouquetService;
  */
 
 class SettingsPlexController extends BaseAdminController {
-    public function index(): void {
-        $this->requirePermission();
+	public function index(): void {
+		$this->requirePermission();
 
-        $rBouquets = BouquetService::getAllSimple();
-        if (!is_array($rBouquets)) {
-            $rBouquets = [];
-        }
+		$rBouquets = BouquetService::getAllSimple();
+		if (!is_array($rBouquets)) {
+			$rBouquets = [];
+		}
 
-        $this->setTitle('Plex Settings');
-        $this->render('settings_plex', compact('rBouquets'));
-    }
+		$this->setTitle('Plex Settings');
+		$this->render('settings_plex', compact('rBouquets'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamCategoriesController.php b/src/Public/Controllers/Admin/StreamCategoriesController.php
index d581881b..5719f38e 100644
--- a/src/Public/Controllers/Admin/StreamCategoriesController.php
+++ b/src/Public/Controllers/Admin/StreamCategoriesController.php
@@ -17,19 +17,19 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class StreamCategoriesController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rCategories = [1 => CategoryService::getAllByType(), 2 => CategoryService::getAllByType('movie'), 3 => CategoryService::getAllByType('series'), 4 => CategoryService::getAllByType('radio')];
-        $rMainCategories = [1 => [], 2 => [], 3 => [], 4 => []];
+		$rCategories = [1 => CategoryService::getAllByType(), 2 => CategoryService::getAllByType('movie'), 3 => CategoryService::getAllByType('series'), 4 => CategoryService::getAllByType('radio')];
+		$rMainCategories = [1 => [], 2 => [], 3 => [], 4 => []];
 
-        foreach ([1, 2, 3, 4] as $rID) {
-            foreach ($rCategories[$rID] as $rCategoryData) {
-                $rMainCategories[$rID][] = $rCategoryData;
-            }
-        }
+		foreach ([1, 2, 3, 4] as $rID) {
+			foreach ($rCategories[$rID] as $rCategoryData) {
+				$rMainCategories[$rID][] = $rCategoryData;
+			}
+		}
 
-        $this->setTitle('Stream Categories');
-        $this->render('stream_categories', compact('rCategories', 'rMainCategories'));
-    }
+		$this->setTitle('Stream Categories');
+		$this->render('stream_categories', compact('rCategories', 'rMainCategories'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamCategoryController.php b/src/Public/Controllers/Admin/StreamCategoryController.php
index 7b6dd532..7b499f42 100644
--- a/src/Public/Controllers/Admin/StreamCategoryController.php
+++ b/src/Public/Controllers/Admin/StreamCategoryController.php
@@ -19,18 +19,18 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class StreamCategoryController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $rCategoryArr = null;
+	public function index() {
+		$this->requirePermission();
+		$rCategoryArr = null;
 
-        if (RequestManager::has('id')) {
-            $rCategoryArr = CategoryService::getById(RequestManager::get('id'));
-            if (!$rCategoryArr || !Authorization::check('adv', 'edit_cat')) {
-                exit();
-            }
-        }
+		if (RequestManager::has('id')) {
+			$rCategoryArr = CategoryService::getById(RequestManager::get('id'));
+			if (!$rCategoryArr || !Authorization::check('adv', 'edit_cat')) {
+				exit();
+			}
+		}
 
-        $this->setTitle('Stream Category');
-        $this->render('stream_category', compact('rCategoryArr'));
-    }
+		$this->setTitle('Stream Category');
+		$this->render('stream_category', compact('rCategoryArr'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamController.php b/src/Public/Controllers/Admin/StreamController.php
index 9f5b9136..0712842b 100644
--- a/src/Public/Controllers/Admin/StreamController.php
+++ b/src/Public/Controllers/Admin/StreamController.php
@@ -21,95 +21,95 @@ use XcVm\Domain\Stream\StreamRepository;
  */
 
 class StreamController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db, $rServers;
+		global $db, $rServers;
 
-        $rStream = null;
+		$rStream = null;
 
-        if (RequestManager::has('id')) {
-            if (!RequestManager::has('import') && Authorization::check('adv', 'edit_stream')) {
-                $rStream = StreamRepository::getById(RequestManager::get('id'));
-                if (!$rStream || $rStream['type'] != 1) {
-                    $this->redirect('streams');
-                    return;
-                }
-            } else {
-                exit();
-            }
-        }
+		if (RequestManager::has('id')) {
+			if (!RequestManager::has('import') && Authorization::check('adv', 'edit_stream')) {
+				$rStream = StreamRepository::getById(RequestManager::get('id'));
+				if (!$rStream || $rStream['type'] != 1) {
+					$this->redirect('streams');
+					return;
+				}
+			} else {
+				exit();
+			}
+		}
 
-        $rEPGSources = EpgService::getAll();
-        $rStreamArguments = StreamConfigRepository::getStreamArguments();
-        $rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
-        $rOnDemand = [];
-        $rStreamOptions = null;
-        $rStreamSys = null;
-        $rEPGJS = [[]];
+		$rEPGSources = EpgService::getAll();
+		$rStreamArguments = StreamConfigRepository::getStreamArguments();
+		$rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
+		$rOnDemand = [];
+		$rStreamOptions = null;
+		$rStreamSys = null;
+		$rEPGJS = [[]];
 
-        foreach ($rEPGSources as $rEPG) {
-            $rEPGJS[$rEPG['id']] = json_decode($rEPG['data'], true);
-        }
+		foreach ($rEPGSources as $rEPG) {
+			$rEPGJS[$rEPG['id']] = json_decode($rEPG['data'], true);
+		}
 
-        $rServerTree = [
-            ['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Online</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
-            ['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
-        ];
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Online</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
+		];
 
-        $rAudioDevices = $rVideoDevices = [];
-        foreach ($rServers as $rServer) {
-            $rVideoDevices[$rServer['id']] = $rServer['video_devices'];
-            $rAudioDevices[$rServer['id']] = $rServer['audio_devices'];
-        }
+		$rAudioDevices = $rVideoDevices = [];
+		foreach ($rServers as $rServer) {
+			$rVideoDevices[$rServer['id']] = $rServer['video_devices'];
+			$rAudioDevices[$rServer['id']] = $rServer['audio_devices'];
+		}
 
-        if (isset($rStream)) {
-            $rStreamOptions = StreamRepository::getOptions(RequestManager::get('id'));
-            $rStreamSys = StreamRepository::getSystemRows(RequestManager::get('id'));
+		if (isset($rStream)) {
+			$rStreamOptions = StreamRepository::getOptions(RequestManager::get('id'));
+			$rStreamSys = StreamRepository::getSystemRows(RequestManager::get('id'));
 
-            foreach ($rServers as $rServer) {
-                if (isset($rStreamSys[intval($rServer['id'])])) {
-                    $rParent = $rStreamSys[intval($rServer['id'])]['parent_id'] != 0
-                        ? intval($rStreamSys[intval($rServer['id'])]['parent_id'])
-                        : 'source';
+			foreach ($rServers as $rServer) {
+				if (isset($rStreamSys[intval($rServer['id'])])) {
+					$rParent = $rStreamSys[intval($rServer['id'])]['parent_id'] != 0
+						? intval($rStreamSys[intval($rServer['id'])]['parent_id'])
+						: 'source';
 
-                    if ($rStreamSys[intval($rServer['id'])]['on_demand']) {
-                        $rOnDemand[] = intval($rServer['id']);
-                    }
-                } else {
-                    $rParent = 'offline';
-                }
-                $rServerTree[] = ['id' => $rServer['id'], 'parent' => $rParent, 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-            }
-        } else {
-            if (Authorization::check('adv', 'add_stream')) {
-                foreach ($rServers as $rServer) {
-                    $rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-                }
-            } else {
-                exit();
-            }
-        }
+					if ($rStreamSys[intval($rServer['id'])]['on_demand']) {
+						$rOnDemand[] = intval($rServer['id']);
+					}
+				} else {
+					$rParent = 'offline';
+				}
+				$rServerTree[] = ['id' => $rServer['id'], 'parent' => $rParent, 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+			}
+		} else {
+			if (Authorization::check('adv', 'add_stream')) {
+				foreach ($rServers as $rServer) {
+					$rServerTree[] = ['id' => $rServer['id'], 'parent' => 'offline', 'text' => $rServer['server_name'], 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+				}
+			} else {
+				exit();
+			}
+		}
 
-        // The load-balancer server tree on this form is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The load-balancer server tree on this form is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Stream');
-        $this->render('stream', compact(
-            'rStream',
-            'rEPGSources',
-            'rStreamArguments',
-            'rTranscodeProfiles',
-            'rOnDemand',
-            'rEPGJS',
-            'rServerTree',
-            'rAudioDevices',
-            'rVideoDevices',
-            'rStreamOptions',
-            'rStreamSys'
-        ));
-    }
+		$this->setTitle('Stream');
+		$this->render('stream', compact(
+			'rStream',
+			'rEPGSources',
+			'rStreamArguments',
+			'rTranscodeProfiles',
+			'rOnDemand',
+			'rEPGJS',
+			'rServerTree',
+			'rAudioDevices',
+			'rVideoDevices',
+			'rStreamOptions',
+			'rStreamSys'
+		));
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamErrorsController.php b/src/Public/Controllers/Admin/StreamErrorsController.php
index b65546e7..a51ede4d 100644
--- a/src/Public/Controllers/Admin/StreamErrorsController.php
+++ b/src/Public/Controllers/Admin/StreamErrorsController.php
@@ -15,10 +15,10 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class StreamErrorsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $this->setTitle('Stream Errors');
-        $this->render('stream_errors');
-    }
+		$this->setTitle('Stream Errors');
+		$this->render('stream_errors');
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamListController.php b/src/Public/Controllers/Admin/StreamListController.php
index 2d5825d3..9880cf80 100644
--- a/src/Public/Controllers/Admin/StreamListController.php
+++ b/src/Public/Controllers/Admin/StreamListController.php
@@ -15,24 +15,24 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class StreamListController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $rAudioCodecs = $rVideoCodecs = [];
+		$rAudioCodecs = $rVideoCodecs = [];
 
-        $db->query('SELECT DISTINCT(`audio_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `audio_codec` IS NOT NULL AND `type` = 1 ORDER BY `audio_codec` ASC;');
-        foreach ($db->get_rows() as $rRow) {
-            $rAudioCodecs[] = $rRow['audio_codec'];
-        }
+		$db->query('SELECT DISTINCT(`audio_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `audio_codec` IS NOT NULL AND `type` = 1 ORDER BY `audio_codec` ASC;');
+		foreach ($db->get_rows() as $rRow) {
+			$rAudioCodecs[] = $rRow['audio_codec'];
+		}
 
-        $db->query('SELECT DISTINCT(`video_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `video_codec` IS NOT NULL AND `type` = 1 ORDER BY `video_codec` ASC;');
-        foreach ($db->get_rows() as $rRow) {
-            $rVideoCodecs[] = $rRow['video_codec'];
-        }
+		$db->query('SELECT DISTINCT(`video_codec`) FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `video_codec` IS NOT NULL AND `type` = 1 ORDER BY `video_codec` ASC;');
+		foreach ($db->get_rows() as $rRow) {
+			$rVideoCodecs[] = $rRow['video_codec'];
+		}
 
-        $this->setTitle('Streams');
-        $this->render('streams', compact('rAudioCodecs', 'rVideoCodecs'));
-    }
+		$this->setTitle('Streams');
+		$this->render('streams', compact('rAudioCodecs', 'rVideoCodecs'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamMassController.php b/src/Public/Controllers/Admin/StreamMassController.php
index f498af5b..a2e7e044 100644
--- a/src/Public/Controllers/Admin/StreamMassController.php
+++ b/src/Public/Controllers/Admin/StreamMassController.php
@@ -18,31 +18,31 @@ use XcVm\Domain\Stream\StreamConfigRepository;
  */
 
 class StreamMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $rServers;
+		global $rServers;
 
-        $rCategories = CategoryService::getAllByType('live');
-        $rStreamArguments = StreamConfigRepository::getStreamArguments();
-        $rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
+		$rCategories = CategoryService::getAllByType('live');
+		$rStreamArguments = StreamConfigRepository::getStreamArguments();
+		$rTranscodeProfiles = StreamConfigRepository::getTranscodeProfiles();
 
-        $rServerTree = [
-            ['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Online</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
-            ['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
-        ];
+		$rServerTree = [
+			['id' => 'source', 'parent' => '#', 'text' => "<span class='badge bg-success'>Online</span>", 'icon' => 'icon-base ti tabler-player-play', 'state' => ['opened' => true]],
+			['id' => 'offline', 'parent' => '#', 'text' => "<span class='badge bg-secondary'>Offline</span>", 'icon' => 'icon-base ti tabler-player-stop', 'state' => ['opened' => true]],
+		];
 
-        foreach ($rServers as $rServer) {
-            $rServerTree[] = ['id' => intval($rServer['id']), 'parent' => 'offline', 'text' => htmlspecialchars($rServer['server_name']), 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
-        }
+		foreach ($rServers as $rServer) {
+			$rServerTree[] = ['id' => intval($rServer['id']), 'parent' => 'offline', 'text' => htmlspecialchars($rServer['server_name']), 'icon' => 'icon-base ti tabler-server', 'state' => ['opened' => true]];
+		}
 
-        // The load-balancer server tree on this form is driven by jstree.
-        $GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
-            (array) ($GLOBALS['xmNewuiVendors'] ?? []),
-            ['jstree']
-        )));
+		// The load-balancer server tree on this form is driven by jstree.
+		$GLOBALS['xmNewuiVendors'] = array_values(array_unique(array_merge(
+			(array) ($GLOBALS['xmNewuiVendors'] ?? []),
+			['jstree']
+		)));
 
-        $this->setTitle('Mass Edit Streams');
-        $this->render('stream_mass', compact('rCategories', 'rStreamArguments', 'rTranscodeProfiles', 'rServerTree'));
-    }
+		$this->setTitle('Mass Edit Streams');
+		$this->render('stream_mass', compact('rCategories', 'rStreamArguments', 'rTranscodeProfiles', 'rServerTree'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamRankController.php b/src/Public/Controllers/Admin/StreamRankController.php
index e20f0358..725db364 100644
--- a/src/Public/Controllers/Admin/StreamRankController.php
+++ b/src/Public/Controllers/Admin/StreamRankController.php
@@ -17,17 +17,17 @@ use XcVm\Core\Http\RequestManager;
  */
 
 class StreamRankController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $rStreamTypes = array(1 => 'Live Stream', 2 => 'Movie', 3 => 'Created Channel', 4 => 'Radio Station', 5 => 'Episode');
-        $rPeriod = (RequestManager::get('period') ?: 'all');
-        $db->query('SELECT `streams_stats`.*, `streams`.`stream_display_name` FROM `streams_stats` INNER JOIN `streams` ON `streams`.`id` = `streams_stats`.`stream_id` WHERE `streams_stats`.`type` = ? AND `streams`.`type` IN (1,3) GROUP BY `stream_id` ORDER BY `streams_stats`.`rank` ASC LIMIT 500;', $rPeriod);
-        $rRows = $db->get_rows();
+		$rStreamTypes = [1 => 'Live Stream', 2 => 'Movie', 3 => 'Created Channel', 4 => 'Radio Station', 5 => 'Episode'];
+		$rPeriod = (RequestManager::get('period') ?: 'all');
+		$db->query('SELECT `streams_stats`.*, `streams`.`stream_display_name` FROM `streams_stats` INNER JOIN `streams` ON `streams`.`id` = `streams_stats`.`stream_id` WHERE `streams_stats`.`type` = ? AND `streams`.`type` IN (1,3) GROUP BY `stream_id` ORDER BY `streams_stats`.`rank` ASC LIMIT 500;', $rPeriod);
+		$rRows = $db->get_rows();
 
-        $this->setTitle('Stream Rank');
-        $this->render('stream_rank', compact('rStreamTypes', 'rPeriod', 'rRows'));
-    }
+		$this->setTitle('Stream Rank');
+		$this->render('stream_rank', compact('rStreamTypes', 'rPeriod', 'rRows'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamReviewController.php b/src/Public/Controllers/Admin/StreamReviewController.php
index 50dc77e1..758a2b58 100644
--- a/src/Public/Controllers/Admin/StreamReviewController.php
+++ b/src/Public/Controllers/Admin/StreamReviewController.php
@@ -19,123 +19,123 @@ use XcVm\Domain\Stream\CategoryService;
  */
 
 class StreamReviewController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        if (RequestManager::has('save_changes')) {
-            $rChanges = array();
+		if (RequestManager::has('save_changes')) {
+			$rChanges = [];
 
-            foreach (array_keys(RequestManager::getAll()) as $rKey) {
-                $rSplit = explode('_', $rKey);
+			foreach (array_keys(RequestManager::getAll()) as $rKey) {
+				$rSplit = explode('_', $rKey);
 
-                if (!($rSplit[0] == 'modified' && RequestManager::get($rKey) == 1)) {
-                } else {
-                    $rID = intval($rSplit[1]);
-                    $rChanges[$rID] = array();
+				if (!($rSplit[0] == 'modified' && RequestManager::get($rKey) == 1)) {
+				} else {
+					$rID = intval($rSplit[1]);
+					$rChanges[$rID] = [];
 
-                    foreach (array('name', 'channel_id', 'epg_id') as $rChangeKey) {
-                        $rChanges[$rID][$rChangeKey] = RequestManager::get($rChangeKey . '_' . $rID);
-                    }
+					foreach (['name', 'channel_id', 'epg_id'] as $rChangeKey) {
+						$rChanges[$rID][$rChangeKey] = RequestManager::get($rChangeKey . '_' . $rID);
+					}
 
-                    foreach (array('bouquets', 'categories') as $rChangeKey) {
-                        $rChanges[$rID][$rChangeKey] = json_decode(RequestManager::get($rChangeKey . '_' . $rID), true);
-                    }
-                }
-            }
+					foreach (['bouquets', 'categories'] as $rChangeKey) {
+						$rChanges[$rID][$rChangeKey] = json_decode(RequestManager::get($rChangeKey . '_' . $rID), true);
+					}
+				}
+			}
 
-            foreach ($rChanges as $rID => $rStream) {
-                if (!RequestManager::get('save_bouquets')) {
-                } else {
-                    $rHasBouquets = array();
+			foreach ($rChanges as $rID => $rStream) {
+				if (!RequestManager::get('save_bouquets')) {
+				} else {
+					$rHasBouquets = [];
 
-                    foreach (BouquetService::getAll() as $rBouquetID => $rBouquet) {
-                        if (!(in_array($rID, $rBouquet['streams']) || in_array($rID, $rBouquet['channels']))) {
-                        } else {
-                            $rHasBouquets[] = $rBouquetID;
-                        }
-                    }
-                    $rAddBouquet = array();
+					foreach (BouquetService::getAll() as $rBouquetID => $rBouquet) {
+						if (!(in_array($rID, $rBouquet['streams']) || in_array($rID, $rBouquet['channels']))) {
+						} else {
+							$rHasBouquets[] = $rBouquetID;
+						}
+					}
+					$rAddBouquet = [];
 
-                    foreach ($rHasBouquets as $rBouquetID) {
-                        if (in_array($rBouquetID, $rStream['bouquets'])) {
-                        } else {
-                            BouquetService::removeItems('stream', $rBouquetID, $rID);
-                        }
-                    }
+					foreach ($rHasBouquets as $rBouquetID) {
+						if (in_array($rBouquetID, $rStream['bouquets'])) {
+						} else {
+							BouquetService::removeItems('stream', $rBouquetID, $rID);
+						}
+					}
 
-                    foreach ($rStream['bouquets'] as $rBouquetID) {
-                        if (in_array($rBouquetID, $rHasBouquets)) {
-                        } else {
-                            $rAddBouquet[] = $rBouquetID;
-                            BouquetService::addItems('stream', $rBouquetID, $rID);
-                        }
-                    }
-                }
+					foreach ($rStream['bouquets'] as $rBouquetID) {
+						if (in_array($rBouquetID, $rHasBouquets)) {
+						} else {
+							$rAddBouquet[] = $rBouquetID;
+							BouquetService::addItems('stream', $rBouquetID, $rID);
+						}
+					}
+				}
 
-                if (RequestManager::get('save_categories') && RequestManager::get('save_epg')) {
-                    $db->query('UPDATE `streams` SET `stream_display_name` = ?, `category_id` = ?, `channel_id` = ?, `epg_id` = ? WHERE `id` = ?;', $rStream['name'], '[' . implode(',', array_map('intval', $rStream['categories'])) . ']', ($rStream['channel_id'] ?: null), (is_null($rStream['epg_id']) ? null : $rStream['epg_id']), $rID);
-                } else {
-                    if (RequestManager::get('save_categories')) {
-                        $db->query('UPDATE `streams` SET `stream_display_name` = ?, `category_id` = ? WHERE `id` = ?;', $rStream['name'], '[' . implode(',', array_map('intval', $rStream['categories'])) . ']', $rID);
-                    } else {
-                        if (RequestManager::get('save_epg')) {
-                            $db->query('UPDATE `streams` SET `stream_display_name` = ?, `channel_id` = ?, `epg_id` = ?, WHERE `id` = ?;', $rStream['name'], ($rStream['channel_id'] ?: null), (is_null($rStream['epg_id']) ? null : $rStream['epg_id']), $rID);
-                        } else {
-                            $db->query('UPDATE `streams` SET `stream_display_name` = ? WHERE `id` = ?;', $rStream['name'], $rID);
-                        }
-                    }
-                }
-            }
-            header('Location: ./streams?status=' . STATUS_SUCCESS);
+				if (RequestManager::get('save_categories') && RequestManager::get('save_epg')) {
+					$db->query('UPDATE `streams` SET `stream_display_name` = ?, `category_id` = ?, `channel_id` = ?, `epg_id` = ? WHERE `id` = ?;', $rStream['name'], '[' . implode(',', array_map('intval', $rStream['categories'])) . ']', ($rStream['channel_id'] ?: null), (is_null($rStream['epg_id']) ? null : $rStream['epg_id']), $rID);
+				} else {
+					if (RequestManager::get('save_categories')) {
+						$db->query('UPDATE `streams` SET `stream_display_name` = ?, `category_id` = ? WHERE `id` = ?;', $rStream['name'], '[' . implode(',', array_map('intval', $rStream['categories'])) . ']', $rID);
+					} else {
+						if (RequestManager::get('save_epg')) {
+							$db->query('UPDATE `streams` SET `stream_display_name` = ?, `channel_id` = ?, `epg_id` = ?, WHERE `id` = ?;', $rStream['name'], ($rStream['channel_id'] ?: null), (is_null($rStream['epg_id']) ? null : $rStream['epg_id']), $rID);
+						} else {
+							$db->query('UPDATE `streams` SET `stream_display_name` = ? WHERE `id` = ?;', $rStream['name'], $rID);
+						}
+					}
+				}
+			}
+			header('Location: ./streams?status=' . STATUS_SUCCESS);
 
-            exit();
-        } else {
-            if (!RequestManager::has('streams')) {
-            } else {
-                $rStreams = json_decode(RequestManager::get('streams'), true);
-                $rCategories = CategoryService::getAllByType('live');
-                $rBouquets = BouquetService::getAllSimple();
-                $rStreamBouquets = array();
-                foreach ($rBouquets as $rBouquet) {
-                    $rBouquetChannels = json_decode($rBouquet['bouquet_channels'], true);
+			exit();
+		} else {
+			if (!RequestManager::has('streams')) {
+			} else {
+				$rStreams = json_decode(RequestManager::get('streams'), true);
+				$rCategories = CategoryService::getAllByType('live');
+				$rBouquets = BouquetService::getAllSimple();
+				$rStreamBouquets = [];
+				foreach ($rBouquets as $rBouquet) {
+					$rBouquetChannels = json_decode($rBouquet['bouquet_channels'], true);
 
-                    foreach ($rBouquetChannels as $rStreamID) {
-                        if (!in_array($rStreamID, $rStreams)) {
-                        } else {
-                            $rStreamBouquets[$rStreamID][] = $rBouquet['id'];
-                        }
-                    }
-                }
-                $rOptions = array('categories' => RequestManager::has('edit_categories'), 'epg' => RequestManager::has('edit_epg'), 'bouquets' => RequestManager::has('edit_bouquets'));
-                $rWidth = array(25, 20, 20);
+					foreach ($rBouquetChannels as $rStreamID) {
+						if (!in_array($rStreamID, $rStreams)) {
+						} else {
+							$rStreamBouquets[$rStreamID][] = $rBouquet['id'];
+						}
+					}
+				}
+				$rOptions = ['categories' => RequestManager::has('edit_categories'), 'epg' => RequestManager::has('edit_epg'), 'bouquets' => RequestManager::has('edit_bouquets')];
+				$rWidth = [25, 20, 20];
 
-                if ($rOptions['categories'] || $rOptions['bouquets'] || $rOptions['epg']) {
-                } else {
-                    $rWidth = array(90, 0, 0);
-                }
+				if ($rOptions['categories'] || $rOptions['bouquets'] || $rOptions['epg']) {
+				} else {
+					$rWidth = [90, 0, 0];
+				}
 
-                $rImport = array();
+				$rImport = [];
 
-                if (0 >= count($rStreams)) {
-                } else {
-                    $db->query('SELECT * FROM `streams` WHERE `id` IN (' . implode(',', array_map('intval', $rStreams)) . ');');
+				if (0 >= count($rStreams)) {
+				} else {
+					$db->query('SELECT * FROM `streams` WHERE `id` IN (' . implode(',', array_map('intval', $rStreams)) . ');');
 
-                    foreach ($db->get_rows() as $rRow) {
-                        $rImport[] = array('id' => $rRow['id'], 'channel_id' => ($rRow['channel_id'] ?: ''), 'epg_id' => ($rRow['epg_id'] ?: ''), 'title' => ($rRow['stream_display_name'] ?: ''), 'category' => json_decode($rRow['category_id'], true), 'bouquets' => ($rStreamBouquets[$rRow['id']] ?: array()));
-                    }
-                }
+					foreach ($db->get_rows() as $rRow) {
+						$rImport[] = ['id' => $rRow['id'], 'channel_id' => ($rRow['channel_id'] ?: ''), 'epg_id' => ($rRow['epg_id'] ?: ''), 'title' => ($rRow['stream_display_name'] ?: ''), 'category' => json_decode($rRow['category_id'], true), 'bouquets' => ($rStreamBouquets[$rRow['id']] ?: [])];
+					}
+				}
 
-                if (count($rImport) != 0) {
-                } else {
-                    $_STATUS = STATUS_NO_SOURCES;
-                    $rImport = null;
-                }
-            }
-        }
+				if (count($rImport) != 0) {
+				} else {
+					$_STATUS = STATUS_NO_SOURCES;
+					$rImport = null;
+				}
+			}
+		}
 
-        $this->setTitle('Review');
-        $this->render('stream_review', compact('rStreams', 'rCategories', 'rBouquets', 'rStreamBouquets', 'rOptions', 'rWidth', 'rImport'));
-    }
+		$this->setTitle('Review');
+		$this->render('stream_review', compact('rStreams', 'rCategories', 'rBouquets', 'rStreamBouquets', 'rOptions', 'rWidth', 'rImport'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamToolsController.php b/src/Public/Controllers/Admin/StreamToolsController.php
index 799fdcd9..42db6665 100644
--- a/src/Public/Controllers/Admin/StreamToolsController.php
+++ b/src/Public/Controllers/Admin/StreamToolsController.php
@@ -15,10 +15,10 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class StreamToolsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $this->setTitle('Stream Tools');
-        $this->render('stream_tools');
-    }
+		$this->setTitle('Stream Tools');
+		$this->render('stream_tools');
+	}
 }
diff --git a/src/Public/Controllers/Admin/StreamViewController.php b/src/Public/Controllers/Admin/StreamViewController.php
index fe09aa33..3d76dd56 100644
--- a/src/Public/Controllers/Admin/StreamViewController.php
+++ b/src/Public/Controllers/Admin/StreamViewController.php
@@ -25,103 +25,103 @@ use XcVm\Domain\Stream\StreamRepository;
  */
 
 class StreamViewController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        if (RequestManager::has('id') && ($rStream = StreamRepository::getById(RequestManager::get('id')))) {
-        } else {
-            AdminHelpers::goHome();
-        }
+		if (RequestManager::has('id') && ($rStream = StreamRepository::getById(RequestManager::get('id')))) {
+		} else {
+			AdminHelpers::goHome();
+		}
 
-        $rTypeString = array(1 => 'Stream', 2 => 'Movie', 3 => 'Channel', 4 => 'Station', 5 => 'Episode')[$rStream['type']];
-        $rEPGData = null;
-        $rImage = null;
-        $rUIToken = null;
-        $rAdaptiveLink = null;
-        $rProperties = null;
-        $rCCInfo = null;
-        $rSeconds = null;
-        $rSeries = null;
-        $rSeriesID = null;
+		$rTypeString = [1 => 'Stream', 2 => 'Movie', 3 => 'Channel', 4 => 'Station', 5 => 'Episode'][$rStream['type']];
+		$rEPGData = null;
+		$rImage = null;
+		$rUIToken = null;
+		$rAdaptiveLink = null;
+		$rProperties = null;
+		$rCCInfo = null;
+		$rSeconds = null;
+		$rSeries = null;
+		$rSeriesID = null;
 
-        if ($rStream['type'] == 1) {
-            $rEPGData = EpgService::getChannelEpg($rStream);
+		if ($rStream['type'] == 1) {
+			$rEPGData = EpgService::getChannelEpg($rStream);
 
-            if (0 >= $rStream['vframes_server_id']) {
-            } else {
-                $rExpires = time() + 3600;
-                $rTokenData = array('session_id' => session_id(), 'expires' => $rExpires, 'stream_id' => intval(RequestManager::get('id')), 'ip' => NetworkUtils::getUserIP());
-                $rUIToken = Encryption::mintToken(json_encode($rTokenData), SettingsManager::get('live_streaming_pass'), OPENSSL_EXTRA, (bool) SettingsManager::get('secure_stream_tokens'));
+			if (0 >= $rStream['vframes_server_id']) {
+			} else {
+				$rExpires = time() + 3600;
+				$rTokenData = ['session_id' => session_id(), 'expires' => $rExpires, 'stream_id' => intval(RequestManager::get('id')), 'ip' => NetworkUtils::getUserIP()];
+				$rUIToken = Encryption::mintToken(json_encode($rTokenData), SettingsManager::get('live_streaming_pass'), OPENSSL_EXTRA, (bool) SettingsManager::get('secure_stream_tokens'));
 
-                if (AdminHelpers::issecure()) {
-                    $rVServer = ServerRepository::getAll()[$rStream['vframes_server_id']];
-                    $rImage = 'https://' . (($rVServer['domain_name'] ? $rVServer['domain_name'] : $rVServer['server_ip'])) . ':' . intval($rVServer['https_broadcast_port']) . '/admin/thumb?uitoken=' . $rUIToken;
-                } else {
-                    $rVServer = ServerRepository::getAll()[$rStream['vframes_server_id']];
-                    $rImage = 'http://' . (($rVServer['domain_name'] ? $rVServer['domain_name'] : $rVServer['server_ip'])) . ':' . intval($rVServer['http_broadcast_port']) . '/admin/thumb?uitoken=' . $rUIToken;
-                }
-            }
+				if (AdminHelpers::issecure()) {
+					$rVServer = ServerRepository::getAll()[$rStream['vframes_server_id']];
+					$rImage = 'https://' . (($rVServer['domain_name'] ? $rVServer['domain_name'] : $rVServer['server_ip'])) . ':' . intval($rVServer['https_broadcast_port']) . '/admin/thumb?uitoken=' . $rUIToken;
+				} else {
+					$rVServer = ServerRepository::getAll()[$rStream['vframes_server_id']];
+					$rImage = 'http://' . (($rVServer['domain_name'] ? $rVServer['domain_name'] : $rVServer['server_ip'])) . ':' . intval($rVServer['http_broadcast_port']) . '/admin/thumb?uitoken=' . $rUIToken;
+				}
+			}
 
-            $rAdaptiveLink = (json_decode($rStream['adaptive_link'], true) ?: array());
-        } else {
-            if ($rStream['type'] == 2 || $rStream['type'] == 5) {
-                $rProperties = json_decode($rStream['movie_properties'], true);
-                $rImage = (!empty($rProperties['backdrop_path'][0]) ? ImageUtils::validateURL($rProperties['backdrop_path'][0], (AdminHelpers::issecure() ? 'https' : 'http')) : ImageUtils::validateURL($rProperties['movie_image'], (AdminHelpers::issecure() ? 'https' : 'http')));
+			$rAdaptiveLink = (json_decode($rStream['adaptive_link'], true) ?: []);
+		} else {
+			if ($rStream['type'] == 2 || $rStream['type'] == 5) {
+				$rProperties = json_decode($rStream['movie_properties'], true);
+				$rImage = (!empty($rProperties['backdrop_path'][0]) ? ImageUtils::validateURL($rProperties['backdrop_path'][0], (AdminHelpers::issecure() ? 'https' : 'http')) : ImageUtils::validateURL($rProperties['movie_image'], (AdminHelpers::issecure() ? 'https' : 'http')));
 
-                if (empty($rImage)) {
-                } else {
-                    if (@getimagesize($rImage)) {
-                    } else {
-                        $rImage = null;
-                    }
-                }
-            } else {
-                if ($rStream['type'] != 3) {
-                } else {
-                    $rCCInfo = null;
-                    $db->query('SELECT `streams_servers`.`stream_started`, `streams_servers`.`cc_info` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` AND `streams_servers`.`parent_id` IS NULL WHERE `streams`.`id` = ? GROUP BY `streams`.`id`;', $rStream['id']);
+				if (empty($rImage)) {
+				} else {
+					if (@getimagesize($rImage)) {
+					} else {
+						$rImage = null;
+					}
+				}
+			} else {
+				if ($rStream['type'] != 3) {
+				} else {
+					$rCCInfo = null;
+					$db->query('SELECT `streams_servers`.`stream_started`, `streams_servers`.`cc_info` FROM `streams` LEFT JOIN `streams_servers` ON `streams_servers`.`stream_id` = `streams`.`id` AND `streams_servers`.`parent_id` IS NULL WHERE `streams`.`id` = ? GROUP BY `streams`.`id`;', $rStream['id']);
 
-                    if (0 >= $db->num_rows()) {
-                    } else {
-                        $rServerRow = $db->get_row();
-                        $rCCInfo = json_decode($rServerRow['cc_info'], true);
-                        $rSeconds = time() - intval($rServerRow['stream_started']);
-                    }
-                }
-            }
-        }
+					if (0 >= $db->num_rows()) {
+					} else {
+						$rServerRow = $db->get_row();
+						$rCCInfo = json_decode($rServerRow['cc_info'], true);
+						$rSeconds = time() - intval($rServerRow['stream_started']);
+					}
+				}
+			}
+		}
 
-        if ($rStream['type'] != 5) {
-        } else {
-            $rSeries = null;
-            $db->query('SELECT * FROM `streams_series` WHERE `id` = (SELECT `series_id` FROM `streams_episodes` WHERE `stream_id` = ?);', $rStream['id']);
+		if ($rStream['type'] != 5) {
+		} else {
+			$rSeries = null;
+			$db->query('SELECT * FROM `streams_series` WHERE `id` = (SELECT `series_id` FROM `streams_episodes` WHERE `stream_id` = ?);', $rStream['id']);
 
-            if (0 >= $db->num_rows()) {
-            } else {
-                $rSeries = $db->get_row();
-            }
+			if (0 >= $db->num_rows()) {
+			} else {
+				$rSeries = $db->get_row();
+			}
 
-            $rSeriesID = $rSeries['id'];
-        }
+			$rSeriesID = $rSeries['id'];
+		}
 
-        $rStreamStats = StreamRepository::getStats($rStream['id']);
+		$rStreamStats = StreamRepository::getStats($rStream['id']);
 
-        $this->setTitle('View ' . $rTypeString);
-        $this->render('stream_view', compact(
-            'rStream',
-            'rTypeString',
-            'rEPGData',
-            'rImage',
-            'rUIToken',
-            'rAdaptiveLink',
-            'rProperties',
-            'rSeries',
-            'rSeriesID',
-            'rStreamStats',
-            'rCCInfo',
-            'rSeconds'
-        ));
-    }
+		$this->setTitle('View ' . $rTypeString);
+		$this->render('stream_view', compact(
+			'rStream',
+			'rTypeString',
+			'rEPGData',
+			'rImage',
+			'rUIToken',
+			'rAdaptiveLink',
+			'rProperties',
+			'rSeries',
+			'rSeriesID',
+			'rStreamStats',
+			'rCCInfo',
+			'rSeconds'
+		));
+	}
 }
diff --git a/src/Public/Controllers/Admin/TableController.php b/src/Public/Controllers/Admin/TableController.php
index a7a4a1c2..f25d3b81 100644
--- a/src/Public/Controllers/Admin/TableController.php
+++ b/src/Public/Controllers/Admin/TableController.php
@@ -269,7 +269,7 @@ class TableController extends BaseAdminController {
 		];
 
 		$rOrderRow = (RequestManager::has("order") && strlen(RequestManager::get("order")[0]["column"] ?? '') > 0)
-			? (int)(RequestManager::get("order")[0]["column"])
+			? (int) (RequestManager::get("order")[0]["column"])
 			: 10;
 
 		$rOrderBy = (isset($rOrder[$rOrderRow]) && $rOrder[$rOrderRow] !== false)
@@ -280,7 +280,7 @@ class TableController extends BaseAdminController {
 		$rWhereV = [];
 
 		// Reseller filter
-		$resellerFilter = (int)(RequestManager::get("reseller") ?? 0);
+		$resellerFilter = (int) (RequestManager::get("reseller") ?? 0);
 		if ($resellerFilter > 0) {
 			$rWhere[] = "`activation_codes`.`created_by` = ?";
 			$rWhereV[] = $resellerFilter;
@@ -288,7 +288,7 @@ class TableController extends BaseAdminController {
 
 		// Status filter: 1=Ready/Stock, 2=Active, 3=Expired, 4=Disabled
 		$filter = RequestManager::get("filter");
-		if (strlen((string)$filter) > 0 && $filter != 0) {
+		if (strlen((string) $filter) > 0 && $filter != 0) {
 			if ($filter == 1) {
 				$rWhere[] = "`activation_codes`.`status` = 1";
 			} elseif ($filter == 2) {
@@ -301,14 +301,14 @@ class TableController extends BaseAdminController {
 		}
 
 		// Batch filter
-		$batchFilter = trim((string)RequestManager::get("batch"));
+		$batchFilter = trim((string) RequestManager::get("batch"));
 		if (strlen($batchFilter) > 0) {
 			$rWhere[] = "`activation_codes`.`batch_name` = ?";
 			$rWhereV[] = $batchFilter;
 		}
 
 		// Package filter
-		$packageFilter = (int)(RequestManager::get("package") ?? 0);
+		$packageFilter = (int) (RequestManager::get("package") ?? 0);
 		if ($packageFilter > 0) {
 			$rWhere[] = "`activation_codes`.`package_id` = ?";
 			$rWhereV[] = $packageFilter;
@@ -330,7 +330,7 @@ class TableController extends BaseAdminController {
 
 		$countSql = "SELECT COUNT(*) as `total` FROM `activation_codes` LEFT JOIN `lines` ON `lines`.`id` = `activation_codes`.`subscriber_id` LEFT JOIN `users` ON `users`.`id` = `activation_codes`.`created_by` {$whereClause};";
 		$db->query($countSql, ...$rWhereV);
-		$rReturn["recordsTotal"] = $rReturn["recordsFiltered"] = (int)($db->get_row()["total"] ?? 0);
+		$rReturn["recordsTotal"] = $rReturn["recordsFiltered"] = (int) ($db->get_row()["total"] ?? 0);
 
 		$sql = "SELECT
 					`activation_codes`.*,
@@ -461,7 +461,7 @@ class TableController extends BaseAdminController {
 				$rActivityIDs = $rLineInfo = $rLineIDs = [];
 				foreach ($rRows as $rRow) {
 					$rLineIDs[] = (int) $rRow["id"];
-					$rLineInfo[(int) $rRow["id"]] = ["owner_name" => NULL, "stream_display_name" => NULL, "stream_id" => NULL, "last_active" => NULL];
+					$rLineInfo[(int) $rRow["id"]] = ["owner_name" => null, "stream_display_name" => null, "stream_id" => null, "last_active" => null];
 					$rLastInfo = [];
 
 					if (!empty($rRow['last_activity_array'])) {
@@ -648,7 +648,7 @@ class TableController extends BaseAdminController {
 				foreach ($rRows as $rRow) {
 					if ($rRow["id"]) {
 						$rLineIDs[] = (int) $rRow["id"];
-						$rLineInfo[(int) $rRow["id"]] = ["owner_name" => NULL, "stream_display_name" => NULL, "stream_id" => NULL, "last_active" => NULL];
+						$rLineInfo[(int) $rRow["id"]] = ["owner_name" => null, "stream_display_name" => null, "stream_id" => null, "last_active" => null];
 					}
 					$rLastInfo = [];
 
@@ -809,7 +809,7 @@ class TableController extends BaseAdminController {
 				foreach ($rRows as $rRow) {
 					if ($rRow["id"]) {
 						$rLineIDs[] = (int) $rRow["id"];
-						$rLineInfo[(int) $rRow["id"]] = ["owner_name" => NULL, "stream_display_name" => NULL, "stream_id" => NULL, "last_active" => NULL];
+						$rLineInfo[(int) $rRow["id"]] = ["owner_name" => null, "stream_display_name" => null, "stream_id" => null, "last_active" => null];
 					}
 					$rLastInfo = [];
 
@@ -941,10 +941,10 @@ class TableController extends BaseAdminController {
 				}
 				$rWhere[] = "(`streams`.`id` LIKE ? OR `streams`.`stream_display_name` LIKE ? OR `streams`.`notes` LIKE ? OR `streams_servers`.`current_source` LIKE ?)";
 			}
-			if (0 < (int)(RequestManager::get("category") ?? 0)) {
+			if (0 < (int) (RequestManager::get("category") ?? 0)) {
 				$rWhere[] = "JSON_CONTAINS(`streams`.`category_id`, ?, '\$')";
 				$rWhereV[] = RequestManager::get("category");
-			} elseif ((int)(RequestManager::get("category") ?? 0) == -1) {
+			} elseif ((int) (RequestManager::get("category") ?? 0) == -1) {
 				$rWhere[] = "(`streams`.`category_id` = '[]' OR `streams`.`category_id` IS NULL)";
 			}
 			if (RequestManager::has("refresh")) {
@@ -1014,11 +1014,11 @@ class TableController extends BaseAdminController {
 			}
 			if (0 < strlen(RequestManager::get("resolution") ?? '')) {
 				$rWhere[] = "`streams_servers`.`resolution` = ?";
-				$rWhereV[] = (int) RequestManager::get("resolution") ?: NULL;
+				$rWhereV[] = (int) RequestManager::get("resolution") ?: null;
 			}
 			if (0 < (int) (RequestManager::get("server") ?? 0)) {
 				$rWhere[] = "`streams_servers`.`server_id` = ?";
-				$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
+				$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
 			} elseif ((int) (RequestManager::get("server") ?? 0) == -1) {
 				$rWhere[] = "`streams_servers`.`server_id` IS NULL";
 			}
@@ -1132,7 +1132,7 @@ class TableController extends BaseAdminController {
 							$rCategoryIDs = [];
 						}
 						if (0 < strlen(RequestManager::get("category") ?? '')) {
-							$rCategory = $rCategories[(int)(RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
+							$rCategory = $rCategories[(int) (RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
 						} else {
 							$rCategory = $rCategoryIDs[0] ?? null;
 							$rCategory = $rCategories[$rCategory]['category_name'] ?? "No Category";
@@ -1359,10 +1359,10 @@ class TableController extends BaseAdminController {
 				}
 				$rWhere[] = "(`streams`.`id` LIKE ? OR `streams`.`stream_display_name` LIKE ? OR `streams`.`notes` LIKE ? OR `streams_servers`.`current_source` LIKE ?)";
 			}
-			if (0 < (int)(RequestManager::get("category") ?? 0)) {
+			if (0 < (int) (RequestManager::get("category") ?? 0)) {
 				$rWhere[] = "JSON_CONTAINS(`streams`.`category_id`, ?, '\$')";
 				$rWhereV[] = RequestManager::get("category");
-			} elseif ((int)(RequestManager::get("category") ?? 0) == -1) {
+			} elseif ((int) (RequestManager::get("category") ?? 0) == -1) {
 				$rWhere[] = "(`streams`.`category_id` = '[]' OR `streams`.`category_id` IS NULL)";
 			}
 			if (RequestManager::has("refresh")) {
@@ -1386,10 +1386,10 @@ class TableController extends BaseAdminController {
 					$rWhere[] = "`streams`.`direct_source` = 1";
 				}
 			}
-			if (0 < (int)(RequestManager::get("server") ?? 0)) {
+			if (0 < (int) (RequestManager::get("server") ?? 0)) {
 				$rWhere[] = "`streams_servers`.`server_id` = ?";
-				$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
-			} elseif ((int)(RequestManager::get("server") ?? 0) == -1) {
+				$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
+			} elseif ((int) (RequestManager::get("server") ?? 0) == -1) {
 				$rWhere[] = "`streams_servers`.`server_id` IS NULL";
 			}
 			$rOrderBy = "";
@@ -1570,10 +1570,10 @@ class TableController extends BaseAdminController {
 				}
 				$rWhere[] = "(`streams`.`id` LIKE ? OR `streams`.`stream_display_name` LIKE ? OR `streams`.`notes` LIKE ? OR `streams_servers`.`current_source` LIKE ?)";
 			}
-			if (0 < (int)(RequestManager::get("category") ?? 0)) {
+			if (0 < (int) (RequestManager::get("category") ?? 0)) {
 				$rWhere[] = "JSON_CONTAINS(`streams`.`category_id`, ?, '\$')";
 				$rWhereV[] = RequestManager::get("category");
-			} elseif ((int)(RequestManager::get("category") ?? 0) == -1) {
+			} elseif ((int) (RequestManager::get("category") ?? 0) == -1) {
 				$rWhere[] = "(`streams`.`category_id` = '[]' OR `streams`.`category_id` IS NULL)";
 			}
 			if (RequestManager::has("refresh")) {
@@ -1620,11 +1620,11 @@ class TableController extends BaseAdminController {
 			}
 			if (0 < strlen(RequestManager::get("resolution") ?? '')) {
 				$rWhere[] = "`streams_servers`.`resolution` = ?";
-				$rWhereV[] = (int) RequestManager::get("resolution") ?: NULL;
+				$rWhereV[] = (int) RequestManager::get("resolution") ?: null;
 			}
 			if (0 < (int) (RequestManager::get("server") ?? 0)) {
 				$rWhere[] = "`streams_servers`.`server_id` = ?";
-				$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
+				$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
 			} elseif ((int) (RequestManager::get("server") ?? 0) == -1) {
 				$rWhere[] = "`streams_servers`.`server_id` IS NULL";
 			}
@@ -1786,10 +1786,10 @@ class TableController extends BaseAdminController {
 		}
 		$rWhere = $rWhereV = [];
 		$rWhere[] = "`streams`.`type` = 5";
-		if (0 < (int)(RequestManager::get("server") ?? 0)) {
+		if (0 < (int) (RequestManager::get("server") ?? 0)) {
 			$rWhere[] = "`streams_servers`.`server_id` = ?";
-			$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
-		} elseif ((int)(RequestManager::get("server") ?? 0) == -1) {
+			$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
+		} elseif ((int) (RequestManager::get("server") ?? 0) == -1) {
 			$rWhere[] = "`streams_servers`.`server_id` IS NULL";
 		}
 		if (0 < strlen(RequestManager::get("series") ?? '')) {
@@ -2066,9 +2066,9 @@ class TableController extends BaseAdminController {
 				$rKeys = explode(",", RequestManager::get("refresh"));
 				$rKeyCount = count($rKeys);
 			} else {
-				$rServerID = 0 < (int)(RequestManager::get("server_id") ?? 0) ? (int)(RequestManager::get("server_id") ?? 0) : NULL;
-				$rStreamID = 0 < (int)(RequestManager::get("stream_id") ?? 0) ? (int)(RequestManager::get("stream_id") ?? 0) : NULL;
-				$rUserID = 0 < (int)(RequestManager::get("user_id") ?? 0) ? (int)(RequestManager::get("user_id") ?? 0) : NULL;
+				$rServerID = 0 < (int) (RequestManager::get("server_id") ?? 0) ? (int) (RequestManager::get("server_id") ?? 0) : null;
+				$rStreamID = 0 < (int) (RequestManager::get("stream_id") ?? 0) ? (int) (RequestManager::get("stream_id") ?? 0) : null;
+				$rUserID = 0 < (int) (RequestManager::get("user_id") ?? 0) ? (int) (RequestManager::get("user_id") ?? 0) : null;
 				if ($rUserID) {
 					if ($rServerID || $rStreamID) {
 						$rKeys = $rRedis->zRevRangeByScore("LINE#" . $rUserID, "+inf", "-inf");
@@ -2184,7 +2184,7 @@ class TableController extends BaseAdminController {
 			}
 			for ($i = 0; $i < count($rRows); $i++) {
 				$rRows[$i]["divergence"] = $rDivergenceMap[$rRows[$i]["uuid"]] ?? 0;
-				$rRows[$i]["series_no"] = $rSeriesMap[$rRows[$i]["stream_id"]] ?? NULL;
+				$rRows[$i]["series_no"] = $rSeriesMap[$rRows[$i]["stream_id"]] ?? null;
 				$rRows[$i]["stream_display_name"] = $rStreamNames[$rRows[$i]["stream_id"]][0] ?? "";
 				$rRows[$i]["type"] = $rStreamNames[$rRows[$i]["stream_id"]][1] ?? 1;
 				$rRows[$i] = array_merge($rRows[$i], $rUserMap[$rRows[$i]["user_id"]] ?? []);
@@ -2349,16 +2349,16 @@ class TableController extends BaseAdminController {
 		} else {
 			$rWhere[] = "`streams`.`type` = 1";
 		}
-		if (0 < (int)(RequestManager::get("category") ?? 0)) {
+		if (0 < (int) (RequestManager::get("category") ?? 0)) {
 			$rWhere[] = "JSON_CONTAINS(`streams`.`category_id`, ?, '\$')";
 			$rWhereV[] = RequestManager::get("category");
-		} elseif ((int)(RequestManager::get("category") ?? 0) == -1) {
+		} elseif ((int) (RequestManager::get("category") ?? 0) == -1) {
 			$rWhere[] = "(`streams`.`category_id` = '[]' OR `streams`.`category_id` IS NULL)";
 		}
-		if (0 < (int)(RequestManager::get("server") ?? 0)) {
+		if (0 < (int) (RequestManager::get("server") ?? 0)) {
 			$rWhere[] = "`streams_servers`.`server_id` = ?";
-			$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
-		} elseif ((int)(RequestManager::get("server") ?? 0) == -1) {
+			$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
+		} elseif ((int) (RequestManager::get("server") ?? 0) == -1) {
 			$rWhere[] = "`streams_servers`.`server_id` IS NULL";
 		}
 		if (0 < strlen(RequestManager::get("filter") ?? '')) {
@@ -2529,16 +2529,16 @@ class TableController extends BaseAdminController {
 		}
 		$rWhere = $rWhereV = [];
 		$rWhere[] = "`streams`.`type` = 2";
-		if (0 < (int)(RequestManager::get("category") ?? 0)) {
+		if (0 < (int) (RequestManager::get("category") ?? 0)) {
 			$rWhere[] = "JSON_CONTAINS(`streams`.`category_id`, ?, '\$')";
 			$rWhereV[] = RequestManager::get("category");
-		} elseif ((int)(RequestManager::get("category") ?? 0) == -1) {
+		} elseif ((int) (RequestManager::get("category") ?? 0) == -1) {
 			$rWhere[] = "(`streams`.`category_id` = '[]' OR `streams`.`category_id` IS NULL)";
 		}
-		if (0 < (int)(RequestManager::get("server") ?? 0)) {
+		if (0 < (int) (RequestManager::get("server") ?? 0)) {
 			$rWhere[] = "`streams_servers`.`server_id` = ?";
-			$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
-		} elseif ((int)(RequestManager::get("server") ?? 0) == -1) {
+			$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
+		} elseif ((int) (RequestManager::get("server") ?? 0) == -1) {
 			$rWhere[] = "`streams_servers`.`server_id` IS NULL";
 		}
 		if (0 < strlen(RequestManager::get("search")["value"] ?? '')) {
@@ -2632,7 +2632,7 @@ class TableController extends BaseAdminController {
 						}
 						$rCategoryIDs = json_decode($rRow["category_id"], true);
 						if (0 < strlen(RequestManager::get("category") ?? '')) {
-							$rCategory = $rCategories[(int)(RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
+							$rCategory = $rCategories[(int) (RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
 						} else {
 							$rCategory = $rCategoryIDs[0] ?? null;
 							$rCategory = $rCategories[$rCategory]['category_name'] ?? "No Category";
@@ -2699,16 +2699,16 @@ class TableController extends BaseAdminController {
 		}
 		$rWhere = $rWhereV = [];
 		$rWhere[] = "`streams`.`type` = 4";
-		if (0 < (int)(RequestManager::get("category") ?? 0)) {
+		if (0 < (int) (RequestManager::get("category") ?? 0)) {
 			$rWhere[] = "JSON_CONTAINS(`streams`.`category_id`, ?, '\$')";
 			$rWhereV[] = RequestManager::get("category");
-		} elseif ((int)(RequestManager::get("category") ?? 0) == -1) {
+		} elseif ((int) (RequestManager::get("category") ?? 0) == -1) {
 			$rWhere[] = "(`streams`.`category_id` = '[]' OR `streams`.`category_id` IS NULL)";
 		}
-		if (0 < (int)(RequestManager::get("server") ?? 0)) {
+		if (0 < (int) (RequestManager::get("server") ?? 0)) {
 			$rWhere[] = "`streams_servers`.`server_id` = ?";
-			$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
-		} elseif ((int)(RequestManager::get("server") ?? 0) == -1) {
+			$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
+		} elseif ((int) (RequestManager::get("server") ?? 0) == -1) {
 			$rWhere[] = "`streams_servers`.`server_id` IS NULL";
 		}
 		if (0 < strlen(RequestManager::get("filter") ?? '')) {
@@ -2771,7 +2771,7 @@ class TableController extends BaseAdminController {
 					} else {
 						$rCategoryIDs = json_decode($rRow["category_id"], true);
 						if (0 < strlen(RequestManager::get("category") ?? '')) {
-							$rCategory = $rCategories[(int)(RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
+							$rCategory = $rCategories[(int) (RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
 						} else {
 							$rCategory = $rCategoryIDs[0] ?? null;
 							$rCategory = $rCategories[$rCategory]['category_name'] ?? "No Category";
@@ -2884,7 +2884,7 @@ class TableController extends BaseAdminController {
 					} else {
 						$rCategoryIDs = json_decode($rRow["category_id"], true);
 						if (0 < strlen(RequestManager::get("category") ?? '')) {
-							$rCategory = $rCategories[(int)(RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
+							$rCategory = $rCategories[(int) (RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
 						} else {
 							$rCategory = $rCategoryIDs[0] ?? null;
 							$rCategory = $rCategories[$rCategory]['category_name'] ?? "No Category";
@@ -3300,7 +3300,7 @@ class TableController extends BaseAdminController {
 			exit;
 		}
 		$rCategories = CategoryService::getAllByType("live");
-		$rOrder = ["`streams`.`id`", "`streams`.`stream_display_name`", false, "`active_count`", NULL];
+		$rOrder = ["`streams`.`id`", "`streams`.`stream_display_name`", false, "`active_count`", null];
 		if (RequestManager::has("order") && 0 < strlen(RequestManager::get("order")[0]["column"] ?? '')) {
 			$rOrderRow = (int) (RequestManager::get("order")[0]["column"] ?? 0);
 		} else {
@@ -3363,7 +3363,7 @@ class TableController extends BaseAdminController {
 					} else {
 						$rCategoryIDs = json_decode($rRow["category_id"], true);
 						if (0 < strlen(RequestManager::get("category") ?? '')) {
-							$rCategory = $rCategories[(int)(RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
+							$rCategory = $rCategories[(int) (RequestManager::get("category") ?? 0)]["category_name"] ?: "No Category";
 						} else {
 							$rCategory = $rCategoryIDs[0] ?? null;
 							$rCategory = $rCategories[$rCategory]['category_name'] ?? "No Category";
@@ -3440,7 +3440,7 @@ class TableController extends BaseAdminController {
 					if ($rRow["owner_id"]) {
 						$rOwnerIDs[] = $rRow["owner_id"];
 					}
-					$rUserInfo[$rRow["id"]] = ["is_reseller" => 0, "user_lines" => 0, "mag_lines" => 0, "e2_lines" => 0, "user_count" => 0, "group_name" => NULL];
+					$rUserInfo[$rRow["id"]] = ["is_reseller" => 0, "user_lines" => 0, "mag_lines" => 0, "e2_lines" => 0, "user_count" => 0, "group_name" => null];
 				}
 				if (0 < count($rUserIDs)) {
 					$db->query("SELECT `users`.`id`, `users_groups`.`is_reseller`, `users_groups`.`group_name` FROM `users_groups` LEFT JOIN `users` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `users`.`id` IN (" . implode(",", $rUserIDs) . ");");
@@ -3716,11 +3716,11 @@ class TableController extends BaseAdminController {
 			}
 			if (0 < strlen(RequestManager::get("resolution") ?? '')) {
 				$rWhere[] = "`streams_servers`.`resolution` = ?";
-				$rWhereV[] = (int) RequestManager::get("resolution") ?: NULL;
+				$rWhereV[] = (int) RequestManager::get("resolution") ?: null;
 			}
 			if (0 < (int) (RequestManager::get("server") ?? 0)) {
 				$rWhere[] = "`streams_servers`.`server_id` = ?";
-				$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
+				$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
 			} elseif ((int) (RequestManager::get("server") ?? 0) == -1) {
 				$rWhere[] = "`streams_servers`.`server_id` IS NULL";
 			}
@@ -3923,7 +3923,6 @@ class TableController extends BaseAdminController {
 		exit;
 	}
 
-
 	private function handleMysqlSyslog($rReturn, $rStart, $rLimit, $rIsAPI) {
 		global $db, $rPermissions;
 		if (!$rPermissions["is_admin"] || !Authorization::check("adv", "panel_logs")) {
@@ -4755,7 +4754,7 @@ class TableController extends BaseAdminController {
 		}
 		$rWhere = $rWhereV = [];
 		$rWhere[] = "`stream_source` LIKE ?";
-		$rWhereV[] = "%s:" . (int)(RequestManager::get("server_id") ?? 0) . ":%";
+		$rWhereV[] = "%s:" . (int) (RequestManager::get("server_id") ?? 0) . ":%";
 		if (RequestManager::has("category_id") && 0 < strlen(RequestManager::get("category_id"))) {
 			$rSplit = explode(":", RequestManager::get("category_id"));
 			if ((int) $rSplit[0] == 0) {
@@ -4965,7 +4964,7 @@ class TableController extends BaseAdminController {
 		$rWhere = $rWhereV = [];
 		$rWhere[] = "`stream_id` = ?";
 		$rWhereV[] = RequestManager::get("stream_id");
-		if (RequestManager::has("server_id") && 0 < (int)(RequestManager::get("server_id") ?? 0)) {
+		if (RequestManager::has("server_id") && 0 < (int) (RequestManager::get("server_id") ?? 0)) {
 			$rWhere[] = "`server_id` = ?";
 			$rWhereV[] = RequestManager::get("server_id");
 		}
@@ -5096,9 +5095,9 @@ class TableController extends BaseAdminController {
 				$rWhere[] = "`ondemand_check`.`status` IS NULL";
 			}
 		}
-		if (0 < (int)(RequestManager::get("server") ?? 0)) {
+		if (0 < (int) (RequestManager::get("server") ?? 0)) {
 			$rWhere[] = "`streams_servers`.`server_id` = ?";
-			$rWhereV[] = (int)(RequestManager::get("server") ?? 0);
+			$rWhereV[] = (int) (RequestManager::get("server") ?? 0);
 		}
 		$rOrderBy = "";
 		if (isset($rOrder[$rOrderRow]) && $rOrder[$rOrderRow]) {
diff --git a/src/Public/Controllers/Admin/TheftDetectionController.php b/src/Public/Controllers/Admin/TheftDetectionController.php
index 3e18c738..998e3dff 100644
--- a/src/Public/Controllers/Admin/TheftDetectionController.php
+++ b/src/Public/Controllers/Admin/TheftDetectionController.php
@@ -15,19 +15,19 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class TheftDetectionController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('VOD Theft Detection');
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('VOD Theft Detection');
 
-        $rRange = intval($this->input('range')) ?: 0;
-        $cacheFile = CACHE_TMP_PATH . 'theft_detection';
-        $rTheftDetection = file_exists($cacheFile)
-            ? (igbinary_unserialize(file_get_contents($cacheFile)) ?: [])
-            : [];
+		$rRange = intval($this->input('range')) ?: 0;
+		$cacheFile = CACHE_TMP_PATH . 'theft_detection';
+		$rTheftDetection = file_exists($cacheFile)
+			? (igbinary_unserialize(file_get_contents($cacheFile)) ?: [])
+			: [];
 
-        $this->render('theft_detection', [
-            'theftDetection' => $rTheftDetection,
-            'range'          => $rRange,
-        ]);
-    }
+		$this->render('theft_detection', [
+			'theftDetection' => $rTheftDetection,
+			'range'          => $rRange,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Admin/TicketController.php b/src/Public/Controllers/Admin/TicketController.php
index ab3e6715..56e0d796 100644
--- a/src/Public/Controllers/Admin/TicketController.php
+++ b/src/Public/Controllers/Admin/TicketController.php
@@ -18,16 +18,16 @@ use XcVm\Domain\User\TicketRepository;
  */
 
 class TicketController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rTicket = TicketRepository::getById(RequestManager::get('id'));
-        if (!$rTicket) {
-            $this->redirect('tickets');
-            return;
-        }
+		$rTicket = TicketRepository::getById(RequestManager::get('id'));
+		if (!$rTicket) {
+			$this->redirect('tickets');
+			return;
+		}
 
-        $this->setTitle('Ticket');
-        $this->render('ticket', compact('rTicket'));
-    }
+		$this->setTitle('Ticket');
+		$this->render('ticket', compact('rTicket'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/TicketViewController.php b/src/Public/Controllers/Admin/TicketViewController.php
index 18585da1..31b5fa3c 100644
--- a/src/Public/Controllers/Admin/TicketViewController.php
+++ b/src/Public/Controllers/Admin/TicketViewController.php
@@ -18,25 +18,25 @@ use XcVm\Domain\User\TicketRepository;
  */
 
 class TicketViewController extends BaseAdminController {
-    public function index() {
-        global $db, $rUserInfo;
+	public function index() {
+		global $db, $rUserInfo;
 
-        $this->requirePermission();
+		$this->requirePermission();
 
-        $rTicketInfo = null;
-        if (RequestManager::has('id')) {
-            $rTicketInfo = TicketRepository::getById(RequestManager::get('id'));
-        }
-        if (!$rTicketInfo) {
-            $this->redirect('tickets');
-            return;
-        }
+		$rTicketInfo = null;
+		if (RequestManager::has('id')) {
+			$rTicketInfo = TicketRepository::getById(RequestManager::get('id'));
+		}
+		if (!$rTicketInfo) {
+			$this->redirect('tickets');
+			return;
+		}
 
-        if ($rUserInfo['id'] != $rTicketInfo['member_id']) {
-            $db->query('UPDATE `tickets` SET `admin_read` = 1 WHERE `id` = ?;', RequestManager::get('id'));
-        }
+		if ($rUserInfo['id'] != $rTicketInfo['member_id']) {
+			$db->query('UPDATE `tickets` SET `admin_read` = 1 WHERE `id` = ?;', RequestManager::get('id'));
+		}
 
-        $this->setTitle('View Ticket');
-        $this->render('ticket_view', compact('rTicketInfo'));
-    }
+		$this->setTitle('View Ticket');
+		$this->render('ticket_view', compact('rTicketInfo'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/TicketsController.php b/src/Public/Controllers/Admin/TicketsController.php
index a93a3887..56096696 100644
--- a/src/Public/Controllers/Admin/TicketsController.php
+++ b/src/Public/Controllers/Admin/TicketsController.php
@@ -15,12 +15,12 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class TicketsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rStatusArray = array('CLOSED', 'OPEN', 'RESPONDED TO', 'READ BY USER', 'NEW RESPONSE', 'READ BY ME', 'READ BY USER');
+		$rStatusArray = ['CLOSED', 'OPEN', 'RESPONDED TO', 'READ BY USER', 'NEW RESPONSE', 'READ BY ME', 'READ BY USER'];
 
-        $this->setTitle('Tickets');
-        $this->render('tickets', compact('rStatusArray'));
-    }
+		$this->setTitle('Tickets');
+		$this->render('tickets', compact('rStatusArray'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/TmdbController.php b/src/Public/Controllers/Admin/TmdbController.php
index 313e899f..fdd28bf0 100644
--- a/src/Public/Controllers/Admin/TmdbController.php
+++ b/src/Public/Controllers/Admin/TmdbController.php
@@ -21,49 +21,48 @@ use XcVm\Infrastructure\Tmdb\TmdbApiService;
  */
 
 class TmdbController {
+	public function search(): void {
+		if (!$this->hasMediaPermission()) {
+			echo json_encode(['result' => false]);
+			exit();
+		}
 
-    public function search(): void {
-        if (!$this->hasMediaPermission()) {
-            echo json_encode(['result' => false]);
-            exit();
-        }
+		$term = RequestManager::get('term') ?? '';
+		if (strlen($term) === 0) {
+			echo json_encode(['result' => false]);
+			exit();
+		}
 
-        $term = RequestManager::get('term') ?? '';
-        if (strlen($term) === 0) {
-            echo json_encode(['result' => false]);
-            exit();
-        }
+		$type     = RequestManager::get('type') ?? 'movie';
+		$language = RequestManager::get('language') ?? null;
+		$season   = RequestManager::has('season') ? intval(RequestManager::get('season')) : null;
 
-        $type     = RequestManager::get('type')     ?? 'movie';
-        $language = RequestManager::get('language')  ?? null;
-        $season   = RequestManager::has('season') ? intval(RequestManager::get('season')) : null;
+		$response = TmdbApiService::search($term, $type, $language ?: null, $season);
+		echo json_encode($response);
+		exit();
+	}
 
-        $response = TmdbApiService::search($term, $type, $language ?: null, $season);
-        echo json_encode($response);
-        exit();
-    }
+	public function details(): void {
+		if (!$this->hasMediaPermission()) {
+			echo json_encode(['result' => false]);
+			exit();
+		}
 
-    public function details(): void {
-        if (!$this->hasMediaPermission()) {
-            echo json_encode(['result' => false]);
-            exit();
-        }
+		$id       = intval(RequestManager::get('id') ?? 0);
+		$type     = RequestManager::get('type') ?? '';
+		$language = RequestManager::get('language') ?? null;
 
-        $id       = intval(RequestManager::get('id')       ?? 0);
-        $type     = RequestManager::get('type')             ?? '';
-        $language = RequestManager::get('language')         ?? null;
+		$response = TmdbApiService::getDetails($id, $type, $language ?: null);
+		echo json_encode($response);
+		exit();
+	}
 
-        $response = TmdbApiService::getDetails($id, $type, $language ?: null);
-        echo json_encode($response);
-        exit();
-    }
-
-    private function hasMediaPermission(): bool {
-        return Authorization::check('adv', 'add_series')
-            || Authorization::check('adv', 'edit_series')
-            || Authorization::check('adv', 'add_movie')
-            || Authorization::check('adv', 'edit_movie')
-            || Authorization::check('adv', 'add_episode')
-            || Authorization::check('adv', 'edit_episode');
-    }
+	private function hasMediaPermission(): bool {
+		return Authorization::check('adv', 'add_series')
+			|| Authorization::check('adv', 'edit_series')
+			|| Authorization::check('adv', 'add_movie')
+			|| Authorization::check('adv', 'edit_movie')
+			|| Authorization::check('adv', 'add_episode')
+			|| Authorization::check('adv', 'edit_episode');
+	}
 }
diff --git a/src/Public/Controllers/Admin/UserController.php b/src/Public/Controllers/Admin/UserController.php
index c65a3fa2..e556030e 100644
--- a/src/Public/Controllers/Admin/UserController.php
+++ b/src/Public/Controllers/Admin/UserController.php
@@ -19,20 +19,20 @@ use XcVm\Domain\User\UserRepository;
  */
 
 class UserController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        global $db;
+		global $db;
 
-        $rUser = RequestManager::has('id') ? UserRepository::getRegisteredUserById(RequestManager::get('id')) : null;
-        if ($rUser === false) {
-            $this->redirect('users');
-            return;
-        }
+		$rUser = RequestManager::has('id') ? UserRepository::getRegisteredUserById(RequestManager::get('id')) : null;
+		if ($rUser === false) {
+			$this->redirect('users');
+			return;
+		}
 
-        $rPackages = $rUser ? PackageService::getAll($rUser['member_group_id']) : [];
+		$rPackages = $rUser ? PackageService::getAll($rUser['member_group_id']) : [];
 
-        $this->setTitle('User');
-        $this->render('user', compact('rUser', 'rPackages'));
-    }
+		$this->setTitle('User');
+		$this->render('user', compact('rUser', 'rPackages'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/UserLogsController.php b/src/Public/Controllers/Admin/UserLogsController.php
index 8aa9e765..dbe3e934 100644
--- a/src/Public/Controllers/Admin/UserLogsController.php
+++ b/src/Public/Controllers/Admin/UserLogsController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class UserLogsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('User Logs');
-        $this->render('user_logs');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('User Logs');
+		$this->render('user_logs');
+	}
 }
diff --git a/src/Public/Controllers/Admin/UserMassController.php b/src/Public/Controllers/Admin/UserMassController.php
index d6dfc4e0..d00efe4f 100644
--- a/src/Public/Controllers/Admin/UserMassController.php
+++ b/src/Public/Controllers/Admin/UserMassController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class UserMassController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Mass Edit Users');
-        $this->render('user_mass');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Mass Edit Users');
+		$this->render('user_mass');
+	}
 }
diff --git a/src/Public/Controllers/Admin/UseragentController.php b/src/Public/Controllers/Admin/UseragentController.php
index 99e1f089..07e2872a 100644
--- a/src/Public/Controllers/Admin/UseragentController.php
+++ b/src/Public/Controllers/Admin/UseragentController.php
@@ -18,19 +18,19 @@ use XcVm\Domain\Security\BlocklistService;
  */
 
 class UseragentController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
+	public function index() {
+		$this->requirePermission();
 
-        $rUAArr = null;
-        if (RequestManager::has('id')) {
-            $rUAArr = BlocklistService::getUserAgentById(RequestManager::get('id'));
-            if (!$rUAArr) {
-                $this->redirect('useragents');
-                return;
-            }
-        }
+		$rUAArr = null;
+		if (RequestManager::has('id')) {
+			$rUAArr = BlocklistService::getUserAgentById(RequestManager::get('id'));
+			if (!$rUAArr) {
+				$this->redirect('useragents');
+				return;
+			}
+		}
 
-        $this->setTitle('Block User-Agent');
-        $this->render('useragent', compact('rUAArr'));
-    }
+		$this->setTitle('Block User-Agent');
+		$this->render('useragent', compact('rUAArr'));
+	}
 }
diff --git a/src/Public/Controllers/Admin/UseragentsController.php b/src/Public/Controllers/Admin/UseragentsController.php
index 7b1da9db..5067e3e0 100644
--- a/src/Public/Controllers/Admin/UseragentsController.php
+++ b/src/Public/Controllers/Admin/UseragentsController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class UseragentsController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Blocked User-Agents');
-        $this->render('useragents');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Blocked User-Agents');
+		$this->render('useragents');
+	}
 }
diff --git a/src/Public/Controllers/Admin/UsersController.php b/src/Public/Controllers/Admin/UsersController.php
index 1d847db3..897afd24 100644
--- a/src/Public/Controllers/Admin/UsersController.php
+++ b/src/Public/Controllers/Admin/UsersController.php
@@ -15,9 +15,9 @@ namespace XcVm\Public\Controllers\Admin;
  */
 
 class UsersController extends BaseAdminController {
-    public function index() {
-        $this->requirePermission();
-        $this->setTitle('Users');
-        $this->render('users');
-    }
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Users');
+		$this->render('users');
+	}
 }
diff --git a/src/Public/Controllers/Api/ActiveCodeApiController.php b/src/Public/Controllers/Api/ActiveCodeApiController.php
index 4f57ab8d..11117b8e 100644
--- a/src/Public/Controllers/Api/ActiveCodeApiController.php
+++ b/src/Public/Controllers/Api/ActiveCodeApiController.php
@@ -19,151 +19,150 @@ use XcVm\Domain\Line\ActiveCodeService;
  * @package XC_VM_Public_Controllers_Api
  */
 class ActiveCodeApiController extends BaseApiController {
+	public function index() {
+		set_time_limit(0);
 
-    public function index() {
-        set_time_limit(0);
+		header('Content-Type: application/json; charset=utf-8');
+		header('Access-Control-Allow-Origin: *');
+		header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
+		header('Access-Control-Allow-Headers: Content-Type, Authorization, X-Requested-With');
 
-        header('Content-Type: application/json; charset=utf-8');
-        header('Access-Control-Allow-Origin: *');
-        header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
-        header('Access-Control-Allow-Headers: Content-Type, Authorization, X-Requested-With');
+		if (($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'OPTIONS') {
+			http_response_code(200);
+			exit();
+		}
 
-        if (($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'OPTIONS') {
-            http_response_code(200);
-            exit();
-        }
+		global $rSettings, $rServers;
 
-        global $rSettings, $rServers;
+		$rawBody = @file_get_contents('php://input');
+		$jsonInput = !empty($rawBody) ? json_decode($rawBody, true) : null;
 
-        $rawBody = @file_get_contents('php://input');
-        $jsonInput = !empty($rawBody) ? json_decode($rawBody, true) : null;
+		$code = trim(
+			RequestManager::get('code')
+			?? RequestManager::get('activation_code')
+			?? RequestManager::get('pin')
+			?? RequestManager::get('c')
+			?? ($jsonInput['code'] ?? $jsonInput['activation_code'] ?? $jsonInput['pin'] ?? '')
+		);
 
-        $code = trim(
-            RequestManager::get('code')
-            ?? RequestManager::get('activation_code')
-            ?? RequestManager::get('pin')
-            ?? RequestManager::get('c')
-            ?? ($jsonInput['code'] ?? $jsonInput['activation_code'] ?? $jsonInput['pin'] ?? '')
-        );
+		$mac = trim(
+			RequestManager::get('mac')
+			?? RequestManager::get('mac_address')
+			?? ($jsonInput['mac'] ?? $jsonInput['mac_address'] ?? '')
+		);
 
-        $mac = trim(
-            RequestManager::get('mac')
-            ?? RequestManager::get('mac_address')
-            ?? ($jsonInput['mac'] ?? $jsonInput['mac_address'] ?? '')
-        );
+		$deviceId = trim(
+			RequestManager::get('device_id')
+			?? RequestManager::get('device')
+			?? ($jsonInput['device_id'] ?? $jsonInput['device'] ?? '')
+		);
 
-        $deviceId = trim(
-            RequestManager::get('device_id')
-            ?? RequestManager::get('device')
-            ?? ($jsonInput['device_id'] ?? $jsonInput['device'] ?? '')
-        );
+		$action = trim(
+			RequestManager::get('action')
+			?? ($jsonInput['action'] ?? 'auth')
+		);
 
-        $action = trim(
-            RequestManager::get('action')
-            ?? ($jsonInput['action'] ?? 'auth')
-        );
+		if (empty($code)) {
+			$this->deny = true;
+			http_response_code(400);
+			echo json_encode([
+				'status' => 'ERROR',
+				'user_info' => ['auth' => 0],
+				'message' => 'Missing activation code. Please provide "code" or "activation_code".'
+			], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+			exit();
+		}
 
-        if (empty($code)) {
-            $this->deny = true;
-            http_response_code(400);
-            echo json_encode([
-                'status' => 'ERROR',
-                'user_info' => ['auth' => 0],
-                'message' => 'Missing activation code. Please provide "code" or "activation_code".'
-            ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-            exit();
-        }
+		$clientIp = $_SERVER['REMOTE_ADDR'] ?? '';
+		$deviceInfo = [
+			'mac' => $mac,
+			'device_id' => $deviceId,
+			'ip' => $clientIp,
+		];
 
-        $clientIp = $_SERVER['REMOTE_ADDR'] ?? '';
-        $deviceInfo = [
-            'mac' => $mac,
-            'device_id' => $deviceId,
-            'ip' => $clientIp,
-        ];
+		// Process activation / stock-countdown trigger
+		$res = ActiveCodeService::activateCode($code, $deviceInfo);
 
-        // Process activation / stock-countdown trigger
-        $res = ActiveCodeService::activateCode($code, $deviceInfo);
+		if ($res['status'] !== 'SUCCESS') {
+			$this->deny = true;
+			BruteforceGuard::checkBruteforce(null, null, $code);
+			http_response_code(200);
+			echo json_encode([
+				'status' => 'ERROR',
+				'error_code' => $res['status'],
+				'user_info' => ['auth' => 0],
+				'message' => $res['message'] ?? 'Activation failed.'
+			], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+			exit();
+		}
 
-        if ($res['status'] !== 'SUCCESS') {
-            $this->deny = true;
-            BruteforceGuard::checkBruteforce(null, null, $code);
-            http_response_code(200);
-            echo json_encode([
-                'status' => 'ERROR',
-                'error_code' => $res['status'],
-                'user_info' => ['auth' => 0],
-                'message' => $res['message'] ?? 'Activation failed.'
-            ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-            exit();
-        }
+		$this->deny = false;
 
-        $this->deny = false;
+		$username = $res['line']['username'] ?? $res['credentials']['username'] ?? '';
+		$password = $res['line']['password'] ?? $res['credentials']['password'] ?? '';
+		$maxConnections = strval($res['line']['max_connections'] ?? $res['max_connections'] ?? '1');
+		$codeDetails = $res['code_details'] ?? [];
 
-        $username = $res['line']['username'] ?? $res['credentials']['username'] ?? '';
-        $password = $res['line']['password'] ?? $res['credentials']['password'] ?? '';
-        $maxConnections = strval($res['line']['max_connections'] ?? $res['max_connections'] ?? '1');
-        $codeDetails = $res['code_details'] ?? [];
+		// Build standard server_info
+		$serverId = defined('SERVER_ID') ? SERVER_ID : 1;
+		$domainName = DomainResolver::resolve($serverId);
+		$domain = parse_url($domainName, PHP_URL_HOST) ?: ($_SERVER['HTTP_HOST'] ?? 'localhost');
+		$protocol = $rServers[$serverId]['server_protocol'] ?? 'http';
+		$port = strval($rServers[$serverId]['http_broadcast_port'] ?? 80);
+		$httpsPort = strval($rServers[$serverId]['https_broadcast_port'] ?? 443);
+		$rtmpPort = strval($rServers[$serverId]['rtmp_port'] ?? 25462);
 
-        // Build standard server_info
-        $serverId = defined('SERVER_ID') ? SERVER_ID : 1;
-        $domainName = DomainResolver::resolve($serverId);
-        $domain = parse_url($domainName, PHP_URL_HOST) ?: ($_SERVER['HTTP_HOST'] ?? 'localhost');
-        $protocol = $rServers[$serverId]['server_protocol'] ?? 'http';
-        $port = strval($rServers[$serverId]['http_broadcast_port'] ?? 80);
-        $httpsPort = strval($rServers[$serverId]['https_broadcast_port'] ?? 443);
-        $rtmpPort = strval($rServers[$serverId]['rtmp_port'] ?? 25462);
+		$serverUrl = $protocol . '://' . $domain . ($port != '80' && $port != '443' ? ':' . $port : '');
+		if (!empty($codeDetails['dns_base'])) {
+			$serverUrl = rtrim($codeDetails['dns_base'], '/');
+		}
 
-        $serverUrl = $protocol . '://' . $domain . ($port != '80' && $port != '443' ? ':' . $port : '');
-        if (!empty($codeDetails['dns_base'])) {
-            $serverUrl = rtrim($codeDetails['dns_base'], '/');
-        }
+		$m3uTs = $serverUrl . '/get.php?username=' . urlencode($username) . '&password=' . urlencode($password) . '&type=m3u_plus&output=ts';
+		$m3uHls = $serverUrl . '/get.php?username=' . urlencode($username) . '&password=' . urlencode($password) . '&type=m3u_plus&output=m3u8';
 
-        $m3uTs = $serverUrl . '/get.php?username=' . urlencode($username) . '&password=' . urlencode($password) . '&type=m3u_plus&output=ts';
-        $m3uHls = $serverUrl . '/get.php?username=' . urlencode($username) . '&password=' . urlencode($password) . '&type=m3u_plus&output=m3u8';
+		$output = [
+			'status' => 'SUCCESS',
+			'user_info' => [
+				'username' => $username,
+				'password' => $password,
+				'message' => $rSettings['message_of_day'] ?? 'Welcome to IPTV',
+				'auth' => 1,
+				'status' => 'Active',
+				'exp_date' => !empty($res['exp_date']) ? strval($res['exp_date']) : null,
+				'exp_formatted' => $res['exp_formatted'] ?? ($res['exp_date_formatted'] ?? ''),
+				'is_trial' => strval($codeDetails['is_trial'] ?? '0'),
+				'active_cons' => '0',
+				'created_at' => strval($codeDetails['created_at'] ?? time()),
+				'max_connections' => $maxConnections,
+				'allowed_output_formats' => ['m3u8', 'ts', 'rtmp']
+			],
+			'server_info' => [
+				'version' => defined('XC_VM_VERSION') ? XC_VM_VERSION : '1.0.0',
+				'url' => $domain,
+				'port' => $port,
+				'https_port' => $httpsPort,
+				'server_protocol' => $protocol,
+				'rtmp_port' => $rtmpPort,
+				'timestamp_now' => time(),
+				'time_now' => date('Y-m-d H:i:s'),
+				'timezone' => ($rSettings['force_epg_timezone'] ?? false) ? 'UTC' : ($rSettings['default_timezone'] ?? 'UTC'),
+				'process' => true
+			],
+			'active_code' => [
+				'code' => $res['code'],
+				'batch_name' => $codeDetails['batch_name'] ?? '',
+				'package_name' => $res['package_name'] ?? 'Premium IPTV',
+				'status' => 'Active',
+				'is_new_activation' => $res['is_new_activation'] ?? false,
+			],
+			'playlists' => [
+				'm3u_ts' => $m3uTs,
+				'm3u_hls' => $m3uHls,
+			],
+			'player_api_url' => $serverUrl . '/player_api.php?username=' . urlencode($username) . '&password=' . urlencode($password)
+		];
 
-        $output = [
-            'status' => 'SUCCESS',
-            'user_info' => [
-                'username' => $username,
-                'password' => $password,
-                'message' => $rSettings['message_of_day'] ?? 'Welcome to IPTV',
-                'auth' => 1,
-                'status' => 'Active',
-                'exp_date' => !empty($res['exp_date']) ? strval($res['exp_date']) : null,
-                'exp_formatted' => $res['exp_formatted'] ?? ($res['exp_date_formatted'] ?? ''),
-                'is_trial' => strval($codeDetails['is_trial'] ?? '0'),
-                'active_cons' => '0',
-                'created_at' => strval($codeDetails['created_at'] ?? time()),
-                'max_connections' => $maxConnections,
-                'allowed_output_formats' => ['m3u8', 'ts', 'rtmp']
-            ],
-            'server_info' => [
-                'version' => defined('XC_VM_VERSION') ? XC_VM_VERSION : '1.0.0',
-                'url' => $domain,
-                'port' => $port,
-                'https_port' => $httpsPort,
-                'server_protocol' => $protocol,
-                'rtmp_port' => $rtmpPort,
-                'timestamp_now' => time(),
-                'time_now' => date('Y-m-d H:i:s'),
-                'timezone' => ($rSettings['force_epg_timezone'] ?? false) ? 'UTC' : ($rSettings['default_timezone'] ?? 'UTC'),
-                'process' => true
-            ],
-            'active_code' => [
-                'code' => $res['code'],
-                'batch_name' => $codeDetails['batch_name'] ?? '',
-                'package_name' => $res['package_name'] ?? 'Premium IPTV',
-                'status' => 'Active',
-                'is_new_activation' => $res['is_new_activation'] ?? false,
-            ],
-            'playlists' => [
-                'm3u_ts' => $m3uTs,
-                'm3u_hls' => $m3uHls,
-            ],
-            'player_api_url' => $serverUrl . '/player_api.php?username=' . urlencode($username) . '&password=' . urlencode($password)
-        ];
-
-        echo json_encode($output, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-        exit();
-    }
+		echo json_encode($output, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+		exit();
+	}
 }
diff --git a/src/Public/Controllers/Api/AdminAPIWrapper.php b/src/Public/Controllers/Api/AdminAPIWrapper.php
index b3fbd70b..e86b82e6 100644
--- a/src/Public/Controllers/Api/AdminAPIWrapper.php
+++ b/src/Public/Controllers/Api/AdminAPIWrapper.php
@@ -35,1455 +35,1612 @@ use XcVm\Module\Watch\WatchService;
 use XcVm\Public\Controllers\Admin\TableController;
 
 class AdminAPIWrapper {
-    public static $db = null;
-    public static $rKey = null;
-    public static function filterRow($rData, $rShow, $rHide, $rSkipResult = false) {
-        if ($rShow || $rHide) {
-            if ($rSkipResult) {
-                $rRow = $rData;
-            } else {
-                $rRow = $rData['data'];
-            }
-            $rReturn = array();
-            if (!$rRow) {
-            } else {
-                foreach (array_keys($rRow) as $rKey) {
-                    if ($rShow) {
-                        if (!in_array($rKey, $rShow)) {
-                        } else {
-                            $rReturn[$rKey] = $rRow[$rKey];
-                        }
-                    } else {
-                        if (!$rHide) {
-                        } else {
-                            if (in_array($rKey, $rHide)) {
-                            } else {
-                                $rReturn[$rKey] = $rRow[$rKey];
-                            }
-                        }
-                    }
-                }
-            }
-            if ($rSkipResult) {
-                return $rReturn;
-            }
-            $rData['data'] = $rReturn;
-            return $rData;
-        }
-        return $rData;
-    }
-    public static function filterRows($rRows, $rShow, $rHide) {
-        $rReturn = array();
-        if (!$rRows['data']) {
-        } else {
-            foreach ($rRows['data'] as $rRow) {
-                $rReturn[] = self::filterRow($rRow, $rShow, $rHide, true);
-            }
-        }
-        return $rReturn;
-    }
-    public static function TableAPI($rID, $rStart = 0, $rLimit = 10, $rData = array(), $rShowColumns = array(), $rHideColumns = array()) {
-        // Historically this proxied over HTTP to `<code>/table.php` on the broadcast
-        // port. That path is dead under the Front Controller: `dirname(PHP_SELF)` now
-        // resolves to `/public`, nginx 404s every `*.php`, and — crucially — the
-        // api-scope access code routes *every* path back to AdminApiController (never
-        // TableController), so the round-trip could only ever return `null`.
-        //
-        // Dispatch the DataTables handler in-process instead. TableController::index()
-        // authenticates via `api_key`, renders the JSON for `$rID`, echoes it and
-        // exit()s — so this method emits the response directly and never returns.
-        $rData['api_key'] = self::$rKey;
-        $rData['id'] = $rID;
-        $rData['start'] = $rStart;
-        $rData['length'] = $rLimit;
-        $rData['show_columns'] = $rShowColumns;
-        $rData['hide_columns'] = $rHideColumns;
-        $rData['draw'] = 0;
+	public static $db = null;
 
-        RequestManager::set(array_merge(RequestManager::getAll(), $rData));
-        $_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
+	public static $rKey = null;
 
-        (new TableController())->index();
-        return null; // unreachable: TableController::index() exit()s after echoing
-    }
-    public static function createSession() {
-        global $rUserInfo;
-        global $rPermissions;
-        self::$db->query('SELECT * FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `api_key` = ? AND LENGTH(`api_key`) > 0 AND `is_admin` = 1 AND `status` = 1;', self::$rKey);
-        if (0 >= self::$db->num_rows()) {
-            return false;
-        }
-        $rUserID = self::$db->get_row()['id'];
-        $GLOBALS['rAdminUserInfo'] = UserRepository::getRegisteredUserById($rUserID);
-        unset($GLOBALS['rAdminUserInfo']['password']);
-        $rUserInfo = $GLOBALS['rAdminUserInfo'];
-        $rPermissions = AuthRepository::getPermissions($rUserInfo['member_group_id']);
-        $rPermissions['advanced'] = array();
-        if (0 >= strlen($rUserInfo['timezone'])) {
-        } else {
-            date_default_timezone_set($rUserInfo['timezone']);
-        }
-        return true;
-    }
-    public static function getUserInfo() {
-        global $rUserInfo;
-        global $rPermissions;
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rUserInfo, 'permissions' => $rPermissions);
-    }
-    public static function getLine($rID) {
-        if (!($rLine = UserRepository::getLineById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rLine);
-    }
-    public static function createLine($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(LineService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getLine($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editLine($rID, $rData) {
-        if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        if (!isset($rData['isp_clear'])) {
-        } else {
-            $rData['isp_clear'] = '';
-        }
-        $rReturn = parseerror(LineService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getLine($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteLine($rID) {
-        if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
-        } else {
-            if (!LineService::deleteLineById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function disableLine($rID) {
-        if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function enableLine($rID) {
-        if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function banLine($rID) {
-        if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function unbanLine($rID) {
-        if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getUser($rID) {
-        if (!($rUser = UserRepository::getRegisteredUserById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rUser);
-    }
-    public static function createUser($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(UserService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getUser($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editUser($rID, $rData) {
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(UserService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getUser($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteUser($rID) {
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-        } else {
-            if (!UserService::deleteRegisteredUser($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function disableUser($rID) {
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `users` SET `status` = 0 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function enableUser($rID) {
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `users` SET `status` = 1 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getMAG($rID) {
-        if (!($rDevice = MagService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rDevice);
-    }
-    public static function createMAG($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(MagService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editMAG($rID, $rData) {
-        if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        if (!isset($rData['isp_clear'])) {
-        } else {
-            $rData['isp_clear'] = '';
-        }
-        $rReturn = parseerror(MagService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteMAG($rID) {
-        if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
-        } else {
-            if (!MagService::deleteDevice($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function disableMAG($rID) {
-        if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function enableMAG($rID) {
-        if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function banMAG($rID) {
-        if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function unbanMAG($rID) {
-        if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function convertMAG($rID) {
-        if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        MagService::deleteDevice($rID, false, false, true);
-        return array('status' => 'STATUS_SUCCESS', 'data' => self::getLine($rDevice['user_id']));
-    }
-    public static function getEnigma($rID) {
-        if (!($rDevice = EnigmaService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rDevice);
-    }
-    public static function createEnigma($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(EnigmaService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editEnigma($rID, $rData) {
-        if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        if (!isset($rData['isp_clear'])) {
-        } else {
-            $rData['isp_clear'] = '';
-        }
-        $rReturn = parseerror(EnigmaService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteEnigma($rID) {
-        if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
-        } else {
-            if (!EnigmaService::deleteDevice($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function disableEnigma($rID) {
-        if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function enableEnigma($rID) {
-        if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function banEnigma($rID) {
-        if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function unbanEnigma($rID) {
-        if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function convertEnigma($rID) {
-        if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        EnigmaService::deleteDevice($rID, false, false, true);
-        return array('status' => 'STATUS_SUCCESS', 'data' => self::getLine($rDevice['user_id']));
-    }
-    public static function getBouquets() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => BouquetService::getAllSimple());
-    }
-    public static function getBouquet($rID) {
-        if (!($rBouquet = BouquetService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rBouquet);
-    }
-    public static function createBouquet($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(BouquetService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getBouquet($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editBouquet($rID, $rData) {
-        if (!(($rBouquet = self::getBouquet($rID)) && isset($rBouquet['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(BouquetService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getBouquet($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteBouquet($rID) {
-        if (($rBouquet = self::getBouquet($rID)) && isset($rBouquet['data'])) {
-            if (BouquetService::deleteById($rID)) {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getAccessCodes() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => AuthRepository::getAllCodes());
-    }
-    public static function getAccessCode($rID) {
-        if (!($rCode = AuthRepository::getCodeById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rCode);
-    }
-    public static function createAccessCode($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(AuthService::processCode($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getAccessCode($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editAccessCode($rID, $rData) {
-        if (!(($rCode = self::getAccessCode($rID)) && isset($rCode['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(AuthService::processCode($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getAccessCode($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteAccessCode($rID) {
-        if (!(($rCode = self::getAccessCode($rID)) && isset($rCode['data']))) {
-        } else {
-            if (!AuthRepository::deleteCode($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getHMACs() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => AuthRepository::getAllHMAC());
-    }
-    public static function getHMAC($rID) {
-        if (!($rToken = AuthRepository::getHMACById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rToken);
-    }
-    public static function createHMAC($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(AuthService::processHMAC($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getHMAC($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editHMAC($rID, $rData) {
-        if (!(($rToken = self::getHMAC($rID)) && isset($rToken['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(AuthService::processHMAC($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getHMAC($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteHMAC($rID) {
-        if (($rToken = self::getHMAC($rID)) && isset($rToken['data'])) {
-            if (AuthRepository::deleteHMAC($rID)) {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getEPGs() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => EpgService::getAll());
-    }
-    public static function getEPG($rID) {
-        if (!($rEPG = EpgService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rEPG);
-    }
-    public static function createEPG($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(EpgService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getEPG($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editEPG($rID, $rData) {
-        if (!(($rEPG = self::getEPG($rID)) && isset($rEPG['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(EpgService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getEPG($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteEPG($rID) {
-        if (!(($rEPG = self::getEPG($rID)) && isset($rEPG['data']))) {
-        } else {
-            if (!EpgService::deleteEpgById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function reloadEPG($rID = null) {
-        if ($rID) {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:epg "' . intval($rID) . '" > /dev/null 2>/dev/null &');
-        } else {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:epg > /dev/null 2>/dev/null &');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getProviders() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => ProviderService::getAll());
-    }
-    public static function getProvider($rID) {
-        if (!($rProvider = ProviderService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rProvider);
-    }
-    public static function createProvider($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(ProviderService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getProvider($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editProvider($rID, $rData) {
-        if (!(($rProvider = self::getProvider($rID)) && isset($rProvider['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(ProviderService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getProvider($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteProvider($rID) {
-        if (!(($rProvider = self::getProvider($rID)) && isset($rProvider['data']))) {
-        } else {
-            if (!ProviderService::deleteById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function reloadProvider($rID = null) {
-        if ($rID) {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:providers "' . intval($rID) . '" > /dev/null 2>/dev/null &');
-        } else {
-            shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:providers > /dev/null 2>/dev/null &');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getGroups() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => GroupService::getAll());
-    }
-    public static function getGroup($rID) {
-        if (!($rGroup = GroupService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rGroup);
-    }
-    public static function createGroup($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(GroupService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getGroup($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editGroup($rID, $rData) {
-        if (!(($rGroup = self::getGroup($rID)) && isset($rGroup['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(GroupService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getGroup($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteGroup($rID) {
-        if (!(($rGroup = self::getGroup($rID)) && isset($rGroup['data']))) {
-        } else {
-            if (!GroupService::deleteById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getPackages() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => PackageService::getAll());
-    }
-    public static function getPackage($rID) {
-        if (!($rPackage = PackageService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rPackage);
-    }
-    public static function createPackage($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(PackageService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getPackage($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editPackage($rID, $rData) {
-        if (!(($rPackage = self::getPackage($rID)) && isset($rPackage['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(PackageService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getPackage($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deletePackage($rID) {
-        if (!(($rPackage = self::getPackage($rID)) && isset($rPackage['data']))) {
-        } else {
-            if (!PackageService::deleteById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getTranscodeProfiles() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => StreamConfigRepository::getTranscodeProfiles());
-    }
-    public static function getTranscodeProfile($rID) {
-        if (!($rProfile = StreamConfigRepository::getTranscodeProfile($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rProfile);
-    }
-    public static function createTranscodeProfile($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(ProfileService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getTranscodeProfile($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editTranscodeProfile($rID, $rData) {
-        if (!(($rProfile = self::getTranscodeProfile($rID)) && isset($rProfile['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(ProfileService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getTranscodeProfile($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteTranscodeProfile($rID) {
-        if (!(($rProfile = self::getTranscodeProfile($rID)) && isset($rProfile['data']))) {
-        } else {
-            if (!StreamConfigRepository::deleteProfile($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getRTMPIPs() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => BlocklistService::getRTMPIPsSimple());
-    }
-    public static function getRTMPIP($rID) {
-        if (!($rIP = BlocklistService::getRTMPIPById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rIP);
-    }
-    public static function addRTMPIP($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(BlocklistService::processRTMPIP($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getRTMPIP($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editRTMPIP($rID, $rData) {
-        if (!(($rIP = self::getRTMPIP($rID)) && isset($rIP['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(BlocklistService::processRTMPIP($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getRTMPIP($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteRTMPIP($rID) {
-        if (!(($rIP = self::getRTMPIP($rID)) && isset($rIP['data']))) {
-        } else {
-            if (!BlocklistService::deleteRTMPIP($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getCategories() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => CategoryService::getAllByType());
-    }
-    public static function getCategory($rID) {
-        if (!($rCategory = CategoryService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rCategory);
-    }
-    public static function createCategory($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(CategoryService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getCategory($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editCategory($rID, $rData) {
-        if (!(($rCategory = self::getCategory($rID)) && isset($rCategory['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(CategoryService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getCategory($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteCategory($rID) {
-        if (!(($rCategory = self::getCategory($rID)) && isset($rCategory['data']))) {
-        } else {
-            if (!CategoryService::deleteById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getWatchFolders() {
-        // watch is an optional module — report failure cleanly when it is absent.
-        if (!class_exists(WatchService::class)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => WatchService::getWatchFolders());
-    }
-    public static function getWatchFolder($rID) {
-        if (!($rFolder = StreamRepository::getWatchFolder($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rFolder);
-    }
-    public static function createWatchFolder($rData) {
-        if (!class_exists(WatchService::class)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(WatchService::processWatchFolder($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getWatchFolder($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editWatchFolder($rID, $rData) {
-        if (!class_exists(WatchService::class)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        if (!(($rFolder = self::getWatchFolder($rID)) && isset($rFolder['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(WatchService::processWatchFolder($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getWatchFolder($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteWatchFolder($rID) {
-        if (!(($rFolder = self::getWatchFolder($rID)) && isset($rFolder['data']))) {
-        } else {
-            if (!StreamRepository::deleteWatchFolder($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function reloadWatchFolder($rServerID, $rID) {
-        if (!class_exists(WatchService::class)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        WatchService::forceWatch($rServerID, $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getBlockedISPs() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => BlocklistService::getAllISPs());
-    }
-    public static function addBlockedISP($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(BlocklistService::processISP($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = $rReturn['data']['insert_id'];
-        }
-        return $rReturn;
-    }
-    public static function deleteBlockedISP($rID) {
-        if (!BlocklistService::deleteBlockedISP($rID)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getBlockedUAs() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => BlocklistService::getAllUserAgents());
-    }
-    public static function addBlockedUA($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(BlocklistService::processUA($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = $rReturn['data']['insert_id'];
-        }
-        return $rReturn;
-    }
-    public static function deleteBlockedUA($rID) {
-        if (!BlocklistService::deleteBlockedUA($rID)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getBlockedIPs() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => BlocklistService::getBlockedIPsSimple());
-    }
-    public static function addBlockedIP($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(BlocklistService::blockIP($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = $rReturn['data']['insert_id'];
-        }
-        return $rReturn;
-    }
-    public static function deleteBlockedIP($rID) {
-        if (!BlocklistService::deleteBlockedIP($rID)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function flushBlockedIPs() {
-        BlocklistService::flushIPs();
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getStream($rID) {
-        if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 1)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rStream);
-    }
-    public static function createStream($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(StreamService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getStream($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editStream($rID, $rData) {
-        if (!(($rStream = self::getStream($rID)) && isset($rStream['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(StreamService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getStream($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteStream($rID, $rServerID = -1) {
-        if (!(($rStream = self::getStream($rID)) && isset($rStream['data']))) {
-        } else {
-            if (!StreamRepository::deleteStream($rID, $rServerID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function startStream($rID, $rServerID = -1) {
-        if ($rServerID == -1) {
-            $rData = json_decode(ApiClient::request(array('action' => 'stream', 'sub' => 'start', 'stream_ids' => array($rID), 'servers' => array_keys(ServerRepository::getAll()))), true);
-        } else {
-            $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'stream', 'stream_ids' => array($rID), 'function' => 'start')), true);
-        }
-        if (!$rData['result']) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function stopStream($rID, $rServerID = -1) {
-        if ($rServerID == -1) {
-            $rData = json_decode(ApiClient::request(array('action' => 'stream', 'sub' => 'stop', 'stream_ids' => array($rID), 'servers' => array_keys(ServerRepository::getAll()))), true);
-        } else {
-            $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'stream', 'stream_ids' => array($rID), 'function' => 'stop')), true);
-        }
-        if (!$rData['result']) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getChannel($rID) {
-        if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 3)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rStream);
-    }
-    public static function createChannel($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(ChannelService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getChannel($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editChannel($rID, $rData) {
-        if (!(($rStream = self::getChannel($rID)) && isset($rStream['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(ChannelService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getChannel($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteChannel($rID, $rServerID = -1) {
-        if (!(($rStream = self::getChannel($rID)) && isset($rStream['data']))) {
-        } else {
-            if (!StreamRepository::deleteStream($rID, $rServerID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getStation($rID) {
-        if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 4)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rStream);
-    }
-    public static function createStation($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(RadioService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getStation($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editStation($rID, $rData) {
-        if (!(($rStream = self::getStation($rID)) && isset($rStream['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(RadioService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getStation($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteStation($rID, $rServerID = -1) {
-        if (!(($rStream = self::getStation($rID)) && isset($rStream['data']))) {
-        } else {
-            if (!StreamRepository::deleteStream($rID, $rServerID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getMovie($rID) {
-        if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 2)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rStream);
-    }
-    public static function createMovie($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(MovieService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getMovie($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editMovie($rID, $rData) {
-        if (!(($rStream = self::getMovie($rID)) && isset($rStream['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(MovieService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getMovie($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteMovie($rID, $rServerID = -1) {
-        if (!(($rStream = self::getMovie($rID)) && isset($rStream['data']))) {
-        } else {
-            if (!StreamRepository::deleteStream($rID, $rServerID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function startMovie($rID, $rServerID = -1) {
-        if ($rServerID == -1) {
-            $rData = json_decode(ApiClient::request(array('action' => 'vod', 'sub' => 'start', 'stream_ids' => array($rID), 'servers' => array_keys(ServerRepository::getAll()))), true);
-        } else {
-            $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'vod', 'stream_ids' => array($rID), 'function' => 'start')), true);
-        }
-        if (!$rData['result']) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function stopMovie($rID, $rServerID = -1) {
-        if ($rServerID == -1) {
-            $rData = json_decode(ApiClient::request(array('action' => 'vod', 'sub' => 'stop', 'stream_ids' => array($rID), 'servers' => array_keys(ServerRepository::getAll()))), true);
-        } else {
-            $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'vod', 'stream_ids' => array($rID), 'function' => 'stop')), true);
-        }
-        if (!$rData['result']) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getEpisode($rID) {
-        if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 5)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rStream);
-    }
-    public static function createEpisode($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(EpisodeService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getEpisode($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editEpisode($rID, $rData) {
-        if (!(($rStream = self::getEpisode($rID)) && isset($rStream['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(EpisodeService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getEpisode($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteEpisode($rID, $rServerID = -1) {
-        if (!(($rStream = self::getEpisode($rID)) && isset($rStream['data']))) {
-        } else {
-            if (!StreamRepository::deleteStream($rID, $rServerID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getSeries($rID) {
-        if (!($rSeries = SeriesService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rSeries);
-    }
-    public static function createSeries($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(SeriesService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getSeries($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editSeries($rID, $rData) {
-        if (!(($rStream = self::getSeries($rID)) && isset($rStream['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(SeriesService::process($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getSeries($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteSeries($rID) {
-        if (!(($rStream = self::getSeries($rID)) && isset($rStream['data']))) {
-        } else {
-            if (!SeriesService::deleteSeriesById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getServers() {
-        global $rPermissions;
-        return array('status' => 'STATUS_SUCCESS', 'data' => ServerRepository::getStreamingSimple($rPermissions));
-    }
-    public static function getServer($rID) {
-        if (!($rServer = ServerRepository::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rServer);
-    }
-    public static function installServer($rData) {
-        global $rPermissions;
-        if (!(empty($rData['type']) || empty($rData['ssh_port']) || empty($rData['root_username']) || empty($rData['root_password']))) {
-            if (!($rData['type'] == 1 && (empty($rData['type']) || empty($rData['ssh_port'])))) {
-                $rReturn = parseerror(ServerService::install($rData, ServerRepository::getStreamingSimple($rPermissions, 'all'), ServerRepository::getProxySimple($rPermissions)));
-                if (!isset($rReturn['data']['insert_id'])) {
-                } else {
-                    $rReturn['data'] = self::getServer($rReturn['data']['insert_id']);
-                }
-                return array('status' => 'STATUS_FAILURE');
-            }
-            return array('status' => 'STATUS_INVALID_INPUT');
-        }
-        return array('status' => 'STATUS_INVALID_INPUT');
-    }
-    public static function editServer($rID, $rData) {
-        if (!(($rServer = self::getServer($rID)) && isset($rServer['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        } else {
-            $rData['edit'] = $rID;
-            $rReturn = parseerror(ServerService::process($rData));
-            if (!isset($rReturn['data']['insert_id'])) {
-            } else {
-                $rReturn['data'] = self::getServer($rReturn['data']['insert_id'])['data'];
-            }
-            return $rReturn;
-        }
-    }
-    public static function editProxy($rID, $rData) {
-        if (!(($rServer = self::getServer($rID)) && isset($rServer['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(ServerService::processProxy($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getServer($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteServer($rID) {
-        if (!(($rServer = self::getServer($rID)) && isset($rServer['data']))) {
-        } else {
-            if (!ServerRepository::deleteById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function getSettings() {
-        return array('status' => 'STATUS_SUCCESS', 'data' => SettingsManager::getAll());
-    }
-    public static function editSettings($rData) {
-        $rReturn = parseerror(SettingsService::edit($rData));
-        $rReturn['data'] = self::getSettings()['data'];
-        return $rReturn;
-    }
-    public static function getStats($rServerID) {
-        global $db;
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'stats')), true);
-        if (!$rData) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['requests_per_second'] = ServerRepository::getAll()[$rServerID]['requests_per_second'];
-        $db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0;', $rServerID);
-        if (0 >= $db->num_rows()) {
-        } else {
-            $rData['open_connections'] = $db->get_row()['count'];
-        }
-        $db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0;');
-        if (0 >= $db->num_rows()) {
-        } else {
-            $rData['total_connections'] = $db->get_row()['count'];
-        }
-        $db->query('SELECT `activity_id` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0 GROUP BY `user_id`;', $rServerID);
-        if (0 >= $db->num_rows()) {
-        } else {
-            $rData['online_users'] = $db->num_rows();
-        }
-        $db->query('SELECT `activity_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
-        if (0 >= $db->num_rows()) {
-        } else {
-            $rData['total_users'] = $db->num_rows();
-        }
-        $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `stream_status` <> 2 AND `type` = 1;', $rServerID);
-        if (0 >= $db->num_rows()) {
-        } else {
-            $rData['total_streams'] = $db->get_row()['count'];
-        }
-        $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `pid` > 0 AND `type` = 1;', $rServerID);
-        if (0 >= $db->num_rows()) {
-        } else {
-            $rData['total_running_streams'] = $db->get_row()['count'];
-        }
-        $db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `type` = 1 AND (`streams`.`direct_source` = 0 AND (`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0);', $rServerID);
-        if (0 >= $db->num_rows()) {
-        } else {
-            $rData['offline_streams'] = $db->get_row()['count'];
-        }
-        $rData['network_guaranteed_speed'] = ServerRepository::getAll()[$rServerID]['network_guaranteed_speed'];
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rData);
-    }
-    public static function getFPMStatus($rServerID) {
-        $rData = ApiClient::systemRequest($rServerID, array('action' => 'fpm_status'));
-        if (!$rData) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rData);
-    }
-    public static function getRTMPStats($rServerID) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'rtmp_stats')), true);
-        if (!$rData) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rData);
-    }
-    public static function getFreeSpace($rServerID) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'get_free_space')), true);
-        if (!$rData) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rData);
-    }
-    public static function getPIDs($rServerID) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'get_pids')), true);
-        if (!$rData) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rData);
-    }
-    public static function getCertificateInfo($rServerID) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'get_certificate_info')), true);
-        if (!$rData) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rData);
-    }
-    public static function reloadNGINX($rServerID) {
-        ApiClient::systemRequest($rServerID, array('action' => 'reload_nginx'));
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function clearTemp($rServerID) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'free_temp')), true);
-        if (!$rData['result']) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function clearStreams($rServerID) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'free_streams')), true);
-        if (!$rData['result']) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getDirectory($rServerID, $rDirectory) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'scandir', 'dir' => $rDirectory)), true);
-        if (!$rData) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        unset($rData['result']);
-        if (!isset($rData['result']) || $rData['result']) {
-            return array('status' => 'STATUS_SUCCESS', 'data' => $rData);
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function killPID($rServerID, $rPID) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'kill_pid', 'pid' => intval($rPID))), true);
-        if (!$rData['result']) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function killConnection($rServerID, $rActivityID) {
-        $rData = json_decode(ApiClient::systemRequest($rServerID, array('action' => 'closeConnection', 'activity_id' => intval($rActivityID))), true);
-        if (!$rData['result']) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function adjustCredits($rID, $rCredits, $rReason = '') {
-        global $db;
-        global $rUserInfo;
-        if (!(is_numeric($rCredits) && ($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-        } else {
-            $rCredits = intval($rUser['data']['credits']) + intval($rCredits);
-            if (0 > $rCredits) {
-            } else {
-                $db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rCredits, $rID);
-                $db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rID, $rUserInfo['id'], $rCredits, time(), $rReason);
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function reloadCache() {
-        shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine > /dev/null 2>/dev/null &');
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function runQuery($rQuery) {
-        global $db;
-        if (!$db->query($rQuery)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $db->get_rows(), 'insert_id' => $db->last_insert_id());
-    }
+	public static function filterRow($rData, $rShow, $rHide, $rSkipResult = false) {
+		if ($rShow || $rHide) {
+			if ($rSkipResult) {
+				$rRow = $rData;
+			} else {
+				$rRow = $rData['data'];
+			}
+			$rReturn = [];
+			if (!$rRow) {
+			} else {
+				foreach (array_keys($rRow) as $rKey) {
+					if ($rShow) {
+						if (!in_array($rKey, $rShow)) {
+						} else {
+							$rReturn[$rKey] = $rRow[$rKey];
+						}
+					} else {
+						if (!$rHide) {
+						} else {
+							if (in_array($rKey, $rHide)) {
+							} else {
+								$rReturn[$rKey] = $rRow[$rKey];
+							}
+						}
+					}
+				}
+			}
+			if ($rSkipResult) {
+				return $rReturn;
+			}
+			$rData['data'] = $rReturn;
+			return $rData;
+		}
+		return $rData;
+	}
+
+	public static function filterRows($rRows, $rShow, $rHide) {
+		$rReturn = [];
+		if (!$rRows['data']) {
+		} else {
+			foreach ($rRows['data'] as $rRow) {
+				$rReturn[] = self::filterRow($rRow, $rShow, $rHide, true);
+			}
+		}
+		return $rReturn;
+	}
+
+	public static function TableAPI($rID, $rStart = 0, $rLimit = 10, $rData = [], $rShowColumns = [], $rHideColumns = []) {
+		// Historically this proxied over HTTP to `<code>/table.php` on the broadcast
+		// port. That path is dead under the Front Controller: `dirname(PHP_SELF)` now
+		// resolves to `/public`, nginx 404s every `*.php`, and — crucially — the
+		// api-scope access code routes *every* path back to AdminApiController (never
+		// TableController), so the round-trip could only ever return `null`.
+		//
+		// Dispatch the DataTables handler in-process instead. TableController::index()
+		// authenticates via `api_key`, renders the JSON for `$rID`, echoes it and
+		// exit()s — so this method emits the response directly and never returns.
+		$rData['api_key'] = self::$rKey;
+		$rData['id'] = $rID;
+		$rData['start'] = $rStart;
+		$rData['length'] = $rLimit;
+		$rData['show_columns'] = $rShowColumns;
+		$rData['hide_columns'] = $rHideColumns;
+		$rData['draw'] = 0;
+
+		RequestManager::set(array_merge(RequestManager::getAll(), $rData));
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
+
+		(new TableController())->index();
+		return null; // unreachable: TableController::index() exit()s after echoing
+	}
+
+	public static function createSession() {
+		global $rUserInfo;
+		global $rPermissions;
+		self::$db->query('SELECT * FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `api_key` = ? AND LENGTH(`api_key`) > 0 AND `is_admin` = 1 AND `status` = 1;', self::$rKey);
+		if (0 >= self::$db->num_rows()) {
+			return false;
+		}
+		$rUserID = self::$db->get_row()['id'];
+		$GLOBALS['rAdminUserInfo'] = UserRepository::getRegisteredUserById($rUserID);
+		unset($GLOBALS['rAdminUserInfo']['password']);
+		$rUserInfo = $GLOBALS['rAdminUserInfo'];
+		$rPermissions = AuthRepository::getPermissions($rUserInfo['member_group_id']);
+		$rPermissions['advanced'] = [];
+		if (0 >= strlen($rUserInfo['timezone'])) {
+		} else {
+			date_default_timezone_set($rUserInfo['timezone']);
+		}
+		return true;
+	}
+
+	public static function getUserInfo() {
+		global $rUserInfo;
+		global $rPermissions;
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rUserInfo, 'permissions' => $rPermissions];
+	}
+
+	public static function getLine($rID) {
+		if (!($rLine = UserRepository::getLineById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rLine];
+	}
+
+	public static function createLine($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(LineService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getLine($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editLine($rID, $rData) {
+		if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		if (!isset($rData['isp_clear'])) {
+		} else {
+			$rData['isp_clear'] = '';
+		}
+		$rReturn = parseerror(LineService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getLine($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteLine($rID) {
+		if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
+		} else {
+			if (!LineService::deleteLineById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function disableLine($rID) {
+		if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function enableLine($rID) {
+		if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function banLine($rID) {
+		if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function unbanLine($rID) {
+		if (!(($rLine = self::getLine($rID)) && isset($rLine['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getUser($rID) {
+		if (!($rUser = UserRepository::getRegisteredUserById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rUser];
+	}
+
+	public static function createUser($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(UserService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getUser($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editUser($rID, $rData) {
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(UserService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getUser($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteUser($rID) {
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+		} else {
+			if (!UserService::deleteRegisteredUser($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function disableUser($rID) {
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `users` SET `status` = 0 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function enableUser($rID) {
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `users` SET `status` = 1 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getMAG($rID) {
+		if (!($rDevice = MagService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rDevice];
+	}
+
+	public static function createMAG($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(MagService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editMAG($rID, $rData) {
+		if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		if (!isset($rData['isp_clear'])) {
+		} else {
+			$rData['isp_clear'] = '';
+		}
+		$rReturn = parseerror(MagService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteMAG($rID) {
+		if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
+		} else {
+			if (!MagService::deleteDevice($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function disableMAG($rID) {
+		if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function enableMAG($rID) {
+		if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function banMAG($rID) {
+		if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function unbanMAG($rID) {
+		if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function convertMAG($rID) {
+		if (!(($rDevice = self::getMAG($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		MagService::deleteDevice($rID, false, false, true);
+		return ['status' => 'STATUS_SUCCESS', 'data' => self::getLine($rDevice['user_id'])];
+	}
+
+	public static function getEnigma($rID) {
+		if (!($rDevice = EnigmaService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rDevice];
+	}
+
+	public static function createEnigma($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(EnigmaService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editEnigma($rID, $rData) {
+		if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		if (!isset($rData['isp_clear'])) {
+		} else {
+			$rData['isp_clear'] = '';
+		}
+		$rReturn = parseerror(EnigmaService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteEnigma($rID) {
+		if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
+		} else {
+			if (!EnigmaService::deleteDevice($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function disableEnigma($rID) {
+		if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function enableEnigma($rID) {
+		if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function banEnigma($rID) {
+		if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `admin_enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function unbanEnigma($rID) {
+		if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `admin_enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function convertEnigma($rID) {
+		if (!(($rDevice = self::getEnigma($rID)) && isset($rDevice['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		EnigmaService::deleteDevice($rID, false, false, true);
+		return ['status' => 'STATUS_SUCCESS', 'data' => self::getLine($rDevice['user_id'])];
+	}
+
+	public static function getBouquets() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => BouquetService::getAllSimple()];
+	}
+
+	public static function getBouquet($rID) {
+		if (!($rBouquet = BouquetService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rBouquet];
+	}
+
+	public static function createBouquet($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(BouquetService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getBouquet($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editBouquet($rID, $rData) {
+		if (!(($rBouquet = self::getBouquet($rID)) && isset($rBouquet['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(BouquetService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getBouquet($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteBouquet($rID) {
+		if (($rBouquet = self::getBouquet($rID)) && isset($rBouquet['data'])) {
+			if (BouquetService::deleteById($rID)) {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getAccessCodes() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => AuthRepository::getAllCodes()];
+	}
+
+	public static function getAccessCode($rID) {
+		if (!($rCode = AuthRepository::getCodeById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rCode];
+	}
+
+	public static function createAccessCode($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(AuthService::processCode($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getAccessCode($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editAccessCode($rID, $rData) {
+		if (!(($rCode = self::getAccessCode($rID)) && isset($rCode['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(AuthService::processCode($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getAccessCode($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteAccessCode($rID) {
+		if (!(($rCode = self::getAccessCode($rID)) && isset($rCode['data']))) {
+		} else {
+			if (!AuthRepository::deleteCode($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getHMACs() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => AuthRepository::getAllHMAC()];
+	}
+
+	public static function getHMAC($rID) {
+		if (!($rToken = AuthRepository::getHMACById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rToken];
+	}
+
+	public static function createHMAC($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(AuthService::processHMAC($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getHMAC($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editHMAC($rID, $rData) {
+		if (!(($rToken = self::getHMAC($rID)) && isset($rToken['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(AuthService::processHMAC($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getHMAC($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteHMAC($rID) {
+		if (($rToken = self::getHMAC($rID)) && isset($rToken['data'])) {
+			if (AuthRepository::deleteHMAC($rID)) {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getEPGs() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => EpgService::getAll()];
+	}
+
+	public static function getEPG($rID) {
+		if (!($rEPG = EpgService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rEPG];
+	}
+
+	public static function createEPG($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(EpgService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getEPG($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editEPG($rID, $rData) {
+		if (!(($rEPG = self::getEPG($rID)) && isset($rEPG['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(EpgService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getEPG($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteEPG($rID) {
+		if (!(($rEPG = self::getEPG($rID)) && isset($rEPG['data']))) {
+		} else {
+			if (!EpgService::deleteEpgById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function reloadEPG($rID = null) {
+		if ($rID) {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:epg "' . intval($rID) . '" > /dev/null 2>/dev/null &');
+		} else {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:epg > /dev/null 2>/dev/null &');
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getProviders() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => ProviderService::getAll()];
+	}
+
+	public static function getProvider($rID) {
+		if (!($rProvider = ProviderService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rProvider];
+	}
+
+	public static function createProvider($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(ProviderService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getProvider($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editProvider($rID, $rData) {
+		if (!(($rProvider = self::getProvider($rID)) && isset($rProvider['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(ProviderService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getProvider($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteProvider($rID) {
+		if (!(($rProvider = self::getProvider($rID)) && isset($rProvider['data']))) {
+		} else {
+			if (!ProviderService::deleteById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function reloadProvider($rID = null) {
+		if ($rID) {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:providers "' . intval($rID) . '" > /dev/null 2>/dev/null &');
+		} else {
+			shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:providers > /dev/null 2>/dev/null &');
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getGroups() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => GroupService::getAll()];
+	}
+
+	public static function getGroup($rID) {
+		if (!($rGroup = GroupService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rGroup];
+	}
+
+	public static function createGroup($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(GroupService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getGroup($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editGroup($rID, $rData) {
+		if (!(($rGroup = self::getGroup($rID)) && isset($rGroup['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(GroupService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getGroup($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteGroup($rID) {
+		if (!(($rGroup = self::getGroup($rID)) && isset($rGroup['data']))) {
+		} else {
+			if (!GroupService::deleteById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getPackages() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => PackageService::getAll()];
+	}
+
+	public static function getPackage($rID) {
+		if (!($rPackage = PackageService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rPackage];
+	}
+
+	public static function createPackage($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(PackageService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getPackage($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editPackage($rID, $rData) {
+		if (!(($rPackage = self::getPackage($rID)) && isset($rPackage['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(PackageService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getPackage($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deletePackage($rID) {
+		if (!(($rPackage = self::getPackage($rID)) && isset($rPackage['data']))) {
+		} else {
+			if (!PackageService::deleteById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getTranscodeProfiles() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => StreamConfigRepository::getTranscodeProfiles()];
+	}
+
+	public static function getTranscodeProfile($rID) {
+		if (!($rProfile = StreamConfigRepository::getTranscodeProfile($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rProfile];
+	}
+
+	public static function createTranscodeProfile($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(ProfileService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getTranscodeProfile($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editTranscodeProfile($rID, $rData) {
+		if (!(($rProfile = self::getTranscodeProfile($rID)) && isset($rProfile['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(ProfileService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getTranscodeProfile($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteTranscodeProfile($rID) {
+		if (!(($rProfile = self::getTranscodeProfile($rID)) && isset($rProfile['data']))) {
+		} else {
+			if (!StreamConfigRepository::deleteProfile($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getRTMPIPs() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => BlocklistService::getRTMPIPsSimple()];
+	}
+
+	public static function getRTMPIP($rID) {
+		if (!($rIP = BlocklistService::getRTMPIPById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rIP];
+	}
+
+	public static function addRTMPIP($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(BlocklistService::processRTMPIP($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getRTMPIP($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editRTMPIP($rID, $rData) {
+		if (!(($rIP = self::getRTMPIP($rID)) && isset($rIP['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(BlocklistService::processRTMPIP($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getRTMPIP($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteRTMPIP($rID) {
+		if (!(($rIP = self::getRTMPIP($rID)) && isset($rIP['data']))) {
+		} else {
+			if (!BlocklistService::deleteRTMPIP($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getCategories() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => CategoryService::getAllByType()];
+	}
+
+	public static function getCategory($rID) {
+		if (!($rCategory = CategoryService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rCategory];
+	}
+
+	public static function createCategory($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(CategoryService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getCategory($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editCategory($rID, $rData) {
+		if (!(($rCategory = self::getCategory($rID)) && isset($rCategory['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(CategoryService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getCategory($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteCategory($rID) {
+		if (!(($rCategory = self::getCategory($rID)) && isset($rCategory['data']))) {
+		} else {
+			if (!CategoryService::deleteById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getWatchFolders() {
+		// watch is an optional module — report failure cleanly when it is absent.
+		if (!class_exists(WatchService::class)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => WatchService::getWatchFolders()];
+	}
+
+	public static function getWatchFolder($rID) {
+		if (!($rFolder = StreamRepository::getWatchFolder($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rFolder];
+	}
+
+	public static function createWatchFolder($rData) {
+		if (!class_exists(WatchService::class)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(WatchService::processWatchFolder($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getWatchFolder($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editWatchFolder($rID, $rData) {
+		if (!class_exists(WatchService::class)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		if (!(($rFolder = self::getWatchFolder($rID)) && isset($rFolder['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(WatchService::processWatchFolder($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getWatchFolder($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteWatchFolder($rID) {
+		if (!(($rFolder = self::getWatchFolder($rID)) && isset($rFolder['data']))) {
+		} else {
+			if (!StreamRepository::deleteWatchFolder($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function reloadWatchFolder($rServerID, $rID) {
+		if (!class_exists(WatchService::class)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		WatchService::forceWatch($rServerID, $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getBlockedISPs() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => BlocklistService::getAllISPs()];
+	}
+
+	public static function addBlockedISP($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(BlocklistService::processISP($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = $rReturn['data']['insert_id'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteBlockedISP($rID) {
+		if (!BlocklistService::deleteBlockedISP($rID)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getBlockedUAs() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => BlocklistService::getAllUserAgents()];
+	}
+
+	public static function addBlockedUA($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(BlocklistService::processUA($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = $rReturn['data']['insert_id'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteBlockedUA($rID) {
+		if (!BlocklistService::deleteBlockedUA($rID)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getBlockedIPs() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => BlocklistService::getBlockedIPsSimple()];
+	}
+
+	public static function addBlockedIP($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(BlocklistService::blockIP($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = $rReturn['data']['insert_id'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteBlockedIP($rID) {
+		if (!BlocklistService::deleteBlockedIP($rID)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function flushBlockedIPs() {
+		BlocklistService::flushIPs();
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getStream($rID) {
+		if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 1)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rStream];
+	}
+
+	public static function createStream($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(StreamService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getStream($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editStream($rID, $rData) {
+		if (!(($rStream = self::getStream($rID)) && isset($rStream['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(StreamService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getStream($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteStream($rID, $rServerID = -1) {
+		if (!(($rStream = self::getStream($rID)) && isset($rStream['data']))) {
+		} else {
+			if (!StreamRepository::deleteStream($rID, $rServerID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function startStream($rID, $rServerID = -1) {
+		if ($rServerID == -1) {
+			$rData = json_decode(ApiClient::request(['action' => 'stream', 'sub' => 'start', 'stream_ids' => [$rID], 'servers' => array_keys(ServerRepository::getAll())]), true);
+		} else {
+			$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'stream', 'stream_ids' => [$rID], 'function' => 'start']), true);
+		}
+		if (!$rData['result']) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function stopStream($rID, $rServerID = -1) {
+		if ($rServerID == -1) {
+			$rData = json_decode(ApiClient::request(['action' => 'stream', 'sub' => 'stop', 'stream_ids' => [$rID], 'servers' => array_keys(ServerRepository::getAll())]), true);
+		} else {
+			$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'stream', 'stream_ids' => [$rID], 'function' => 'stop']), true);
+		}
+		if (!$rData['result']) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getChannel($rID) {
+		if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 3)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rStream];
+	}
+
+	public static function createChannel($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(ChannelService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getChannel($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editChannel($rID, $rData) {
+		if (!(($rStream = self::getChannel($rID)) && isset($rStream['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(ChannelService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getChannel($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteChannel($rID, $rServerID = -1) {
+		if (!(($rStream = self::getChannel($rID)) && isset($rStream['data']))) {
+		} else {
+			if (!StreamRepository::deleteStream($rID, $rServerID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getStation($rID) {
+		if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 4)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rStream];
+	}
+
+	public static function createStation($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(RadioService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getStation($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editStation($rID, $rData) {
+		if (!(($rStream = self::getStation($rID)) && isset($rStream['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(RadioService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getStation($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteStation($rID, $rServerID = -1) {
+		if (!(($rStream = self::getStation($rID)) && isset($rStream['data']))) {
+		} else {
+			if (!StreamRepository::deleteStream($rID, $rServerID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getMovie($rID) {
+		if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 2)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rStream];
+	}
+
+	public static function createMovie($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(MovieService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getMovie($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editMovie($rID, $rData) {
+		if (!(($rStream = self::getMovie($rID)) && isset($rStream['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(MovieService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getMovie($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteMovie($rID, $rServerID = -1) {
+		if (!(($rStream = self::getMovie($rID)) && isset($rStream['data']))) {
+		} else {
+			if (!StreamRepository::deleteStream($rID, $rServerID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function startMovie($rID, $rServerID = -1) {
+		if ($rServerID == -1) {
+			$rData = json_decode(ApiClient::request(['action' => 'vod', 'sub' => 'start', 'stream_ids' => [$rID], 'servers' => array_keys(ServerRepository::getAll())]), true);
+		} else {
+			$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'vod', 'stream_ids' => [$rID], 'function' => 'start']), true);
+		}
+		if (!$rData['result']) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function stopMovie($rID, $rServerID = -1) {
+		if ($rServerID == -1) {
+			$rData = json_decode(ApiClient::request(['action' => 'vod', 'sub' => 'stop', 'stream_ids' => [$rID], 'servers' => array_keys(ServerRepository::getAll())]), true);
+		} else {
+			$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'vod', 'stream_ids' => [$rID], 'function' => 'stop']), true);
+		}
+		if (!$rData['result']) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getEpisode($rID) {
+		if (!(($rStream = StreamRepository::getById($rID)) && $rStream['type'] == 5)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rStream];
+	}
+
+	public static function createEpisode($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(EpisodeService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getEpisode($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editEpisode($rID, $rData) {
+		if (!(($rStream = self::getEpisode($rID)) && isset($rStream['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(EpisodeService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getEpisode($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteEpisode($rID, $rServerID = -1) {
+		if (!(($rStream = self::getEpisode($rID)) && isset($rStream['data']))) {
+		} else {
+			if (!StreamRepository::deleteStream($rID, $rServerID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getSeries($rID) {
+		if (!($rSeries = SeriesService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rSeries];
+	}
+
+	public static function createSeries($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(SeriesService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getSeries($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editSeries($rID, $rData) {
+		if (!(($rStream = self::getSeries($rID)) && isset($rStream['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(SeriesService::process($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getSeries($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteSeries($rID) {
+		if (!(($rStream = self::getSeries($rID)) && isset($rStream['data']))) {
+		} else {
+			if (!SeriesService::deleteSeriesById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getServers() {
+		global $rPermissions;
+		return ['status' => 'STATUS_SUCCESS', 'data' => ServerRepository::getStreamingSimple($rPermissions)];
+	}
+
+	public static function getServer($rID) {
+		if (!($rServer = ServerRepository::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rServer];
+	}
+
+	public static function installServer($rData) {
+		global $rPermissions;
+		if (!(empty($rData['type']) || empty($rData['ssh_port']) || empty($rData['root_username']) || empty($rData['root_password']))) {
+			if (!($rData['type'] == 1 && (empty($rData['type']) || empty($rData['ssh_port'])))) {
+				$rReturn = parseerror(ServerService::install($rData, ServerRepository::getStreamingSimple($rPermissions, 'all'), ServerRepository::getProxySimple($rPermissions)));
+				if (!isset($rReturn['data']['insert_id'])) {
+				} else {
+					$rReturn['data'] = self::getServer($rReturn['data']['insert_id']);
+				}
+				return ['status' => 'STATUS_FAILURE'];
+			}
+			return ['status' => 'STATUS_INVALID_INPUT'];
+		}
+		return ['status' => 'STATUS_INVALID_INPUT'];
+	}
+
+	public static function editServer($rID, $rData) {
+		if (!(($rServer = self::getServer($rID)) && isset($rServer['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		} else {
+			$rData['edit'] = $rID;
+			$rReturn = parseerror(ServerService::process($rData));
+			if (!isset($rReturn['data']['insert_id'])) {
+			} else {
+				$rReturn['data'] = self::getServer($rReturn['data']['insert_id'])['data'];
+			}
+			return $rReturn;
+		}
+	}
+
+	public static function editProxy($rID, $rData) {
+		if (!(($rServer = self::getServer($rID)) && isset($rServer['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(ServerService::processProxy($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getServer($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteServer($rID) {
+		if (!(($rServer = self::getServer($rID)) && isset($rServer['data']))) {
+		} else {
+			if (!ServerRepository::deleteById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function getSettings() {
+		return ['status' => 'STATUS_SUCCESS', 'data' => SettingsManager::getAll()];
+	}
+
+	public static function editSettings($rData) {
+		$rReturn = parseerror(SettingsService::edit($rData));
+		$rReturn['data'] = self::getSettings()['data'];
+		return $rReturn;
+	}
+
+	public static function getStats($rServerID) {
+		global $db;
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'stats']), true);
+		if (!$rData) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['requests_per_second'] = ServerRepository::getAll()[$rServerID]['requests_per_second'];
+		$db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0;', $rServerID);
+		if (0 >= $db->num_rows()) {
+		} else {
+			$rData['open_connections'] = $db->get_row()['count'];
+		}
+		$db->query('SELECT COUNT(*) AS `count` FROM `lines_live` WHERE `hls_end` = 0;');
+		if (0 >= $db->num_rows()) {
+		} else {
+			$rData['total_connections'] = $db->get_row()['count'];
+		}
+		$db->query('SELECT `activity_id` FROM `lines_live` WHERE `server_id` = ? AND `hls_end` = 0 GROUP BY `user_id`;', $rServerID);
+		if (0 >= $db->num_rows()) {
+		} else {
+			$rData['online_users'] = $db->num_rows();
+		}
+		$db->query('SELECT `activity_id` FROM `lines_live` WHERE `hls_end` = 0 GROUP BY `user_id`;');
+		if (0 >= $db->num_rows()) {
+		} else {
+			$rData['total_users'] = $db->num_rows();
+		}
+		$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `stream_status` <> 2 AND `type` = 1;', $rServerID);
+		if (0 >= $db->num_rows()) {
+		} else {
+			$rData['total_streams'] = $db->get_row()['count'];
+		}
+		$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `pid` > 0 AND `type` = 1;', $rServerID);
+		if (0 >= $db->num_rows()) {
+		} else {
+			$rData['total_running_streams'] = $db->get_row()['count'];
+		}
+		$db->query('SELECT COUNT(*) AS `count` FROM `streams_servers` LEFT JOIN `streams` ON `streams`.`id` = `streams_servers`.`stream_id` WHERE `server_id` = ? AND `type` = 1 AND (`streams`.`direct_source` = 0 AND (`streams_servers`.`monitor_pid` IS NOT NULL AND `streams_servers`.`monitor_pid` > 0) AND (`streams_servers`.`pid` IS NULL OR `streams_servers`.`pid` <= 0) AND `streams_servers`.`stream_status` <> 0);', $rServerID);
+		if (0 >= $db->num_rows()) {
+		} else {
+			$rData['offline_streams'] = $db->get_row()['count'];
+		}
+		$rData['network_guaranteed_speed'] = ServerRepository::getAll()[$rServerID]['network_guaranteed_speed'];
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rData];
+	}
+
+	public static function getFPMStatus($rServerID) {
+		$rData = ApiClient::systemRequest($rServerID, ['action' => 'fpm_status']);
+		if (!$rData) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rData];
+	}
+
+	public static function getRTMPStats($rServerID) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'rtmp_stats']), true);
+		if (!$rData) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rData];
+	}
+
+	public static function getFreeSpace($rServerID) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'get_free_space']), true);
+		if (!$rData) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rData];
+	}
+
+	public static function getPIDs($rServerID) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'get_pids']), true);
+		if (!$rData) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rData];
+	}
+
+	public static function getCertificateInfo($rServerID) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'get_certificate_info']), true);
+		if (!$rData) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rData];
+	}
+
+	public static function reloadNGINX($rServerID) {
+		ApiClient::systemRequest($rServerID, ['action' => 'reload_nginx']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function clearTemp($rServerID) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'free_temp']), true);
+		if (!$rData['result']) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function clearStreams($rServerID) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'free_streams']), true);
+		if (!$rData['result']) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getDirectory($rServerID, $rDirectory) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'scandir', 'dir' => $rDirectory]), true);
+		if (!$rData) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		unset($rData['result']);
+		if (!isset($rData['result']) || $rData['result']) {
+			return ['status' => 'STATUS_SUCCESS', 'data' => $rData];
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function killPID($rServerID, $rPID) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'kill_pid', 'pid' => intval($rPID)]), true);
+		if (!$rData['result']) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function killConnection($rServerID, $rActivityID) {
+		$rData = json_decode(ApiClient::systemRequest($rServerID, ['action' => 'closeConnection', 'activity_id' => intval($rActivityID)]), true);
+		if (!$rData['result']) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function adjustCredits($rID, $rCredits, $rReason = '') {
+		global $db;
+		global $rUserInfo;
+		if (!(is_numeric($rCredits) && ($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+		} else {
+			$rCredits = intval($rUser['data']['credits']) + intval($rCredits);
+			if (0 > $rCredits) {
+			} else {
+				$db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rCredits, $rID);
+				$db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rID, $rUserInfo['id'], $rCredits, time(), $rReason);
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function reloadCache() {
+		shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache_engine > /dev/null 2>/dev/null &');
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function runQuery($rQuery) {
+		global $db;
+		if (!$db->query($rQuery)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $db->get_rows(), 'insert_id' => $db->last_insert_id()];
+	}
 }
 
 if (!function_exists('parseError')) {
diff --git a/src/Public/Controllers/Api/AdminApiController.php b/src/Public/Controllers/Api/AdminApiController.php
index 067c11b3..10f0b9bf 100644
--- a/src/Public/Controllers/Api/AdminApiController.php
+++ b/src/Public/Controllers/Api/AdminApiController.php
@@ -20,621 +20,621 @@ class AdminApiController {
 		global $db;
 		global $_ERRORS;
 
-		$_ERRORS = array();
-foreach (get_defined_constants(true)['user'] as $rKey => $rValue) {
-    if (substr($rKey, 0, 7) != 'STATUS_') {
-    } else {
-        $_ERRORS[intval($rValue)] = $rKey;
-    }
-}
-$rData = RequestManager::getAll();
-AdminAPIWrapper::$db = &$db;
-AdminAPIWrapper::$rKey = $rData['api_key'] ?? '';
-if (!empty($rData['api_key']) && AdminAPIWrapper::createSession()) {
-    $rAction = $rData['action'] ?? '';
-    $rStart = intval($rData['start'] ?? 0);
-    $rLimit = intval($rData['limit'] ?? 50) ?: 50;
-    unset($rData['api_key'], $rData['action'], $rData['start'], $rData['limit']);
-    if (RequestManager::has('show_columns')) {
-        $rShowColumns = explode(',', RequestManager::get('show_columns'));
-    } else {
-        $rShowColumns = null;
-    }
-    if (RequestManager::has('hide_columns')) {
-        $rHideColumns = explode(',', RequestManager::get('hide_columns'));
-    } else {
-        $rHideColumns = null;
-    }
-    switch ($rAction) {
-        case 'mysql_query':
-            echo json_encode(AdminAPIWrapper::runQuery($rData['query']));
-            break;
-        case 'user_info':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getUserInfo(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_lines':
-            echo json_encode(AdminAPIWrapper::TableAPI('lines', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_mags':
-            echo json_encode(AdminAPIWrapper::TableAPI('mags', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_enigmas':
-            echo json_encode(AdminAPIWrapper::TableAPI('enigmas', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_users':
-            echo json_encode(AdminAPIWrapper::TableAPI('reg_users', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_streams':
-            echo json_encode(AdminAPIWrapper::TableAPI('streams', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_provider_streams':
-            echo json_encode(AdminAPIWrapper::TableAPI('provider_streams', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_channels':
-            $rData['created'] = true;
-            echo json_encode(AdminAPIWrapper::TableAPI('streams', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_stations':
-            echo json_encode(AdminAPIWrapper::TableAPI('radios', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_movies':
-            echo json_encode(AdminAPIWrapper::TableAPI('movies', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_series_list':
-            echo json_encode(AdminAPIWrapper::TableAPI('series', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_episodes':
-            echo json_encode(AdminAPIWrapper::TableAPI('episodes', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'activity_logs':
-            echo json_encode(AdminAPIWrapper::TableAPI('line_activity', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'live_connections':
-            echo json_encode(AdminAPIWrapper::TableAPI('live_connections', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'credit_logs':
-            echo json_encode(AdminAPIWrapper::TableAPI('credits_log', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'client_logs':
-            echo json_encode(AdminAPIWrapper::TableAPI('client_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'user_logs':
-            echo json_encode(AdminAPIWrapper::TableAPI('reg_user_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'stream_errors':
-            echo json_encode(AdminAPIWrapper::TableAPI('stream_errors', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'system_logs':
-            echo json_encode(AdminAPIWrapper::TableAPI('mysql_syslog', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'login_logs':
-            echo json_encode(AdminAPIWrapper::TableAPI('login_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'restream_logs':
-            echo json_encode(AdminAPIWrapper::TableAPI('restream_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'mag_events':
-            echo json_encode(AdminAPIWrapper::TableAPI('mag_events', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_line':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getLine($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_line':
-            echo json_encode(AdminAPIWrapper::createLine($rData));
-            break;
-        case 'edit_line':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editLine($rID, $rData));
-            break;
-        case 'delete_line':
-            echo json_encode(AdminAPIWrapper::deleteLine($rData['id']));
-            break;
-        case 'disable_line':
-            echo json_encode(AdminAPIWrapper::disableLine($rData['id']));
-            break;
-        case 'enable_line':
-            echo json_encode(AdminAPIWrapper::enableLine($rData['id']));
-            break;
-        case 'unban_line':
-            echo json_encode(AdminAPIWrapper::unbanLine($rData['id']));
-            break;
-        case 'ban_line':
-            echo json_encode(AdminAPIWrapper::banLine($rData['id']));
-            break;
-        case 'get_user':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getUser($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_user':
-            echo json_encode(AdminAPIWrapper::createUser($rData));
-            break;
-        case 'edit_user':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editUser($rID, $rData));
-            break;
-        case 'delete_user':
-            echo json_encode(AdminAPIWrapper::deleteUser($rData['id']));
-            break;
-        case 'disable_user':
-            echo json_encode(AdminAPIWrapper::disableUser($rData['id']));
-            break;
-        case 'enable_user':
-            echo json_encode(AdminAPIWrapper::enableUser($rData['id']));
-            break;
-        case 'get_mag':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getMAG($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_mag':
-            echo json_encode(AdminAPIWrapper::createMAG($rData));
-            break;
-        case 'edit_mag':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editMAG($rID, $rData));
-            break;
-        case 'delete_mag':
-            echo json_encode(AdminAPIWrapper::deleteMAG($rData['id']));
-            break;
-        case 'disable_mag':
-            echo json_encode(AdminAPIWrapper::disableMAG($rData['id']));
-            break;
-        case 'enable_mag':
-            echo json_encode(AdminAPIWrapper::enableMAG($rData['id']));
-            break;
-        case 'unban_mag':
-            echo json_encode(AdminAPIWrapper::unbanMAG($rData['id']));
-            break;
-        case 'ban_mag':
-            echo json_encode(AdminAPIWrapper::banMAG($rData['id']));
-            break;
-        case 'convert_mag':
-            echo json_encode(AdminAPIWrapper::convertMAG($rData['id']));
-            break;
-        case 'get_enigma':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getEnigma($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_enigma':
-            echo json_encode(AdminAPIWrapper::createEnigma($rData));
-            break;
-        case 'edit_enigma':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editEnigma($rID, $rData));
-            break;
-        case 'delete_enigma':
-            echo json_encode(AdminAPIWrapper::deleteEnigma($rData['id']));
-            break;
-        case 'disable_enigma':
-            echo json_encode(AdminAPIWrapper::disableEnigma($rData['id']));
-            break;
-        case 'enable_enigma':
-            echo json_encode(AdminAPIWrapper::enableEnigma($rData['id']));
-            break;
-        case 'unban_enigma':
-            echo json_encode(AdminAPIWrapper::unbanEnigma($rData['id']));
-            break;
-        case 'ban_enigma':
-            echo json_encode(AdminAPIWrapper::banEnigma($rData['id']));
-            break;
-        case 'convert_enigma':
-            echo json_encode(AdminAPIWrapper::convertEnigma($rData['id']));
-            break;
-        case 'get_bouquets':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getBouquets(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_bouquet':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getBouquet($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_bouquet':
-            echo json_encode(AdminAPIWrapper::createBouquet($rData));
-            break;
-        case 'edit_bouquet':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editBouquet($rID, $rData));
-            break;
-        case 'delete_bouquet':
-            echo json_encode(AdminAPIWrapper::deleteBouquet($rData['id']));
-            break;
-        case 'get_access_codes':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getAccessCodes(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_access_code':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getAccessCode($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_access_code':
-            echo json_encode(AdminAPIWrapper::createAccessCode($rData));
-            break;
-        case 'edit_access_code':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editAccessCode($rID, $rData));
-            break;
-        case 'delete_access_code':
-            echo json_encode(AdminAPIWrapper::deleteAccessCode($rData['id']));
-            break;
-        case 'get_hmacs':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getHMACs(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_hmac':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getHMAC($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_hmac':
-            echo json_encode(AdminAPIWrapper::createHMAC($rData));
-            break;
-        case 'edit_hmac':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editHMAC($rID, $rData));
-            break;
-        case 'delete_hmac':
-            echo json_encode(AdminAPIWrapper::deleteHMAC($rData['id']));
-            break;
-        case 'get_epgs':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getEPGs(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_epg':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getEPG($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_epg':
-            echo json_encode(AdminAPIWrapper::createEPG($rData));
-            break;
-        case 'edit_epg':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editEPG($rID, $rData));
-            break;
-        case 'delete_epg':
-            echo json_encode(AdminAPIWrapper::deleteEPG($rData['id']));
-            break;
-        case 'reload_epg':
-            echo json_encode(AdminAPIWrapper::reloadEPG((isset($rData['id']) ? intval($rData['id']) : null)));
-            break;
-        case 'get_providers':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getProviders(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_provider':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getProvider($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_provider':
-            echo json_encode(AdminAPIWrapper::createProvider($rData));
-            break;
-        case 'edit_provider':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editProvider($rID, $rData));
-            break;
-        case 'delete_provider':
-            echo json_encode(AdminAPIWrapper::deleteProvider($rData['id']));
-            break;
-        case 'reload_provider':
-            echo json_encode(AdminAPIWrapper::reloadProvider((isset($rData['id']) ? intval($rData['id']) : null)));
-            break;
-        case 'get_groups':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getGroups(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_group':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getGroup($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_group':
-            echo json_encode(AdminAPIWrapper::createGroup($rData));
-            break;
-        case 'edit_group':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editGroup($rID, $rData));
-            break;
-        case 'delete_group':
-            echo json_encode(AdminAPIWrapper::deleteGroup($rData['id']));
-            break;
-        case 'get_packages':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getPackages(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_package':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getPackage($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_package':
-            echo json_encode(AdminAPIWrapper::createPackage($rData));
-            break;
-        case 'edit_package':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editPackage($rID, $rData));
-            break;
-        case 'delete_package':
-            echo json_encode(AdminAPIWrapper::deletePackage($rData['id']));
-            break;
-        case 'get_transcode_profiles':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getTranscodeProfiles(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_transcode_profile':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getTranscodeProfile($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_transcode_profile':
-            echo json_encode(AdminAPIWrapper::createTranscodeProfile($rData));
-            break;
-        case 'edit_transcode_profile':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editTranscodeProfile($rID, $rData));
-            break;
-        case 'delete_transcode_profile':
-            echo json_encode(AdminAPIWrapper::deleteTranscodeProfile($rData['id']));
-            break;
-        case 'get_rtmp_ips':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getRTMPIPs(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_rtmp_ip':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getRTMPIP($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_rtmp_ip':
-            echo json_encode(AdminAPIWrapper::addRTMPIP($rData));
-            break;
-        case 'edit_rtmp_ip':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editRTMPIP($rID, $rData));
-            break;
-        case 'delete_rtmp_ip':
-            echo json_encode(AdminAPIWrapper::deleteRTMPIP($rData['id']));
-            break;
-        case 'get_categories':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getCategories(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_category':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getCategory($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_category':
-            echo json_encode(AdminAPIWrapper::createCategory($rData));
-            break;
-        case 'edit_category':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editCategory($rID, $rData));
-            break;
-        case 'delete_category':
-            echo json_encode(AdminAPIWrapper::deleteCategory($rData['id']));
-            break;
-        case 'get_watch_folders':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getWatchFolders(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_watch_folder':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getWatchFolder($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_watch_folder':
-            echo json_encode(AdminAPIWrapper::createWatchFolder($rData));
-            break;
-        case 'edit_watch_folder':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editWatchFolder($rID, $rData));
-            break;
-        case 'delete_watch_folder':
-            echo json_encode(AdminAPIWrapper::deleteWatchFolder($rData['id']));
-            break;
-        case 'reload_watch_folder':
-            echo json_encode(AdminAPIWrapper::reloadWatchFolder((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID), $rData['id']));
-            break;
-        case 'get_blocked_isps':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getBlockedISPs(), $rShowColumns, $rHideColumns));
-            break;
-        case 'add_blocked_isp':
-            echo json_encode(AdminAPIWrapper::addBlockedISP($rData['id']));
-            break;
-        case 'delete_blocked_isp':
-            echo json_encode(AdminAPIWrapper::deleteBlockedISP($rData['id']));
-            break;
-        case 'get_blocked_uas':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getBlockedUAs(), $rShowColumns, $rHideColumns));
-            break;
-        case 'add_blocked_ua':
-            echo json_encode(AdminAPIWrapper::addBlockedUA($rData));
-            break;
-        case 'delete_blocked_ua':
-            echo json_encode(AdminAPIWrapper::deleteBlockedUA($rData['id']));
-            break;
-        case 'get_blocked_ips':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getBlockedIPs(), $rShowColumns, $rHideColumns));
-            break;
-        case 'add_blocked_ip':
-            echo json_encode(AdminAPIWrapper::addBlockedIP($rData['id']));
-            break;
-        case 'delete_blocked_ip':
-            echo json_encode(AdminAPIWrapper::deleteBlockedIP($rData['id']));
-            break;
-        case 'flush_blocked_ips':
-            echo json_encode(AdminAPIWrapper::flushBlockedIPs());
-            break;
-        case 'get_stream':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getStream($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_stream':
-            echo json_encode(AdminAPIWrapper::createStream($rData));
-            break;
-        case 'edit_stream':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editStream($rID, $rData));
-            break;
-        case 'delete_stream':
-            echo json_encode(AdminAPIWrapper::deleteStream($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
-            break;
-        case 'start_station':
-        case 'start_channel':
-        case 'start_stream':
-            echo json_encode(AdminAPIWrapper::startStream($rData['id'], $rData['server_id']));
-            break;
-        case 'stop_station':
-        case 'stop_channel':
-        case 'stop_stream':
-            echo json_encode(AdminAPIWrapper::stopStream($rData['id'], $rData['server_id']));
-            break;
-        case 'get_channel':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getChannel($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_channel':
-            echo json_encode(AdminAPIWrapper::createChannel($rData));
-            break;
-        case 'edit_channel':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editChannel($rID, $rData));
-            break;
-        case 'delete_channel':
-            echo json_encode(AdminAPIWrapper::deleteChannel($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
-            break;
-        case 'get_station':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getStation($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_station':
-            echo json_encode(AdminAPIWrapper::createStation($rData));
-            break;
-        case 'edit_station':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editStation($rID, $rData));
-            break;
-        case 'delete_station':
-            echo json_encode(AdminAPIWrapper::deleteStation($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
-            break;
-        case 'get_movie':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getMovie($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_movie':
-            echo json_encode(AdminAPIWrapper::createMovie($rData));
-            break;
-        case 'edit_movie':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editMovie($rID, $rData));
-            break;
-        case 'delete_movie':
-            echo json_encode(AdminAPIWrapper::deleteMovie($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
-            break;
-        case 'start_episode':
-        case 'start_movie':
-            echo json_encode(AdminAPIWrapper::startMovie($rData['id'], $rData['server_id']));
-            break;
-        case 'stop_episode':
-        case 'stop_movie':
-            echo json_encode(AdminAPIWrapper::stopMovie($rData['id'], $rData['server_id']));
-            break;
-        case 'get_episode':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getEpisode($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_episode':
-            echo json_encode(AdminAPIWrapper::createEpisode($rData));
-            break;
-        case 'edit_episode':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editEpisode($rID, $rData));
-            break;
-        case 'delete_episode':
-            echo json_encode(AdminAPIWrapper::deleteEpisode($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
-            break;
-        case 'get_series':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getSeries($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_series':
-            echo json_encode(AdminAPIWrapper::createSeries($rData));
-            break;
-        case 'edit_series':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editSeries($rID, $rData));
-            break;
-        case 'delete_series':
-            echo json_encode(AdminAPIWrapper::deleteSeries($rData['id']));
-            break;
-        case 'get_servers':
-            echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getServers(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_server':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getServer($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'install_server':
-            $rData['type'] = 0;
-            echo json_encode(AdminAPIWrapper::installServer($rData));
-            break;
-        case 'install_proxy':
-            $rData['type'] = 1;
-            echo json_encode(AdminAPIWrapper::installServer($rData));
-            break;
-        case 'edit_server':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editServer($rID, $rData));
-            break;
-        case 'edit_proxy':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(AdminAPIWrapper::editProxy($rID, $rData));
-            break;
-        case 'delete_server':
-            echo json_encode(AdminAPIWrapper::deleteServer($rData['id']));
-            break;
-        case 'get_settings':
-            echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getSettings(), $rShowColumns, $rHideColumns));
-            break;
-        case 'edit_settings':
-            echo json_encode(AdminAPIWrapper::editSettings($rData));
-            break;
-        case 'get_server_stats':
-            echo json_encode(AdminAPIWrapper::getStats((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'get_fpm_status':
-            echo json_encode(AdminAPIWrapper::getFPMStatus((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'get_rtmp_stats':
-            echo json_encode(AdminAPIWrapper::getRTMPStats((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'get_free_space':
-            echo json_encode(AdminAPIWrapper::getFreeSpace((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'get_pids':
-            echo json_encode(AdminAPIWrapper::getPIDs((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'get_certificate_info':
-            echo json_encode(AdminAPIWrapper::getCertificateInfo((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'reload_nginx':
-            echo json_encode(AdminAPIWrapper::reloadNGINX((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'clear_temp':
-            echo json_encode(AdminAPIWrapper::clearTemp((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'clear_streams':
-            echo json_encode(AdminAPIWrapper::clearStreams((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
-            break;
-        case 'get_directory':
-            echo json_encode(AdminAPIWrapper::getDirectory((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID), $rData['dir']));
-            break;
-        case 'kill_pid':
-            echo json_encode(AdminAPIWrapper::killPID((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID), $rData['pid']));
-            break;
-        case 'kill_connection':
-            echo json_encode(AdminAPIWrapper::killConnection((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID), $rData['activity_id']));
-            break;
-        case 'adjust_credits':
-            echo json_encode(AdminAPIWrapper::adjustCredits($rData['id'], $rData['credits'], (isset($rData['reason']) ? $rData['reason'] : '')));
-            break;
-        case 'reload_cache':
-            echo json_encode(AdminAPIWrapper::reloadCache());
-            break;
-        default:
-            // Module-owned serverSide tables (TableRegistry) are exposed generically
-            // by their id, so a module table needs no hard-coded case here.
-            if (class_exists(TableRegistry::class) && TableRegistry::has($rAction)) {
-                echo json_encode(AdminAPIWrapper::TableAPI($rAction, $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-                break;
-            }
-            echo json_encode(array('status' => 'STATUS_FAILURE', 'error' => 'Invalid action.'));
-            break;
-    }
-} else {
-    echo json_encode(array('status' => 'STATUS_FAILURE', 'error' => 'Invalid API key.'));
-}
+		$_ERRORS = [];
+		foreach (get_defined_constants(true)['user'] as $rKey => $rValue) {
+			if (substr($rKey, 0, 7) != 'STATUS_') {
+			} else {
+				$_ERRORS[intval($rValue)] = $rKey;
+			}
+		}
+		$rData = RequestManager::getAll();
+		AdminAPIWrapper::$db = &$db;
+		AdminAPIWrapper::$rKey = $rData['api_key'] ?? '';
+		if (!empty($rData['api_key']) && AdminAPIWrapper::createSession()) {
+			$rAction = $rData['action'] ?? '';
+			$rStart = intval($rData['start'] ?? 0);
+			$rLimit = intval($rData['limit'] ?? 50) ?: 50;
+			unset($rData['api_key'], $rData['action'], $rData['start'], $rData['limit']);
+			if (RequestManager::has('show_columns')) {
+				$rShowColumns = explode(',', RequestManager::get('show_columns'));
+			} else {
+				$rShowColumns = null;
+			}
+			if (RequestManager::has('hide_columns')) {
+				$rHideColumns = explode(',', RequestManager::get('hide_columns'));
+			} else {
+				$rHideColumns = null;
+			}
+			switch ($rAction) {
+				case 'mysql_query':
+					echo json_encode(AdminAPIWrapper::runQuery($rData['query']));
+					break;
+				case 'user_info':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getUserInfo(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_lines':
+					echo json_encode(AdminAPIWrapper::TableAPI('lines', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_mags':
+					echo json_encode(AdminAPIWrapper::TableAPI('mags', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_enigmas':
+					echo json_encode(AdminAPIWrapper::TableAPI('enigmas', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_users':
+					echo json_encode(AdminAPIWrapper::TableAPI('reg_users', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_streams':
+					echo json_encode(AdminAPIWrapper::TableAPI('streams', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_provider_streams':
+					echo json_encode(AdminAPIWrapper::TableAPI('provider_streams', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_channels':
+					$rData['created'] = true;
+					echo json_encode(AdminAPIWrapper::TableAPI('streams', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_stations':
+					echo json_encode(AdminAPIWrapper::TableAPI('radios', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_movies':
+					echo json_encode(AdminAPIWrapper::TableAPI('movies', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_series_list':
+					echo json_encode(AdminAPIWrapper::TableAPI('series', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_episodes':
+					echo json_encode(AdminAPIWrapper::TableAPI('episodes', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'activity_logs':
+					echo json_encode(AdminAPIWrapper::TableAPI('line_activity', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'live_connections':
+					echo json_encode(AdminAPIWrapper::TableAPI('live_connections', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'credit_logs':
+					echo json_encode(AdminAPIWrapper::TableAPI('credits_log', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'client_logs':
+					echo json_encode(AdminAPIWrapper::TableAPI('client_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'user_logs':
+					echo json_encode(AdminAPIWrapper::TableAPI('reg_user_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'stream_errors':
+					echo json_encode(AdminAPIWrapper::TableAPI('stream_errors', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'system_logs':
+					echo json_encode(AdminAPIWrapper::TableAPI('mysql_syslog', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'login_logs':
+					echo json_encode(AdminAPIWrapper::TableAPI('login_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'restream_logs':
+					echo json_encode(AdminAPIWrapper::TableAPI('restream_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'mag_events':
+					echo json_encode(AdminAPIWrapper::TableAPI('mag_events', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_line':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getLine($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_line':
+					echo json_encode(AdminAPIWrapper::createLine($rData));
+					break;
+				case 'edit_line':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editLine($rID, $rData));
+					break;
+				case 'delete_line':
+					echo json_encode(AdminAPIWrapper::deleteLine($rData['id']));
+					break;
+				case 'disable_line':
+					echo json_encode(AdminAPIWrapper::disableLine($rData['id']));
+					break;
+				case 'enable_line':
+					echo json_encode(AdminAPIWrapper::enableLine($rData['id']));
+					break;
+				case 'unban_line':
+					echo json_encode(AdminAPIWrapper::unbanLine($rData['id']));
+					break;
+				case 'ban_line':
+					echo json_encode(AdminAPIWrapper::banLine($rData['id']));
+					break;
+				case 'get_user':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getUser($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_user':
+					echo json_encode(AdminAPIWrapper::createUser($rData));
+					break;
+				case 'edit_user':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editUser($rID, $rData));
+					break;
+				case 'delete_user':
+					echo json_encode(AdminAPIWrapper::deleteUser($rData['id']));
+					break;
+				case 'disable_user':
+					echo json_encode(AdminAPIWrapper::disableUser($rData['id']));
+					break;
+				case 'enable_user':
+					echo json_encode(AdminAPIWrapper::enableUser($rData['id']));
+					break;
+				case 'get_mag':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getMAG($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_mag':
+					echo json_encode(AdminAPIWrapper::createMAG($rData));
+					break;
+				case 'edit_mag':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editMAG($rID, $rData));
+					break;
+				case 'delete_mag':
+					echo json_encode(AdminAPIWrapper::deleteMAG($rData['id']));
+					break;
+				case 'disable_mag':
+					echo json_encode(AdminAPIWrapper::disableMAG($rData['id']));
+					break;
+				case 'enable_mag':
+					echo json_encode(AdminAPIWrapper::enableMAG($rData['id']));
+					break;
+				case 'unban_mag':
+					echo json_encode(AdminAPIWrapper::unbanMAG($rData['id']));
+					break;
+				case 'ban_mag':
+					echo json_encode(AdminAPIWrapper::banMAG($rData['id']));
+					break;
+				case 'convert_mag':
+					echo json_encode(AdminAPIWrapper::convertMAG($rData['id']));
+					break;
+				case 'get_enigma':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getEnigma($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_enigma':
+					echo json_encode(AdminAPIWrapper::createEnigma($rData));
+					break;
+				case 'edit_enigma':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editEnigma($rID, $rData));
+					break;
+				case 'delete_enigma':
+					echo json_encode(AdminAPIWrapper::deleteEnigma($rData['id']));
+					break;
+				case 'disable_enigma':
+					echo json_encode(AdminAPIWrapper::disableEnigma($rData['id']));
+					break;
+				case 'enable_enigma':
+					echo json_encode(AdminAPIWrapper::enableEnigma($rData['id']));
+					break;
+				case 'unban_enigma':
+					echo json_encode(AdminAPIWrapper::unbanEnigma($rData['id']));
+					break;
+				case 'ban_enigma':
+					echo json_encode(AdminAPIWrapper::banEnigma($rData['id']));
+					break;
+				case 'convert_enigma':
+					echo json_encode(AdminAPIWrapper::convertEnigma($rData['id']));
+					break;
+				case 'get_bouquets':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getBouquets(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_bouquet':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getBouquet($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_bouquet':
+					echo json_encode(AdminAPIWrapper::createBouquet($rData));
+					break;
+				case 'edit_bouquet':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editBouquet($rID, $rData));
+					break;
+				case 'delete_bouquet':
+					echo json_encode(AdminAPIWrapper::deleteBouquet($rData['id']));
+					break;
+				case 'get_access_codes':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getAccessCodes(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_access_code':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getAccessCode($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_access_code':
+					echo json_encode(AdminAPIWrapper::createAccessCode($rData));
+					break;
+				case 'edit_access_code':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editAccessCode($rID, $rData));
+					break;
+				case 'delete_access_code':
+					echo json_encode(AdminAPIWrapper::deleteAccessCode($rData['id']));
+					break;
+				case 'get_hmacs':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getHMACs(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_hmac':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getHMAC($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_hmac':
+					echo json_encode(AdminAPIWrapper::createHMAC($rData));
+					break;
+				case 'edit_hmac':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editHMAC($rID, $rData));
+					break;
+				case 'delete_hmac':
+					echo json_encode(AdminAPIWrapper::deleteHMAC($rData['id']));
+					break;
+				case 'get_epgs':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getEPGs(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_epg':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getEPG($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_epg':
+					echo json_encode(AdminAPIWrapper::createEPG($rData));
+					break;
+				case 'edit_epg':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editEPG($rID, $rData));
+					break;
+				case 'delete_epg':
+					echo json_encode(AdminAPIWrapper::deleteEPG($rData['id']));
+					break;
+				case 'reload_epg':
+					echo json_encode(AdminAPIWrapper::reloadEPG((isset($rData['id']) ? intval($rData['id']) : null)));
+					break;
+				case 'get_providers':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getProviders(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_provider':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getProvider($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_provider':
+					echo json_encode(AdminAPIWrapper::createProvider($rData));
+					break;
+				case 'edit_provider':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editProvider($rID, $rData));
+					break;
+				case 'delete_provider':
+					echo json_encode(AdminAPIWrapper::deleteProvider($rData['id']));
+					break;
+				case 'reload_provider':
+					echo json_encode(AdminAPIWrapper::reloadProvider((isset($rData['id']) ? intval($rData['id']) : null)));
+					break;
+				case 'get_groups':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getGroups(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_group':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getGroup($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_group':
+					echo json_encode(AdminAPIWrapper::createGroup($rData));
+					break;
+				case 'edit_group':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editGroup($rID, $rData));
+					break;
+				case 'delete_group':
+					echo json_encode(AdminAPIWrapper::deleteGroup($rData['id']));
+					break;
+				case 'get_packages':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getPackages(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_package':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getPackage($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_package':
+					echo json_encode(AdminAPIWrapper::createPackage($rData));
+					break;
+				case 'edit_package':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editPackage($rID, $rData));
+					break;
+				case 'delete_package':
+					echo json_encode(AdminAPIWrapper::deletePackage($rData['id']));
+					break;
+				case 'get_transcode_profiles':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getTranscodeProfiles(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_transcode_profile':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getTranscodeProfile($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_transcode_profile':
+					echo json_encode(AdminAPIWrapper::createTranscodeProfile($rData));
+					break;
+				case 'edit_transcode_profile':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editTranscodeProfile($rID, $rData));
+					break;
+				case 'delete_transcode_profile':
+					echo json_encode(AdminAPIWrapper::deleteTranscodeProfile($rData['id']));
+					break;
+				case 'get_rtmp_ips':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getRTMPIPs(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_rtmp_ip':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getRTMPIP($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_rtmp_ip':
+					echo json_encode(AdminAPIWrapper::addRTMPIP($rData));
+					break;
+				case 'edit_rtmp_ip':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editRTMPIP($rID, $rData));
+					break;
+				case 'delete_rtmp_ip':
+					echo json_encode(AdminAPIWrapper::deleteRTMPIP($rData['id']));
+					break;
+				case 'get_categories':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getCategories(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_category':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getCategory($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_category':
+					echo json_encode(AdminAPIWrapper::createCategory($rData));
+					break;
+				case 'edit_category':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editCategory($rID, $rData));
+					break;
+				case 'delete_category':
+					echo json_encode(AdminAPIWrapper::deleteCategory($rData['id']));
+					break;
+				case 'get_watch_folders':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getWatchFolders(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_watch_folder':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getWatchFolder($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_watch_folder':
+					echo json_encode(AdminAPIWrapper::createWatchFolder($rData));
+					break;
+				case 'edit_watch_folder':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editWatchFolder($rID, $rData));
+					break;
+				case 'delete_watch_folder':
+					echo json_encode(AdminAPIWrapper::deleteWatchFolder($rData['id']));
+					break;
+				case 'reload_watch_folder':
+					echo json_encode(AdminAPIWrapper::reloadWatchFolder((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID), $rData['id']));
+					break;
+				case 'get_blocked_isps':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getBlockedISPs(), $rShowColumns, $rHideColumns));
+					break;
+				case 'add_blocked_isp':
+					echo json_encode(AdminAPIWrapper::addBlockedISP($rData['id']));
+					break;
+				case 'delete_blocked_isp':
+					echo json_encode(AdminAPIWrapper::deleteBlockedISP($rData['id']));
+					break;
+				case 'get_blocked_uas':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getBlockedUAs(), $rShowColumns, $rHideColumns));
+					break;
+				case 'add_blocked_ua':
+					echo json_encode(AdminAPIWrapper::addBlockedUA($rData));
+					break;
+				case 'delete_blocked_ua':
+					echo json_encode(AdminAPIWrapper::deleteBlockedUA($rData['id']));
+					break;
+				case 'get_blocked_ips':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getBlockedIPs(), $rShowColumns, $rHideColumns));
+					break;
+				case 'add_blocked_ip':
+					echo json_encode(AdminAPIWrapper::addBlockedIP($rData['id']));
+					break;
+				case 'delete_blocked_ip':
+					echo json_encode(AdminAPIWrapper::deleteBlockedIP($rData['id']));
+					break;
+				case 'flush_blocked_ips':
+					echo json_encode(AdminAPIWrapper::flushBlockedIPs());
+					break;
+				case 'get_stream':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getStream($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_stream':
+					echo json_encode(AdminAPIWrapper::createStream($rData));
+					break;
+				case 'edit_stream':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editStream($rID, $rData));
+					break;
+				case 'delete_stream':
+					echo json_encode(AdminAPIWrapper::deleteStream($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
+					break;
+				case 'start_station':
+				case 'start_channel':
+				case 'start_stream':
+					echo json_encode(AdminAPIWrapper::startStream($rData['id'], $rData['server_id']));
+					break;
+				case 'stop_station':
+				case 'stop_channel':
+				case 'stop_stream':
+					echo json_encode(AdminAPIWrapper::stopStream($rData['id'], $rData['server_id']));
+					break;
+				case 'get_channel':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getChannel($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_channel':
+					echo json_encode(AdminAPIWrapper::createChannel($rData));
+					break;
+				case 'edit_channel':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editChannel($rID, $rData));
+					break;
+				case 'delete_channel':
+					echo json_encode(AdminAPIWrapper::deleteChannel($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
+					break;
+				case 'get_station':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getStation($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_station':
+					echo json_encode(AdminAPIWrapper::createStation($rData));
+					break;
+				case 'edit_station':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editStation($rID, $rData));
+					break;
+				case 'delete_station':
+					echo json_encode(AdminAPIWrapper::deleteStation($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
+					break;
+				case 'get_movie':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getMovie($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_movie':
+					echo json_encode(AdminAPIWrapper::createMovie($rData));
+					break;
+				case 'edit_movie':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editMovie($rID, $rData));
+					break;
+				case 'delete_movie':
+					echo json_encode(AdminAPIWrapper::deleteMovie($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
+					break;
+				case 'start_episode':
+				case 'start_movie':
+					echo json_encode(AdminAPIWrapper::startMovie($rData['id'], $rData['server_id']));
+					break;
+				case 'stop_episode':
+				case 'stop_movie':
+					echo json_encode(AdminAPIWrapper::stopMovie($rData['id'], $rData['server_id']));
+					break;
+				case 'get_episode':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getEpisode($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_episode':
+					echo json_encode(AdminAPIWrapper::createEpisode($rData));
+					break;
+				case 'edit_episode':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editEpisode($rID, $rData));
+					break;
+				case 'delete_episode':
+					echo json_encode(AdminAPIWrapper::deleteEpisode($rData['id'], (isset($rData['server_id']) ? $rData['server_id'] : -1)));
+					break;
+				case 'get_series':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getSeries($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_series':
+					echo json_encode(AdminAPIWrapper::createSeries($rData));
+					break;
+				case 'edit_series':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editSeries($rID, $rData));
+					break;
+				case 'delete_series':
+					echo json_encode(AdminAPIWrapper::deleteSeries($rData['id']));
+					break;
+				case 'get_servers':
+					echo json_encode(AdminAPIWrapper::filterRows(AdminAPIWrapper::getServers(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_server':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getServer($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'install_server':
+					$rData['type'] = 0;
+					echo json_encode(AdminAPIWrapper::installServer($rData));
+					break;
+				case 'install_proxy':
+					$rData['type'] = 1;
+					echo json_encode(AdminAPIWrapper::installServer($rData));
+					break;
+				case 'edit_server':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editServer($rID, $rData));
+					break;
+				case 'edit_proxy':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(AdminAPIWrapper::editProxy($rID, $rData));
+					break;
+				case 'delete_server':
+					echo json_encode(AdminAPIWrapper::deleteServer($rData['id']));
+					break;
+				case 'get_settings':
+					echo json_encode(AdminAPIWrapper::filterRow(AdminAPIWrapper::getSettings(), $rShowColumns, $rHideColumns));
+					break;
+				case 'edit_settings':
+					echo json_encode(AdminAPIWrapper::editSettings($rData));
+					break;
+				case 'get_server_stats':
+					echo json_encode(AdminAPIWrapper::getStats((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'get_fpm_status':
+					echo json_encode(AdminAPIWrapper::getFPMStatus((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'get_rtmp_stats':
+					echo json_encode(AdminAPIWrapper::getRTMPStats((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'get_free_space':
+					echo json_encode(AdminAPIWrapper::getFreeSpace((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'get_pids':
+					echo json_encode(AdminAPIWrapper::getPIDs((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'get_certificate_info':
+					echo json_encode(AdminAPIWrapper::getCertificateInfo((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'reload_nginx':
+					echo json_encode(AdminAPIWrapper::reloadNGINX((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'clear_temp':
+					echo json_encode(AdminAPIWrapper::clearTemp((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'clear_streams':
+					echo json_encode(AdminAPIWrapper::clearStreams((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID)));
+					break;
+				case 'get_directory':
+					echo json_encode(AdminAPIWrapper::getDirectory((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID), $rData['dir']));
+					break;
+				case 'kill_pid':
+					echo json_encode(AdminAPIWrapper::killPID((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID), $rData['pid']));
+					break;
+				case 'kill_connection':
+					echo json_encode(AdminAPIWrapper::killConnection((isset($rData['server_id']) ? $rData['server_id'] : SERVER_ID), $rData['activity_id']));
+					break;
+				case 'adjust_credits':
+					echo json_encode(AdminAPIWrapper::adjustCredits($rData['id'], $rData['credits'], (isset($rData['reason']) ? $rData['reason'] : '')));
+					break;
+				case 'reload_cache':
+					echo json_encode(AdminAPIWrapper::reloadCache());
+					break;
+				default:
+					// Module-owned serverSide tables (TableRegistry) are exposed generically
+					// by their id, so a module table needs no hard-coded case here.
+					if (class_exists(TableRegistry::class) && TableRegistry::has($rAction)) {
+						echo json_encode(AdminAPIWrapper::TableAPI($rAction, $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+						break;
+					}
+					echo json_encode(['status' => 'STATUS_FAILURE', 'error' => 'Invalid action.']);
+					break;
+			}
+		} else {
+			echo json_encode(['status' => 'STATUS_FAILURE', 'error' => 'Invalid API key.']);
+		}
 	}
 }
diff --git a/src/Public/Controllers/Api/BaseApiController.php b/src/Public/Controllers/Api/BaseApiController.php
index 7f59f717..b17ebc5c 100644
--- a/src/Public/Controllers/Api/BaseApiController.php
+++ b/src/Public/Controllers/Api/BaseApiController.php
@@ -21,8 +21,11 @@ use XcVm\Domain\User\UserRepository;
 
 class BaseApiController {
 	protected $deny = true;
+
 	protected $downloading = false;
+
 	protected array|false|null $userInfo = null;
+
 	protected $downloadType = '';
 
 	public function shutdown() {
diff --git a/src/Public/Controllers/Api/Enigma2ApiController.php b/src/Public/Controllers/Api/Enigma2ApiController.php
index c1194b3d..cb1d9b7b 100644
--- a/src/Public/Controllers/Api/Enigma2ApiController.php
+++ b/src/Public/Controllers/Api/Enigma2ApiController.php
@@ -16,14 +16,23 @@ use XcVm\Infrastructure\Database\DatabaseFactory;
 
 class Enigma2ApiController {
 	private bool $deny = true;
+
 	private array|false|null $userInfo = null;
+
 	private ?string $url = null;
+
 	private ?string $username = null;
+
 	private ?string $password = null;
+
 	private array $liveCategories = [];
+
 	private array $vodCategories = [];
+
 	private array $seriesCategories = [];
+
 	private array $liveStreams = [];
+
 	private array $vodStreams = [];
 
 	public function shutdown() {
@@ -81,10 +90,10 @@ class Enigma2ApiController {
 		if ($rSettings['enable_cache']) {
 			$rChannels = $this->userInfo['channel_ids'];
 		} else {
-			$rChannels = array();
+			$rChannels = [];
 
 			if (count($this->userInfo['channel_ids']) > 0) {
-				$rWhere = array();
+				$rWhere = [];
 				$rWhere[] = '`id` IN (' . implode(',', $this->userInfo['channel_ids']) . ')';
 				$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
 				$rOrder = 'FIELD(id,' . implode(',', $this->userInfo['channel_ids']) . ')';
@@ -359,7 +368,7 @@ class Enigma2ApiController {
 				continue;
 			}
 
-			$rChannelEPGs = array();
+			$rChannelEPGs = [];
 
 			if (file_exists(EPG_PATH . 'stream_' . intval($rStream['id']))) {
 				foreach (igbinary_unserialize(file_get_contents(EPG_PATH . 'stream_' . $rStream['id'])) as $rRow) {
diff --git a/src/Public/Controllers/Api/EpgApiController.php b/src/Public/Controllers/Api/EpgApiController.php
index 8b092fd4..bd9585cf 100644
--- a/src/Public/Controllers/Api/EpgApiController.php
+++ b/src/Public/Controllers/Api/EpgApiController.php
@@ -61,7 +61,7 @@ class EpgApiController extends BaseApiController {
 
 		$this->validateUser($rUserInfo, $rUserAgent, $rIP, $rCountryCode);
 
-		$rBouquets = array();
+		$rBouquets = [];
 
 		foreach ($rUserInfo['bouquet'] as $rBouquetID) {
 			if (in_array($rBouquetID, array_keys(BouquetService::getAll()))) {
diff --git a/src/Public/Controllers/Api/InternalApiController.php b/src/Public/Controllers/Api/InternalApiController.php
index 446f3333..3bc491e0 100644
--- a/src/Public/Controllers/Api/InternalApiController.php
+++ b/src/Public/Controllers/Api/InternalApiController.php
@@ -102,7 +102,7 @@ class InternalApiController {
 
 			case 'streams_ramdisk':
 				set_time_limit(30);
-				$rReturn = array('result' => true, 'streams' => array());
+				$rReturn = ['result' => true, 'streams' => []];
 				exec('ls -l ' . STREAMS_PATH, $rFiles);
 
 				foreach ($rFiles as $rFile) {
@@ -142,7 +142,7 @@ class InternalApiController {
 								}
 							}
 
-							echo json_encode(array('result' => true));
+							echo json_encode(['result' => true]);
 
 							exit();
 
@@ -151,7 +151,7 @@ class InternalApiController {
 								StreamProcess::stopMovie($rStreamID);
 							}
 
-							echo json_encode(array('result' => true));
+							echo json_encode(['result' => true]);
 
 							exit();
 					}
@@ -168,9 +168,9 @@ class InternalApiController {
 
 				if (0 < $rPID) {
 					posix_kill($rPID, 9);
-					echo json_encode(array('result' => true));
+					echo json_encode(['result' => true]);
 				} else {
-					echo json_encode(array('result' => false));
+					echo json_encode(['result' => false]);
 				}
 
 				break;
@@ -178,7 +178,7 @@ class InternalApiController {
 			case 'rtmp_kill':
 				$rName = $rRequest['name'];
 				shell_exec('wget --timeout=2 -O /dev/null -o /dev/null "' . ServerRepository::getAll()[SERVER_ID]['rtmp_mport_url'] . 'control/drop/publisher?app=live&name=' . escapeshellcmd($rName) . '" >/dev/null 2>/dev/null &');
-				echo json_encode(array('result' => true));
+				echo json_encode(['result' => true]);
 
 				exit();
 
@@ -198,7 +198,7 @@ class InternalApiController {
 								}
 							}
 
-							echo json_encode(array('result' => true));
+							echo json_encode(['result' => true]);
 
 							exit();
 
@@ -207,7 +207,7 @@ class InternalApiController {
 								StreamProcess::stopStream($rStreamID, true);
 							}
 
-							echo json_encode(array('result' => true));
+							echo json_encode(['result' => true]);
 
 							exit();
 
@@ -235,12 +235,12 @@ class InternalApiController {
 					}
 				}
 
-				exit(json_encode(array('result' => true)));
+				exit(json_encode(['result' => true]));
 
 			case 'closeConnection':
 				ConnectionTracker::closeConnection(intval($rRequest['activity_id']));
 
-				exit(json_encode(array('result' => true)));
+				exit(json_encode(['result' => true]));
 
 			case 'pidsAreRunning':
 				if (empty($rRequest['pids']) || !is_array($rRequest['pids']) || empty($rRequest['program'])) {
@@ -249,7 +249,7 @@ class InternalApiController {
 
 				$rPIDs = array_map('intval', $rRequest['pids']);
 				$rProgram = $rRequest['program'];
-				$rOutput = array();
+				$rOutput = [];
 
 				foreach ($rPIDs as $rPID) {
 					$rOutput[$rPID] = false;
@@ -274,7 +274,7 @@ class InternalApiController {
 				$rAllowed = !empty($rRequest['allowed']) ? urldecode($rRequest['allowed']) : null;
 
 				if (!file_exists($rDirectory)) {
-					exit(json_encode(array('result' => false)));
+					exit(json_encode(['result' => false]));
 				}
 
 				if ($rAllowed) {
@@ -291,17 +291,17 @@ class InternalApiController {
 			case 'scandir':
 				set_time_limit(30);
 				$rDirectory = urldecode($rRequest['dir']);
-				$rAllowed = !empty($rRequest['allowed']) ? explode('|', urldecode($rRequest['allowed'])) : array();
+				$rAllowed = !empty($rRequest['allowed']) ? explode('|', urldecode($rRequest['allowed'])) : [];
 
 				if (!file_exists($rDirectory)) {
-					exit(json_encode(array('result' => false)));
+					exit(json_encode(['result' => false]));
 				}
 
-				$rReturn = array('result' => true, 'dirs' => array(), 'files' => array());
-				$rFiles = scanDir($rDirectory);
+				$rReturn = ['result' => true, 'dirs' => [], 'files' => []];
+				$rFiles = scandir($rDirectory);
 
 				foreach ($rFiles as $rValue) {
-					if (in_array($rValue, array('.', '..'))) {
+					if (in_array($rValue, ['.', '..'])) {
 						continue;
 					}
 
@@ -345,13 +345,13 @@ class InternalApiController {
 			case 'free_temp':
 				exec('rm -rf ' . MAIN_HOME . 'tmp/*');
 				shell_exec(PHP_BIN . ' ' . MAIN_HOME . 'console.php cron:cache');
-				echo json_encode(array('result' => true));
+				echo json_encode(['result' => true]);
 
 				break;
 
 			case 'free_streams':
 				exec('rm ' . MAIN_HOME . 'content/streams/*');
-				echo json_encode(array('result' => true));
+				echo json_encode(['result' => true]);
 
 				break;
 
@@ -386,19 +386,19 @@ class InternalApiController {
 
 			case 'get_archive_files':
 				$rStreamID = intval($rRequest['stream_id']);
-				echo json_encode(array('result' => true, 'data' => glob(ARCHIVE_PATH . $rStreamID . '/*.ts')));
+				echo json_encode(['result' => true, 'data' => glob(ARCHIVE_PATH . $rStreamID . '/*.ts')]);
 
 				exit();
 
 			case 'kill_watch':
 				$this->killProcessGroup(CACHE_TMP_PATH . 'watch_pid', WATCH_TMP_PATH . '*.wpid');
 
-				exit(json_encode(array('result' => true)));
+				exit(json_encode(['result' => true]));
 
 			case 'kill_plex':
 				$this->killProcessGroup(CACHE_TMP_PATH . 'plex_pid', WATCH_TMP_PATH . '*.ppid');
 
-				exit(json_encode(array('result' => true)));
+				exit(json_encode(['result' => true]));
 
 			case 'probe':
 				$this->probeStream($rRequest);
@@ -406,7 +406,7 @@ class InternalApiController {
 				break;
 
 			default:
-				exit(json_encode(array('result' => false)));
+				exit(json_encode(['result' => false]));
 		}
 	}
 
@@ -437,18 +437,18 @@ class InternalApiController {
 
 	private function serveFile($rRequest, $rSettings) {
 		if (empty($rRequest['filename'])) {
-			exit(json_encode(array('result' => false)));
+			exit(json_encode(['result' => false]));
 		}
 
 		$rFilename = urldecode($rRequest['filename']);
 		$rFilename = trim($rFilename, "'\"\\");
 
-		if (!in_array(strtolower(pathinfo($rFilename)['extension']), array('log', 'tar.gz', 'gz', 'zip', 'm3u8', 'mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts', 'srt', 'sub', 'sbv', 'jpg', 'png', 'bmp', 'jpeg', 'gif', 'tif'))) {
-			exit(json_encode(array('result' => false, 'error' => 'Invalid file extension.')));
+		if (!in_array(strtolower(pathinfo($rFilename)['extension']), ['log', 'tar.gz', 'gz', 'zip', 'm3u8', 'mp4', 'mkv', 'avi', 'mpg', 'flv', '3gp', 'm4v', 'wmv', 'mov', 'ts', 'srt', 'sub', 'sbv', 'jpg', 'png', 'bmp', 'jpeg', 'gif', 'tif'])) {
+			exit(json_encode(['result' => false, 'error' => 'Invalid file extension.']));
 		}
 
 		if (!file_exists($rFilename) || !is_readable($rFilename)) {
-			exit(json_encode(array('result' => false, 'error' => 'Invalid file extension.')));
+			exit(json_encode(['result' => false, 'error' => 'Invalid file extension.']));
 		}
 
 		header('Content-Type: application/octet-stream');
@@ -514,11 +514,11 @@ class InternalApiController {
 
 	private function probeStream($rRequest) {
 		if (empty($rRequest['url'])) {
-			exit(json_encode(array('result' => false)));
+			exit(json_encode(['result' => false]));
 		}
 
 		$rURL = $rRequest['url'];
-		$rFetchArguments = array();
+		$rFetchArguments = [];
 
 		if (!empty($rRequest['user_agent'])) {
 			$rFetchArguments[] = sprintf("-user_agent '%s'", escapeshellcmd($rRequest['user_agent']));
@@ -536,6 +536,6 @@ class InternalApiController {
 		$rHeaders .= 'X-XC_VM-Prebuffer:1' . "\r\n";
 		$rFetchArguments[] = sprintf('-headers %s', escapeshellarg($rHeaders));
 
-		exit(json_encode(array('result' => true, 'data' => FFprobeRunner::probeStream($rURL, $rFetchArguments, '', false))));
+		exit(json_encode(['result' => true, 'data' => FFprobeRunner::probeStream($rURL, $rFetchArguments, '', false)]));
 	}
 }
diff --git a/src/Public/Controllers/Api/PlayerApiController.php b/src/Public/Controllers/Api/PlayerApiController.php
index b48f9146..2a6b4553 100644
--- a/src/Public/Controllers/Api/PlayerApiController.php
+++ b/src/Public/Controllers/Api/PlayerApiController.php
@@ -24,11 +24,17 @@ use XcVm\Infrastructure\Cache\CacheReader;
 
 class PlayerApiController {
 	private $deny = true;
+
 	private array|false|null $userInfo = null;
+
 	private $domainName;
+
 	private $domain;
+
 	private $panelAPI = false;
+
 	private $offset = 0;
+
 	private $limit = 0;
 
 	/**
@@ -84,7 +90,7 @@ class PlayerApiController {
 		$this->domainName = DomainResolver::resolve(SERVER_ID);
 		$this->domain = parse_url($this->domainName)['host'] ?? '';
 
-		$rValidActions = array('get_epg', 200 => 'get_vod_categories', 201 => 'get_live_categories', 202 => 'get_live_streams', 203 => 'get_vod_streams', 204 => 'get_series_info', 205 => 'get_short_epg', 206 => 'get_series_categories', 207 => 'get_simple_data_table', 208 => 'get_series', 209 => 'get_vod_info');
+		$rValidActions = ['get_epg', 200 => 'get_vod_categories', 201 => 'get_live_categories', 202 => 'get_live_streams', 203 => 'get_vod_streams', 204 => 'get_series_info', 205 => 'get_short_epg', 206 => 'get_series_categories', 207 => 'get_simple_data_table', 208 => 'get_series', 209 => 'get_vod_info'];
 		$rAction = (!empty($rRequest['action']) && (in_array($rRequest['action'], $rValidActions) || array_key_exists($rRequest['action'], $rValidActions)) ? $rRequest['action'] : '');
 
 		if (isset($rValidActions[$rAction])) {
@@ -94,14 +100,14 @@ class PlayerApiController {
 		if ($this->panelAPI && empty($rAction)) {
 			$rGetChannels = true;
 		} else {
-			$rGetChannels = in_array($rAction, array('get_series', 'get_vod_streams', 'get_live_streams'));
+			$rGetChannels = in_array($rAction, ['get_series', 'get_vod_streams', 'get_live_streams']);
 		}
 
 		$rBouquets = $rGetChannels ? CacheReader::get('bouquets') : null;
 
 		$rCategories = null;
 
-		if ($this->panelAPI && empty($rAction) || in_array($rAction, array('get_vod_categories', 'get_series_categories', 'get_live_categories'))) {
+		if ($this->panelAPI && empty($rAction) || in_array($rAction, ['get_vod_categories', 'get_series_categories', 'get_live_categories'])) {
 			$rCategories = CacheReader::get('categories');
 		}
 		$rUserInfo = null;
@@ -255,13 +261,13 @@ class PlayerApiController {
 
 			if (is_numeric($rRequest['stream_id']) && !isset($rRequest['multi'])) {
 				$rMulti = false;
-				$rStreamIDs = array(intval($rRequest['stream_id']));
+				$rStreamIDs = [intval($rRequest['stream_id'])];
 			} else {
 				$rMulti = true;
 				$rStreamIDs = array_map('intval', explode(',', $rRequest['stream_id']));
 			}
 
-			$rEPGs = array();
+			$rEPGs = [];
 
 			if (count($rStreamIDs) > 0) {
 				foreach ($rStreamIDs as $rStreamID) {
@@ -294,7 +300,7 @@ class PlayerApiController {
 			exit();
 		}
 
-		echo json_encode(array());
+		echo json_encode([]);
 		exit();
 	}
 
@@ -302,7 +308,7 @@ class PlayerApiController {
 		global $rSettings, $rCached, $rRequest, $db;
 
 		$rSeriesID = (empty($rRequest['series_id']) ? 0 : intval($rRequest['series_id']));
-		$output = array();
+		$output = [];
 
 		if ($rCached) {
 			$rSeriesInfo = self::readStreamCache(SERIES_TMP_PATH . 'series_' . $rSeriesID);
@@ -321,17 +327,17 @@ class PlayerApiController {
 			return $output;
 		}
 		if (!is_array($rRows)) {
-			$rRows = array();
+			$rRows = [];
 		}
 
 		// Older cache entries / DB rows may lack newer columns; default them so
 		// the info block below does not raise undefined-key warnings. += only
 		// fills absent keys, leaving present values untouched.
-		$rSeriesInfo += array('title' => '', 'year' => '', 'cover' => '', 'plot' => '', 'cast' => '', 'director' => '', 'genre' => '', 'release_date' => '', 'last_modified' => '', 'youtube_trailer' => '', 'episode_run_time' => '', 'rating' => 0, 'seasons' => '', 'backdrop_path' => '', 'category_id' => '[]');
+		$rSeriesInfo += ['title' => '', 'year' => '', 'cover' => '', 'plot' => '', 'cast' => '', 'director' => '', 'genre' => '', 'release_date' => '', 'last_modified' => '', 'youtube_trailer' => '', 'episode_run_time' => '', 'rating' => 0, 'seasons' => '', 'backdrop_path' => '', 'category_id' => '[]'];
 
-		$output['seasons'] = array();
+		$output['seasons'] = [];
 
-		foreach ((!empty($rSeriesInfo['seasons']) ? array_values(json_decode($rSeriesInfo['seasons'], true)) : array()) as $rSeason) {
+		foreach ((!empty($rSeriesInfo['seasons']) ? array_values(json_decode($rSeriesInfo['seasons'], true)) : []) as $rSeason) {
 			$rSeason['cover'] = ImageUtils::validateURL($rSeason['cover']);
 			$rSeason['cover_big'] = ImageUtils::validateURL($rSeason['cover_big']);
 			$output['seasons'][] = $rSeason;
@@ -347,7 +353,7 @@ class PlayerApiController {
 
 		$rating = is_numeric($rSeriesInfo['rating']) ? floatval($rSeriesInfo['rating']) : 0.0;
 
-		$output['info'] = array('name' => StreamSorter::formatTitle($rSeriesInfo['title'], $rSeriesInfo['year']), 'title' => $rSeriesInfo['title'], 'year' => strval($rSeriesInfo['year']), 'cover' => ImageUtils::validateURL($rSeriesInfo['cover']), 'plot' => $rSeriesInfo['plot'], 'cast' => $rSeriesInfo['cast'], 'director' => $rSeriesInfo['director'], 'genre' => $rSeriesInfo['genre'], 'release_date' => $rSeriesInfo['release_date'], 'releaseDate' => $rSeriesInfo['release_date'], 'last_modified' => $rSeriesInfo['last_modified'], 'rating' => number_format($rating, 0), 'rating_5based' => number_format($rating * 0.5, 1) + 0, 'backdrop_path' => $rBackdrops, 'youtube_trailer' => $rSeriesInfo['youtube_trailer'], 'episode_run_time' => strval($rSeriesInfo['episode_run_time']), 'category_id' => strval(json_decode($rSeriesInfo['category_id'], true)[0] ?? ''), 'category_ids' => json_decode($rSeriesInfo['category_id'], true));
+		$output['info'] = ['name' => StreamSorter::formatTitle($rSeriesInfo['title'], $rSeriesInfo['year']), 'title' => $rSeriesInfo['title'], 'year' => strval($rSeriesInfo['year']), 'cover' => ImageUtils::validateURL($rSeriesInfo['cover']), 'plot' => $rSeriesInfo['plot'], 'cast' => $rSeriesInfo['cast'], 'director' => $rSeriesInfo['director'], 'genre' => $rSeriesInfo['genre'], 'release_date' => $rSeriesInfo['release_date'], 'releaseDate' => $rSeriesInfo['release_date'], 'last_modified' => $rSeriesInfo['last_modified'], 'rating' => number_format($rating, 0), 'rating_5based' => number_format($rating * 0.5, 1) + 0, 'backdrop_path' => $rBackdrops, 'youtube_trailer' => $rSeriesInfo['youtube_trailer'], 'episode_run_time' => strval($rSeriesInfo['episode_run_time']), 'category_id' => strval(json_decode($rSeriesInfo['category_id'], true)[0] ?? ''), 'category_ids' => json_decode($rSeriesInfo['category_id'], true)];
 
 		foreach ($rRows as $rSeason => $rEpisodes) {
 			foreach ($rEpisodes as $rEpisode) {
@@ -375,9 +381,9 @@ class PlayerApiController {
 					$rURL = '';
 				}
 
-				$rProperties = (!empty($rEpisodeData['movie_properties']) ? json_decode($rEpisodeData['movie_properties'], true) : array());
+				$rProperties = (!empty($rEpisodeData['movie_properties']) ? json_decode($rEpisodeData['movie_properties'], true) : []);
 				if (!is_array($rProperties)) {
-					$rProperties = array();
+					$rProperties = [];
 				}
 				$rProperties['cover_big'] = ImageUtils::validateURL($rProperties['cover_big'] ?? '');
 				$rProperties['movie_image'] = ImageUtils::validateURL($rProperties['movie_image'] ?? '');
@@ -394,24 +400,24 @@ class PlayerApiController {
 					}
 				}
 
-				$rSubtitles = array();
+				$rSubtitles = [];
 
 				if (is_array($rProperties['subtitle'] ?? null)) {
 					$i = 0;
 
 					foreach ($rProperties['subtitle'] as $rSubtitle) {
-						$rSubtitles[] = array('index' => $i, 'language' => ($rSubtitle['tags']['language'] ?: null), 'title' => ($rSubtitle['tags']['title'] ?: null));
+						$rSubtitles[] = ['index' => $i, 'language' => ($rSubtitle['tags']['language'] ?: null), 'title' => ($rSubtitle['tags']['title'] ?: null)];
 						$i++;
 					}
 				}
 
-				foreach (array('audio', 'video', 'subtitle') as $rKey) {
+				foreach (['audio', 'video', 'subtitle'] as $rKey) {
 					if (isset($rProperties[$rKey])) {
 						unset($rProperties[$rKey]);
 					}
 				}
 
-				$output['episodes'][$rSeason][] = array('id' => $rEpisode['stream_id'], 'episode_num' => $rEpisode['episode_num'], 'title' => $rEpisodeData['stream_display_name'], 'container_extension' => $rEpisodeData['target_container'], 'info' => $rProperties, 'subtitles' => $rSubtitles, 'custom_sid' => strval($rEpisodeData['custom_sid']), 'added' => ($rEpisodeData['added'] ?: ''), 'season' => $rSeason, 'direct_source' => $rURL);
+				$output['episodes'][$rSeason][] = ['id' => $rEpisode['stream_id'], 'episode_num' => $rEpisode['episode_num'], 'title' => $rEpisodeData['stream_display_name'], 'container_extension' => $rEpisodeData['target_container'], 'info' => $rProperties, 'subtitles' => $rSubtitles, 'custom_sid' => strval($rEpisodeData['custom_sid']), 'added' => ($rEpisodeData['added'] ?: ''), 'season' => $rSeason, 'direct_source' => $rURL];
 			}
 		}
 
@@ -423,7 +429,7 @@ class PlayerApiController {
 
 		$rCategoryIDSearch = (empty($rRequest['category_id']) ? null : intval($rRequest['category_id']));
 		$rMovieNum = 0;
-		$output = array();
+		$output = [];
 
 		if (count($this->userInfo['series_ids']) > 0) {
 			if ($rCached) {
@@ -451,7 +457,7 @@ class PlayerApiController {
 					foreach ($rCategoryIDs as $rCategoryID) {
 						if (!$rCategoryIDSearch || $rCategoryIDSearch == $rCategoryID) {
 							$rating = is_numeric($rSeriesItem['rating']) ? floatval($rSeriesItem['rating']) : 0.0;
-							$output[] = array('num' => ++$rMovieNum, 'name' => StreamSorter::formatTitle($rSeriesItem['title'], $rSeriesItem['year']), 'title' => $rSeriesItem['title'], 'year' => strval($rSeriesItem['year']), 'stream_type' => 'series', 'series_id' => (int) $rSeriesItem['id'], 'cover' => ImageUtils::validateURL($rSeriesItem['cover']), 'plot' => $rSeriesItem['plot'], 'cast' => $rSeriesItem['cast'], 'director' => $rSeriesItem['director'], 'genre' => $rSeriesItem['genre'], 'release_date' => $rSeriesItem['release_date'], 'releaseDate' => $rSeriesItem['release_date'], 'last_modified' => $rSeriesItem['last_modified'], 'rating' => number_format($rating, 0), 'rating_5based' => number_format($rating * 0.5, 1) + 0, 'backdrop_path' => $rBackdrops, 'youtube_trailer' => $rSeriesItem['youtube_trailer'], 'episode_run_time' => strval($rSeriesItem['episode_run_time']), 'category_id' => strval($rCategoryID), 'category_ids' => $rCategoryIDs);
+							$output[] = ['num' => ++$rMovieNum, 'name' => StreamSorter::formatTitle($rSeriesItem['title'], $rSeriesItem['year']), 'title' => $rSeriesItem['title'], 'year' => strval($rSeriesItem['year']), 'stream_type' => 'series', 'series_id' => (int) $rSeriesItem['id'], 'cover' => ImageUtils::validateURL($rSeriesItem['cover']), 'plot' => $rSeriesItem['plot'], 'cast' => $rSeriesItem['cast'], 'director' => $rSeriesItem['director'], 'genre' => $rSeriesItem['genre'], 'release_date' => $rSeriesItem['release_date'], 'releaseDate' => $rSeriesItem['release_date'], 'last_modified' => $rSeriesItem['last_modified'], 'rating' => number_format($rating, 0), 'rating_5based' => number_format($rating * 0.5, 1) + 0, 'backdrop_path' => $rBackdrops, 'youtube_trailer' => $rSeriesItem['youtube_trailer'], 'episode_run_time' => strval($rSeriesItem['episode_run_time']), 'category_id' => strval($rCategoryID), 'category_ids' => $rCategoryIDs];
 						}
 
 						if (!($rCategoryIDSearch || $rSettings['show_category_duplicates'])) {
@@ -487,7 +493,7 @@ class PlayerApiController {
 						foreach ($rCategoryIDs as $rCategoryID) {
 							if (!$rCategoryIDSearch || $rCategoryIDSearch == $rCategoryID) {
 								$rating = is_numeric($rSeriesItem['rating']) ? floatval($rSeriesItem['rating']) : 0.0;
-								$output[] = array('num' => ++$rMovieNum, 'name' => StreamSorter::formatTitle($rSeriesItem['title'], $rSeriesItem['year']), 'title' => $rSeriesItem['title'], 'year' => $rSeriesItem['year'], 'stream_type' => 'series', 'series_id' => (int) $rSeriesItem['id'], 'cover' => ImageUtils::validateURL($rSeriesItem['cover']), 'plot' => $rSeriesItem['plot'], 'cast' => $rSeriesItem['cast'], 'director' => $rSeriesItem['director'], 'genre' => $rSeriesItem['genre'], 'release_date' => $rSeriesItem['release_date'], 'releaseDate' => $rSeriesItem['release_date'], 'last_modified' => $rSeriesItem['last_modified'], 'rating' => number_format($rating, 0), 'rating_5based' => number_format($rating * 0.5, 1) + 0, 'backdrop_path' => $rBackdrops, 'youtube_trailer' => $rSeriesItem['youtube_trailer'], 'episode_run_time' => $rSeriesItem['episode_run_time'], 'category_id' => strval($rCategoryID), 'category_ids' => $rCategoryIDs);
+								$output[] = ['num' => ++$rMovieNum, 'name' => StreamSorter::formatTitle($rSeriesItem['title'], $rSeriesItem['year']), 'title' => $rSeriesItem['title'], 'year' => $rSeriesItem['year'], 'stream_type' => 'series', 'series_id' => (int) $rSeriesItem['id'], 'cover' => ImageUtils::validateURL($rSeriesItem['cover']), 'plot' => $rSeriesItem['plot'], 'cast' => $rSeriesItem['cast'], 'director' => $rSeriesItem['director'], 'genre' => $rSeriesItem['genre'], 'release_date' => $rSeriesItem['release_date'], 'releaseDate' => $rSeriesItem['release_date'], 'last_modified' => $rSeriesItem['last_modified'], 'rating' => number_format($rating, 0), 'rating_5based' => number_format($rating * 0.5, 1) + 0, 'backdrop_path' => $rBackdrops, 'youtube_trailer' => $rSeriesItem['youtube_trailer'], 'episode_run_time' => $rSeriesItem['episode_run_time'], 'category_id' => strval($rCategoryID), 'category_ids' => $rCategoryIDs];
 							}
 
 							if (!$rCategoryIDSearch && !$rSettings['show_category_duplicates']) {
@@ -504,11 +510,11 @@ class PlayerApiController {
 
 	private function getVodCategories($rCategories) {
 		$rCategories = CategoryService::filterLoaded($rCategories, 'movie');
-		$output = array();
+		$output = [];
 
 		foreach ($rCategories as $rCategory) {
 			if (in_array($rCategory['id'], $this->userInfo['category_ids'])) {
-				$output[] = array('category_id' => strval($rCategory['id']), 'category_name' => $rCategory['category_name'], 'parent_id' => 0);
+				$output[] = ['category_id' => strval($rCategory['id']), 'category_name' => $rCategory['category_name'], 'parent_id' => 0];
 			}
 		}
 
@@ -517,11 +523,11 @@ class PlayerApiController {
 
 	private function getSeriesCategories($rCategories) {
 		$rCategories = CategoryService::filterLoaded($rCategories, 'series');
-		$output = array();
+		$output = [];
 
 		foreach ($rCategories as $rCategory) {
 			if (in_array($rCategory['id'], $this->userInfo['category_ids'])) {
-				$output[] = array('category_id' => strval($rCategory['id']), 'category_name' => $rCategory['category_name'], 'parent_id' => 0);
+				$output[] = ['category_id' => strval($rCategory['id']), 'category_name' => $rCategory['category_name'], 'parent_id' => 0];
 			}
 		}
 
@@ -530,11 +536,11 @@ class PlayerApiController {
 
 	private function getLiveCategories($rCategories) {
 		$rCategories = array_merge(CategoryService::filterLoaded($rCategories, 'live'), CategoryService::filterLoaded($rCategories, 'radio'));
-		$output = array();
+		$output = [];
 
 		foreach ($rCategories as $rCategory) {
 			if (in_array($rCategory['id'], $this->userInfo['category_ids'])) {
-				$output[] = array('category_id' => strval($rCategory['id']), 'category_name' => $rCategory['category_name'], 'parent_id' => 0);
+				$output[] = ['category_id' => strval($rCategory['id']), 'category_name' => $rCategory['category_name'], 'parent_id' => 0];
 			}
 		}
 
@@ -544,7 +550,7 @@ class PlayerApiController {
 	private function getSimpleDataTable() {
 		global $rSettings, $rCached, $rRequest, $db;
 
-		$output = array('epg_listings' => array());
+		$output = ['epg_listings' => []];
 
 		if (empty($rRequest['stream_id'])) {
 			return $output;
@@ -552,7 +558,7 @@ class PlayerApiController {
 
 		if (is_numeric($rRequest['stream_id']) && !isset($rRequest['multi'])) {
 			$rMulti = false;
-			$rStreamIDs = array(intval($rRequest['stream_id']));
+			$rStreamIDs = [intval($rRequest['stream_id'])];
 		} else {
 			$rMulti = true;
 			$rStreamIDs = array_map('intval', explode(',', $rRequest['stream_id']));
@@ -562,7 +568,7 @@ class PlayerApiController {
 			return $output;
 		}
 
-		$rArchiveInfo = array();
+		$rArchiveInfo = [];
 
 		if ($rCached) {
 			foreach ($rStreamIDs as $rStreamID) {
@@ -624,7 +630,7 @@ class PlayerApiController {
 	private function getShortEpg() {
 		global $rRequest;
 
-		$output = array('epg_listings' => array());
+		$output = ['epg_listings' => []];
 
 		if (empty($rRequest['stream_id'])) {
 			return $output;
@@ -634,7 +640,7 @@ class PlayerApiController {
 
 		if (is_numeric($rRequest['stream_id']) && !isset($rRequest['multi'])) {
 			$rMulti = false;
-			$rStreamIDs = array(intval($rRequest['stream_id']));
+			$rStreamIDs = [intval($rRequest['stream_id'])];
 		} else {
 			$rMulti = true;
 			$rStreamIDs = array_map('intval', explode(',', $rRequest['stream_id']));
@@ -687,7 +693,7 @@ class PlayerApiController {
 
 		$rCategoryIDSearch = (empty($rRequest['category_id']) ? null : intval($rRequest['category_id']));
 		$rLiveNum = 0;
-		$output = array();
+		$output = [];
 		$this->userInfo['live_ids'] = array_merge($this->userInfo['live_ids'], $this->userInfo['radio_ids']);
 
 		if (!empty($this->limit)) {
@@ -697,10 +703,10 @@ class PlayerApiController {
 		$this->userInfo['live_ids'] = StreamSorter::sortChannels($this->userInfo['live_ids']);
 
 		if (!$rCached) {
-			$rChannels = array();
+			$rChannels = [];
 
 			if (count($this->userInfo['live_ids']) > 0) {
-				$rWhereV = $rWhere = array();
+				$rWhereV = $rWhere = [];
 
 				if (!empty($rCategoryIDSearch)) {
 					$rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
@@ -735,7 +741,7 @@ class PlayerApiController {
 				}
 			}
 
-			if (in_array($rChannel['type_key'], array('live', 'created_live', 'radio_streams'))) {
+			if (in_array($rChannel['type_key'], ['live', 'created_live', 'radio_streams'])) {
 				$rCategoryIDs = json_decode($rChannel['category_id'], true);
 
 				if (empty($rCategoryIDs)) {
@@ -768,7 +774,7 @@ class PlayerApiController {
 							$rThumbURL = '';
 						}
 
-						$output[] = array('num' => ++$rLiveNum, 'name' => $rChannel['stream_display_name'], 'stream_type' => $rChannel['type_key'], 'stream_id' => (int) $rChannel['id'], 'stream_icon' => $rStreamIcon, 'epg_channel_id' => $rChannel['channel_id'], 'added' => ($rChannel['added'] ?: ''), 'custom_sid' => strval($rChannel['custom_sid']), 'tv_archive' => $rTVArchive, 'direct_source' => $rURL, 'tv_archive_duration' => ($rTVArchive ? intval($rChannel['tv_archive_duration']) : 0), 'category_id' => strval($rCategoryID), 'category_ids' => $rCategoryIDs, 'thumbnail' => $rThumbURL);
+						$output[] = ['num' => ++$rLiveNum, 'name' => $rChannel['stream_display_name'], 'stream_type' => $rChannel['type_key'], 'stream_id' => (int) $rChannel['id'], 'stream_icon' => $rStreamIcon, 'epg_channel_id' => $rChannel['channel_id'], 'added' => ($rChannel['added'] ?: ''), 'custom_sid' => strval($rChannel['custom_sid']), 'tv_archive' => $rTVArchive, 'direct_source' => $rURL, 'tv_archive_duration' => ($rTVArchive ? intval($rChannel['tv_archive_duration']) : 0), 'category_id' => strval($rCategoryID), 'category_ids' => $rCategoryIDs, 'thumbnail' => $rThumbURL];
 					}
 
 					if (!($rCategoryIDSearch || $rSettings['show_category_duplicates'])) {
@@ -784,7 +790,7 @@ class PlayerApiController {
 	private function getVodInfo() {
 		global $rSettings, $rCached, $rRequest, $db;
 
-		$output = array('info' => array());
+		$output = ['info' => []];
 
 		if (!empty($rRequest['vod_id'])) {
 			$rVODID = intval($rRequest['vod_id']);
@@ -808,7 +814,7 @@ class PlayerApiController {
 
 				$rating = isset($output['info']['rating']) && is_numeric($output['info']['rating']) ? floatval($output['info']['rating']) : 0.0;
 
-				$output['info'] = json_decode($rRow['movie_properties'] ?? '', true) ?: array();
+				$output['info'] = json_decode($rRow['movie_properties'] ?? '', true) ?: [];
 				$output['info']['tmdb_id'] = intval($output['info']['tmdb_id'] ?? 0);
 				$output['info']['episode_run_time'] = intval($output['info']['episode_run_time'] ?? 0);
 				$output['info']['releasedate'] = $output['info']['release_date'] ?? '';
@@ -822,24 +828,24 @@ class PlayerApiController {
 					}
 				}
 
-				$output['info']['subtitles'] = array();
+				$output['info']['subtitles'] = [];
 
 				if (isset($output['info']['subtitle']) && is_array($output['info']['subtitle'])) {
 					$i = 0;
 
 					foreach ($output['info']['subtitle'] as $rSubtitle) {
-						$output['info']['subtitles'][] = array('index' => $i, 'language' => ($rSubtitle['tags']['language'] ?: null), 'title' => ($rSubtitle['tags']['title'] ?: null));
+						$output['info']['subtitles'][] = ['index' => $i, 'language' => ($rSubtitle['tags']['language'] ?: null), 'title' => ($rSubtitle['tags']['title'] ?: null)];
 						$i++;
 					}
 				}
 
-				foreach (array('audio', 'video', 'subtitle') as $rKey) {
+				foreach (['audio', 'video', 'subtitle'] as $rKey) {
 					if (isset($output['info'][$rKey])) {
 						unset($output['info'][$rKey]);
 					}
 				}
 
-				$output['movie_data'] = array('stream_id' => (int) $rRow['id'], 'name' => StreamSorter::formatTitle($rRow['stream_display_name'], $rRow['year']), 'title' => $rRow['stream_display_name'], 'year' => $rRow['year'], 'added' => ($rRow['added'] ?: ''), 'category_id' => strval(json_decode($rRow['category_id'], true)[0]), 'category_ids' => json_decode($rRow['category_id'], true), 'container_extension' => $rRow['target_container'], 'custom_sid' => strval($rRow['custom_sid']), 'direct_source' => $rURL);
+				$output['movie_data'] = ['stream_id' => (int) $rRow['id'], 'name' => StreamSorter::formatTitle($rRow['stream_display_name'], $rRow['year']), 'title' => $rRow['stream_display_name'], 'year' => $rRow['year'], 'added' => ($rRow['added'] ?: ''), 'category_id' => strval(json_decode($rRow['category_id'], true)[0]), 'category_ids' => json_decode($rRow['category_id'], true), 'container_extension' => $rRow['target_container'], 'custom_sid' => strval($rRow['custom_sid']), 'direct_source' => $rURL];
 			}
 		}
 
@@ -851,7 +857,7 @@ class PlayerApiController {
 
 		$rCategoryIDSearch = (empty($rRequest['category_id']) ? null : intval($rRequest['category_id']));
 		$rMovieNum = 0;
-		$output = array();
+		$output = [];
 
 		if (!empty($this->limit)) {
 			$this->userInfo['vod_ids'] = array_slice($this->userInfo['vod_ids'], $this->offset, $this->limit);
@@ -860,10 +866,10 @@ class PlayerApiController {
 		$this->userInfo['vod_ids'] = StreamSorter::sortChannels($this->userInfo['vod_ids']);
 
 		if (!$rCached) {
-			$rChannels = array();
+			$rChannels = [];
 
 			if (count($this->userInfo['vod_ids']) > 0) {
-				$rWhereV = $rWhere = array();
+				$rWhereV = $rWhere = [];
 
 				if (!empty($rCategoryIDSearch)) {
 					$rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
@@ -901,11 +907,11 @@ class PlayerApiController {
 				}
 			}
 
-			if (in_array($rChannel['type_key'], array('movie'))) {
+			if (in_array($rChannel['type_key'], ['movie'])) {
 				$rProperties = json_decode((string) $rChannel['movie_properties'], true);
 
 				if (!is_array($rProperties)) {
-					$rProperties = array();
+					$rProperties = [];
 				}
 
 				$rCategoryIDs = json_decode($rChannel['category_id'], true);
@@ -921,7 +927,7 @@ class PlayerApiController {
 						}
 
 						$rating = is_numeric($rProperties['rating'] ?? null) ? floatval($rProperties['rating']) : 0.0;
-						$output[] = array('num' => ++$rMovieNum, 'name' => StreamSorter::formatTitle($rChannel['stream_display_name'], $rChannel['year']), 'title' => $rChannel['stream_display_name'], 'year' => strval($rChannel['year']), 'stream_type' => $rChannel['type_key'], 'stream_id' => (int) $rChannel['id'], 'stream_icon' => (ImageUtils::validateURL($rProperties['movie_image'] ?? '') ?: ''), 'rating' => number_format($rating, 1) + 0, 'rating_5based' => number_format($rating * 0.5, 1) + 0, 'added' => strval(($rChannel['added'] ?: '')), 'plot' => $rProperties['plot'] ?? null, 'cast' => $rProperties['cast'] ?? null, 'director' => $rProperties['director'] ?? null, 'genre' => $rProperties['genre'] ?? null, 'release_date' => $rProperties['release_date'] ?? null, 'youtube_trailer' => $rProperties['youtube_trailer'] ?? null, 'episode_run_time' => $rProperties['episode_run_time'] ?? null, 'category_id' => strval($rCategoryID), 'category_ids' => $rCategoryIDs, 'container_extension' => $rChannel['target_container'], 'custom_sid' => strval($rChannel['custom_sid']), 'direct_source' => $rURL);
+						$output[] = ['num' => ++$rMovieNum, 'name' => StreamSorter::formatTitle($rChannel['stream_display_name'], $rChannel['year']), 'title' => $rChannel['stream_display_name'], 'year' => strval($rChannel['year']), 'stream_type' => $rChannel['type_key'], 'stream_id' => (int) $rChannel['id'], 'stream_icon' => (ImageUtils::validateURL($rProperties['movie_image'] ?? '') ?: ''), 'rating' => number_format($rating, 1) + 0, 'rating_5based' => number_format($rating * 0.5, 1) + 0, 'added' => strval(($rChannel['added'] ?: '')), 'plot' => $rProperties['plot'] ?? null, 'cast' => $rProperties['cast'] ?? null, 'director' => $rProperties['director'] ?? null, 'genre' => $rProperties['genre'] ?? null, 'release_date' => $rProperties['release_date'] ?? null, 'youtube_trailer' => $rProperties['youtube_trailer'] ?? null, 'episode_run_time' => $rProperties['episode_run_time'] ?? null, 'category_id' => strval($rCategoryID), 'category_ids' => $rCategoryIDs, 'container_extension' => $rChannel['target_container'], 'custom_sid' => strval($rChannel['custom_sid']), 'direct_source' => $rURL];
 					}
 
 					if (!($rCategoryIDSearch || $rSettings['show_category_duplicates'])) {
@@ -937,7 +943,7 @@ class PlayerApiController {
 	private function getDefaultInfo() {
 		global $rSettings, $rServers;
 
-		$output = array();
+		$output = [];
 
 		$output['user_info'] = [
 			'username' => $this->userInfo['username'],
@@ -974,8 +980,8 @@ class PlayerApiController {
 	}
 
 	private static function getOutputFormats($rFormats) {
-		$rFormatArray = array(1 => 'm3u8', 2 => 'ts', 3 => 'rtmp');
-		$rReturn = array();
+		$rFormatArray = [1 => 'm3u8', 2 => 'ts', 3 => 'rtmp'];
+		$rReturn = [];
 
 		foreach ($rFormats as $rFormat) {
 			$rReturn[] = $rFormatArray[$rFormat];
diff --git a/src/Public/Controllers/Api/ResellerAPIWrapper.php b/src/Public/Controllers/Api/ResellerAPIWrapper.php
index 47f302f1..35f5f226 100644
--- a/src/Public/Controllers/Api/ResellerAPIWrapper.php
+++ b/src/Public/Controllers/Api/ResellerAPIWrapper.php
@@ -13,386 +13,420 @@ use XcVm\Domain\User\UserRepository;
 use XcVm\Domain\User\UserService;
 
 class ResellerAPIWrapper {
-    public static $db = null;
-    public static $rKey = null;
-    public static function filterRow($rData, $rShow, $rHide, $rSkipResult = false) {
-        if ($rShow || $rHide) {
-            if ($rSkipResult) {
-                $rRow = $rData;
-            } else {
-                $rRow = $rData['data'];
-            }
-            $rReturn = array();
-            if (!$rRow) {
-            } else {
-                foreach (array_keys($rRow) as $rKey) {
-                    if ($rShow) {
-                        if (!in_array($rKey, $rShow)) {
-                        } else {
-                            $rReturn[$rKey] = $rRow[$rKey];
-                        }
-                    } else {
-                        if (!$rHide) {
-                        } else {
-                            if (in_array($rKey, $rHide)) {
-                            } else {
-                                $rReturn[$rKey] = $rRow[$rKey];
-                            }
-                        }
-                    }
-                }
-            }
-            if ($rSkipResult) {
-                return $rReturn;
-            }
-            $rData['data'] = $rReturn;
-            return $rData;
-        }
-        return $rData;
-    }
-    public static function filterRows($rRows, $rShow, $rHide) {
-        $rReturn = array();
-        if (!$rRows['data']) {
-        } else {
-            foreach ($rRows['data'] as $rRow) {
-                $rReturn[] = self::filterRow($rRow, $rShow, $rHide, true);
-            }
-        }
-        return $rReturn;
-    }
-    public static function TableAPI($rID, $rStart = 0, $rLimit = 10, $rData = array(), $rShowColumns = array(), $rHideColumns = array()) {
-        $rTableAPI = 'http://127.0.0.1:' . ServerRepository::getAll()[SERVER_ID]['http_broadcast_port'] . '/' . trim(dirname($_SERVER['PHP_SELF']), '/') . '/table.php';
-        $rData['api_key'] = self::$rKey;
-        $rData['id'] = $rID;
-        $rData['start'] = $rStart;
-        $rData['length'] = $rLimit;
-        $rData['show_columns'] = $rShowColumns;
-        $rData['hide_columns'] = $rHideColumns;
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $rTableAPI);
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($rData));
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('X-Requested-With: xmlhttprequest'));
-        $rReturn = json_decode(curl_exec($ch), true);
-        curl_close($ch);
-        return $rReturn;
-    }
-    public static function createSession() {
-        global $rUserInfo;
-        global $rPermissions;
-        self::$db->query('SELECT * FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `api_key` = ? AND LENGTH(`api_key`) > 0 AND `is_reseller` = 1 AND `status` = 1;', self::$rKey);
-        if (0 >= self::$db->num_rows()) {
-            return false;
-        }
-        ResellerAPI::init(self::$db->get_row()['id']);
-        unset(ResellerAPI::$rUserInfo['password']);
-        $rUserInfo = ResellerAPI::$rUserInfo;
-        $rPermissions = ResellerAPI::$rPermissions;
-        if (0 >= strlen($rUserInfo['timezone'])) {
-        } else {
-            date_default_timezone_set($rUserInfo['timezone']);
-        }
-        return true;
-    }
-    public static function getUserInfo() {
-        global $rUserInfo;
-        global $rPermissions;
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rUserInfo, 'permissions' => $rPermissions);
-    }
-    public static function getPackages() {
-        global $rUserInfo;
-        if (!$rUserInfo) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rPackages = array();
-        $rOverride = json_decode($rUserInfo['override_packages'], true);
-        foreach (PackageService::getAll($rUserInfo['member_group_id']) as $rPackage) {
-            if (isset($rOverride[$rPackage['id']]['official_credits']) && 0 < strlen($rOverride[$rPackage['id']]['official_credits'])) {
-                $rPackage['official_credits'] = intval($rOverride[$rPackage['id']]['official_credits']);
-            } else {
-                $rPackage['official_credits'] = intval($rPackage['official_credits']);
-            }
-            $rPackages[] = $rPackage;
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rPackages);
-    }
-    public static function getLine($rID) {
-        if (!(($rLine = UserRepository::getLineById($rID)) && Authorization::check('line', $rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rLine);
-    }
-    public static function createLine($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(ResellerAPI::processLine($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getLine($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editLine($rID, $rData) {
-        if (!UserRepository::getLineById($rID)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        if (!isset($rData['isp_clear'])) {
-        } else {
-            $rData['isp_clear'] = '';
-        }
-        $rReturn = parseerror(ResellerAPI::processLine($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getLine($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteLine($rID) {
-        if (!UserRepository::getLineById($rID)) {
-        } else {
-            if (!LineService::deleteLineById($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function disableLine($rID) {
-        if (!UserRepository::getLineById($rID)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function enableLine($rID) {
-        if (!UserRepository::getLineById($rID)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function getMAG($rID) {
-        if (!($rDevice = MagService::getById($rID))) {
-        } else {
-            if (!Authorization::check('line', $rDevice['user_id'])) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS', 'data' => $rDevice);
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function createMAG($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(ResellerAPI::processMAG($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editMAG($rID, $rData) {
-        if (!MagService::getById($rID)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        if (!isset($rData['isp_clear'])) {
-        } else {
-            $rData['isp_clear'] = '';
-        }
-        $rReturn = parseerror(ResellerAPI::processMAG($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteMAG($rID) {
-        if (!MagService::getById($rID)) {
-        } else {
-            if (!MagService::deleteDevice($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function disableMAG($rID) {
-        if (!($rDevice = MagService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function enableMAG($rID) {
-        if (!($rDevice = MagService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function convertMAG($rID) {
-        global $db;
-        if (!($rDevice = MagService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        MagService::deleteDevice($rID, false, false, true);
-        return array('status' => 'STATUS_SUCCESS', 'data' => UserRepository::getLineById($rDevice['user_id']));
-    }
-    public static function getEnigma($rID) {
-        if (!($rDevice = EnigmaService::getById($rID))) {
-        } else {
-            if (!Authorization::check('line', $rDevice['user_id'])) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS', 'data' => $rDevice);
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function createEnigma($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(ResellerAPI::processEnigma($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getEnigma($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editEnigma($rID, $rData) {
-        if (!EnigmaService::getById($rID)) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        if (!isset($rData['isp_clear'])) {
-        } else {
-            $rData['isp_clear'] = '';
-        }
-        $rReturn = parseerror(ResellerAPI::processEnigma($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getEnigma($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteEnigma($rID) {
-        if (!EnigmaService::getById($rID)) {
-        } else {
-            if (!EnigmaService::deleteDevice($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function disableEnigma($rID) {
-        if (!($rDevice = EnigmaService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function enableEnigma($rID) {
-        if (!($rDevice = EnigmaService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function convertEnigma($rID) {
-        global $db;
-        if (!($rDevice = EnigmaService::getById($rID))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        EnigmaService::deleteDevice($rID, false, false, true);
-        return array('status' => 'STATUS_SUCCESS', 'data' => UserRepository::getLineById($rDevice['user_id']));
-    }
-    public static function getUser($rID) {
-        if (!(($rUser = UserRepository::getRegisteredUserById($rID)) && Authorization::check('user', $rUser['id']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        return array('status' => 'STATUS_SUCCESS', 'data' => $rUser);
-    }
-    public static function createUser($rData) {
-        if (!isset($rData['edit'])) {
-        } else {
-            unset($rData['edit']);
-        }
-        $rReturn = parseerror(ResellerAPI::processUser($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getUser($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function editUser($rID, $rData) {
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        $rData['edit'] = $rID;
-        $rReturn = parseerror(ResellerAPI::processUser($rData));
-        if (!isset($rReturn['data']['insert_id'])) {
-        } else {
-            $rReturn['data'] = self::getUser($rReturn['data']['insert_id'])['data'];
-        }
-        return $rReturn;
-    }
-    public static function deleteUser($rID) {
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-        } else {
-            if (!UserService::deleteRegisteredUser($rID)) {
-            } else {
-                return array('status' => 'STATUS_SUCCESS');
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
-    public static function disableUser($rID) {
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `users` SET `status` = 0 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function enableUser($rID) {
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-            return array('status' => 'STATUS_FAILURE');
-        }
-        self::$db->query('UPDATE `users` SET `status` = 1 WHERE `id` = ?;', $rID);
-        return array('status' => 'STATUS_SUCCESS');
-    }
-    public static function adjustCredits($rID, $rCredits, $rNote) {
-        global $rUserInfo;
-        if (strlen($rNote) != 0) {
-        } else {
-            $rNote = 'Reseller API Adjustment';
-        }
-        if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
-        } else {
-            if (!is_numeric($rCredits)) {
-            } else {
-                $rOwnerCredits = intval($rUserInfo['credits']) - intval($rCredits);
-                $rNewCredits = intval($rUser['data']['credits']) + intval($rCredits);
-                if (!(0 <= $rNewCredits && 0 <= $rOwnerCredits)) {
-                } else {
-                    self::$db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rOwnerCredits, $rUserInfo['id']);
-                    self::$db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rNewCredits, $rUser['data']['id']);
-                    self::$db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rUser['data']['id'], $rUserInfo['id'], $rCredits, time(), $rNote);
-                    self::$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'user', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'adjust_credits', $rID, intval($rCredits), $rOwnerCredits, time(), json_encode($rUser['data']));
-                    return array('status' => 'STATUS_SUCCESS');
-                }
-            }
-        }
-        return array('status' => 'STATUS_FAILURE');
-    }
+	public static $db = null;
+
+	public static $rKey = null;
+
+	public static function filterRow($rData, $rShow, $rHide, $rSkipResult = false) {
+		if ($rShow || $rHide) {
+			if ($rSkipResult) {
+				$rRow = $rData;
+			} else {
+				$rRow = $rData['data'];
+			}
+			$rReturn = [];
+			if (!$rRow) {
+			} else {
+				foreach (array_keys($rRow) as $rKey) {
+					if ($rShow) {
+						if (!in_array($rKey, $rShow)) {
+						} else {
+							$rReturn[$rKey] = $rRow[$rKey];
+						}
+					} else {
+						if (!$rHide) {
+						} else {
+							if (in_array($rKey, $rHide)) {
+							} else {
+								$rReturn[$rKey] = $rRow[$rKey];
+							}
+						}
+					}
+				}
+			}
+			if ($rSkipResult) {
+				return $rReturn;
+			}
+			$rData['data'] = $rReturn;
+			return $rData;
+		}
+		return $rData;
+	}
+
+	public static function filterRows($rRows, $rShow, $rHide) {
+		$rReturn = [];
+		if (!$rRows['data']) {
+		} else {
+			foreach ($rRows['data'] as $rRow) {
+				$rReturn[] = self::filterRow($rRow, $rShow, $rHide, true);
+			}
+		}
+		return $rReturn;
+	}
+
+	public static function TableAPI($rID, $rStart = 0, $rLimit = 10, $rData = [], $rShowColumns = [], $rHideColumns = []) {
+		$rTableAPI = 'http://127.0.0.1:' . ServerRepository::getAll()[SERVER_ID]['http_broadcast_port'] . '/' . trim(dirname($_SERVER['PHP_SELF']), '/') . '/table.php';
+		$rData['api_key'] = self::$rKey;
+		$rData['id'] = $rID;
+		$rData['start'] = $rStart;
+		$rData['length'] = $rLimit;
+		$rData['show_columns'] = $rShowColumns;
+		$rData['hide_columns'] = $rHideColumns;
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $rTableAPI);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($rData));
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, ['X-Requested-With: xmlhttprequest']);
+		$rReturn = json_decode(curl_exec($ch), true);
+		curl_close($ch);
+		return $rReturn;
+	}
+
+	public static function createSession() {
+		global $rUserInfo;
+		global $rPermissions;
+		self::$db->query('SELECT * FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `api_key` = ? AND LENGTH(`api_key`) > 0 AND `is_reseller` = 1 AND `status` = 1;', self::$rKey);
+		if (0 >= self::$db->num_rows()) {
+			return false;
+		}
+		ResellerAPI::init(self::$db->get_row()['id']);
+		unset(ResellerAPI::$rUserInfo['password']);
+		$rUserInfo = ResellerAPI::$rUserInfo;
+		$rPermissions = ResellerAPI::$rPermissions;
+		if (0 >= strlen($rUserInfo['timezone'])) {
+		} else {
+			date_default_timezone_set($rUserInfo['timezone']);
+		}
+		return true;
+	}
+
+	public static function getUserInfo() {
+		global $rUserInfo;
+		global $rPermissions;
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rUserInfo, 'permissions' => $rPermissions];
+	}
+
+	public static function getPackages() {
+		global $rUserInfo;
+		if (!$rUserInfo) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rPackages = [];
+		$rOverride = json_decode($rUserInfo['override_packages'], true);
+		foreach (PackageService::getAll($rUserInfo['member_group_id']) as $rPackage) {
+			if (isset($rOverride[$rPackage['id']]['official_credits']) && 0 < strlen($rOverride[$rPackage['id']]['official_credits'])) {
+				$rPackage['official_credits'] = intval($rOverride[$rPackage['id']]['official_credits']);
+			} else {
+				$rPackage['official_credits'] = intval($rPackage['official_credits']);
+			}
+			$rPackages[] = $rPackage;
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rPackages];
+	}
+
+	public static function getLine($rID) {
+		if (!(($rLine = UserRepository::getLineById($rID)) && Authorization::check('line', $rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rLine];
+	}
+
+	public static function createLine($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(ResellerAPI::processLine($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getLine($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editLine($rID, $rData) {
+		if (!UserRepository::getLineById($rID)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		if (!isset($rData['isp_clear'])) {
+		} else {
+			$rData['isp_clear'] = '';
+		}
+		$rReturn = parseerror(ResellerAPI::processLine($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getLine($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteLine($rID) {
+		if (!UserRepository::getLineById($rID)) {
+		} else {
+			if (!LineService::deleteLineById($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function disableLine($rID) {
+		if (!UserRepository::getLineById($rID)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function enableLine($rID) {
+		if (!UserRepository::getLineById($rID)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function getMAG($rID) {
+		if (!($rDevice = MagService::getById($rID))) {
+		} else {
+			if (!Authorization::check('line', $rDevice['user_id'])) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS', 'data' => $rDevice];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function createMAG($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(ResellerAPI::processMAG($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editMAG($rID, $rData) {
+		if (!MagService::getById($rID)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		if (!isset($rData['isp_clear'])) {
+		} else {
+			$rData['isp_clear'] = '';
+		}
+		$rReturn = parseerror(ResellerAPI::processMAG($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getMAG($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteMAG($rID) {
+		if (!MagService::getById($rID)) {
+		} else {
+			if (!MagService::deleteDevice($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function disableMAG($rID) {
+		if (!($rDevice = MagService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function enableMAG($rID) {
+		if (!($rDevice = MagService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function convertMAG($rID) {
+		global $db;
+		if (!($rDevice = MagService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		MagService::deleteDevice($rID, false, false, true);
+		return ['status' => 'STATUS_SUCCESS', 'data' => UserRepository::getLineById($rDevice['user_id'])];
+	}
+
+	public static function getEnigma($rID) {
+		if (!($rDevice = EnigmaService::getById($rID))) {
+		} else {
+			if (!Authorization::check('line', $rDevice['user_id'])) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS', 'data' => $rDevice];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function createEnigma($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(ResellerAPI::processEnigma($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getEnigma($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editEnigma($rID, $rData) {
+		if (!EnigmaService::getById($rID)) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		if (!isset($rData['isp_clear'])) {
+		} else {
+			$rData['isp_clear'] = '';
+		}
+		$rReturn = parseerror(ResellerAPI::processEnigma($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getEnigma($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteEnigma($rID) {
+		if (!EnigmaService::getById($rID)) {
+		} else {
+			if (!EnigmaService::deleteDevice($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function disableEnigma($rID) {
+		if (!($rDevice = EnigmaService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 0 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function enableEnigma($rID) {
+		if (!($rDevice = EnigmaService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `lines` SET `enabled` = 1 WHERE `id` = ?;', $rDevice['user_id']);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function convertEnigma($rID) {
+		global $db;
+		if (!($rDevice = EnigmaService::getById($rID))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		EnigmaService::deleteDevice($rID, false, false, true);
+		return ['status' => 'STATUS_SUCCESS', 'data' => UserRepository::getLineById($rDevice['user_id'])];
+	}
+
+	public static function getUser($rID) {
+		if (!(($rUser = UserRepository::getRegisteredUserById($rID)) && Authorization::check('user', $rUser['id']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		return ['status' => 'STATUS_SUCCESS', 'data' => $rUser];
+	}
+
+	public static function createUser($rData) {
+		if (!isset($rData['edit'])) {
+		} else {
+			unset($rData['edit']);
+		}
+		$rReturn = parseerror(ResellerAPI::processUser($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getUser($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function editUser($rID, $rData) {
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		$rData['edit'] = $rID;
+		$rReturn = parseerror(ResellerAPI::processUser($rData));
+		if (!isset($rReturn['data']['insert_id'])) {
+		} else {
+			$rReturn['data'] = self::getUser($rReturn['data']['insert_id'])['data'];
+		}
+		return $rReturn;
+	}
+
+	public static function deleteUser($rID) {
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+		} else {
+			if (!UserService::deleteRegisteredUser($rID)) {
+			} else {
+				return ['status' => 'STATUS_SUCCESS'];
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
+
+	public static function disableUser($rID) {
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `users` SET `status` = 0 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function enableUser($rID) {
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+			return ['status' => 'STATUS_FAILURE'];
+		}
+		self::$db->query('UPDATE `users` SET `status` = 1 WHERE `id` = ?;', $rID);
+		return ['status' => 'STATUS_SUCCESS'];
+	}
+
+	public static function adjustCredits($rID, $rCredits, $rNote) {
+		global $rUserInfo;
+		if (strlen($rNote) != 0) {
+		} else {
+			$rNote = 'Reseller API Adjustment';
+		}
+		if (!(($rUser = self::getUser($rID)) && isset($rUser['data']))) {
+		} else {
+			if (!is_numeric($rCredits)) {
+			} else {
+				$rOwnerCredits = intval($rUserInfo['credits']) - intval($rCredits);
+				$rNewCredits = intval($rUser['data']['credits']) + intval($rCredits);
+				if (!(0 <= $rNewCredits && 0 <= $rOwnerCredits)) {
+				} else {
+					self::$db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rOwnerCredits, $rUserInfo['id']);
+					self::$db->query('UPDATE `users` SET `credits` = ? WHERE `id` = ?;', $rNewCredits, $rUser['data']['id']);
+					self::$db->query('INSERT INTO `users_credits_logs`(`target_id`, `admin_id`, `amount`, `date`, `reason`) VALUES(?, ?, ?, ?, ?);', $rUser['data']['id'], $rUserInfo['id'], $rCredits, time(), $rNote);
+					self::$db->query("INSERT INTO `users_logs`(`owner`, `type`, `action`, `log_id`, `package_id`, `cost`, `credits_after`, `date`, `deleted_info`) VALUES(?, 'user', ?, ?, null, ?, ?, ?, ?);", $rUserInfo['id'], 'adjust_credits', $rID, intval($rCredits), $rOwnerCredits, time(), json_encode($rUser['data']));
+					return ['status' => 'STATUS_SUCCESS'];
+				}
+			}
+		}
+		return ['status' => 'STATUS_FAILURE'];
+	}
 }
 
 if (!function_exists('parseError')) {
diff --git a/src/Public/Controllers/Api/ResellerRestApiController.php b/src/Public/Controllers/Api/ResellerRestApiController.php
index 587a04e9..1d4e690b 100644
--- a/src/Public/Controllers/Api/ResellerRestApiController.php
+++ b/src/Public/Controllers/Api/ResellerRestApiController.php
@@ -19,158 +19,158 @@ class ResellerRestApiController {
 		global $db;
 		global $_ERRORS;
 
-		$_ERRORS = array();
-foreach (get_defined_constants(true)['user'] as $rKey => $rValue) {
-    if (substr($rKey, 0, 7) != 'STATUS_') {
-    } else {
-        $_ERRORS[intval($rValue)] = $rKey;
-    }
-}
-$rData = RequestManager::getAll();
-ResellerAPIWrapper::$db = &$db;
-ResellerAPIWrapper::$rKey = $rData['api_key'];
-if (!empty(RequestManager::get('api_key')) && ResellerAPIWrapper::createSession()) {
-    $rAction = $rData['action'];
-    $rStart = (intval($rData['start']) ?: 0);
-    $rLimit = (intval($rData['limit']) ?: 50);
-    unset($rData['api_key'], $rData['action'], $rData['start'], $rData['limit']);
-    if (RequestManager::has('show_columns')) {
-        $rShowColumns = explode(',', RequestManager::get('show_columns'));
-    } else {
-        $rShowColumns = null;
-    }
-    if (RequestManager::has('hide_columns')) {
-        $rHideColumns = explode(',', RequestManager::get('hide_columns'));
-    } else {
-        $rHideColumns = null;
-    }
-    switch ($rAction) {
-        case 'packages':
-            echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getPackages(), $rShowColumns, $rHideColumns));
-            break;
-        case 'user_info':
-            echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getUserInfo(), $rShowColumns, $rHideColumns));
-            break;
-        case 'get_lines':
-            echo json_encode(ResellerAPIWrapper::TableAPI('lines', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_mags':
-            echo json_encode(ResellerAPIWrapper::TableAPI('mags', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_enigmas':
-            echo json_encode(ResellerAPIWrapper::TableAPI('enigmas', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_users':
-            echo json_encode(ResellerAPIWrapper::TableAPI('reg_users', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'activity_logs':
-            echo json_encode(ResellerAPIWrapper::TableAPI('line_activity', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'live_connections':
-            echo json_encode(ResellerAPIWrapper::TableAPI('live_connections', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'user_logs':
-            echo json_encode(ResellerAPIWrapper::TableAPI('reg_user_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
-            break;
-        case 'get_line':
-            echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getLine(RequestManager::get('id')), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_line':
-            echo json_encode(ResellerAPIWrapper::createLine(RequestManager::getAll()));
-            break;
-        case 'edit_line':
-            $rData = RequestManager::getAll();
-            unset($rData['id']);
-            echo json_encode(ResellerAPIWrapper::editLine(RequestManager::get('id'), $rData));
-            break;
-        case 'delete_line':
-            echo json_encode(ResellerAPIWrapper::deleteLine(RequestManager::get('id')));
-            break;
-        case 'disable_line':
-            echo json_encode(ResellerAPIWrapper::disableLine(RequestManager::get('id')));
-            break;
-        case 'enable_line':
-            echo json_encode(ResellerAPIWrapper::enableLine(RequestManager::get('id')));
-            break;
-        case 'get_mag':
-            echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getMAG(RequestManager::get('id')), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_mag':
-            echo json_encode(ResellerAPIWrapper::createMAG(RequestManager::getAll()));
-            break;
-        case 'edit_mag':
-            $rData = RequestManager::getAll();
-            unset($rData['id']);
-            echo json_encode(ResellerAPIWrapper::editMAG(RequestManager::get('id'), $rData));
-            break;
-        case 'delete_mag':
-            echo json_encode(ResellerAPIWrapper::deleteMAG(RequestManager::get('id')));
-            break;
-        case 'disable_mag':
-            echo json_encode(ResellerAPIWrapper::disableMAG(RequestManager::get('id')));
-            break;
-        case 'enable_mag':
-            echo json_encode(ResellerAPIWrapper::enableMAG(RequestManager::get('id')));
-            break;
-        case 'convert_mag':
-            echo json_encode(ResellerAPIWrapper::convertMAG(RequestManager::get('id')));
-            break;
-        case 'get_enigma':
-            echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getEnigma(RequestManager::get('id')), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_enigma':
-            echo json_encode(ResellerAPIWrapper::createEnigma(RequestManager::getAll()));
-            break;
-        case 'edit_enigma':
-            $rData = RequestManager::getAll();
-            unset($rData['id']);
-            echo json_encode(ResellerAPIWrapper::editEnigma(RequestManager::get('id'), $rData));
-            break;
-        case 'delete_enigma':
-            echo json_encode(ResellerAPIWrapper::deleteEnigma(RequestManager::get('id')));
-            break;
-        case 'disable_enigma':
-            echo json_encode(ResellerAPIWrapper::disableEnigma(RequestManager::get('id')));
-            break;
-        case 'enable_enigma':
-            echo json_encode(ResellerAPIWrapper::enableEnigma(RequestManager::get('id')));
-            break;
-        case 'convert_enigma':
-            echo json_encode(ResellerAPIWrapper::convertEnigma(RequestManager::get('id')));
-            break;
-        case 'get_user':
-            if (in_array('password', $rHideColumns)) {
-            } else {
-                $rHideColumns[] = 'password';
-            }
-            echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getUser($rData['id']), $rShowColumns, $rHideColumns));
-            break;
-        case 'create_user':
-            echo json_encode(ResellerAPIWrapper::createUser($rData));
-            break;
-        case 'edit_user':
-            $rID = $rData['id'];
-            unset($rData['id']);
-            echo json_encode(ResellerAPIWrapper::editUser($rID, $rData));
-            break;
-        case 'delete_user':
-            echo json_encode(ResellerAPIWrapper::deleteUser($rData['id']));
-            break;
-        case 'disable_user':
-            echo json_encode(ResellerAPIWrapper::disableUser($rData['id']));
-            break;
-        case 'enable_user':
-            echo json_encode(ResellerAPIWrapper::enableUser($rData['id']));
-            break;
-        case 'adjust_credits':
-            echo json_encode(ResellerAPIWrapper::adjustCredits($rData['id'], $rData['credits'], ($rData['note'] ?: '')));
-            break;
-        default:
-            echo json_encode(array('status' => 'STATUS_FAILURE', 'error' => 'Invalid action.'));
-            break;
-    }
-} else {
-    echo json_encode(array('status' => 'STATUS_FAILURE', 'error' => 'Invalid API key.'));
-}
+		$_ERRORS = [];
+		foreach (get_defined_constants(true)['user'] as $rKey => $rValue) {
+			if (substr($rKey, 0, 7) != 'STATUS_') {
+			} else {
+				$_ERRORS[intval($rValue)] = $rKey;
+			}
+		}
+		$rData = RequestManager::getAll();
+		ResellerAPIWrapper::$db = &$db;
+		ResellerAPIWrapper::$rKey = $rData['api_key'];
+		if (!empty(RequestManager::get('api_key')) && ResellerAPIWrapper::createSession()) {
+			$rAction = $rData['action'];
+			$rStart = (intval($rData['start']) ?: 0);
+			$rLimit = (intval($rData['limit']) ?: 50);
+			unset($rData['api_key'], $rData['action'], $rData['start'], $rData['limit']);
+			if (RequestManager::has('show_columns')) {
+				$rShowColumns = explode(',', RequestManager::get('show_columns'));
+			} else {
+				$rShowColumns = null;
+			}
+			if (RequestManager::has('hide_columns')) {
+				$rHideColumns = explode(',', RequestManager::get('hide_columns'));
+			} else {
+				$rHideColumns = null;
+			}
+			switch ($rAction) {
+				case 'packages':
+					echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getPackages(), $rShowColumns, $rHideColumns));
+					break;
+				case 'user_info':
+					echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getUserInfo(), $rShowColumns, $rHideColumns));
+					break;
+				case 'get_lines':
+					echo json_encode(ResellerAPIWrapper::TableAPI('lines', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_mags':
+					echo json_encode(ResellerAPIWrapper::TableAPI('mags', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_enigmas':
+					echo json_encode(ResellerAPIWrapper::TableAPI('enigmas', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_users':
+					echo json_encode(ResellerAPIWrapper::TableAPI('reg_users', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'activity_logs':
+					echo json_encode(ResellerAPIWrapper::TableAPI('line_activity', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'live_connections':
+					echo json_encode(ResellerAPIWrapper::TableAPI('live_connections', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'user_logs':
+					echo json_encode(ResellerAPIWrapper::TableAPI('reg_user_logs', $rStart, $rLimit, $rData, $rShowColumns, $rHideColumns));
+					break;
+				case 'get_line':
+					echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getLine(RequestManager::get('id')), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_line':
+					echo json_encode(ResellerAPIWrapper::createLine(RequestManager::getAll()));
+					break;
+				case 'edit_line':
+					$rData = RequestManager::getAll();
+					unset($rData['id']);
+					echo json_encode(ResellerAPIWrapper::editLine(RequestManager::get('id'), $rData));
+					break;
+				case 'delete_line':
+					echo json_encode(ResellerAPIWrapper::deleteLine(RequestManager::get('id')));
+					break;
+				case 'disable_line':
+					echo json_encode(ResellerAPIWrapper::disableLine(RequestManager::get('id')));
+					break;
+				case 'enable_line':
+					echo json_encode(ResellerAPIWrapper::enableLine(RequestManager::get('id')));
+					break;
+				case 'get_mag':
+					echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getMAG(RequestManager::get('id')), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_mag':
+					echo json_encode(ResellerAPIWrapper::createMAG(RequestManager::getAll()));
+					break;
+				case 'edit_mag':
+					$rData = RequestManager::getAll();
+					unset($rData['id']);
+					echo json_encode(ResellerAPIWrapper::editMAG(RequestManager::get('id'), $rData));
+					break;
+				case 'delete_mag':
+					echo json_encode(ResellerAPIWrapper::deleteMAG(RequestManager::get('id')));
+					break;
+				case 'disable_mag':
+					echo json_encode(ResellerAPIWrapper::disableMAG(RequestManager::get('id')));
+					break;
+				case 'enable_mag':
+					echo json_encode(ResellerAPIWrapper::enableMAG(RequestManager::get('id')));
+					break;
+				case 'convert_mag':
+					echo json_encode(ResellerAPIWrapper::convertMAG(RequestManager::get('id')));
+					break;
+				case 'get_enigma':
+					echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getEnigma(RequestManager::get('id')), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_enigma':
+					echo json_encode(ResellerAPIWrapper::createEnigma(RequestManager::getAll()));
+					break;
+				case 'edit_enigma':
+					$rData = RequestManager::getAll();
+					unset($rData['id']);
+					echo json_encode(ResellerAPIWrapper::editEnigma(RequestManager::get('id'), $rData));
+					break;
+				case 'delete_enigma':
+					echo json_encode(ResellerAPIWrapper::deleteEnigma(RequestManager::get('id')));
+					break;
+				case 'disable_enigma':
+					echo json_encode(ResellerAPIWrapper::disableEnigma(RequestManager::get('id')));
+					break;
+				case 'enable_enigma':
+					echo json_encode(ResellerAPIWrapper::enableEnigma(RequestManager::get('id')));
+					break;
+				case 'convert_enigma':
+					echo json_encode(ResellerAPIWrapper::convertEnigma(RequestManager::get('id')));
+					break;
+				case 'get_user':
+					if (in_array('password', $rHideColumns)) {
+					} else {
+						$rHideColumns[] = 'password';
+					}
+					echo json_encode(ResellerAPIWrapper::filterRow(ResellerAPIWrapper::getUser($rData['id']), $rShowColumns, $rHideColumns));
+					break;
+				case 'create_user':
+					echo json_encode(ResellerAPIWrapper::createUser($rData));
+					break;
+				case 'edit_user':
+					$rID = $rData['id'];
+					unset($rData['id']);
+					echo json_encode(ResellerAPIWrapper::editUser($rID, $rData));
+					break;
+				case 'delete_user':
+					echo json_encode(ResellerAPIWrapper::deleteUser($rData['id']));
+					break;
+				case 'disable_user':
+					echo json_encode(ResellerAPIWrapper::disableUser($rData['id']));
+					break;
+				case 'enable_user':
+					echo json_encode(ResellerAPIWrapper::enableUser($rData['id']));
+					break;
+				case 'adjust_credits':
+					echo json_encode(ResellerAPIWrapper::adjustCredits($rData['id'], $rData['credits'], ($rData['note'] ?: '')));
+					break;
+				default:
+					echo json_encode(['status' => 'STATUS_FAILURE', 'error' => 'Invalid action.']);
+					break;
+			}
+		} else {
+			echo json_encode(['status' => 'STATUS_FAILURE', 'error' => 'Invalid API key.']);
+		}
 	}
 }
diff --git a/src/Public/Controllers/Api/XPluginApiController.php b/src/Public/Controllers/Api/XPluginApiController.php
index 8b96ffe7..6c02f6db 100644
--- a/src/Public/Controllers/Api/XPluginApiController.php
+++ b/src/Public/Controllers/Api/XPluginApiController.php
@@ -109,7 +109,7 @@ class XPluginApiController {
 		$rDNS = !empty($rRequest['dn']) ? htmlentities($rRequest['dn']) : '-';
 		$rCMAC = !empty($rRequest['cmac']) ? htmlentities(strtoupper($rRequest['cmac'])) : '';
 
-		$rDevice = UserRepository::getE2Info(array('device_id' => null, 'mac' => strtoupper($rMAC)));
+		$rDevice = UserRepository::getE2Info(['device_id' => null, 'mac' => strtoupper($rMAC)]);
 
 		if (!$rDevice) {
 			BruteforceGuard::checkBruteforce(null, strtoupper($rMAC));
@@ -128,8 +128,8 @@ class XPluginApiController {
 		$rToken = strtoupper(md5(uniqid(rand(), true)));
 		$rTimeout = mt_rand(60, 70);
 		$db->query('UPDATE `enigma2_devices` SET `original_mac` = ?,`dns` = ?,`key_auth` = ?,`lversion` = ?,`watchdog_timeout` = ?,`modem_mac` = ?,`local_ip` = ?,`public_ip` = ?,`enigma_version` = ?,`cpu` = ?,`version` = ?,`token` = ?,`last_updated` = ? WHERE `device_id` = ?', $rCMAC, $rDNS, $rUserAgent, $rLVersion, $rTimeout, $rModemMAC, $rLocalIP, $rIP, $rEnigmaVersion, $rCPU, $rPluginVersion, $rToken, time(), $rDevice['enigma2']['device_id']);
-		$rDetails = array();
-		$rDetails['details'] = array();
+		$rDetails = [];
+		$rDetails['details'] = [];
 		$rDetails['details']['token'] = $rToken;
 		$rDetails['details']['username'] = $rDevice['user_info']['username'];
 		$rDetails['details']['password'] = $rDevice['user_info']['password'];
@@ -144,13 +144,13 @@ class XPluginApiController {
 		$db = self::db();
 		$db->query('UPDATE `enigma2_devices` SET `last_updated` = ?,`rc` = ? WHERE `device_id` = ?;', time(), $rRequest['rc'], $rDeviceInfo['device_id']);
 		$db->query('SELECT * FROM `enigma2_actions` WHERE `device_id` = ?;', $rDeviceInfo['device_id']);
-		$rResult = array();
+		$rResult = [];
 
 		if ($db->num_rows() > 0) {
 			$rFirst = $db->get_row();
 
 			if ($rFirst['key'] == 'message') {
-				$rResult['message'] = array();
+				$rResult['message'] = [];
 				$rResult['message']['title'] = $rFirst['command2'];
 				$rResult['message']['message'] = $rFirst['command'];
 			} elseif ($rFirst['key'] == 'ssh') {
@@ -180,7 +180,7 @@ class XPluginApiController {
 
 		header('Content-Type: application/json');
 
-		exit(json_encode(array('valid' => true, 'data' => $rResult)));
+		exit(json_encode(['valid' => true, 'data' => $rResult]));
 	}
 
 	private function handleFileUpload($rDeviceInfo, $rRequest) {
diff --git a/src/Public/Controllers/Player/BasePlayerController.php b/src/Public/Controllers/Player/BasePlayerController.php
index e074483f..b94f4993 100644
--- a/src/Public/Controllers/Player/BasePlayerController.php
+++ b/src/Public/Controllers/Player/BasePlayerController.php
@@ -26,79 +26,75 @@ use XcVm\Public\Controllers\Admin\BaseAdminController;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class BasePlayerController extends BaseAdminController
-{
-    /** @var string Scope: 'player' */
-    protected $scope = 'player';
+class BasePlayerController extends BaseAdminController {
+	/** @var string Scope: 'player' */
+	protected $scope = 'player';
 
-    /**
-     * Player не использует RBAC — проверка не нужна.
-     */
-    protected function requirePermission()
-    {
-        // Player авторизация обрабатывается bootstrap (PlayerScopeBootstrap).
-        // Если пользователь дошёл до контроллера — он уже аутентифицирован.
-    }
+	/**
+	 * Player не использует RBAC — проверка не нужна.
+	 */
+	protected function requirePermission() {
+		// Player авторизация обрабатывается bootstrap (PlayerScopeBootstrap).
+		// Если пользователь дошёл до контроллера — он уже аутентифицирован.
+	}
 
-    /**
-     * Render: header → view → footer.
-     *
-     * Переопределяет admin render для player-specific глобалов.
-     * Player footer.php содержит page-specific JS, поэтому
-     * все глобалы должны быть доступны на момент его вызова.
-     *
-     * @param string $view Имя view-файла (без .php)
-     * @param array  $data Данные для view (extract'd в scope)
-     */
-    protected function render($view, array $data = [])
-    {
-        require_once MAIN_HOME . 'Public/Views/layouts/admin.php';
-        require_once MAIN_HOME . 'Public/Views/layouts/footer.php';
+	/**
+	 * Render: header → view → footer.
+	 *
+	 * Переопределяет admin render для player-specific глобалов.
+	 * Player footer.php содержит page-specific JS, поэтому
+	 * все глобалы должны быть доступны на момент его вызова.
+	 *
+	 * @param string $view Имя view-файла (без .php)
+	 * @param array  $data Данные для view (extract'd в scope)
+	 */
+	protected function render(string $view, array $data = []) {
+		require_once MAIN_HOME . 'Public/Views/layouts/admin.php';
+		require_once MAIN_HOME . 'Public/Views/layouts/footer.php';
 
-        // Player-специфичные глобалы (для header.php и footer.php)
-        $viewGlobals = [
-            // Core
-            'db', 'rSettings', 'rUserInfo', '_TITLE', '_PAGE',
-            // Player data
-            'rStreamIDs', 'rFilterBy', 'rSortArray', 'rFilterArray',
-            'rSearchBy', 'rURLs', 'rSubtitles', 'rLegacy', 'rSeries',
-            'rYearStart', 'rYearEnd', 'rRatingStart', 'rRatingEnd',
-        ];
-        foreach ($viewGlobals as $_g) {
-            if (array_key_exists($_g, $GLOBALS) && !array_key_exists($_g, $data)) {
-                $data[$_g] = $GLOBALS[$_g];
-            }
-        }
-        unset($_g);
+		// Player-специфичные глобалы (для header.php и footer.php)
+		$viewGlobals = [
+			// Core
+			'db', 'rSettings', 'rUserInfo', '_TITLE', '_PAGE',
+			// Player data
+			'rStreamIDs', 'rFilterBy', 'rSortArray', 'rFilterArray',
+			'rSearchBy', 'rURLs', 'rSubtitles', 'rLegacy', 'rSeries',
+			'rYearStart', 'rYearEnd', 'rRatingStart', 'rRatingEnd',
+		];
+		foreach ($viewGlobals as $_g) {
+			if (array_key_exists($_g, $GLOBALS) && !array_key_exists($_g, $data)) {
+				$data[$_g] = $GLOBALS[$_g];
+			}
+		}
+		unset($_g);
 
-        // Экспортируем $data в $GLOBALS чтобы footer.php мог их видеть
-        foreach ($data as $key => $value) {
-            $GLOBALS[$key] = $value;
-        }
+		// Экспортируем $data в $GLOBALS чтобы footer.php мог их видеть
+		foreach ($data as $key => $value) {
+			$GLOBALS[$key] = $value;
+		}
 
-        extract($data);
+		extract($data);
 
-        $__viewsDir = MAIN_HOME . 'Public/Views/' . $this->scope . '/';
+		$__viewsDir = MAIN_HOME . 'Public/Views/' . $this->scope . '/';
 
-        // 1. Header
-        renderUnifiedLayoutHeader($this->scope);
+		// 1. Header
+		renderUnifiedLayoutHeader($this->scope);
 
-        // 2. View content
-        $__viewFile = $__viewsDir . $view . '.php';
-        if (file_exists($__viewFile)) {
-            require $__viewFile;
-        }
+		// 2. View content
+		$__viewFile = $__viewsDir . $view . '.php';
+		if (file_exists($__viewFile)) {
+			require $__viewFile;
+		}
 
-        // 3. Footer (player footer.php содержит page-specific JS)
-        renderUnifiedLayoutFooter($this->scope);
-    }
+		// 3. Footer (player footer.php содержит page-specific JS)
+		renderUnifiedLayoutFooter($this->scope);
+	}
 
-    /**
-     * Редирект на player home.
-     */
-    protected function goPlayerHome()
-    {
-        header('Location: index');
-        exit;
-    }
+	/**
+	 * Редирект на player home.
+	 */
+	protected function goPlayerHome() {
+		header('Location: index');
+		exit;
+	}
 }
diff --git a/src/Public/Controllers/Player/EpisodesController.php b/src/Public/Controllers/Player/EpisodesController.php
index 99ced773..0981b8b2 100644
--- a/src/Public/Controllers/Player/EpisodesController.php
+++ b/src/Public/Controllers/Player/EpisodesController.php
@@ -20,145 +20,143 @@ use XcVm\Domain\Vod\TMDbService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class EpisodesController extends BasePlayerController
-{
-    public function index()
-    {
-        global $db, $rUserInfo;
+class EpisodesController extends BasePlayerController {
+	public function index() {
+		global $db, $rUserInfo;
 
-        if (($rSeries = SeriesService::getById(RequestManager::get('id'))) && in_array(RequestManager::get('id'), $rUserInfo['series_ids'])) {
-            $rDomainName = DomainResolver::resolve(SERVER_ID, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443);
-            $rTMDB = null;
+		if (($rSeries = SeriesService::getById(RequestManager::get('id'))) && in_array(RequestManager::get('id'), $rUserInfo['series_ids'])) {
+			$rDomainName = DomainResolver::resolve(SERVER_ID, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443);
+			$rTMDB = null;
 
-            if ($rSeries['tmdb_id']) {
-                if (!file_exists(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'])) {
-                    $rTMDB = TMDbService::getSeries($rSeries['tmdb_id']);
+			if ($rSeries['tmdb_id']) {
+				if (!file_exists(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'])) {
+					$rTMDB = TMDbService::getSeries($rSeries['tmdb_id']);
 
-                    if ($rTMDB) {
-                        file_put_contents(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'], igbinary_serialize($rTMDB));
-                    }
-                } else {
-                    $rTMDB = igbinary_unserialize(file_get_contents(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id']));
-                }
-            }
+					if ($rTMDB) {
+						file_put_contents(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'], igbinary_serialize($rTMDB));
+					}
+				} else {
+					$rTMDB = igbinary_unserialize(file_get_contents(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id']));
+				}
+			}
 
-            $rCover = (ImageUtils::validateURL(json_decode($rSeries['backdrop_path'], true)[0]) ?: '');
-            $rPoster = (ImageUtils::validateURL($rSeries['cover_big']) ?: '');
+			$rCover = (ImageUtils::validateURL(json_decode($rSeries['backdrop_path'], true)[0]) ?: '');
+			$rPoster = (ImageUtils::validateURL($rSeries['cover_big']) ?: '');
 
-            $rSubtitles = $rURLs = $rSeasons = array();
+			$rSubtitles = $rURLs = $rSeasons = [];
 
-            $db->query('SELECT DISTINCT(`season_num`) AS `season_num` FROM `streams_episodes` WHERE `series_id` = ? ORDER BY `season_num` ASC;', $rSeries['id']);
+			$db->query('SELECT DISTINCT(`season_num`) AS `season_num` FROM `streams_episodes` WHERE `series_id` = ? ORDER BY `season_num` ASC;', $rSeries['id']);
 
-            foreach ($db->get_rows() as $rRow) {
-                if (SettingsManager::get('player_hide_incompatible')) {
-                    $db->query('SELECT MAX(`compatible`) AS `compatible` FROM `streams_servers` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams_servers`.`stream_id` WHERE `series_id` = ? AND `season_num` = ?;', $rSeries['id'], $rRow['season_num']);
+			foreach ($db->get_rows() as $rRow) {
+				if (SettingsManager::get('player_hide_incompatible')) {
+					$db->query('SELECT MAX(`compatible`) AS `compatible` FROM `streams_servers` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams_servers`.`stream_id` WHERE `series_id` = ? AND `season_num` = ?;', $rSeries['id'], $rRow['season_num']);
 
-                    if (!$db->get_row()['compatible']) {
-                    } else {
-                        $rSeasons[] = $rRow['season_num'];
-                    }
-                } else {
-                    $rSeasons[] = $rRow['season_num'];
-                }
-            }
-            $rSeasonNo = (intval(RequestManager::get('season') ?? 0) ?: ($rSeasons[0] ?: 1));
+					if (!$db->get_row()['compatible']) {
+					} else {
+						$rSeasons[] = $rRow['season_num'];
+					}
+				} else {
+					$rSeasons[] = $rRow['season_num'];
+				}
+			}
+			$rSeasonNo = (intval(RequestManager::get('season') ?? 0) ?: ($rSeasons[0] ?: 1));
 
-            if (SettingsManager::get('player_hide_incompatible')) {
-                $db->query('SELECT * FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` WHERE `series_id` = ? AND `season_num` = ? AND (SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1 ORDER BY `episode_num` ASC;', $rSeries['id'], $rSeasonNo);
-            } else {
-                $db->query('SELECT * FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` WHERE `series_id` = ? AND `season_num` = ? ORDER BY `episode_num` ASC;', $rSeries['id'], $rSeasonNo);
-            }
+			if (SettingsManager::get('player_hide_incompatible')) {
+				$db->query('SELECT * FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` WHERE `series_id` = ? AND `season_num` = ? AND (SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1 ORDER BY `episode_num` ASC;', $rSeries['id'], $rSeasonNo);
+			} else {
+				$db->query('SELECT * FROM `streams_episodes` LEFT JOIN `streams` ON `streams`.`id` = `streams_episodes`.`stream_id` WHERE `series_id` = ? AND `season_num` = ? ORDER BY `episode_num` ASC;', $rSeries['id'], $rSeasonNo);
+			}
 
-            $rLegacy = false;
-            $rEpisodes = $db->get_rows();
+			$rLegacy = false;
+			$rEpisodes = $db->get_rows();
 
-            for ($i = 0; $i < count($rEpisodes); $i++) {
-                $rURLs[$rEpisodes[$i]['id']] = $rDomainName . 'series/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rEpisodes[$i]['id'] . '.' . $rEpisodes[$i]['target_container'];
-                $rProperties = json_decode($rEpisodes[$i]['movie_properties'], true);
-                $rSubtitles[$rEpisodes[$i]['id']] = getSubtitles($rEpisodes[$i]['id'], $rProperties['subtitle'] ?? []);
+			for ($i = 0; $i < count($rEpisodes); $i++) {
+				$rURLs[$rEpisodes[$i]['id']] = $rDomainName . 'series/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rEpisodes[$i]['id'] . '.' . $rEpisodes[$i]['target_container'];
+				$rProperties = json_decode($rEpisodes[$i]['movie_properties'], true);
+				$rSubtitles[$rEpisodes[$i]['id']] = getSubtitles($rEpisodes[$i]['id'], $rProperties['subtitle'] ?? []);
 
-                if ($rEpisodes[$i]['target_container'] == 'mp4') {
-                } else {
-                    $rProxySubtitles = array();
+				if ($rEpisodes[$i]['target_container'] == 'mp4') {
+				} else {
+					$rProxySubtitles = [];
 
-                    foreach ($rSubtitles[$rEpisodes[$i]['id']] as $rSubtitle) {
-                        $rSubtitle['file'] = 'proxy.php?url=' . Encryption::mintToken($rSubtitle['file'], SettingsManager::get('live_streaming_pass'), 'd8de497ebccf4f4697a1da20219c7c33', (bool) SettingsManager::get('secure_stream_tokens'));
-                        $rProxySubtitles[] = $rSubtitle;
-                    }
-                    $rSubtitles[$rEpisodes[$i]['id']] = $rProxySubtitles;
-                    $rLegacy = true;
-                }
-            }
-            $rSeason = null;
+					foreach ($rSubtitles[$rEpisodes[$i]['id']] as $rSubtitle) {
+						$rSubtitle['file'] = 'proxy.php?url=' . Encryption::mintToken($rSubtitle['file'], SettingsManager::get('live_streaming_pass'), 'd8de497ebccf4f4697a1da20219c7c33', (bool) SettingsManager::get('secure_stream_tokens'));
+						$rProxySubtitles[] = $rSubtitle;
+					}
+					$rSubtitles[$rEpisodes[$i]['id']] = $rProxySubtitles;
+					$rLegacy = true;
+				}
+			}
+			$rSeason = null;
 
-            if (!$rSeries['tmdb_id']) {
-            } else {
-                if (!file_exists(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'] . '_' . $rSeasonNo)) {
-                    $rSeason = TMDbService::getSeason($rSeries['tmdb_id'], $rSeasonNo);
+			if (!$rSeries['tmdb_id']) {
+			} else {
+				if (!file_exists(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'] . '_' . $rSeasonNo)) {
+					$rSeason = TMDbService::getSeason($rSeries['tmdb_id'], $rSeasonNo);
 
-                    if (!$rSeason) {
-                    } else {
-                        file_put_contents(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'] . '_' . $rSeasonNo, igbinary_serialize($rSeason));
-                    }
-                } else {
-                    $rSeason = igbinary_unserialize(file_get_contents(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'] . '_' . $rSeasonNo));
-                }
-            }
+					if (!$rSeason) {
+					} else {
+						file_put_contents(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'] . '_' . $rSeasonNo, igbinary_serialize($rSeason));
+					}
+				} else {
+					$rSeason = igbinary_unserialize(file_get_contents(TMP_PATH . 'tmdb_' . $rSeries['tmdb_id'] . '_' . $rSeasonNo));
+				}
+			}
 
-            if ($rSeason && $rSeason['episodes']) {
-                $rSeasonArray = array();
+			if ($rSeason && $rSeason['episodes']) {
+				$rSeasonArray = [];
 
-                foreach ($rSeason['episodes'] as $rEpisode) {
-                    $rSeasonArray[$rEpisode['episode_number']] = array('title' => $rEpisode['name'], 'description' => ($rEpisode['overview'] ?: 'No description is available...'), 'rating' => ($rEpisode['vote_average'] ?: null), 'image' => ($rEpisode['still_path'] ? 'https://image.tmdb.org/t/p/w500' . $rEpisode['still_path'] : ''), 'image_cover' => ($rEpisode['still_path'] ? 'https://image.tmdb.org/t/p/w1280' . $rEpisode['still_path'] : ''));
-                }
-            } else {
-                $rSeasonArray = array();
-                foreach ($rEpisodes as $rEpisode) {
-                    $rProperties = json_decode($rEpisode['movie_properties'], true);
-                    $rSeasonArray[$rEpisode['episode_num']] = array('title' => 'Episode ' . intval($rEpisode['episode_num']), 'description' => ($rProperties['plot'] ?: 'No description is available...'), 'rating' => ($rProperties['rating'] ?: null), 'image' => (str_replace('w600_and_h900_bestv2', 'w500', ImageUtils::validateURL($rProperties['movie_image'])) ?: ''), 'image_cover' => str_replace('w600_and_h900_bestv2', 'w500', ImageUtils::validateURL($rProperties['movie_image'])));
-                }
-            }
+				foreach ($rSeason['episodes'] as $rEpisode) {
+					$rSeasonArray[$rEpisode['episode_number']] = ['title' => $rEpisode['name'], 'description' => ($rEpisode['overview'] ?: 'No description is available...'), 'rating' => ($rEpisode['vote_average'] ?: null), 'image' => ($rEpisode['still_path'] ? 'https://image.tmdb.org/t/p/w500' . $rEpisode['still_path'] : ''), 'image_cover' => ($rEpisode['still_path'] ? 'https://image.tmdb.org/t/p/w1280' . $rEpisode['still_path'] : '')];
+				}
+			} else {
+				$rSeasonArray = [];
+				foreach ($rEpisodes as $rEpisode) {
+					$rProperties = json_decode($rEpisode['movie_properties'], true);
+					$rSeasonArray[$rEpisode['episode_num']] = ['title' => 'Episode ' . intval($rEpisode['episode_num']), 'description' => ($rProperties['plot'] ?: 'No description is available...'), 'rating' => ($rProperties['rating'] ?: null), 'image' => (str_replace('w600_and_h900_bestv2', 'w500', ImageUtils::validateURL($rProperties['movie_image'])) ?: ''), 'image_cover' => str_replace('w600_and_h900_bestv2', 'w500', ImageUtils::validateURL($rProperties['movie_image']))];
+				}
+			}
 
-            $rSimilarIDs = array($rSeries['id']);
-            $rSimilar = array();
-            $rSimilarArray = json_decode($rSeries['similar'], true);
+			$rSimilarIDs = [$rSeries['id']];
+			$rSimilar = [];
+			$rSimilarArray = json_decode($rSeries['similar'], true);
 
-            if (0 >= count($rSimilarArray)) {
-            } else {
-                if (SettingsManager::get('player_hide_incompatible')) {
-                    $db->query('SELECT * FROM `streams_series` WHERE `tmdb_id` IN (' . implode(',', $rSimilarArray) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams_servers`.`stream_id` WHERE `streams_episodes`.`series_id` = `streams_series`.`id`) = 1 LIMIT 6;');
-                } else {
-                    $db->query('SELECT * FROM `streams_series` WHERE `tmdb_id` IN (' . implode(',', $rSimilarArray) . ') LIMIT 6;');
-                }
+			if (0 >= count($rSimilarArray)) {
+			} else {
+				if (SettingsManager::get('player_hide_incompatible')) {
+					$db->query('SELECT * FROM `streams_series` WHERE `tmdb_id` IN (' . implode(',', $rSimilarArray) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams_servers`.`stream_id` WHERE `streams_episodes`.`series_id` = `streams_series`.`id`) = 1 LIMIT 6;');
+				} else {
+					$db->query('SELECT * FROM `streams_series` WHERE `tmdb_id` IN (' . implode(',', $rSimilarArray) . ') LIMIT 6;');
+				}
 
-                foreach ($db->get_rows() as $rRow) {
-                    $rSimilar[] = array('type' => 'series', 'id' => $rRow['id'], 'title' => $rRow['title'], 'year' => ($rRow['year'] ?: ($rRow['releaseDate'] ? substr($rRow['releaseDate'], 0, 4) : null)), 'rating' => $rRow['rating'], 'cover' => (ImageUtils::validateURL($rRow['cover']) ?: ''), 'backdrop' => (ImageUtils::validateURL(json_decode($rRow['backdrop_path'], true)[0]) ?: ''));
-                    $rSimilarIDs[] = $rRow['id'];
-                }
-            }
+				foreach ($db->get_rows() as $rRow) {
+					$rSimilar[] = ['type' => 'series', 'id' => $rRow['id'], 'title' => $rRow['title'], 'year' => ($rRow['year'] ?: ($rRow['releaseDate'] ? substr($rRow['releaseDate'], 0, 4) : null)), 'rating' => $rRow['rating'], 'cover' => (ImageUtils::validateURL($rRow['cover']) ?: ''), 'backdrop' => (ImageUtils::validateURL(json_decode($rRow['backdrop_path'], true)[0]) ?: '')];
+					$rSimilarIDs[] = $rRow['id'];
+				}
+			}
 
-            $GLOBALS['_TITLE'] = $rSeries['title'];
-            $GLOBALS['rURLs'] = $rURLs;
-            $GLOBALS['rSubtitles'] = $rSubtitles;
-            $GLOBALS['rLegacy'] = $rLegacy;
-            $GLOBALS['rSeries'] = $rSeries;
+			$GLOBALS['_TITLE'] = $rSeries['title'];
+			$GLOBALS['rURLs'] = $rURLs;
+			$GLOBALS['rSubtitles'] = $rSubtitles;
+			$GLOBALS['rLegacy'] = $rLegacy;
+			$GLOBALS['rSeries'] = $rSeries;
 
-            $this->render('episodes', [
-                'rSeries' => $rSeries,
-                'rCover' => $rCover,
-                'rPoster' => $rPoster,
-                'rSeasons' => $rSeasons,
-                'rSeasonNo' => $rSeasonNo,
-                'rEpisodes' => $rEpisodes,
-                'rURLs' => $rURLs,
-                'rSubtitles' => $rSubtitles,
-                'rLegacy' => $rLegacy,
-                'rSeasonArray' => $rSeasonArray,
-                'rSimilar' => $rSimilar,
-            ]);
-        } else {
-            header('Location: series');
-            exit();
-        }
-    }
+			$this->render('episodes', [
+				'rSeries' => $rSeries,
+				'rCover' => $rCover,
+				'rPoster' => $rPoster,
+				'rSeasons' => $rSeasons,
+				'rSeasonNo' => $rSeasonNo,
+				'rEpisodes' => $rEpisodes,
+				'rURLs' => $rURLs,
+				'rSubtitles' => $rSubtitles,
+				'rLegacy' => $rLegacy,
+				'rSeasonArray' => $rSeasonArray,
+				'rSimilar' => $rSimilar,
+			]);
+		} else {
+			header('Location: series');
+			exit();
+		}
+	}
 }
diff --git a/src/Public/Controllers/Player/HomeController.php b/src/Public/Controllers/Player/HomeController.php
index 61db32f7..482edc2a 100644
--- a/src/Public/Controllers/Player/HomeController.php
+++ b/src/Public/Controllers/Player/HomeController.php
@@ -16,82 +16,80 @@ use XcVm\Core\Util\ImageUtils;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class HomeController extends BasePlayerController
-{
-    public function index()
-    {
-        global $db, $rUserInfo;
+class HomeController extends BasePlayerController {
+	public function index() {
+		global $db, $rUserInfo;
 
-        if (RequestManager::has('search') && RequestManager::has('type')) {
-            if (in_array(RequestManager::get('type'), array('live', 'movies', 'series'))) {
-                header('Location: ' . RequestManager::get('type') . '?search=' . urlencode(RequestManager::get('search')));
-                exit();
-            }
-        }
+		if (RequestManager::has('search') && RequestManager::has('type')) {
+			if (in_array(RequestManager::get('type'), ['live', 'movies', 'series'])) {
+				header('Location: ' . RequestManager::get('type') . '?search=' . urlencode(RequestManager::get('search')));
+				exit();
+			}
+		}
 
-        $rPopularNow = array();
-        // tmdb_popular is written by a cron and may be absent (fresh install /
-        // TMDB disabled) or corrupt; guard the read + unserialize so the home
-        // page never fatals on a missing file or a non-array payload.
-        $rPopular = array('movies' => array(), 'series' => array());
-        $rPopularFile = CONTENT_PATH . 'tmdb_popular';
-        if (is_file($rPopularFile)) {
-            $rPopularData = igbinary_unserialize((string) @file_get_contents($rPopularFile));
-            if (is_array($rPopularData)) {
-                $rPopular = array_merge($rPopular, $rPopularData);
-            }
-        }
-        if (!is_array($rPopular['movies'])) {
-            $rPopular['movies'] = array();
-        }
-        if (!is_array($rPopular['series'])) {
-            $rPopular['series'] = array();
-        }
+		$rPopularNow = [];
+		// tmdb_popular is written by a cron and may be absent (fresh install /
+		// TMDB disabled) or corrupt; guard the read + unserialize so the home
+		// page never fatals on a missing file or a non-array payload.
+		$rPopular = ['movies' => [], 'series' => []];
+		$rPopularFile = CONTENT_PATH . 'tmdb_popular';
+		if (is_file($rPopularFile)) {
+			$rPopularData = igbinary_unserialize((string) @file_get_contents($rPopularFile));
+			if (is_array($rPopularData)) {
+				$rPopular = array_merge($rPopular, $rPopularData);
+			}
+		}
+		if (!is_array($rPopular['movies'])) {
+			$rPopular['movies'] = [];
+		}
+		if (!is_array($rPopular['series'])) {
+			$rPopular['series'] = [];
+		}
 
-        if (!(0 < count($rPopular['movies']) && 0 < count($rUserInfo['vod_ids'] ?? array()))) {
-        } else {
-            if (SettingsManager::get('player_hide_incompatible')) {
-                $db->query('SELECT `id`, `stream_display_name`, `year`, `rating`, `movie_properties` FROM `streams` WHERE `id` IN (' . implode(',', $rPopular['movies']) . ') AND `id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1 ORDER BY FIELD(id, ' . implode(',', $rPopular['movies']) . ') ASC LIMIT 50;');
-            } else {
-                $db->query('SELECT `id`, `stream_display_name`, `year`, `rating`, `movie_properties` FROM `streams` WHERE `id` IN (' . implode(',', $rPopular['movies']) . ') AND `id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') ORDER BY FIELD(id, ' . implode(',', $rPopular['movies']) . ') ASC LIMIT 50;');
-            }
+		if (!(0 < count($rPopular['movies']) && 0 < count($rUserInfo['vod_ids'] ?? []))) {
+		} else {
+			if (SettingsManager::get('player_hide_incompatible')) {
+				$db->query('SELECT `id`, `stream_display_name`, `year`, `rating`, `movie_properties` FROM `streams` WHERE `id` IN (' . implode(',', $rPopular['movies']) . ') AND `id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1 ORDER BY FIELD(id, ' . implode(',', $rPopular['movies']) . ') ASC LIMIT 50;');
+			} else {
+				$db->query('SELECT `id`, `stream_display_name`, `year`, `rating`, `movie_properties` FROM `streams` WHERE `id` IN (' . implode(',', $rPopular['movies']) . ') AND `id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') ORDER BY FIELD(id, ' . implode(',', $rPopular['movies']) . ') ASC LIMIT 50;');
+			}
 
-            $rStreams = $db->get_rows();
+			$rStreams = $db->get_rows();
 
-            foreach ($rStreams as $rStream) {
-                $rProperties = json_decode($rStream['movie_properties'], true);
-                $rPopularNow[] = array('type' => 'movie', 'id' => $rStream['id'], 'title' => $rStream['stream_display_name'], 'year' => ($rStream['year'] ?: null), 'rating' => $rStream['rating'], 'cover' => (ImageUtils::validateURL($rProperties['movie_image']) ?: ''), 'backdrop' => (ImageUtils::validateURL($rProperties['backdrop_path'][0]) ?: ''));
-            }
-        }
+			foreach ($rStreams as $rStream) {
+				$rProperties = json_decode($rStream['movie_properties'], true);
+				$rPopularNow[] = ['type' => 'movie', 'id' => $rStream['id'], 'title' => $rStream['stream_display_name'], 'year' => ($rStream['year'] ?: null), 'rating' => $rStream['rating'], 'cover' => (ImageUtils::validateURL($rProperties['movie_image']) ?: ''), 'backdrop' => (ImageUtils::validateURL($rProperties['backdrop_path'][0]) ?: '')];
+			}
+		}
 
-        if (!(0 < count($rPopular['series']) && 0 < count($rUserInfo['series_ids'] ?? array()))) {
-        } else {
-            if (SettingsManager::get('player_hide_incompatible')) {
-                $db->query('SELECT `id`, `title`, `year`, `rating`, `cover`, `backdrop_path` FROM `streams_series` WHERE `id` IN (' . implode(',', $rPopular['series']) . ') AND `id` IN (' . implode(',', $rUserInfo['series_ids']) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams_servers`.`stream_id` WHERE `streams_episodes`.`series_id` = `streams_series`.`id`) = 1 ORDER BY FIELD(id, ' . implode(',', $rPopular['series']) . ') ASC LIMIT 50;');
-            } else {
-                $db->query('SELECT `id`, `title`, `year`, `rating`, `cover`, `backdrop_path` FROM `streams_series` WHERE `id` IN (' . implode(',', $rPopular['series']) . ') AND `id` IN (' . implode(',', $rUserInfo['series_ids']) . ') ORDER BY FIELD(id, ' . implode(',', $rPopular['series']) . ') ASC LIMIT 50;');
-            }
+		if (!(0 < count($rPopular['series']) && 0 < count($rUserInfo['series_ids'] ?? []))) {
+		} else {
+			if (SettingsManager::get('player_hide_incompatible')) {
+				$db->query('SELECT `id`, `title`, `year`, `rating`, `cover`, `backdrop_path` FROM `streams_series` WHERE `id` IN (' . implode(',', $rPopular['series']) . ') AND `id` IN (' . implode(',', $rUserInfo['series_ids']) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams_servers`.`stream_id` WHERE `streams_episodes`.`series_id` = `streams_series`.`id`) = 1 ORDER BY FIELD(id, ' . implode(',', $rPopular['series']) . ') ASC LIMIT 50;');
+			} else {
+				$db->query('SELECT `id`, `title`, `year`, `rating`, `cover`, `backdrop_path` FROM `streams_series` WHERE `id` IN (' . implode(',', $rPopular['series']) . ') AND `id` IN (' . implode(',', $rUserInfo['series_ids']) . ') ORDER BY FIELD(id, ' . implode(',', $rPopular['series']) . ') ASC LIMIT 50;');
+			}
 
-            $rStreams = $db->get_rows();
+			$rStreams = $db->get_rows();
 
-            foreach ($rStreams as $rStream) {
-                $rBackdrop = json_decode($rStream['backdrop_path'], true);
-                $rPopularNow[] = array('type' => 'episodes', 'id' => $rStream['id'], 'title' => $rStream['title'], 'year' => ($rStream['year'] ?: (substr($rStream['releaseDate'], 0, 4) ?: null)), 'rating' => $rStream['rating'], 'cover' => (ImageUtils::validateURL($rStream['cover']) ?: ''), 'backdrop' => (ImageUtils::validateURL($rBackdrop[0]) ?: ''));
-            }
-        }
+			foreach ($rStreams as $rStream) {
+				$rBackdrop = json_decode($rStream['backdrop_path'], true);
+				$rPopularNow[] = ['type' => 'episodes', 'id' => $rStream['id'], 'title' => $rStream['title'], 'year' => ($rStream['year'] ?: (substr($rStream['releaseDate'], 0, 4) ?: null)), 'rating' => $rStream['rating'], 'cover' => (ImageUtils::validateURL($rStream['cover']) ?: ''), 'backdrop' => (ImageUtils::validateURL($rBackdrop[0]) ?: '')];
+			}
+		}
 
-        shuffle($rPopularNow);
-        $searchParam = isset($rSearchBy) ? $rSearchBy : null;
-        $rPopularNow = array_slice($rPopularNow, 0, 20);
-        $rMovies = getUserStreams($rUserInfo, array('movie'), null, null, 'added', null, null, 0, 20);
-        $rSeries = getUserSeries($rUserInfo, null, null, 'added', $searchParam, null, 0, 20);
+		shuffle($rPopularNow);
+		$searchParam = isset($rSearchBy) ? $rSearchBy : null;
+		$rPopularNow = array_slice($rPopularNow, 0, 20);
+		$rMovies = getUserStreams($rUserInfo, ['movie'], null, null, 'added', null, null, 0, 20);
+		$rSeries = getUserSeries($rUserInfo, null, null, 'added', $searchParam, null, 0, 20);
 
-        $GLOBALS['_TITLE'] = 'Home';
+		$GLOBALS['_TITLE'] = 'Home';
 
-        $this->render('index', [
-            'rPopularNow' => $rPopularNow,
-            'rMovies' => $rMovies,
-            'rSeries' => $rSeries,
-        ]);
-    }
+		$this->render('index', [
+			'rPopularNow' => $rPopularNow,
+			'rMovies' => $rMovies,
+			'rSeries' => $rSeries,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Player/ListingsController.php b/src/Public/Controllers/Player/ListingsController.php
index 5e96e52c..d1da71e6 100644
--- a/src/Public/Controllers/Player/ListingsController.php
+++ b/src/Public/Controllers/Player/ListingsController.php
@@ -18,160 +18,158 @@ use XcVm\Domain\Stream\CategoryService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ListingsController extends BasePlayerController
-{
-    public function index()
-    {
-        global $db, $rUserInfo;
+class ListingsController extends BasePlayerController {
+	public function index() {
+		global $db, $rUserInfo;
 
-        $rFlip = array_flip($rUserInfo['channel_ids']);
-        $rTimezone = (RequestManager::get('timezone') ?? 'Europe/London');
-        date_default_timezone_set($rTimezone);
+		$rFlip = array_flip($rUserInfo['channel_ids']);
+		$rTimezone = (RequestManager::get('timezone') ?? 'Europe/London');
+		date_default_timezone_set($rTimezone);
 
-        if (RequestManager::has('id')) {
-            $rReturn = array('id' => RequestManager::get('id'), 'title' => 'LIVE TV', 'epg_title' => 'No Programme Information...', 'epg_description' => '', 'url' => null);
+		if (RequestManager::has('id')) {
+			$rReturn = ['id' => RequestManager::get('id'), 'title' => 'LIVE TV', 'epg_title' => 'No Programme Information...', 'epg_description' => '', 'url' => null];
 
-            if (!isset($rFlip[RequestManager::get('id')])) {
-            } else {
-                $rStart = intval(RequestManager::get('start') ?? time());
-                $rDuration = intval(RequestManager::get('duration') ?? 0);
-                $db->query('SELECT `id`, `stream_display_name`, `channel_id`, `epg_id` FROM `streams` WHERE `id` = ?;', RequestManager::get('id'));
+			if (!isset($rFlip[RequestManager::get('id')])) {
+			} else {
+				$rStart = intval(RequestManager::get('start') ?? time());
+				$rDuration = intval(RequestManager::get('duration') ?? 0);
+				$db->query('SELECT `id`, `stream_display_name`, `channel_id`, `epg_id` FROM `streams` WHERE `id` = ?;', RequestManager::get('id'));
 
-                if ($db->num_rows() != 1) {
-                } else {
-                    $rStream = $db->get_row();
-                    $rReturn['title'] = $rStream['stream_display_name'];
-                    $rEPGRow = (EpgService::getStreamEpg(RequestManager::get('id'), $rStart, $rStart + 86400)[0] ?? null);
+				if ($db->num_rows() != 1) {
+				} else {
+					$rStream = $db->get_row();
+					$rReturn['title'] = $rStream['stream_display_name'];
+					$rEPGRow = (EpgService::getStreamEpg(RequestManager::get('id'), $rStart, $rStart + 86400)[0] ?? null);
 
-                    if (!$rEPGRow) {
-                    } else {
-                        $rReturn['epg_title'] = date('h:ia', $rEPGRow['start']) . ' - ' . $rEPGRow['title'];
-                        $rReturn['epg_description'] = $rEPGRow['description'];
-                    }
-                }
+					if (!$rEPGRow) {
+					} else {
+						$rReturn['epg_title'] = date('h:ia', $rEPGRow['start']) . ' - ' . $rEPGRow['title'];
+						$rReturn['epg_description'] = $rEPGRow['description'];
+					}
+				}
 
-                $rDomainName = DomainResolver::resolve(SERVER_ID, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443);
+				$rDomainName = DomainResolver::resolve(SERVER_ID, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443);
 
-                if ($rStart + $rDuration * 60 < time() && 0 < $rDuration) {
-                    $rReturn['url'] = $rDomainName . 'timeshift/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rDuration . '/' . $rStart . '/' . intval(RequestManager::get('id')) . '.m3u8';
-                } else {
-                    $rReturn['url'] = $rDomainName . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . intval(RequestManager::get('id')) . '.m3u8';
-                }
-            }
+				if ($rStart + $rDuration * 60 < time() && 0 < $rDuration) {
+					$rReturn['url'] = $rDomainName . 'timeshift/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rDuration . '/' . $rStart . '/' . intval(RequestManager::get('id')) . '.m3u8';
+				} else {
+					$rReturn['url'] = $rDomainName . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . intval(RequestManager::get('id')) . '.m3u8';
+				}
+			}
 
-            echo json_encode($rReturn);
-        } else {
-            $rReturn = array('Channels' => array());
-            $rChannels = array();
-            $rHideEmpty = (intval(RequestManager::get('hideempty')) ?: 0);
+			echo json_encode($rReturn);
+		} else {
+			$rReturn = ['Channels' => []];
+			$rChannels = [];
+			$rHideEmpty = (intval(RequestManager::get('hideempty')) ?: 0);
 
-            foreach (array_map('intval', explode(',', RequestManager::get('channels'))) as $rChannelID) {
-                if (!($rChannelID && isset($rFlip[$rChannelID]))) {
-                } else {
-                    $rChannels[] = $rChannelID;
-                }
-            }
+			foreach (array_map('intval', explode(',', RequestManager::get('channels'))) as $rChannelID) {
+				if (!($rChannelID && isset($rFlip[$rChannelID]))) {
+				} else {
+					$rChannels[] = $rChannelID;
+				}
+			}
 
-            if (count($rChannels) != 0) {
-                $rHours = (intval(RequestManager::get('hours')) ?: 3);
-                $rStartDate = (intval(strtotime(RequestManager::get('startdate'))) ?: time());
-                $rFinishDate = $rStartDate + $rHours * 3600;
-                $rPerUnit = floatval(100 / ($rHours * 60));
-                $rChannelsSort = $rChannels;
-                sort($rChannelsSort);
-                $rCacheID = md5($rTimezone . '_' . $rStartDate . '_' . $rHours . '_' . implode(',', $rChannelsSort) . '_' . $rHideEmpty);
+			if (count($rChannels) != 0) {
+				$rHours = (intval(RequestManager::get('hours')) ?: 3);
+				$rStartDate = (intval(strtotime(RequestManager::get('startdate'))) ?: time());
+				$rFinishDate = $rStartDate + $rHours * 3600;
+				$rPerUnit = floatval(100 / ($rHours * 60));
+				$rChannelsSort = $rChannels;
+				sort($rChannelsSort);
+				$rCacheID = md5($rTimezone . '_' . $rStartDate . '_' . $rHours . '_' . implode(',', $rChannelsSort) . '_' . $rHideEmpty);
 
-                if (!file_exists(TMP_PATH . 'cache_' . $rCacheID) || 600 < time() - filemtime(TMP_PATH . 'cache_' . $rCacheID)) {
-                    $rListings = array();
+				if (!file_exists(TMP_PATH . 'cache_' . $rCacheID) || 600 < time() - filemtime(TMP_PATH . 'cache_' . $rCacheID)) {
+					$rListings = [];
 
-                    if (0 >= count($rChannels)) {
-                    } else {
-                        $rArchiveInfo = array();
-                        $db->query('SELECT `id`, `tv_archive_duration`, `tv_archive_server_id` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ');');
+					if (0 >= count($rChannels)) {
+					} else {
+						$rArchiveInfo = [];
+						$db->query('SELECT `id`, `tv_archive_duration`, `tv_archive_server_id` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ');');
 
-                        if (0 >= $db->num_rows()) {
-                        } else {
-                            foreach ($db->get_rows() as $rRow) {
-                                $rArchiveInfo[$rRow['id']] = $rRow;
-                            }
-                        }
+						if (0 >= $db->num_rows()) {
+						} else {
+							foreach ($db->get_rows() as $rRow) {
+								$rArchiveInfo[$rRow['id']] = $rRow;
+							}
+						}
 
-                        $rEPGs = EpgService::getStreamsEpg($rChannels, $rStartDate, $rFinishDate);
+						$rEPGs = EpgService::getStreamsEpg($rChannels, $rStartDate, $rFinishDate);
 
-                        foreach ($rEPGs as $rChannelID => $rEPGData) {
-                            $rFullSize = 0;
+						foreach ($rEPGs as $rChannelID => $rEPGData) {
+							$rFullSize = 0;
 
-                            foreach ($rEPGData as $rEPGItem) {
-                                $rCapStart = ($rEPGItem['start'] < $rStartDate ? $rStartDate : $rEPGItem['start']);
-                                $rCapEnd = ($rFinishDate < $rEPGItem['end'] ? $rFinishDate : $rEPGItem['end']);
-                                $rDuration = ($rCapEnd - $rCapStart) / 60;
-                                $rArchive = null;
+							foreach ($rEPGData as $rEPGItem) {
+								$rCapStart = ($rEPGItem['start'] < $rStartDate ? $rStartDate : $rEPGItem['start']);
+								$rCapEnd = ($rFinishDate < $rEPGItem['end'] ? $rFinishDate : $rEPGItem['end']);
+								$rDuration = ($rCapEnd - $rCapStart) / 60;
+								$rArchive = null;
 
-                                if (!isset($rArchiveInfo[$rChannelID])) {
-                                } else {
-                                    if (!(0 < $rArchiveInfo[$rChannelID]['tv_archive_server_id'] && 0 < $rArchiveInfo[$rChannelID]['tv_archive_duration'])) {
-                                    } else {
-                                        if (time() - $rEPGItem['tv_archive_duration'] * 86400 > $rEPGItem['start']) {
-                                        } else {
-                                            $rArchive = array($rEPGItem['start'], intval(($rEPGItem['end'] - $rEPGItem['start']) / 60));
-                                        }
-                                    }
-                                }
+								if (!isset($rArchiveInfo[$rChannelID])) {
+								} else {
+									if (!(0 < $rArchiveInfo[$rChannelID]['tv_archive_server_id'] && 0 < $rArchiveInfo[$rChannelID]['tv_archive_duration'])) {
+									} else {
+										if (time() - $rEPGItem['tv_archive_duration'] * 86400 > $rEPGItem['start']) {
+										} else {
+											$rArchive = [$rEPGItem['start'], intval(($rEPGItem['end'] - $rEPGItem['start']) / 60)];
+										}
+									}
+								}
 
-                                $rRelativeSize = round($rDuration * $rPerUnit, 2);
-                                $rFullSize += $rRelativeSize;
+								$rRelativeSize = round($rDuration * $rPerUnit, 2);
+								$rFullSize += $rRelativeSize;
 
-                                if (100 >= $rFullSize) {
-                                } else {
-                                    $rRelativeSize -= $rFullSize - 100;
-                                }
+								if (100 >= $rFullSize) {
+								} else {
+									$rRelativeSize -= $rFullSize - 100;
+								}
 
-                                $rListings[$rChannelID][] = array('ListingId' => $rEPGItem['id'], 'ChannelId' => $rChannelID, 'Title' => $rEPGItem['title'], 'RelativeSize' => $rRelativeSize, 'StartTime' => date('h:ia', $rCapStart), 'EndTime' => date('h:ia', $rCapEnd), 'Start' => $rEPGItem['start'], 'End' => $rEPGItem['end'], 'Specialisation' => 'tv', 'Archive' => $rArchive);
-                            }
-                        }
-                    }
+								$rListings[$rChannelID][] = ['ListingId' => $rEPGItem['id'], 'ChannelId' => $rChannelID, 'Title' => $rEPGItem['title'], 'RelativeSize' => $rRelativeSize, 'StartTime' => date('h:ia', $rCapStart), 'EndTime' => date('h:ia', $rCapEnd), 'Start' => $rEPGItem['start'], 'End' => $rEPGItem['end'], 'Specialisation' => 'tv', 'Archive' => $rArchive];
+							}
+						}
+					}
 
-                    $rDefaultEPG = array('ChannelId' => null, 'Title' => 'No Programme Information...', 'RelativeSize' => 100, 'StartTime' => 'N/A', 'EndTime' => '', 'Specialisation' => 'tv', 'Archive' => null);
-                    $db->query('SELECT `id`, `stream_icon`, `stream_display_name`, `tv_archive_duration`, `tv_archive_server_id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ') ORDER BY FIELD(`id`, ' . implode(',', $rChannels) . ') ASC;');
+					$rDefaultEPG = ['ChannelId' => null, 'Title' => 'No Programme Information...', 'RelativeSize' => 100, 'StartTime' => 'N/A', 'EndTime' => '', 'Specialisation' => 'tv', 'Archive' => null];
+					$db->query('SELECT `id`, `stream_icon`, `stream_display_name`, `tv_archive_duration`, `tv_archive_server_id`, `category_id` FROM `streams` WHERE `id` IN (' . implode(',', $rChannels) . ') ORDER BY FIELD(`id`, ' . implode(',', $rChannels) . ') ASC;');
 
-                    foreach ($db->get_rows() as $rStream) {
-                        if ($rHideEmpty && 0 >= count($rListings[$rStream['id']] ?? [])) {
-                        } else {
-                            if (0 < $rStream['tv_archive_duration'] && 0 < $rStream['tv_archive_server_id']) {
-                                $rArchive = $rStream['tv_archive_duration'];
-                            } else {
-                                $rArchive = 0;
-                            }
+					foreach ($db->get_rows() as $rStream) {
+						if ($rHideEmpty && 0 >= count($rListings[$rStream['id']] ?? [])) {
+						} else {
+							if (0 < $rStream['tv_archive_duration'] && 0 < $rStream['tv_archive_server_id']) {
+								$rArchive = $rStream['tv_archive_duration'];
+							} else {
+								$rArchive = 0;
+							}
 
-                            $rDefaultArray = $rDefaultEPG;
-                            $rDefaultArray['ChannelId'] = $rStream['id'];
-                            $rCategoryIDs = json_decode($rStream['category_id'], true);
-                            $rCategories = CategoryService::getFromDatabase('live');
+							$rDefaultArray = $rDefaultEPG;
+							$rDefaultArray['ChannelId'] = $rStream['id'];
+							$rCategoryIDs = json_decode($rStream['category_id'], true);
+							$rCategories = CategoryService::getFromDatabase('live');
 
-                            if (0 < strlen(RequestManager::get('category') ?? '')) {
-                                $rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?? 'No Category');
-                            } else {
-                                $rCategory = ($rCategories[$rCategoryIDs[0] ?? null]['category_name'] ?? 'No Category');
-                            }
+							if (0 < strlen(RequestManager::get('category') ?? '')) {
+								$rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?? 'No Category');
+							} else {
+								$rCategory = ($rCategories[$rCategoryIDs[0] ?? null]['category_name'] ?? 'No Category');
+							}
 
-                            if (1 >= count($rCategoryIDs)) {
-                            } else {
-                                $rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
-                            }
+							if (1 >= count($rCategoryIDs)) {
+							} else {
+								$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
+							}
 
-                            $rReturn['Channels'][] = array('Id' => $rStream['id'], 'DisplayName' => $rStream['stream_display_name'], 'CategoryName' => $rCategory, 'Archive' => $rArchive, 'Image' => (ImageUtils::validateURL($rStream['stream_icon']) ?: ''), 'TvListings' => ($rListings[$rStream['id']] ?? array($rDefaultArray)));
-                        }
-                    }
-                    file_put_contents(TMP_PATH . 'cache_' . $rCacheID, igbinary_serialize($rReturn));
-                } else {
-                    $rReturn = igbinary_unserialize(file_get_contents(TMP_PATH . 'cache_' . $rCacheID));
-                }
+							$rReturn['Channels'][] = ['Id' => $rStream['id'], 'DisplayName' => $rStream['stream_display_name'], 'CategoryName' => $rCategory, 'Archive' => $rArchive, 'Image' => (ImageUtils::validateURL($rStream['stream_icon']) ?: ''), 'TvListings' => ($rListings[$rStream['id']] ?? [$rDefaultArray])];
+						}
+					}
+					file_put_contents(TMP_PATH . 'cache_' . $rCacheID, igbinary_serialize($rReturn));
+				} else {
+					$rReturn = igbinary_unserialize(file_get_contents(TMP_PATH . 'cache_' . $rCacheID));
+				}
 
-                echo json_encode($rReturn);
-            } else {
-                echo json_encode($rReturn);
-                exit();
-            }
-        }
-    }
+				echo json_encode($rReturn);
+			} else {
+				echo json_encode($rReturn);
+				exit();
+			}
+		}
+	}
 }
diff --git a/src/Public/Controllers/Player/LiveController.php b/src/Public/Controllers/Player/LiveController.php
index 7037e623..6113b973 100644
--- a/src/Public/Controllers/Player/LiveController.php
+++ b/src/Public/Controllers/Player/LiveController.php
@@ -16,57 +16,55 @@ use XcVm\Core\Util\ImageUtils;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class LiveController extends BasePlayerController
-{
-    public function index()
-    {
-        global $db, $rUserInfo;
+class LiveController extends BasePlayerController {
+	public function index() {
+		global $db, $rUserInfo;
 
-        if (!in_array(1, $rUserInfo['allowed_outputs']) || SettingsManager::get('disable_hls')) {
-            header('Location: index');
-            exit;
-        }
+		if (!in_array(1, $rUserInfo['allowed_outputs']) || SettingsManager::get('disable_hls')) {
+			header('Location: index');
+			exit;
+		}
 
-        $rCategories = getOrderedCategories($rUserInfo['category_ids'], 'live');
-        $rFilterArray = array('all' => 'All Channels', 'timeshift' => 'Timeshift Only', 'epg' => 'Has EPG Only');
-        $rFilterBy = (isset($rFilterArray[RequestManager::get('filter') ?? '']) ? RequestManager::get('filter') : 'all');
-        $rPicking = array('filter' => $rFilterBy);
-        $rSortArray = array('number' => 'Default', 'name' => 'Name A-Z', 'added' => 'Date Added');
-        $rSortBy = (isset($rSortArray[RequestManager::get('sort') ?? '']) ? RequestManager::get('sort') : 'number');
-        $rCategoryID = (intval(RequestManager::get('category') ?? 0) ?: $rCategories[0]['id']);
-        $rSearchBy = (RequestManager::get('search') ?? null);
-        $rStreamIDs = array();
-        $rStreams = getUserStreams($rUserInfo, array('live', 'created_live'), $rCategoryID, null, $rSortBy, $rSearchBy, $rPicking, null, null, true);
+		$rCategories = getOrderedCategories($rUserInfo['category_ids'], 'live');
+		$rFilterArray = ['all' => 'All Channels', 'timeshift' => 'Timeshift Only', 'epg' => 'Has EPG Only'];
+		$rFilterBy = (isset($rFilterArray[RequestManager::get('filter') ?? '']) ? RequestManager::get('filter') : 'all');
+		$rPicking = ['filter' => $rFilterBy];
+		$rSortArray = ['number' => 'Default', 'name' => 'Name A-Z', 'added' => 'Date Added'];
+		$rSortBy = (isset($rSortArray[RequestManager::get('sort') ?? '']) ? RequestManager::get('sort') : 'number');
+		$rCategoryID = (intval(RequestManager::get('category') ?? 0) ?: $rCategories[0]['id']);
+		$rSearchBy = (RequestManager::get('search') ?? null);
+		$rStreamIDs = [];
+		$rStreams = getUserStreams($rUserInfo, ['live', 'created_live'], $rCategoryID, null, $rSortBy, $rSearchBy, $rPicking, null, null, true);
 
-        foreach ($rStreams as $rStream) {
-            $rStreamIDs[] = $rStream['id'];
-        }
+		foreach ($rStreams as $rStream) {
+			$rStreamIDs[] = $rStream['id'];
+		}
 
-        $db->query('SELECT `movie_properties` FROM `streams` WHERE `movie_properties` IS NOT NULL AND `type` = 2 ORDER BY RAND() LIMIT 5;');
-        $rCover = '';
+		$db->query('SELECT `movie_properties` FROM `streams` WHERE `movie_properties` IS NOT NULL AND `type` = 2 ORDER BY RAND() LIMIT 5;');
+		$rCover = '';
 
-        foreach ($db->get_rows() as $rStream) {
-            $rProperties = json_decode($rStream['movie_properties'], true);
+		foreach ($db->get_rows() as $rStream) {
+			$rProperties = json_decode($rStream['movie_properties'], true);
 
-            if (!empty($rProperties['backdrop_path'][0])) {
-                $rCover = ImageUtils::validateURL($rProperties['backdrop_path'][0]);
-                break;
-            }
-        }
+			if (!empty($rProperties['backdrop_path'][0])) {
+				$rCover = ImageUtils::validateURL($rProperties['backdrop_path'][0]);
+				break;
+			}
+		}
 
-        $GLOBALS['_TITLE'] = 'Live TV';
-        $GLOBALS['rStreamIDs'] = $rStreamIDs;
+		$GLOBALS['_TITLE'] = 'Live TV';
+		$GLOBALS['rStreamIDs'] = $rStreamIDs;
 
-        $this->render('live', [
-            'rCategories' => $rCategories,
-            'rFilterArray' => $rFilterArray,
-            'rFilterBy' => $rFilterBy,
-            'rSortArray' => $rSortArray,
-            'rSortBy' => $rSortBy,
-            'rCategoryID' => $rCategoryID,
-            'rSearchBy' => $rSearchBy,
-            'rStreamIDs' => $rStreamIDs,
-            'rCover' => $rCover,
-        ]);
-    }
+		$this->render('live', [
+			'rCategories' => $rCategories,
+			'rFilterArray' => $rFilterArray,
+			'rFilterBy' => $rFilterBy,
+			'rSortArray' => $rSortArray,
+			'rSortBy' => $rSortBy,
+			'rCategoryID' => $rCategoryID,
+			'rSearchBy' => $rSearchBy,
+			'rStreamIDs' => $rStreamIDs,
+			'rCover' => $rCover,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Player/MoviesController.php b/src/Public/Controllers/Player/MoviesController.php
index f0c2abd9..0953680e 100644
--- a/src/Public/Controllers/Player/MoviesController.php
+++ b/src/Public/Controllers/Player/MoviesController.php
@@ -15,128 +15,126 @@ use XcVm\Core\Util\ImageUtils;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class MoviesController extends BasePlayerController
-{
-    public function index()
-    {
-        global $db, $rUserInfo;
+class MoviesController extends BasePlayerController {
+	public function index() {
+		global $db, $rUserInfo;
 
-        if (RequestManager::has('sort') && RequestManager::get('sort') == 'popular') {
-            $rPopular = true;
-            $rPopular = (igbinary_unserialize(file_get_contents(CONTENT_PATH . 'tmdb_popular'))['movies'] ?: array());
+		if (RequestManager::has('sort') && RequestManager::get('sort') == 'popular') {
+			$rPopular = true;
+			$rPopular = (igbinary_unserialize(file_get_contents(CONTENT_PATH . 'tmdb_popular'))['movies'] ?: []);
 
-            if (0 < count($rPopular) && 0 < count($rUserInfo['vod_ids'])) {
-                $db->query('SELECT `id`, `stream_display_name`, `year`, `rating`, `movie_properties` FROM `streams` WHERE `id` IN (' . implode(',', $rPopular) . ') AND `id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') ORDER BY FIELD(id, ' . implode(',', $rPopular) . ') ASC LIMIT 100;');
+			if (0 < count($rPopular) && 0 < count($rUserInfo['vod_ids'])) {
+				$db->query('SELECT `id`, `stream_display_name`, `year`, `rating`, `movie_properties` FROM `streams` WHERE `id` IN (' . implode(',', $rPopular) . ') AND `id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') ORDER BY FIELD(id, ' . implode(',', $rPopular) . ') ASC LIMIT 100;');
 
-                $rStreams = array('count' => $db->num_rows(), 'streams' => $db->get_rows());
-            } else {
-                header('Location: movies');
-                exit;
-            }
-        } else {
-            $rPopular = false;
-            $rPage = (intval(RequestManager::get('page') ?? 0) ?: 1);
-            $rLimit = 48;
-            $rSortArray = array('number' => 'Default', 'added' => 'Date Added', 'release' => 'Release Date', 'name' => 'Title A-Z', 'top' => 'Rating');
-            $rSortBy = (isset($rSortArray[RequestManager::get('sort') ?? '']) ? RequestManager::get('sort') : 'number');
-            $rPicking = array();
-            $rYearStart = (intval(RequestManager::get('year_s') ?? 0) ?: 1900);
-            $rYearEnd = (intval(RequestManager::get('year_e') ?? 0) ?: date('Y'));
+				$rStreams = ['count' => $db->num_rows(), 'streams' => $db->get_rows()];
+			} else {
+				header('Location: movies');
+				exit;
+			}
+		} else {
+			$rPopular = false;
+			$rPage = (intval(RequestManager::get('page') ?? 0) ?: 1);
+			$rLimit = 48;
+			$rSortArray = ['number' => 'Default', 'added' => 'Date Added', 'release' => 'Release Date', 'name' => 'Title A-Z', 'top' => 'Rating'];
+			$rSortBy = (isset($rSortArray[RequestManager::get('sort') ?? '']) ? RequestManager::get('sort') : 'number');
+			$rPicking = [];
+			$rYearStart = (intval(RequestManager::get('year_s') ?? 0) ?: 1900);
+			$rYearEnd = (intval(RequestManager::get('year_e') ?? 0) ?: date('Y'));
 
-            if (!($rYearStart < 1900 || date('Y') < $rYearStart)) {
-            } else {
-                $rYearStart = 1900;
-            }
+			if (!($rYearStart < 1900 || date('Y') < $rYearStart)) {
+			} else {
+				$rYearStart = 1900;
+			}
 
-            if (!($rYearEnd < 1900 || date('Y') < $rYearEnd || $rYearEnd < $rYearStart)) {
-            } else {
-                $rYearEnd = date('Y');
-            }
+			if (!($rYearEnd < 1900 || date('Y') < $rYearEnd || $rYearEnd < $rYearStart)) {
+			} else {
+				$rYearEnd = date('Y');
+			}
 
-            if (!(1900 < $rYearStart || $rYearEnd < date('Y'))) {
-            } else {
-                $rPicking['year_range'] = array($rYearStart, $rYearEnd);
-            }
+			if (!(1900 < $rYearStart || $rYearEnd < date('Y'))) {
+			} else {
+				$rPicking['year_range'] = [$rYearStart, $rYearEnd];
+			}
 
-            $rRatingStart = (floatval(RequestManager::get('rating_s') ?? 0) ?: 0);
-            $rRatingEnd = (floatval(RequestManager::get('rating_e') ?? 0) ?: 10);
+			$rRatingStart = (floatval(RequestManager::get('rating_s') ?? 0) ?: 0);
+			$rRatingEnd = (floatval(RequestManager::get('rating_e') ?? 0) ?: 10);
 
-            if (!($rRatingStart < 0 || 10 < $rRatingStart)) {
-            } else {
-                $rRatingStart = 0;
-            }
+			if (!($rRatingStart < 0 || 10 < $rRatingStart)) {
+			} else {
+				$rRatingStart = 0;
+			}
 
-            if (!($rRatingEnd < 0 || 10 < $rRatingEnd || $rRatingEnd < $rRatingStart)) {
-            } else {
-                $rRatingEnd = 10;
-            }
+			if (!($rRatingEnd < 0 || 10 < $rRatingEnd || $rRatingEnd < $rRatingStart)) {
+			} else {
+				$rRatingEnd = 10;
+			}
 
-            if (!(0 < $rRatingStart || $rRatingEnd < 10)) {
-            } else {
-                $rPicking['rating_range'] = array($rRatingStart, $rRatingEnd);
-            }
+			if (!(0 < $rRatingStart || $rRatingEnd < 10)) {
+			} else {
+				$rPicking['rating_range'] = [$rRatingStart, $rRatingEnd];
+			}
 
-            $rCategoryID = (intval(RequestManager::get('category') ?? 0) ?: null);
-            $rSearchBy = (RequestManager::get('search') ?? null);
+			$rCategoryID = (intval(RequestManager::get('category') ?? 0) ?: null);
+			$rSearchBy = (RequestManager::get('search') ?? null);
 
-            if (!$rSearchBy) {
-            } else {
-                $rPage = 1;
-                $rLimit = 100;
-            }
+			if (!$rSearchBy) {
+			} else {
+				$rPage = 1;
+				$rLimit = 100;
+			}
 
-            $rStreams = getUserStreams($rUserInfo, array('movie'), $rCategoryID, null, $rSortBy, $rSearchBy, $rPicking, ($rPage - 1) * $rLimit, $rLimit);
-        }
+			$rStreams = getUserStreams($rUserInfo, ['movie'], $rCategoryID, null, $rSortBy, $rSearchBy, $rPicking, ($rPage - 1) * $rLimit, $rLimit);
+		}
 
-        $rCover = '';
-        $rShuffle = $rStreams['streams'];
-        shuffle($rShuffle);
+		$rCover = '';
+		$rShuffle = $rStreams['streams'];
+		shuffle($rShuffle);
 
-        foreach ($rShuffle as $rStream) {
-            $rProperties = json_decode($rStream['movie_properties'], true);
+		foreach ($rShuffle as $rStream) {
+			$rProperties = json_decode($rStream['movie_properties'], true);
 
-            if (empty($rProperties['backdrop_path'][0])) {
-            } else {
-                $rCover = ImageUtils::validateURL($rProperties['backdrop_path'][0]);
-                break;
-            }
-        }
+			if (empty($rProperties['backdrop_path'][0])) {
+			} else {
+				$rCover = ImageUtils::validateURL($rProperties['backdrop_path'][0]);
+				break;
+			}
+		}
 
-        if ($rPopular || (isset($rSearchBy) && $rSearchBy)) {
-        } else {
-            $rCount = $rStreams['count'];
-            $rPages = ceil($rCount / $rLimit);
-            $rPagination = array();
+		if ($rPopular || (isset($rSearchBy) && $rSearchBy)) {
+		} else {
+			$rCount = $rStreams['count'];
+			$rPages = ceil($rCount / $rLimit);
+			$rPagination = [];
 
-            foreach (range($rPage - 2, $rPage + 2) as $i) {
-                if (!(1 <= $i && $i <= $rPages)) {
-                } else {
-                    $rPagination[] = $i;
-                }
-            }
-        }
+			foreach (range($rPage - 2, $rPage + 2) as $i) {
+				if (!(1 <= $i && $i <= $rPages)) {
+				} else {
+					$rPagination[] = $i;
+				}
+			}
+		}
 
-        $GLOBALS['_TITLE'] = 'Movies';
-        $GLOBALS['rYearStart'] = isset($rYearStart) ? $rYearStart : 1900;
-        $GLOBALS['rYearEnd'] = isset($rYearEnd) ? $rYearEnd : date('Y');
-        $GLOBALS['rRatingStart'] = isset($rRatingStart) ? $rRatingStart : 0;
-        $GLOBALS['rRatingEnd'] = isset($rRatingEnd) ? $rRatingEnd : 10;
+		$GLOBALS['_TITLE'] = 'Movies';
+		$GLOBALS['rYearStart'] = isset($rYearStart) ? $rYearStart : 1900;
+		$GLOBALS['rYearEnd'] = isset($rYearEnd) ? $rYearEnd : date('Y');
+		$GLOBALS['rRatingStart'] = isset($rRatingStart) ? $rRatingStart : 0;
+		$GLOBALS['rRatingEnd'] = isset($rRatingEnd) ? $rRatingEnd : 10;
 
-        $this->render('movies', [
-            'rPopular' => $rPopular,
-            'rStreams' => $rStreams,
-            'rCover' => $rCover,
-            'rSortArray' => isset($rSortArray) ? $rSortArray : [],
-            'rSortBy' => isset($rSortBy) ? $rSortBy : null,
-            'rCategoryID' => isset($rCategoryID) ? $rCategoryID : null,
-            'rSearchBy' => isset($rSearchBy) ? $rSearchBy : null,
-            'rPage' => isset($rPage) ? $rPage : 1,
-            'rPages' => isset($rPages) ? $rPages : 1,
-            'rPagination' => isset($rPagination) ? $rPagination : [],
-            'rYearStart' => isset($rYearStart) ? $rYearStart : 1900,
-            'rYearEnd' => isset($rYearEnd) ? $rYearEnd : date('Y'),
-            'rRatingStart' => isset($rRatingStart) ? $rRatingStart : 0,
-            'rRatingEnd' => isset($rRatingEnd) ? $rRatingEnd : 10,
-        ]);
-    }
+		$this->render('movies', [
+			'rPopular' => $rPopular,
+			'rStreams' => $rStreams,
+			'rCover' => $rCover,
+			'rSortArray' => isset($rSortArray) ? $rSortArray : [],
+			'rSortBy' => isset($rSortBy) ? $rSortBy : null,
+			'rCategoryID' => isset($rCategoryID) ? $rCategoryID : null,
+			'rSearchBy' => isset($rSearchBy) ? $rSearchBy : null,
+			'rPage' => isset($rPage) ? $rPage : 1,
+			'rPages' => isset($rPages) ? $rPages : 1,
+			'rPagination' => isset($rPagination) ? $rPagination : [],
+			'rYearStart' => isset($rYearStart) ? $rYearStart : 1900,
+			'rYearEnd' => isset($rYearEnd) ? $rYearEnd : date('Y'),
+			'rRatingStart' => isset($rRatingStart) ? $rRatingStart : 0,
+			'rRatingEnd' => isset($rRatingEnd) ? $rRatingEnd : 10,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Player/PlayerLoginController.php b/src/Public/Controllers/Player/PlayerLoginController.php
index 6d0c86a8..c6d32e4f 100644
--- a/src/Public/Controllers/Player/PlayerLoginController.php
+++ b/src/Public/Controllers/Player/PlayerLoginController.php
@@ -24,10 +24,8 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class PlayerLoginController
-{
-	public function index()
-	{
+class PlayerLoginController {
+	public function index() {
 		define('CLIENT_INVALID', 0);
 		define('CLIENT_IS_E2', 1);
 		define('CLIENT_IS_MAG', 2);
@@ -81,8 +79,7 @@ class PlayerLoginController
 		}
 	}
 
-	private function processLogin()
-	{
+	private function processLogin() {
 		$rIP = NetworkUtils::getUserIP();
 		$rCountryCode = GeoIP::getCountry($rIP)['country']['iso_code'];
 		$rUserInfo = UserRepository::getUserInfo(null, RequestManager::get('username'), RequestManager::get('password'), true);
diff --git a/src/Public/Controllers/Player/PlayerLogoutController.php b/src/Public/Controllers/Player/PlayerLogoutController.php
index b1d6d850..53964828 100644
--- a/src/Public/Controllers/Player/PlayerLogoutController.php
+++ b/src/Public/Controllers/Player/PlayerLogoutController.php
@@ -14,12 +14,10 @@ use XcVm\Core\Auth\SessionManager;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class PlayerLogoutController extends BasePlayerController
-{
-    public function index()
-    {
-        SessionManager::clearContext('player');
-        header('Location: login');
-        exit();
-    }
+class PlayerLogoutController extends BasePlayerController {
+	public function index() {
+		SessionManager::clearContext('player');
+		header('Location: login');
+		exit();
+	}
 }
diff --git a/src/Public/Controllers/Player/PlayerMovieController.php b/src/Public/Controllers/Player/PlayerMovieController.php
index 5ce2fb9e..bd195c01 100644
--- a/src/Public/Controllers/Player/PlayerMovieController.php
+++ b/src/Public/Controllers/Player/PlayerMovieController.php
@@ -18,99 +18,97 @@ use XcVm\Domain\Vod\TMDbService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class PlayerMovieController extends BasePlayerController
-{
-    public function index()
-    {
-        global $db, $rUserInfo;
+class PlayerMovieController extends BasePlayerController {
+	public function index() {
+		global $db, $rUserInfo;
 
-        if (($rStream = getStream(RequestManager::get('id'))) && in_array(RequestManager::get('id'), $rUserInfo['vod_ids'])) {
-            $rProperties = json_decode($rStream['movie_properties'], true);
-            $rSubtitles = array(getSubtitles($rStream['id'], $rProperties['subtitle'] ?? []));
-            $rDomainName = DomainResolver::resolve(SERVER_ID, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443);
-            $rURLs = array($rDomainName . 'movie/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rStream['id'] . '.' . $rStream['target_container']);
-            $rLegacy = false;
+		if (($rStream = getStream(RequestManager::get('id'))) && in_array(RequestManager::get('id'), $rUserInfo['vod_ids'])) {
+			$rProperties = json_decode($rStream['movie_properties'], true);
+			$rSubtitles = [getSubtitles($rStream['id'], $rProperties['subtitle'] ?? [])];
+			$rDomainName = DomainResolver::resolve(SERVER_ID, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443);
+			$rURLs = [$rDomainName . 'movie/' . $rUserInfo['username'] . '/' . $rUserInfo['password'] . '/' . $rStream['id'] . '.' . $rStream['target_container']];
+			$rLegacy = false;
 
-            if ($rStream['target_container'] != 'mp4') {
-                $rLegacy = true;
-            }
+			if ($rStream['target_container'] != 'mp4') {
+				$rLegacy = true;
+			}
 
-            if ($rProperties['tmdb_id']) {
-                if (!file_exists(TMP_PATH . 'tmdb_' . $rProperties['tmdb_id'])) {
-                    $rTMDB = json_decode(json_encode(TMDbService::getMovie($rProperties['tmdb_id'])), true);
+			if ($rProperties['tmdb_id']) {
+				if (!file_exists(TMP_PATH . 'tmdb_' . $rProperties['tmdb_id'])) {
+					$rTMDB = json_decode(json_encode(TMDbService::getMovie($rProperties['tmdb_id'])), true);
 
-                    if ($rTMDB) {
-                        file_put_contents(TMP_PATH . 'tmdb_' . $rProperties['tmdb_id'], igbinary_serialize($rTMDB));
-                    }
-                } else {
-                    $rTMDB = igbinary_unserialize(file_get_contents(TMP_PATH . 'tmdb_' . $rProperties['tmdb_id']));
-                }
-            }
+					if ($rTMDB) {
+						file_put_contents(TMP_PATH . 'tmdb_' . $rProperties['tmdb_id'], igbinary_serialize($rTMDB));
+					}
+				} else {
+					$rTMDB = igbinary_unserialize(file_get_contents(TMP_PATH . 'tmdb_' . $rProperties['tmdb_id']));
+				}
+			}
 
-            $rCover = (ImageUtils::validateURL($rProperties['backdrop_path'][0]) ?: '');
-            $rPoster = (ImageUtils::validateURL($rProperties['cover_big']) ?: '');
+			$rCover = (ImageUtils::validateURL($rProperties['backdrop_path'][0]) ?: '');
+			$rPoster = (ImageUtils::validateURL($rProperties['cover_big']) ?: '');
 
-            $rSimilarIDs = array($rStream['id']);
-            $rSimilar = array();
-            $rSimilarArray = json_decode($rStream['similar'], true);
+			$rSimilarIDs = [$rStream['id']];
+			$rSimilar = [];
+			$rSimilarArray = json_decode($rStream['similar'], true);
 
-            if (0 >= count($rSimilarArray)) {
-            } else {
-                if (SettingsManager::get('player_hide_incompatible')) {
-                    $db->query('SELECT * FROM `streams` WHERE `tmdb_id` IN (' . implode(',', $rSimilarArray) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1 LIMIT 6;');
-                } else {
-                    $db->query('SELECT * FROM `streams` WHERE `tmdb_id` IN (' . implode(',', $rSimilarArray) . ') LIMIT 6;');
-                }
+			if (0 >= count($rSimilarArray)) {
+			} else {
+				if (SettingsManager::get('player_hide_incompatible')) {
+					$db->query('SELECT * FROM `streams` WHERE `tmdb_id` IN (' . implode(',', $rSimilarArray) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1 LIMIT 6;');
+				} else {
+					$db->query('SELECT * FROM `streams` WHERE `tmdb_id` IN (' . implode(',', $rSimilarArray) . ') LIMIT 6;');
+				}
 
-                foreach ($db->get_rows() as $rRow) {
-                    $rSimilarProperties = json_decode($rRow['movie_properties'], true);
-                        $rSimilar[] = array('type' => 'movie', 'id' => $rRow['id'], 'title' => ($rRow['title'] ?? $rRow['stream_display_name']), 'year' => ($rRow['year'] ?: null), 'rating' => $rSimilarProperties['rating'], 'cover' => (ImageUtils::validateURL($rSimilarProperties['movie_image']) ?: ''), 'backdrop' => (ImageUtils::validateURL($rSimilarProperties['backdrop_path'][0] ?? '') ?: ''));
-                    $rSimilarIDs[] = $rRow['id'];
-                }
-            }
+				foreach ($db->get_rows() as $rRow) {
+					$rSimilarProperties = json_decode($rRow['movie_properties'], true);
+						$rSimilar[] = ['type' => 'movie', 'id' => $rRow['id'], 'title' => ($rRow['title'] ?? $rRow['stream_display_name']), 'year' => ($rRow['year'] ?: null), 'rating' => $rSimilarProperties['rating'], 'cover' => (ImageUtils::validateURL($rSimilarProperties['movie_image']) ?: ''), 'backdrop' => (ImageUtils::validateURL($rSimilarProperties['backdrop_path'][0] ?? '') ?: '')];
+					$rSimilarIDs[] = $rRow['id'];
+				}
+			}
 
-            if (count($rSimilar) >= 6) {
-            } else {
-                if (0 < count($rSimilarIDs)) {
-                    $rPrevious = '`stream_id` NOT IN (' . implode(',', $rSimilarIDs) . ') AND ';
-                } else {
-                    $rPrevious = '';
-                }
+			if (count($rSimilar) >= 6) {
+			} else {
+				if (0 < count($rSimilarIDs)) {
+					$rPrevious = '`stream_id` NOT IN (' . implode(',', $rSimilarIDs) . ') AND ';
+				} else {
+					$rPrevious = '';
+				}
 
-                if (SettingsManager::get('player_hide_incompatible')) {
-                    $db->query('SELECT `streams`.*, COUNT(`user_id`) AS `count` FROM `lines_activity` LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id` WHERE `user_id` IN (SELECT DISTINCT(`user_id`) FROM `lines_activity` WHERE `stream_id` = ? AND (`date_end` - `date_start` > 60)) AND `type` = 2 AND ' . $rPrevious . ' `stream_id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1 GROUP BY `stream_id` ORDER BY `count` DESC LIMIT ' . (6 - count($rSimilar)) . ';', $rStream['id']);
-                } else {
-                    $db->query('SELECT `streams`.*, COUNT(`user_id`) AS `count` FROM `lines_activity` LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id` WHERE `user_id` IN (SELECT DISTINCT(`user_id`) FROM `lines_activity` WHERE `stream_id` = ? AND (`date_end` - `date_start` > 60)) AND `type` = 2 AND ' . $rPrevious . ' `stream_id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') GROUP BY `stream_id` ORDER BY `count` DESC LIMIT ' . (6 - count($rSimilar)) . ';', $rStream['id']);
-                }
+				if (SettingsManager::get('player_hide_incompatible')) {
+					$db->query('SELECT `streams`.*, COUNT(`user_id`) AS `count` FROM `lines_activity` LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id` WHERE `user_id` IN (SELECT DISTINCT(`user_id`) FROM `lines_activity` WHERE `stream_id` = ? AND (`date_end` - `date_start` > 60)) AND `type` = 2 AND ' . $rPrevious . ' `stream_id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') AND (SELECT MAX(`compatible`) FROM `streams_servers` WHERE `streams_servers`.`stream_id` = `streams`.`id` LIMIT 1) = 1 GROUP BY `stream_id` ORDER BY `count` DESC LIMIT ' . (6 - count($rSimilar)) . ';', $rStream['id']);
+				} else {
+					$db->query('SELECT `streams`.*, COUNT(`user_id`) AS `count` FROM `lines_activity` LEFT JOIN `streams` ON `streams`.`id` = `lines_activity`.`stream_id` WHERE `user_id` IN (SELECT DISTINCT(`user_id`) FROM `lines_activity` WHERE `stream_id` = ? AND (`date_end` - `date_start` > 60)) AND `type` = 2 AND ' . $rPrevious . ' `stream_id` IN (' . implode(',', $rUserInfo['vod_ids']) . ') GROUP BY `stream_id` ORDER BY `count` DESC LIMIT ' . (6 - count($rSimilar)) . ';', $rStream['id']);
+				}
 
-                foreach ($db->get_rows() as $rRow) {
-                    if (!$rRow['id']) {
-                    } else {
-                        $rSimilarProperties = json_decode($rRow['movie_properties'], true);
-                        $rSimilar[] = array('type' => 'movie', 'id' => $rRow['id'], 'title' => ($rRow['title'] ?? $rRow['stream_display_name']), 'year' => ($rRow['year'] ?: null), 'rating' => $rSimilarProperties['rating'], 'cover' => (ImageUtils::validateURL($rSimilarProperties['movie_image']) ?: ''), 'backdrop' => (ImageUtils::validateURL($rSimilarProperties['backdrop_path'][0] ?? '') ?: ''));
-                        $rSimilarIDs[] = $rRow['id'];
-                    }
-                }
-            }
+				foreach ($db->get_rows() as $rRow) {
+					if (!$rRow['id']) {
+					} else {
+						$rSimilarProperties = json_decode($rRow['movie_properties'], true);
+						$rSimilar[] = ['type' => 'movie', 'id' => $rRow['id'], 'title' => ($rRow['title'] ?? $rRow['stream_display_name']), 'year' => ($rRow['year'] ?: null), 'rating' => $rSimilarProperties['rating'], 'cover' => (ImageUtils::validateURL($rSimilarProperties['movie_image']) ?: ''), 'backdrop' => (ImageUtils::validateURL($rSimilarProperties['backdrop_path'][0] ?? '') ?: '')];
+						$rSimilarIDs[] = $rRow['id'];
+					}
+				}
+			}
 
-            $GLOBALS['_TITLE'] = $rStream['stream_display_name'];
-            $GLOBALS['rURLs'] = $rURLs;
-            $GLOBALS['rSubtitles'] = $rSubtitles;
-            $GLOBALS['rLegacy'] = $rLegacy;
+			$GLOBALS['_TITLE'] = $rStream['stream_display_name'];
+			$GLOBALS['rURLs'] = $rURLs;
+			$GLOBALS['rSubtitles'] = $rSubtitles;
+			$GLOBALS['rLegacy'] = $rLegacy;
 
-            $this->render('movie', [
-                'rStream' => $rStream,
-                'rProperties' => $rProperties,
-                'rSubtitles' => $rSubtitles,
-                'rURLs' => $rURLs,
-                'rLegacy' => $rLegacy,
-                'rCover' => $rCover,
-                'rPoster' => $rPoster,
-                'rSimilar' => $rSimilar,
-            ]);
-        } else {
-            header('Location: movies');
-            exit();
-        }
-    }
+			$this->render('movie', [
+				'rStream' => $rStream,
+				'rProperties' => $rProperties,
+				'rSubtitles' => $rSubtitles,
+				'rURLs' => $rURLs,
+				'rLegacy' => $rLegacy,
+				'rCover' => $rCover,
+				'rPoster' => $rPoster,
+				'rSimilar' => $rSimilar,
+			]);
+		} else {
+			header('Location: movies');
+			exit();
+		}
+	}
 }
diff --git a/src/Public/Controllers/Player/PlayerProfileController.php b/src/Public/Controllers/Player/PlayerProfileController.php
index eee15868..17780d35 100644
--- a/src/Public/Controllers/Player/PlayerProfileController.php
+++ b/src/Public/Controllers/Player/PlayerProfileController.php
@@ -18,39 +18,37 @@ use XcVm\Domain\Line\LineService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class PlayerProfileController extends BasePlayerController
-{
-    public function index()
-    {
-        global $db, $rUserInfo;
+class PlayerProfileController extends BasePlayerController {
+	public function index() {
+		global $db, $rUserInfo;
 
-        if (!SettingsManager::get('player_allow_bouquet')) {
-        } else {
-            $rBouquetNames = array();
+		if (!SettingsManager::get('player_allow_bouquet')) {
+		} else {
+			$rBouquetNames = [];
 
-            foreach (BouquetService::getAll() as $rBouquet) {
-                if (isset($rBouquet['id'], $rBouquet['bouquet_name'])) {
-                    $rBouquetNames[$rBouquet['id']] = $rBouquet['bouquet_name'];
-                }
-            }
+			foreach (BouquetService::getAll() as $rBouquet) {
+				if (isset($rBouquet['id'], $rBouquet['bouquet_name'])) {
+					$rBouquetNames[$rBouquet['id']] = $rBouquet['bouquet_name'];
+				}
+			}
 
-            if (!RequestManager::has('bouquet_order')) {
-            } else {
-                $rBouquetOrder = json_decode(RequestManager::get('bouquet_order'), true);
-                $rUserInfo['bouquet'] = array_map('intval', AdminHelpers::sortArrayByArray($rUserInfo['bouquet'], $rBouquetOrder));
-                $db->query('UPDATE `lines` SET `bouquet` = ? WHERE `id` = ?;', '[' . implode(',', $rUserInfo['bouquet']) . ']', $rUserInfo['id']);
+			if (!RequestManager::has('bouquet_order')) {
+			} else {
+				$rBouquetOrder = json_decode(RequestManager::get('bouquet_order'), true);
+				$rUserInfo['bouquet'] = array_map('intval', AdminHelpers::sortArrayByArray($rUserInfo['bouquet'], $rBouquetOrder));
+				$db->query('UPDATE `lines` SET `bouquet` = ? WHERE `id` = ?;', '[' . implode(',', $rUserInfo['bouquet']) . ']', $rUserInfo['id']);
 
-                if (!SettingsManager::get('enable_cache')) {
-                } else {
-                    LineService::updateLineSignal($rUserInfo['id']);
-                }
-            }
-        }
+				if (!SettingsManager::get('enable_cache')) {
+				} else {
+					LineService::updateLineSignal($rUserInfo['id']);
+				}
+			}
+		}
 
-        $GLOBALS['_TITLE'] = 'Profile';
+		$GLOBALS['_TITLE'] = 'Profile';
 
-        $this->render('profile', [
-            'rBouquetNames' => (isset($rBouquetNames) ? $rBouquetNames : []),
-        ]);
-    }
+		$this->render('profile', [
+			'rBouquetNames' => (isset($rBouquetNames) ? $rBouquetNames : []),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Player/PlayerProxyController.php b/src/Public/Controllers/Player/PlayerProxyController.php
index 24fc50ea..a8622b7d 100644
--- a/src/Public/Controllers/Player/PlayerProxyController.php
+++ b/src/Public/Controllers/Player/PlayerProxyController.php
@@ -19,10 +19,8 @@ use XcVm\Core\Util\Encryption;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class PlayerProxyController extends BasePlayerController
-{
-	public function index()
-	{
+class PlayerProxyController extends BasePlayerController {
+	public function index() {
 		ini_set('default_socket_timeout', 10);
 
 		// The URL is fetched from this server: it must be one this panel sealed.
diff --git a/src/Public/Controllers/Player/PlayerResizeController.php b/src/Public/Controllers/Player/PlayerResizeController.php
index 9996cee6..2a4d4421 100644
--- a/src/Public/Controllers/Player/PlayerResizeController.php
+++ b/src/Public/Controllers/Player/PlayerResizeController.php
@@ -18,10 +18,8 @@ use XcVm\Core\Util\ImageResizeService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class PlayerResizeController extends BasePlayerController
-{
-	public function index()
-	{
+class PlayerResizeController extends BasePlayerController {
+	public function index() {
 		session_write_close();
 
 		if (!isset($GLOBALS['rUserInfo']) || !$GLOBALS['rUserInfo']['id']) {
diff --git a/src/Public/Controllers/Player/PortalController.php b/src/Public/Controllers/Player/PortalController.php
index 36f72698..360d98ff 100644
--- a/src/Public/Controllers/Player/PortalController.php
+++ b/src/Public/Controllers/Player/PortalController.php
@@ -14,37 +14,37 @@ use XcVm\Domain\Line\ActiveCodeService;
  * @package XC_VM_Public_Controllers_Player
  */
 class PortalController {
-    public function index() {
-        $action = RequestManager::get('action') ?? '';
-        $code = trim(RequestManager::get('code') ?? '');
+	public function index() {
+		$action = RequestManager::get('action') ?? '';
+		$code = trim(RequestManager::get('code') ?? '');
 
-        $result = null;
-        if ($_SERVER['REQUEST_METHOD'] === 'POST' || $action === 'activate') {
-            if (!empty($code)) {
-                $deviceInfo = [
-                    'mac' => trim(RequestManager::get('mac') ?? ''),
-                    'device_id' => trim(RequestManager::get('device_id') ?? ''),
-                    'ip' => $_SERVER['REMOTE_ADDR'] ?? '',
-                ];
-                $result = ActiveCodeService::activateCode($code, $deviceInfo);
+		$result = null;
+		if ($_SERVER['REQUEST_METHOD'] === 'POST' || $action === 'activate') {
+			if (!empty($code)) {
+				$deviceInfo = [
+					'mac' => trim(RequestManager::get('mac') ?? ''),
+					'device_id' => trim(RequestManager::get('device_id') ?? ''),
+					'ip' => $_SERVER['REMOTE_ADDR'] ?? '',
+				];
+				$result = ActiveCodeService::activateCode($code, $deviceInfo);
 
-                // If AJAX request, return JSON
-                if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest') {
-                    header('Content-Type: application/json; charset=utf-8');
-                    echo json_encode($result);
-                    exit();
-                }
-            } else {
-                $result = ['status' => 'ERROR', 'message' => 'Please enter an activation code.'];
-                if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest') {
-                    header('Content-Type: application/json; charset=utf-8');
-                    echo json_encode($result);
-                    exit();
-                }
-            }
-        }
+				// If AJAX request, return JSON
+				if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest') {
+					header('Content-Type: application/json; charset=utf-8');
+					echo json_encode($result);
+					exit();
+				}
+			} else {
+				$result = ['status' => 'ERROR', 'message' => 'Please enter an activation code.'];
+				if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest') {
+					header('Content-Type: application/json; charset=utf-8');
+					echo json_encode($result);
+					exit();
+				}
+			}
+		}
 
-        require MAIN_HOME . 'Public/Views/portal/index.php';
-        exit();
-    }
+		require MAIN_HOME . 'Public/Views/portal/index.php';
+		exit();
+	}
 }
diff --git a/src/Public/Controllers/Player/SeriesController.php b/src/Public/Controllers/Player/SeriesController.php
index bb152045..a0605105 100644
--- a/src/Public/Controllers/Player/SeriesController.php
+++ b/src/Public/Controllers/Player/SeriesController.php
@@ -15,128 +15,126 @@ use XcVm\Core\Util\ImageUtils;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class SeriesController extends BasePlayerController
-{
-    public function index()
-    {
-        global $db, $rUserInfo;
+class SeriesController extends BasePlayerController {
+	public function index() {
+		global $db, $rUserInfo;
 
-        if (RequestManager::has('sort') && RequestManager::get('sort') == 'popular') {
-            $rPopular = true;
-            $rPopular = (igbinary_unserialize(file_get_contents(CONTENT_PATH . 'tmdb_popular'))['series'] ?: array());
+		if (RequestManager::has('sort') && RequestManager::get('sort') == 'popular') {
+			$rPopular = true;
+			$rPopular = (igbinary_unserialize(file_get_contents(CONTENT_PATH . 'tmdb_popular'))['series'] ?: []);
 
-            if (0 < count($rPopular) && 0 < count($rUserInfo['series_ids'])) {
-                $db->query('SELECT `id`, `title`, `year`, `rating`, `cover`, `backdrop_path` FROM `streams_series` WHERE `id` IN (' . implode(',', $rPopular) . ') AND `id` IN (' . implode(',', $rUserInfo['series_ids']) . ') ORDER BY FIELD(id, ' . implode(',', $rPopular) . ') ASC LIMIT 100;');
+			if (0 < count($rPopular) && 0 < count($rUserInfo['series_ids'])) {
+				$db->query('SELECT `id`, `title`, `year`, `rating`, `cover`, `backdrop_path` FROM `streams_series` WHERE `id` IN (' . implode(',', $rPopular) . ') AND `id` IN (' . implode(',', $rUserInfo['series_ids']) . ') ORDER BY FIELD(id, ' . implode(',', $rPopular) . ') ASC LIMIT 100;');
 
-                $rSeries = array('count' => $db->num_rows(), 'streams' => $db->get_rows());
-            } else {
-                header('Location: series');
-                exit;
-            }
-        } else {
-            $rPopular = false;
-            $rPage = (intval(RequestManager::get('page') ?? 0) ?: 1);
-            $rLimit = 48;
-            $rSortArray = array('number' => 'Default', 'added' => 'Last Updated', 'release' => 'Air Date', 'name' => 'Title A-Z', 'top' => 'Rating');
-            $rSortBy = (isset($rSortArray[RequestManager::get('sort') ?? '']) ? RequestManager::get('sort') : 'number');
-            $rPicking = array();
-            $rYearStart = (intval(RequestManager::get('year_s') ?? 0) ?: 1900);
-            $rYearEnd = (intval(RequestManager::get('year_e') ?? 0) ?: date('Y'));
+				$rSeries = ['count' => $db->num_rows(), 'streams' => $db->get_rows()];
+			} else {
+				header('Location: series');
+				exit;
+			}
+		} else {
+			$rPopular = false;
+			$rPage = (intval(RequestManager::get('page') ?? 0) ?: 1);
+			$rLimit = 48;
+			$rSortArray = ['number' => 'Default', 'added' => 'Last Updated', 'release' => 'Air Date', 'name' => 'Title A-Z', 'top' => 'Rating'];
+			$rSortBy = (isset($rSortArray[RequestManager::get('sort') ?? '']) ? RequestManager::get('sort') : 'number');
+			$rPicking = [];
+			$rYearStart = (intval(RequestManager::get('year_s') ?? 0) ?: 1900);
+			$rYearEnd = (intval(RequestManager::get('year_e') ?? 0) ?: date('Y'));
 
-            if (!($rYearStart < 1900 || date('Y') < $rYearStart)) {
-            } else {
-                $rYearStart = 1900;
-            }
+			if (!($rYearStart < 1900 || date('Y') < $rYearStart)) {
+			} else {
+				$rYearStart = 1900;
+			}
 
-            if (!($rYearEnd < 1900 || date('Y') < $rYearEnd || $rYearEnd < $rYearStart)) {
-            } else {
-                $rYearEnd = date('Y');
-            }
+			if (!($rYearEnd < 1900 || date('Y') < $rYearEnd || $rYearEnd < $rYearStart)) {
+			} else {
+				$rYearEnd = date('Y');
+			}
 
-            if (!(1900 < $rYearStart || $rYearEnd < date('Y'))) {
-            } else {
-                $rPicking['year_range'] = array($rYearStart, $rYearEnd);
-            }
+			if (!(1900 < $rYearStart || $rYearEnd < date('Y'))) {
+			} else {
+				$rPicking['year_range'] = [$rYearStart, $rYearEnd];
+			}
 
-            $rRatingStart = (intval(RequestManager::get('rating_s') ?? 0) ?: 0);
-            $rRatingEnd = (intval(RequestManager::get('rating_e') ?? 0) ?: 10);
+			$rRatingStart = (intval(RequestManager::get('rating_s') ?? 0) ?: 0);
+			$rRatingEnd = (intval(RequestManager::get('rating_e') ?? 0) ?: 10);
 
-            if (!($rRatingStart < 0 || 10 < $rRatingStart)) {
-            } else {
-                $rRatingStart = 0;
-            }
+			if (!($rRatingStart < 0 || 10 < $rRatingStart)) {
+			} else {
+				$rRatingStart = 0;
+			}
 
-            if (!($rRatingEnd < 0 || 10 < $rRatingEnd || $rRatingEnd < $rRatingStart)) {
-            } else {
-                $rRatingEnd = 10;
-            }
+			if (!($rRatingEnd < 0 || 10 < $rRatingEnd || $rRatingEnd < $rRatingStart)) {
+			} else {
+				$rRatingEnd = 10;
+			}
 
-            if (!(0 < $rRatingStart || $rRatingEnd < 10)) {
-            } else {
-                $rPicking['rating_range'] = array($rRatingStart, $rRatingEnd);
-            }
+			if (!(0 < $rRatingStart || $rRatingEnd < 10)) {
+			} else {
+				$rPicking['rating_range'] = [$rRatingStart, $rRatingEnd];
+			}
 
-            $rCategoryID = (intval(RequestManager::get('category') ?? 0) ?: null);
-            $rSearchBy = (RequestManager::get('search') ?? null);
+			$rCategoryID = (intval(RequestManager::get('category') ?? 0) ?: null);
+			$rSearchBy = (RequestManager::get('search') ?? null);
 
-            if (!$rSearchBy) {
-            } else {
-                $rPage = 1;
-                $rLimit = 100;
-            }
+			if (!$rSearchBy) {
+			} else {
+				$rPage = 1;
+				$rLimit = 100;
+			}
 
-            $rSeries = getUserSeries($rUserInfo, $rCategoryID, null, $rSortBy, $rSearchBy, $rPicking, ($rPage - 1) * $rLimit, $rLimit);
-        }
+			$rSeries = getUserSeries($rUserInfo, $rCategoryID, null, $rSortBy, $rSearchBy, $rPicking, ($rPage - 1) * $rLimit, $rLimit);
+		}
 
-        $rCover = '';
-        $rShuffle = $rSeries['streams'];
-        shuffle($rShuffle);
+		$rCover = '';
+		$rShuffle = $rSeries['streams'];
+		shuffle($rShuffle);
 
-        foreach ($rShuffle as $rStream) {
-            $rBackdrop = json_decode($rStream['backdrop_path'], true);
+		foreach ($rShuffle as $rStream) {
+			$rBackdrop = json_decode($rStream['backdrop_path'], true);
 
-            if (empty($rBackdrop[0])) {
-            } else {
-                $rCover = ImageUtils::validateURL($rBackdrop[0]);
-                break;
-            }
-        }
+			if (empty($rBackdrop[0])) {
+			} else {
+				$rCover = ImageUtils::validateURL($rBackdrop[0]);
+				break;
+			}
+		}
 
-        if ($rPopular || (isset($rSearchBy) && $rSearchBy)) {
-        } else {
-            $rCount = $rSeries['count'];
-            $rPages = ceil($rCount / $rLimit);
-            $rPagination = array();
+		if ($rPopular || (isset($rSearchBy) && $rSearchBy)) {
+		} else {
+			$rCount = $rSeries['count'];
+			$rPages = ceil($rCount / $rLimit);
+			$rPagination = [];
 
-            foreach (range($rPage - 2, $rPage + 2) as $i) {
-                if (!(1 <= $i && $i <= $rPages)) {
-                } else {
-                    $rPagination[] = $i;
-                }
-            }
-        }
+			foreach (range($rPage - 2, $rPage + 2) as $i) {
+				if (!(1 <= $i && $i <= $rPages)) {
+				} else {
+					$rPagination[] = $i;
+				}
+			}
+		}
 
-        $GLOBALS['_TITLE'] = 'TV Series';
-        $GLOBALS['rYearStart'] = isset($rYearStart) ? $rYearStart : 1900;
-        $GLOBALS['rYearEnd'] = isset($rYearEnd) ? $rYearEnd : date('Y');
-        $GLOBALS['rRatingStart'] = isset($rRatingStart) ? $rRatingStart : 0;
-        $GLOBALS['rRatingEnd'] = isset($rRatingEnd) ? $rRatingEnd : 10;
+		$GLOBALS['_TITLE'] = 'TV Series';
+		$GLOBALS['rYearStart'] = isset($rYearStart) ? $rYearStart : 1900;
+		$GLOBALS['rYearEnd'] = isset($rYearEnd) ? $rYearEnd : date('Y');
+		$GLOBALS['rRatingStart'] = isset($rRatingStart) ? $rRatingStart : 0;
+		$GLOBALS['rRatingEnd'] = isset($rRatingEnd) ? $rRatingEnd : 10;
 
-        $this->render('series', [
-            'rPopular' => $rPopular,
-            'rSeries' => $rSeries,
-            'rCover' => $rCover,
-            'rSortArray' => isset($rSortArray) ? $rSortArray : [],
-            'rSortBy' => isset($rSortBy) ? $rSortBy : null,
-            'rCategoryID' => isset($rCategoryID) ? $rCategoryID : null,
-            'rSearchBy' => isset($rSearchBy) ? $rSearchBy : null,
-            'rPage' => isset($rPage) ? $rPage : 1,
-            'rPages' => isset($rPages) ? $rPages : 1,
-            'rPagination' => isset($rPagination) ? $rPagination : [],
-            'rYearStart' => isset($rYearStart) ? $rYearStart : 1900,
-            'rYearEnd' => isset($rYearEnd) ? $rYearEnd : date('Y'),
-            'rRatingStart' => isset($rRatingStart) ? $rRatingStart : 0,
-            'rRatingEnd' => isset($rRatingEnd) ? $rRatingEnd : 10,
-        ]);
-    }
+		$this->render('series', [
+			'rPopular' => $rPopular,
+			'rSeries' => $rSeries,
+			'rCover' => $rCover,
+			'rSortArray' => isset($rSortArray) ? $rSortArray : [],
+			'rSortBy' => isset($rSortBy) ? $rSortBy : null,
+			'rCategoryID' => isset($rCategoryID) ? $rCategoryID : null,
+			'rSearchBy' => isset($rSearchBy) ? $rSearchBy : null,
+			'rPage' => isset($rPage) ? $rPage : 1,
+			'rPages' => isset($rPages) ? $rPages : 1,
+			'rPagination' => isset($rPagination) ? $rPagination : [],
+			'rYearStart' => isset($rYearStart) ? $rYearStart : 1900,
+			'rYearEnd' => isset($rYearEnd) ? $rYearEnd : date('Y'),
+			'rRatingStart' => isset($rRatingStart) ? $rRatingStart : 0,
+			'rRatingEnd' => isset($rRatingEnd) ? $rRatingEnd : 10,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/BaseResellerController.php b/src/Public/Controllers/Reseller/BaseResellerController.php
index 38af75ed..8e27ea7a 100644
--- a/src/Public/Controllers/Reseller/BaseResellerController.php
+++ b/src/Public/Controllers/Reseller/BaseResellerController.php
@@ -23,35 +23,32 @@ use XcVm\Public\Controllers\Admin\BaseAdminController;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class BaseResellerController extends BaseAdminController
-{
-    /** @var string Scope: 'reseller' */
-    protected $scope = 'reseller';
+class BaseResellerController extends BaseAdminController {
+	/** @var string Scope: 'reseller' */
+	protected $scope = 'reseller';
 
-    /**
-     * Проверка прав доступа реселлера.
-     * При отказе — redirect на главную + exit.
-     */
-    protected function requirePermission()
-    {
-        if (!PageAuthorization::checkResellerPermissions()) {
-            AdminHelpers::goHome();
-            exit;
-        }
-    }
+	/**
+	 * Проверка прав доступа реселлера.
+	 * При отказе — redirect на главную + exit.
+	 */
+	protected function requirePermission() {
+		if (!PageAuthorization::checkResellerPermissions()) {
+			AdminHelpers::goHome();
+			exit;
+		}
+	}
 
-    /**
-     * Проверка расширенных прав реселлера.
-     * Reseller permissions загружены через getGroupPermissions().
-     *
-     * @param string $type Тип прав
-     * @param string $key  Ключ прав
-     */
-    protected function requireAdvPermission($type, $key)
-    {
-        if (!Authorization::check($type, $key)) {
-            AdminHelpers::goHome();
-            exit;
-        }
-    }
+	/**
+	 * Проверка расширенных прав реселлера.
+	 * Reseller permissions загружены через getGroupPermissions().
+	 *
+	 * @param string $type Тип прав
+	 * @param string $key  Ключ прав
+	 */
+	protected function requireAdvPermission(string $type, string $key) {
+		if (!Authorization::check($type, $key)) {
+			AdminHelpers::goHome();
+			exit;
+		}
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerActiveCodeController.php b/src/Public/Controllers/Reseller/ResellerActiveCodeController.php
index 89ea018a..49b4a6c0 100644
--- a/src/Public/Controllers/Reseller/ResellerActiveCodeController.php
+++ b/src/Public/Controllers/Reseller/ResellerActiveCodeController.php
@@ -10,20 +10,18 @@ use XcVm\Domain\Line\PackageService;
  *
  * @package XC_VM_Public_Controllers_Reseller
  */
-class ResellerActiveCodeController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Generate Active Codes');
+class ResellerActiveCodeController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Generate Active Codes');
 
-        $rUserInfo = $GLOBALS['rUserInfo'] ?? [];
-        $rPackages = PackageService::getAll($rUserInfo['member_group_id'] ?? 0, 'line') ?: [];
-        $rBouquets = BouquetService::getAllSimple() ?: [];
+		$rUserInfo = $GLOBALS['rUserInfo'] ?? [];
+		$rPackages = PackageService::getAll($rUserInfo['member_group_id'] ?? 0, 'line') ?: [];
+		$rBouquets = BouquetService::getAllSimple() ?: [];
 
-        $this->render('active_code', [
-            'rPackages' => $rPackages,
-            'rBouquets' => $rBouquets,
-        ]);
-    }
+		$this->render('active_code', [
+			'rPackages' => $rPackages,
+			'rBouquets' => $rBouquets,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerActiveCodesBatchController.php b/src/Public/Controllers/Reseller/ResellerActiveCodesBatchController.php
index 5df983d5..4d6cc7fa 100644
--- a/src/Public/Controllers/Reseller/ResellerActiveCodesBatchController.php
+++ b/src/Public/Controllers/Reseller/ResellerActiveCodesBatchController.php
@@ -9,18 +9,16 @@ use XcVm\Domain\Line\ActiveCodeService;
  *
  * @package XC_VM_Public_Controllers_Reseller
  */
-class ResellerActiveCodesBatchController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Batch Manager');
+class ResellerActiveCodesBatchController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Batch Manager');
 
-        $rUserInfo = $GLOBALS['rUserInfo'] ?? [];
-        $batches = ActiveCodeService::getBatchSummary($rUserInfo, false);
+		$rUserInfo = $GLOBALS['rUserInfo'] ?? [];
+		$batches = ActiveCodeService::getBatchSummary($rUserInfo, false);
 
-        $this->render('active_codes_batch', [
-            'batches' => $batches,
-        ]);
-    }
+		$this->render('active_codes_batch', [
+			'batches' => $batches,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerActiveCodesController.php b/src/Public/Controllers/Reseller/ResellerActiveCodesController.php
index 47af82e0..824cbfad 100644
--- a/src/Public/Controllers/Reseller/ResellerActiveCodesController.php
+++ b/src/Public/Controllers/Reseller/ResellerActiveCodesController.php
@@ -10,19 +10,17 @@ use XcVm\Domain\Line\PackageService;
  *
  * @package XC_VM_Public_Controllers_Reseller
  */
-class ResellerActiveCodesController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Active Codes');
+class ResellerActiveCodesController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Active Codes');
 
-        $rUserInfo = $GLOBALS['rUserInfo'] ?? [];
-        $allowedReports = (array) ($rUserInfo['reports'] ?? [$rUserInfo['id'] ?? 0]);
+		$rUserInfo = $GLOBALS['rUserInfo'] ?? [];
+		$allowedReports = (array) ($rUserInfo['reports'] ?? [$rUserInfo['id'] ?? 0]);
 
-        $this->render('active_codes', [
-            'rPackages' => PackageService::getAll($rUserInfo['member_group_id'] ?? 0, 'line') ?: [],
-            'batches'   => ActiveCodeService::getRecentBatchNames($allowedReports),
-        ]);
-    }
+		$this->render('active_codes', [
+			'rPackages' => PackageService::getAll($rUserInfo['member_group_id'] ?? 0, 'line') ?: [],
+			'batches'   => ActiveCodeService::getRecentBatchNames($allowedReports),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerApiController.php b/src/Public/Controllers/Reseller/ResellerApiController.php
index 489593a8..0148bbe8 100644
--- a/src/Public/Controllers/Reseller/ResellerApiController.php
+++ b/src/Public/Controllers/Reseller/ResellerApiController.php
@@ -24,38 +24,36 @@ use XcVm\Infrastructure\ResellerApiDispatcher;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerApiController extends BaseResellerController
-{
-    public function index()
-    {
-        session_write_close();
+class ResellerApiController extends BaseResellerController {
+	public function index() {
+		session_write_close();
 
-        $rUserInfo = $GLOBALS['rUserInfo'] ?? null;
-        $rPermissions = $GLOBALS['rPermissions'] ?? [];
-        global $db;
+		$rUserInfo = $GLOBALS['rUserInfo'] ?? null;
+		$rPermissions = $GLOBALS['rPermissions'] ?? [];
+		global $db;
 
-        if (!PHP_ERRORS) {
-            if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest') {
-                exit();
-            }
-        }
+		if (!PHP_ERRORS) {
+			if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest') {
+				exit();
+			}
+		}
 
-        if (SettingsManager::get('redis_handler')) {
-            RedisManager::ensureConnected();
-        }
+		if (SettingsManager::get('redis_handler')) {
+			RedisManager::ensureConnected();
+		}
 
-        if (!$rUserInfo || !$rUserInfo['id']) {
-            echo json_encode(['result' => false]);
-            exit();
-        }
+		if (!$rUserInfo || !$rUserInfo['id']) {
+			echo json_encode(['result' => false]);
+			exit();
+		}
 
-        if (!isset($rUserInfo['reports'])) {
-            echo json_encode(['result' => false]);
-            exit();
-        }
+		if (!isset($rUserInfo['reports'])) {
+			echo json_encode(['result' => false]);
+			exit();
+		}
 
-        $action = RequestManager::get('action') ?? '';
+		$action = RequestManager::get('action') ?? '';
 
-        ResellerApiDispatcher::dispatch($action, $rUserInfo, $rPermissions);
-    }
+		ResellerApiDispatcher::dispatch($action, $rUserInfo, $rPermissions);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerCreatedChannelsController.php b/src/Public/Controllers/Reseller/ResellerCreatedChannelsController.php
index 1ca0ca56..0870ce60 100644
--- a/src/Public/Controllers/Reseller/ResellerCreatedChannelsController.php
+++ b/src/Public/Controllers/Reseller/ResellerCreatedChannelsController.php
@@ -14,14 +14,12 @@ use XcVm\Domain\Stream\CategoryService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerCreatedChannelsController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Created Channels');
-        $this->render('created_channels', [
-            'categories' => CategoryService::getAllByType('live'),
-        ]);
-    }
+class ResellerCreatedChannelsController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Created Channels');
+		$this->render('created_channels', [
+			'categories' => CategoryService::getAllByType('live'),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerDashboardController.php b/src/Public/Controllers/Reseller/ResellerDashboardController.php
index 7d799932..df67559b 100644
--- a/src/Public/Controllers/Reseller/ResellerDashboardController.php
+++ b/src/Public/Controllers/Reseller/ResellerDashboardController.php
@@ -19,127 +19,125 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerDashboardController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->setTitle('Dashboard');
+class ResellerDashboardController extends BaseResellerController {
+	public function index() {
+		$this->setTitle('Dashboard');
 
-        $rUserInfo = $GLOBALS['rUserInfo'];
-        $rPermissions = $GLOBALS['rPermissions'];
+		$rUserInfo = $GLOBALS['rUserInfo'];
+		$rPermissions = $GLOBALS['rPermissions'];
 
-        $rRegisteredUsers = UserRepository::getResellers($rUserInfo['id'], true);
-        $rGroups = GroupService::getAll();
+		$rRegisteredUsers = UserRepository::getResellers($rUserInfo['id'], true);
+		$rGroups = GroupService::getAll();
 
-        // Sanitize notice HTML
-        $rNotice = html_entity_decode($rGroups[$rUserInfo['member_group_id']]['notice_html'] ?? '');
-        $rNotice = preg_replace('#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*+>#i', '', $rNotice);
-        $rNotice = preg_replace('#</*\\w+:\\w[^>]*+>#i', '', $rNotice);
-        $rNotice = str_replace(array('&amp;', '&lt;', '&gt;'), array('&amp;amp;', '&amp;lt;', '&amp;gt;'), $rNotice);
-        $rNotice = preg_replace('/(&#*\\w+)[\\x00-\\x20]+;/u', '$1;', $rNotice);
-        $rNotice = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $rNotice);
-        $rNotice = html_entity_decode($rNotice, ENT_COMPAT, 'UTF-8');
-        $rNotice = preg_replace("#(<[^>]+?[\\x00-\\x20\"'])(?:on|xmlns)[^>]*+[>\\b]?#iu", '$1>', $rNotice);
-        $rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=[\\x00-\\x20]*([`'\"]*)[\\x00-\\x20]*j[\\x00-\\x20]*a[\\x00-\\x20]*v[\\x00-\\x20]*a[\\x00-\\x20]*s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:#iu", '$1=$2nojavascript...', $rNotice);
-        $rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=(['\"]*)[\\x00-\\x20]*v[\\x00-\\x20]*b[\\x00-\\x20]*s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:#iu", '$1=$2novbscript...', $rNotice);
-        $rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=(['\"]*)[\\x00-\\x20]*-moz-binding[\\x00-\\x20]*:#u", '$1=$2nomozbinding...', $rNotice);
-        $rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?expression[\\x00-\\x20]*\\([^>]*+>#i", '$1>', $rNotice);
-        $rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?behaviour[\\x00-\\x20]*\\([^>]*+>#i", '$1>', $rNotice);
-        $rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:*[^>]*+>#iu", '$1>', $rNotice);
+		// Sanitize notice HTML
+		$rNotice = html_entity_decode($rGroups[$rUserInfo['member_group_id']]['notice_html'] ?? '');
+		$rNotice = preg_replace('#</*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*+>#i', '', $rNotice);
+		$rNotice = preg_replace('#</*\\w+:\\w[^>]*+>#i', '', $rNotice);
+		$rNotice = str_replace(['&amp;', '&lt;', '&gt;'], ['&amp;amp;', '&amp;lt;', '&amp;gt;'], $rNotice);
+		$rNotice = preg_replace('/(&#*\\w+)[\\x00-\\x20]+;/u', '$1;', $rNotice);
+		$rNotice = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $rNotice);
+		$rNotice = html_entity_decode($rNotice, ENT_COMPAT, 'UTF-8');
+		$rNotice = preg_replace("#(<[^>]+?[\\x00-\\x20\"'])(?:on|xmlns)[^>]*+[>\\b]?#iu", '$1>', $rNotice);
+		$rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=[\\x00-\\x20]*([`'\"]*)[\\x00-\\x20]*j[\\x00-\\x20]*a[\\x00-\\x20]*v[\\x00-\\x20]*a[\\x00-\\x20]*s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:#iu", '$1=$2nojavascript...', $rNotice);
+		$rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=(['\"]*)[\\x00-\\x20]*v[\\x00-\\x20]*b[\\x00-\\x20]*s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:#iu", '$1=$2novbscript...', $rNotice);
+		$rNotice = preg_replace("#([a-z]*)[\\x00-\\x20]*=(['\"]*)[\\x00-\\x20]*-moz-binding[\\x00-\\x20]*:#u", '$1=$2nomozbinding...', $rNotice);
+		$rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?expression[\\x00-\\x20]*\\([^>]*+>#i", '$1>', $rNotice);
+		$rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?behaviour[\\x00-\\x20]*\\([^>]*+>#i", '$1>', $rNotice);
+		$rNotice = preg_replace("#(<[^>]+?)style[\\x00-\\x20]*=[\\x00-\\x20]*[`'\"]*.*?s[\\x00-\\x20]*c[\\x00-\\x20]*r[\\x00-\\x20]*i[\\x00-\\x20]*p[\\x00-\\x20]*t[\\x00-\\x20]*:*[^>]*+>#iu", '$1>', $rNotice);
 
-        // Recent activity
-        $rPackages = PackageService::getAll();
-        global $db;
-        $rAllReports = array_merge(array($rUserInfo['id']), $rPermissions['all_reports'] ?? []);
-        $db->query('SELECT `users`.`username`, `users_logs`.`owner`, `users_logs`.`type`, `users_logs`.`action`, `users_logs`.`log_id`, `users_logs`.`package_id`, `users_logs`.`cost`, `users_logs`.`date`, `users_logs`.`deleted_info` FROM `users_logs` LEFT JOIN `users` ON `users`.`id` = `users_logs`.`owner` WHERE `users_logs`.`owner` IN (' . implode(',', array_map('intval', $rAllReports)) . ') ORDER BY `users_logs`.`date` DESC LIMIT 250;');
-        $rActivityRows = [];
-        $rDeviceMap = ['line' => 'User Line', 'mag' => 'MAG Device', 'enigma' => 'Enigma2 Device', 'user' => 'Reseller'];
-        foreach ($db->get_rows() as $rRow) {
-            $rDevice = $rDeviceMap[$rRow['type']] ?? '';
-            $rText = '';
-            switch ($rRow['action']) {
-                case 'new':
-                    $rText = 'Created New ' . $rDevice . ($rRow['package_id'] && isset($rPackages[$rRow['package_id']]) ? ' with Package:<br/>' . $rPackages[$rRow['package_id']]['package_name'] : '');
-                    break;
-                case 'extend':
-                    $rText = 'Extended ' . $rDevice . ($rRow['package_id'] && isset($rPackages[$rRow['package_id']]) ? ' with Package:<br/>' . $rPackages[$rRow['package_id']]['package_name'] : '');
-                    break;
-                case 'convert':
-                    $rText = 'Converted Device to User Line';
-                    break;
-                case 'edit':
-                    $rText = 'Edited ' . $rDevice;
-                    break;
-                case 'enable':
-                    $rText = 'Enabled ' . $rDevice;
-                    break;
-                case 'disable':
-                    $rText = 'Disabled ' . $rDevice;
-                    break;
-                case 'delete':
-                    $rText = 'Deleted ' . $rDevice;
-                    break;
-                case 'send_event':
-                    $rText = 'Sent Event to ' . $rDevice;
-                    break;
-                case 'adjust_credits':
-                    $rText = 'Adjusted Credits by ' . $rRow['cost'];
-                    break;
-            }
-            $rTargetHtml = '';
-            $rTargetId = intval($rRow['log_id'] ?? 0);
-            switch ($rRow['type']) {
-                case 'line':
-                    $rTarget = UserRepository::getLineById($rTargetId);
-                    if ($rTarget) {
-                        $rTargetHtml = "<a class='text-dark' href='line?id=" . $rTargetId . "'>" . htmlspecialchars((string) $rTarget['username'], ENT_QUOTES, 'UTF-8') . '</a>';
-                    }
-                    break;
-                case 'user':
-                    $rTarget = UserRepository::getRegisteredUserById($rTargetId);
-                    if ($rTarget) {
-                        $rTargetHtml = "<a class='text-dark' href='user?id=" . $rTargetId . "'>" . htmlspecialchars((string) $rTarget['username'], ENT_QUOTES, 'UTF-8') . '</a>';
-                    }
-                    break;
-                case 'mag':
-                    $rTarget = MagService::getById($rTargetId);
-                    if ($rTarget) {
-                        $rTargetHtml = "<a class='text-dark' href='mag?id=" . $rTargetId . "'>" . htmlspecialchars((string) $rTarget['mac'], ENT_QUOTES, 'UTF-8') . '</a>';
-                    }
-                    break;
-                case 'enigma':
-                    $rTarget = EnigmaService::getById($rTargetId);
-                    if ($rTarget) {
-                        $rTargetHtml = "<a class='text-dark' href='enigma?id=" . $rTargetId . "'>" . htmlspecialchars((string) $rTarget['mac'], ENT_QUOTES, 'UTF-8') . '</a>';
-                    }
-                    break;
-            }
-            if ($rTargetHtml === '') {
-                $rDeletedInfo = json_decode((string) ($rRow['deleted_info'] ?? ''), true);
-                $rTargetName = is_array($rDeletedInfo)
-                    ? (string) ($rDeletedInfo['mac'] ?? $rDeletedInfo['username'] ?? '')
-                    : '';
-                $rTargetHtml = $rTargetName !== ''
-                    ? "<span class='text-secondary'>" . htmlspecialchars($rTargetName, ENT_QUOTES, 'UTF-8') . '</span>'
-                    : "<span class='text-secondary'>-</span>";
-            }
-            $rActivityRows[] = [
-                'owner_id'  => $rRow['owner'],
-                'username'  => $rRow['username'],
-                'text'        => $rText,
-                'target_html' => $rTargetHtml,
-                'date'        => $rRow['date'],
-            ];
-        }
+		// Recent activity
+		$rPackages = PackageService::getAll();
+		global $db;
+		$rAllReports = array_merge([$rUserInfo['id']], $rPermissions['all_reports'] ?? []);
+		$db->query('SELECT `users`.`username`, `users_logs`.`owner`, `users_logs`.`type`, `users_logs`.`action`, `users_logs`.`log_id`, `users_logs`.`package_id`, `users_logs`.`cost`, `users_logs`.`date`, `users_logs`.`deleted_info` FROM `users_logs` LEFT JOIN `users` ON `users`.`id` = `users_logs`.`owner` WHERE `users_logs`.`owner` IN (' . implode(',', array_map('intval', $rAllReports)) . ') ORDER BY `users_logs`.`date` DESC LIMIT 250;');
+		$rActivityRows = [];
+		$rDeviceMap = ['line' => 'User Line', 'mag' => 'MAG Device', 'enigma' => 'Enigma2 Device', 'user' => 'Reseller'];
+		foreach ($db->get_rows() as $rRow) {
+			$rDevice = $rDeviceMap[$rRow['type']] ?? '';
+			$rText = '';
+			switch ($rRow['action']) {
+				case 'new':
+					$rText = 'Created New ' . $rDevice . ($rRow['package_id'] && isset($rPackages[$rRow['package_id']]) ? ' with Package:<br/>' . $rPackages[$rRow['package_id']]['package_name'] : '');
+					break;
+				case 'extend':
+					$rText = 'Extended ' . $rDevice . ($rRow['package_id'] && isset($rPackages[$rRow['package_id']]) ? ' with Package:<br/>' . $rPackages[$rRow['package_id']]['package_name'] : '');
+					break;
+				case 'convert':
+					$rText = 'Converted Device to User Line';
+					break;
+				case 'edit':
+					$rText = 'Edited ' . $rDevice;
+					break;
+				case 'enable':
+					$rText = 'Enabled ' . $rDevice;
+					break;
+				case 'disable':
+					$rText = 'Disabled ' . $rDevice;
+					break;
+				case 'delete':
+					$rText = 'Deleted ' . $rDevice;
+					break;
+				case 'send_event':
+					$rText = 'Sent Event to ' . $rDevice;
+					break;
+				case 'adjust_credits':
+					$rText = 'Adjusted Credits by ' . $rRow['cost'];
+					break;
+			}
+			$rTargetHtml = '';
+			$rTargetId = intval($rRow['log_id'] ?? 0);
+			switch ($rRow['type']) {
+				case 'line':
+					$rTarget = UserRepository::getLineById($rTargetId);
+					if ($rTarget) {
+						$rTargetHtml = "<a class='text-dark' href='line?id=" . $rTargetId . "'>" . htmlspecialchars((string) $rTarget['username'], ENT_QUOTES, 'UTF-8') . '</a>';
+					}
+					break;
+				case 'user':
+					$rTarget = UserRepository::getRegisteredUserById($rTargetId);
+					if ($rTarget) {
+						$rTargetHtml = "<a class='text-dark' href='user?id=" . $rTargetId . "'>" . htmlspecialchars((string) $rTarget['username'], ENT_QUOTES, 'UTF-8') . '</a>';
+					}
+					break;
+				case 'mag':
+					$rTarget = MagService::getById($rTargetId);
+					if ($rTarget) {
+						$rTargetHtml = "<a class='text-dark' href='mag?id=" . $rTargetId . "'>" . htmlspecialchars((string) $rTarget['mac'], ENT_QUOTES, 'UTF-8') . '</a>';
+					}
+					break;
+				case 'enigma':
+					$rTarget = EnigmaService::getById($rTargetId);
+					if ($rTarget) {
+						$rTargetHtml = "<a class='text-dark' href='enigma?id=" . $rTargetId . "'>" . htmlspecialchars((string) $rTarget['mac'], ENT_QUOTES, 'UTF-8') . '</a>';
+					}
+					break;
+			}
+			if ($rTargetHtml === '') {
+				$rDeletedInfo = json_decode((string) ($rRow['deleted_info'] ?? ''), true);
+				$rTargetName = is_array($rDeletedInfo)
+					? (string) ($rDeletedInfo['mac'] ?? $rDeletedInfo['username'] ?? '')
+					: '';
+				$rTargetHtml = $rTargetName !== ''
+					? "<span class='text-secondary'>" . htmlspecialchars($rTargetName, ENT_QUOTES, 'UTF-8') . '</span>'
+					: "<span class='text-secondary'>-</span>";
+			}
+			$rActivityRows[] = [
+				'owner_id'  => $rRow['owner'],
+				'username'  => $rRow['username'],
+				'text'        => $rText,
+				'target_html' => $rTargetHtml,
+				'date'        => $rRow['date'],
+			];
+		}
 
-        // Expiring lines
-        $rExpiringLines = LineService::getExpiring() ?: [];
+		// Expiring lines
+		$rExpiringLines = LineService::getExpiring() ?: [];
 
-        $this->render('dashboard', [
-            'rRegisteredUsers' => $rRegisteredUsers,
-            'rNotice'          => $rNotice,
-            'rActivityRows'    => $rActivityRows,
-            'rExpiringLines'   => $rExpiringLines,
-        ]);
-    }
+		$this->render('dashboard', [
+			'rRegisteredUsers' => $rRegisteredUsers,
+			'rNotice'          => $rNotice,
+			'rActivityRows'    => $rActivityRows,
+			'rExpiringLines'   => $rExpiringLines,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerEditProfileController.php b/src/Public/Controllers/Reseller/ResellerEditProfileController.php
index 63446e0a..d449686f 100644
--- a/src/Public/Controllers/Reseller/ResellerEditProfileController.php
+++ b/src/Public/Controllers/Reseller/ResellerEditProfileController.php
@@ -16,31 +16,29 @@ use XcVm\Domain\Server\ServerRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerEditProfileController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->setTitle('Edit Profile');
+class ResellerEditProfileController extends BaseResellerController {
+	public function index() {
+		$this->setTitle('Edit Profile');
 
-        $data = [
-            'timezones' => AdminHelpers::TimeZoneList(),
-        ];
+		$data = [
+			'timezones' => AdminHelpers::TimeZoneList(),
+		];
 
-        // Find API code for this user's group
-        foreach (AuthRepository::getAllCodes() as $rCode) {
-            if ($rCode['type'] == 4 && in_array($GLOBALS['rUserInfo']['member_group_id'], json_decode($rCode['groups'], true) ?: [])) {
-                $data['apiCode'] = $rCode;
-                $servers = ServerRepository::getAll();
-                $userInfo = $GLOBALS['rUserInfo'];
-                if (empty($userInfo['reseller_dns'])) {
-                    $data['apiUrl'] = $servers[SERVER_ID]['http_url'] . $rCode['code'] . '/';
-                } else {
-                    $data['apiUrl'] = 'http://' . $userInfo['reseller_dns'] . ':' . intval($servers[SERVER_ID]['http_broadcast_port']) . '/' . $rCode['code'] . '/';
-                }
-                break;
-            }
-        }
+		// Find API code for this user's group
+		foreach (AuthRepository::getAllCodes() as $rCode) {
+			if ($rCode['type'] == 4 && in_array($GLOBALS['rUserInfo']['member_group_id'], json_decode($rCode['groups'], true) ?: [])) {
+				$data['apiCode'] = $rCode;
+				$servers = ServerRepository::getAll();
+				$userInfo = $GLOBALS['rUserInfo'];
+				if (empty($userInfo['reseller_dns'])) {
+					$data['apiUrl'] = $servers[SERVER_ID]['http_url'] . $rCode['code'] . '/';
+				} else {
+					$data['apiUrl'] = 'http://' . $userInfo['reseller_dns'] . ':' . intval($servers[SERVER_ID]['http_broadcast_port']) . '/' . $rCode['code'] . '/';
+				}
+				break;
+			}
+		}
 
-        $this->render('edit_profile', $data);
-    }
+		$this->render('edit_profile', $data);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerEnigmaController.php b/src/Public/Controllers/Reseller/ResellerEnigmaController.php
index d61367de..e8fa89bb 100644
--- a/src/Public/Controllers/Reseller/ResellerEnigmaController.php
+++ b/src/Public/Controllers/Reseller/ResellerEnigmaController.php
@@ -18,38 +18,36 @@ use XcVm\Domain\Line\PackageService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerEnigmaController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Enigma Device');
+class ResellerEnigmaController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Enigma Device');
 
-        $rRequest = RequestManager::getAll();
-        $rUserInfo = $GLOBALS['rUserInfo'];
-        $rDevice = null;
-        $rLine = null;
-        $rOrigPackage = null;
+		$rRequest = RequestManager::getAll();
+		$rUserInfo = $GLOBALS['rUserInfo'];
+		$rDevice = null;
+		$rLine = null;
+		$rOrigPackage = null;
 
-        if (isset($rRequest['id'])) {
-            $rDevice = EnigmaService::getById($rRequest['id']);
-            if (!($rDevice && $rDevice['user'] && $rDevice['user']['is_e2'] && Authorization::check('line', $rDevice['user']['id']))) {
-                AdminHelpers::goHome();
-                return;
-            }
-            $rLine = $rDevice['user'];
-            if ($rLine['package_id'] > 0) {
-                $rOrigPackage = PackageService::getById($rLine['package_id']);
-            }
-        }
+		if (isset($rRequest['id'])) {
+			$rDevice = EnigmaService::getById($rRequest['id']);
+			if (!($rDevice && $rDevice['user'] && $rDevice['user']['is_e2'] && Authorization::check('line', $rDevice['user']['id']))) {
+				AdminHelpers::goHome();
+				return;
+			}
+			$rLine = $rDevice['user'];
+			if ($rLine['package_id'] > 0) {
+				$rOrigPackage = PackageService::getById($rLine['package_id']);
+			}
+		}
 
-        $rPackages = PackageService::getAll($rUserInfo['member_group_id'], 'e2') ?: [];
+		$rPackages = PackageService::getAll($rUserInfo['member_group_id'], 'e2') ?: [];
 
-        $this->render('enigma', [
-            'rDevice'      => $rDevice,
-            'rLine'        => $rLine,
-            'rOrigPackage' => $rOrigPackage,
-            'rPackages'    => $rPackages,
-        ]);
-    }
+		$this->render('enigma', [
+			'rDevice'      => $rDevice,
+			'rLine'        => $rLine,
+			'rOrigPackage' => $rOrigPackage,
+			'rPackages'    => $rPackages,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerEnigmasController.php b/src/Public/Controllers/Reseller/ResellerEnigmasController.php
index b5cdfa0c..624de4e9 100644
--- a/src/Public/Controllers/Reseller/ResellerEnigmasController.php
+++ b/src/Public/Controllers/Reseller/ResellerEnigmasController.php
@@ -12,12 +12,10 @@ namespace XcVm\Public\Controllers\Reseller;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerEnigmasController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Enigma Devices');
-        $this->render('enigmas');
-    }
+class ResellerEnigmasController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Enigma Devices');
+		$this->render('enigmas');
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerEpgViewController.php b/src/Public/Controllers/Reseller/ResellerEpgViewController.php
index cac09b69..856f965e 100644
--- a/src/Public/Controllers/Reseller/ResellerEpgViewController.php
+++ b/src/Public/Controllers/Reseller/ResellerEpgViewController.php
@@ -15,90 +15,88 @@ use XcVm\Domain\Stream\CategoryService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerEpgViewController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
+class ResellerEpgViewController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
 
-        $rMobile = $GLOBALS['rMobile'] ?? false;
-        if ($rMobile) {
-            header('Location: dashboard');
-            exit;
-        }
+		$rMobile = $GLOBALS['rMobile'] ?? false;
+		if ($rMobile) {
+			header('Location: dashboard');
+			exit;
+		}
 
-        $rRequest     = $GLOBALS['rRequest'] ?? [];
-        $rPermissions = $GLOBALS['rPermissions'] ?? [];
-        $db           = $GLOBALS['db'];
+		$rRequest     = $GLOBALS['rRequest'] ?? [];
+		$rPermissions = $GLOBALS['rPermissions'] ?? [];
+		$db           = $GLOBALS['db'];
 
-        $rPageInt = (intval($rRequest['page'] ?? 0) > 0 ? intval($rRequest['page']) : 1);
-        $rLimit   = (intval($rRequest['entries'] ?? 0) > 0 ? intval($rRequest['entries']) : SettingsManager::get('default_entries'));
-        $rStart   = ($rPageInt - 1) * $rLimit;
+		$rPageInt = (intval($rRequest['page'] ?? 0) > 0 ? intval($rRequest['page']) : 1);
+		$rLimit   = (intval($rRequest['entries'] ?? 0) > 0 ? intval($rRequest['entries']) : SettingsManager::get('default_entries'));
+		$rStart   = ($rPageInt - 1) * $rLimit;
 
-        $rStreamIDs = [];
-        $rCount     = 0;
+		$rStreamIDs = [];
+		$rCount     = 0;
 
-        if (count($rPermissions['stream_ids'] ?? []) > 0) {
-            $rWhere  = [];
-            $rWhereV = [];
-            $rWhere[] = '`type` = 1 AND `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL';
-            $rWhere[] = '`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'] ?? [])) . ')';
+		if (count($rPermissions['stream_ids'] ?? []) > 0) {
+			$rWhere  = [];
+			$rWhereV = [];
+			$rWhere[] = '`type` = 1 AND `epg_id` IS NOT NULL AND `channel_id` IS NOT NULL';
+			$rWhere[] = '`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'] ?? [])) . ')';
 
-            if (isset($rRequest['category']) && intval($rRequest['category']) > 0) {
-                $rWhere[]  = "JSON_CONTAINS(`category_id`, ?, '\$')";
-                $rWhereV[] = $rRequest['category'];
-            }
+			if (isset($rRequest['category']) && intval($rRequest['category']) > 0) {
+				$rWhere[]  = "JSON_CONTAINS(`category_id`, ?, '\$')";
+				$rWhereV[] = $rRequest['category'];
+			}
 
-            if (!empty($rRequest['search'])) {
-                $rWhere[]  = '(`stream_display_name` LIKE ? OR `id` LIKE ?)';
-                $rWhereV[] = '%' . $rRequest['search'] . '%';
-                $rWhereV[] = $rRequest['search'];
-            }
+			if (!empty($rRequest['search'])) {
+				$rWhere[]  = '(`stream_display_name` LIKE ? OR `id` LIKE ?)';
+				$rWhereV[] = '%' . $rRequest['search'] . '%';
+				$rWhereV[] = $rRequest['search'];
+			}
 
-            $rWhereString = count($rWhere) > 0 ? 'WHERE ' . implode(' AND ', $rWhere) : '';
+			$rWhereString = count($rWhere) > 0 ? 'WHERE ' . implode(' AND ', $rWhere) : '';
 
-            $rOrder = ['name' => '`stream_display_name` ASC', 'added' => '`added` DESC'];
+			$rOrder = ['name' => '`stream_display_name` ASC', 'added' => '`added` DESC'];
 
-            if (!empty($rRequest['sort']) && isset($rOrder[$rRequest['sort']])) {
-                $rOrderBy = $rOrder[$rRequest['sort']];
-            } else {
-                $rChannelOrder = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'channel_order'));
+			if (!empty($rRequest['sort']) && isset($rOrder[$rRequest['sort']])) {
+				$rOrderBy = $rOrder[$rRequest['sort']];
+			} else {
+				$rChannelOrder = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'channel_order'));
 
-                if (SettingsManager::get('channel_number_type') != 'manual' && count($rChannelOrder) > 0) {
-                    $rOrderBy = 'FIELD(`id`,' . implode(',', $rChannelOrder) . ')';
-                } else {
-                    $rOrderBy = '`order` ASC';
-                }
-            }
+				if (SettingsManager::get('channel_number_type') != 'manual' && count($rChannelOrder) > 0) {
+					$rOrderBy = 'FIELD(`id`,' . implode(',', $rChannelOrder) . ')';
+				} else {
+					$rOrderBy = '`order` ASC';
+				}
+			}
 
-            $db->query('SELECT COUNT(`id`) AS `count` FROM `streams` ' . $rWhereString . ';', ...$rWhereV);
-            $rCount = $db->get_row()['count'];
-            $db->query('SELECT `id` FROM `streams` ' . $rWhereString . ' ORDER BY ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';', ...$rWhereV);
+			$db->query('SELECT COUNT(`id`) AS `count` FROM `streams` ' . $rWhereString . ';', ...$rWhereV);
+			$rCount = $db->get_row()['count'];
+			$db->query('SELECT `id` FROM `streams` ' . $rWhereString . ' ORDER BY ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';', ...$rWhereV);
 
-            foreach ($db->get_rows() as $rRow) {
-                $rStreamIDs[] = $rRow['id'];
-            }
-        }
+			foreach ($db->get_rows() as $rRow) {
+				$rStreamIDs[] = $rRow['id'];
+			}
+		}
 
-        $rPages      = ceil($rCount / max($rLimit, 1));
-        $rPagination = [];
-        foreach (range($rPageInt - 2, $rPageInt + 2) as $i) {
-            if ($i >= 1 && $i <= $rPages) {
-                $rPagination[] = $i;
-            }
-        }
+		$rPages      = ceil($rCount / max($rLimit, 1));
+		$rPagination = [];
+		foreach (range($rPageInt - 2, $rPageInt + 2) as $i) {
+			if ($i >= 1 && $i <= $rPages) {
+				$rPagination[] = $i;
+			}
+		}
 
-        $rCategories = CategoryService::getAllByType('live');
+		$rCategories = CategoryService::getAllByType('live');
 
-        $this->setTitle('TV Guide');
-        $this->render('epg_view', [
-            'rStreamIDs'  => $rStreamIDs,
-            'rCount'      => $rCount,
-            'rPageInt'    => $rPageInt,
-            'rPages'      => $rPages,
-            'rLimit'      => $rLimit,
-            'rPagination' => $rPagination,
-            'rCategories' => $rCategories,
-        ]);
-    }
+		$this->setTitle('TV Guide');
+		$this->render('epg_view', [
+			'rStreamIDs'  => $rStreamIDs,
+			'rCount'      => $rCount,
+			'rPageInt'    => $rPageInt,
+			'rPages'      => $rPages,
+			'rLimit'      => $rLimit,
+			'rPagination' => $rPagination,
+			'rCategories' => $rCategories,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerEpisodesController.php b/src/Public/Controllers/Reseller/ResellerEpisodesController.php
index 42f25cd1..3d48a03e 100644
--- a/src/Public/Controllers/Reseller/ResellerEpisodesController.php
+++ b/src/Public/Controllers/Reseller/ResellerEpisodesController.php
@@ -15,15 +15,13 @@ use XcVm\Domain\Vod\SeriesService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerEpisodesController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Episodes');
-        $this->render('episodes', [
-            'seriesList' => SeriesService::getList(),
-            'categories' => CategoryService::getAllByType('series'),
-        ]);
-    }
+class ResellerEpisodesController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Episodes');
+		$this->render('episodes', [
+			'seriesList' => SeriesService::getList(),
+			'categories' => CategoryService::getAllByType('series'),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerLineActivityController.php b/src/Public/Controllers/Reseller/ResellerLineActivityController.php
index ac8db422..334830f6 100644
--- a/src/Public/Controllers/Reseller/ResellerLineActivityController.php
+++ b/src/Public/Controllers/Reseller/ResellerLineActivityController.php
@@ -17,28 +17,26 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerLineActivityController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Activity Logs');
+class ResellerLineActivityController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Activity Logs');
 
-        $rRequest = RequestManager::getAll();
-        $data = [];
+		$rRequest = RequestManager::getAll();
+		$data = [];
 
-        if (isset($rRequest['line'])) {
-            if (Authorization::check('line', $rRequest['line'])) {
-                $data['rSearchLine'] = UserRepository::getLineById($rRequest['line']);
-            } else {
-                exit();
-            }
-        }
+		if (isset($rRequest['line'])) {
+			if (Authorization::check('line', $rRequest['line'])) {
+				$data['rSearchLine'] = UserRepository::getLineById($rRequest['line']);
+			} else {
+				exit();
+			}
+		}
 
-        if (isset($rRequest['stream'])) {
-            $data['rSearchStream'] = StreamRepository::getById($rRequest['stream']);
-        }
+		if (isset($rRequest['stream'])) {
+			$data['rSearchStream'] = StreamRepository::getById($rRequest['stream']);
+		}
 
-        $this->render('line_activity', $data);
-    }
+		$this->render('line_activity', $data);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerLineController.php b/src/Public/Controllers/Reseller/ResellerLineController.php
index a0d7c44c..db94599d 100644
--- a/src/Public/Controllers/Reseller/ResellerLineController.php
+++ b/src/Public/Controllers/Reseller/ResellerLineController.php
@@ -18,35 +18,33 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerLineController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Line');
+class ResellerLineController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Line');
 
-        $rRequest = RequestManager::getAll();
-        $rUserInfo = $GLOBALS['rUserInfo'];
-        $rLine = null;
-        $rOrigPackage = null;
+		$rRequest = RequestManager::getAll();
+		$rUserInfo = $GLOBALS['rUserInfo'];
+		$rLine = null;
+		$rOrigPackage = null;
 
-        if (isset($rRequest['id'])) {
-            $rLine = UserRepository::getLineById($rRequest['id']);
-            if (!$rLine || $rLine['is_mag'] || $rLine['is_e2'] || !Authorization::check('line', $rLine['id'])) {
-                AdminHelpers::goHome();
-                return;
-            }
-            if ($rLine['package_id'] > 0) {
-                $rOrigPackage = PackageService::getById($rLine['package_id']);
-            }
-        }
+		if (isset($rRequest['id'])) {
+			$rLine = UserRepository::getLineById($rRequest['id']);
+			if (!$rLine || $rLine['is_mag'] || $rLine['is_e2'] || !Authorization::check('line', $rLine['id'])) {
+				AdminHelpers::goHome();
+				return;
+			}
+			if ($rLine['package_id'] > 0) {
+				$rOrigPackage = PackageService::getById($rLine['package_id']);
+			}
+		}
 
-        $rPackages = PackageService::getAll($rUserInfo['member_group_id'], 'line') ?: [];
+		$rPackages = PackageService::getAll($rUserInfo['member_group_id'], 'line') ?: [];
 
-        $this->render('line', [
-            'rLine'        => $rLine,
-            'rOrigPackage' => $rOrigPackage,
-            'rPackages'    => $rPackages,
-        ]);
-    }
+		$this->render('line', [
+			'rLine'        => $rLine,
+			'rOrigPackage' => $rOrigPackage,
+			'rPackages'    => $rPackages,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerLinesController.php b/src/Public/Controllers/Reseller/ResellerLinesController.php
index 18631623..3887159a 100644
--- a/src/Public/Controllers/Reseller/ResellerLinesController.php
+++ b/src/Public/Controllers/Reseller/ResellerLinesController.php
@@ -12,12 +12,10 @@ namespace XcVm\Public\Controllers\Reseller;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerLinesController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Lines');
-        $this->render('lines');
-    }
+class ResellerLinesController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Lines');
+		$this->render('lines');
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerLiveConnectionsController.php b/src/Public/Controllers/Reseller/ResellerLiveConnectionsController.php
index b33ca93c..d598ae13 100644
--- a/src/Public/Controllers/Reseller/ResellerLiveConnectionsController.php
+++ b/src/Public/Controllers/Reseller/ResellerLiveConnectionsController.php
@@ -18,30 +18,28 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerLiveConnectionsController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Live Connections');
+class ResellerLiveConnectionsController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Live Connections');
 
-        $rRequest = RequestManager::getAll();
-        $data = [
-            'redisEnabled' => (bool) SettingsManager::get('redis_handler'),
-        ];
+		$rRequest = RequestManager::getAll();
+		$data = [
+			'redisEnabled' => (bool) SettingsManager::get('redis_handler'),
+		];
 
-        if (isset($rRequest['line'])) {
-            if (Authorization::check('line', $rRequest['line'])) {
-                $data['rSearchLine'] = UserRepository::getLineById($rRequest['line']);
-            } else {
-                exit();
-            }
-        }
+		if (isset($rRequest['line'])) {
+			if (Authorization::check('line', $rRequest['line'])) {
+				$data['rSearchLine'] = UserRepository::getLineById($rRequest['line']);
+			} else {
+				exit();
+			}
+		}
 
-        if (isset($rRequest['stream'])) {
-            $data['rSearchStream'] = StreamRepository::getById($rRequest['stream']);
-        }
+		if (isset($rRequest['stream'])) {
+			$data['rSearchStream'] = StreamRepository::getById($rRequest['stream']);
+		}
 
-        $this->render('live_connections', $data);
-    }
+		$this->render('live_connections', $data);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerLoginController.php b/src/Public/Controllers/Reseller/ResellerLoginController.php
index b39b0be9..4da45b5b 100644
--- a/src/Public/Controllers/Reseller/ResellerLoginController.php
+++ b/src/Public/Controllers/Reseller/ResellerLoginController.php
@@ -25,63 +25,63 @@ use XcVm\Domain\User\ResellerAPI;
  */
 
 class ResellerLoginController {
-    public function index() {
-        // Bootstrap (login page is in noBootstrapPages, so FC skips bootstrap)
-        require_once MAIN_HOME . 'bootstrap.php';
-        \XC_Bootstrap::boot(\XC_Bootstrap::CONTEXT_ADMIN);
+	public function index() {
+		// Bootstrap (login page is in noBootstrapPages, so FC skips bootstrap)
+		require_once MAIN_HOME . 'bootstrap.php';
+		\XC_Bootstrap::boot(\XC_Bootstrap::CONTEXT_ADMIN);
 
-        // Already logged in → dashboard
-        if (isset($_SESSION['reseller'])) {
-            header('Location: dashboard');
-            exit();
-        }
+		// Already logged in → dashboard
+		if (isset($_SESSION['reseller'])) {
+			header('Location: dashboard');
+			exit();
+		}
 
-        $rIP = NetworkUtils::getUserIP();
+		$rIP = NetworkUtils::getUserIP();
 
-        // Flood protection
-        $rSettings = SettingsManager::getAll();
-        global $db;
+		// Flood protection
+		$rSettings = SettingsManager::getAll();
+		global $db;
 
-        // Translator FQCN for reseller/login.php's `$language::get(...)` calls.
+		// Translator FQCN for reseller/login.php's `$language::get(...)` calls.
         // phpcs:ignore SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable -- consumed by required view reseller/login.php
-        $language = Translator::class;
+		$language = Translator::class;
 
-        if (Authenticator::loginFloodExceeded($rIP, intval($rSettings['login_flood']))) {
-            BlocklistService::blockIP(['ip' => $rIP, 'notes' => 'LOGIN FLOOD ATTACK']);
-            exit();
-        }
+		if (Authenticator::loginFloodExceeded($rIP, intval($rSettings['login_flood']))) {
+			BlocklistService::blockIP(['ip' => $rIP, 'notes' => 'LOGIN FLOOD ATTACK']);
+			exit();
+		}
 
-        // Process login POST
-        $_STATUS = null;
-        if (RequestManager::has('login')) {
-            $rReturn = ResellerAPI::processLogin(RequestManager::getAll());
-            $_STATUS = $rReturn['status'];
+		// Process login POST
+		$_STATUS = null;
+		if (RequestManager::has('login')) {
+			$rReturn = ResellerAPI::processLogin(RequestManager::getAll());
+			$_STATUS = $rReturn['status'];
 
-            if ($_STATUS === STATUS_SUCCESS) {
-                $rReferer = RequestManager::get('referrer') ?? '';
-                if (strlen($rReferer) > 0) {
-                    $rReferer = basename($rReferer);
-                    if (substr($rReferer, 0, 6) === 'logout') {
-                        $rReferer = 'dashboard';
-                    }
-                    header('Location: ' . $rReferer);
-                } else {
-                    header('Location: dashboard');
-                }
-                exit();
-            }
-        }
+			if ($_STATUS === STATUS_SUCCESS) {
+				$rReferer = RequestManager::get('referrer') ?? '';
+				if (strlen($rReferer) > 0) {
+					$rReferer = basename($rReferer);
+					if (substr($rReferer, 0, 6) === 'logout') {
+						$rReferer = 'dashboard';
+					}
+					header('Location: ' . $rReferer);
+				} else {
+					header('Location: dashboard');
+				}
+				exit();
+			}
+		}
 
-        // Render login view
-        $__viewFile = MAIN_HOME . 'Public/Views/reseller/login.php';
+		// Render login view
+		$__viewFile = MAIN_HOME . 'Public/Views/reseller/login.php';
         // phpcs:ignore SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable -- consumed by required view reseller/login.php
-        $referrer = htmlspecialchars(RequestManager::get('referrer') ?? '');
+		$referrer = htmlspecialchars(RequestManager::get('referrer') ?? '');
 
-        if (file_exists($__viewFile)) {
-            require $__viewFile;
-        } else {
-            http_response_code(500);
-            echo 'Login view not found';
-        }
-    }
+		if (file_exists($__viewFile)) {
+			require $__viewFile;
+		} else {
+			http_response_code(500);
+			echo 'Login view not found';
+		}
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerLogoutController.php b/src/Public/Controllers/Reseller/ResellerLogoutController.php
index aabc42b8..f465df56 100644
--- a/src/Public/Controllers/Reseller/ResellerLogoutController.php
+++ b/src/Public/Controllers/Reseller/ResellerLogoutController.php
@@ -14,11 +14,9 @@ use XcVm\Core\Auth\SessionManager;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerLogoutController extends BaseResellerController
-{
-    public function index()
-    {
-        SessionManager::clearContext('reseller');
-        $this->redirect('./login');
-    }
+class ResellerLogoutController extends BaseResellerController {
+	public function index() {
+		SessionManager::clearContext('reseller');
+		$this->redirect('./login');
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerMagController.php b/src/Public/Controllers/Reseller/ResellerMagController.php
index 8b62a74e..6d897042 100644
--- a/src/Public/Controllers/Reseller/ResellerMagController.php
+++ b/src/Public/Controllers/Reseller/ResellerMagController.php
@@ -17,38 +17,36 @@ use XcVm\Domain\Line\PackageService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerMagController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
+class ResellerMagController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
 
-        $rDevice = null;
-        $rLine = null;
-        $rOrigPackage = null;
+		$rDevice = null;
+		$rLine = null;
+		$rOrigPackage = null;
 
-        if (isset($GLOBALS['rRequest']['id'])) {
-            $rDevice = MagService::getById($GLOBALS['rRequest']['id']);
+		if (isset($GLOBALS['rRequest']['id'])) {
+			$rDevice = MagService::getById($GLOBALS['rRequest']['id']);
 
-            if (!$rDevice || !$rDevice['user'] || !$rDevice['user']['is_mag'] || !Authorization::check('line', $rDevice['user']['id'])) {
-                AdminHelpers::goHome();
-            }
+			if (!$rDevice || !$rDevice['user'] || !$rDevice['user']['is_mag'] || !Authorization::check('line', $rDevice['user']['id'])) {
+				AdminHelpers::goHome();
+			}
 
-            $rLine = $rDevice['user'];
+			$rLine = $rDevice['user'];
 
-            if ($rLine['package_id'] > 0) {
-                $rOrigPackage = PackageService::getById($rLine['package_id']);
-            }
-        }
+			if ($rLine['package_id'] > 0) {
+				$rOrigPackage = PackageService::getById($rLine['package_id']);
+			}
+		}
 
-        $rPackages = PackageService::getAll($GLOBALS['rUserInfo']['member_group_id'], 'mag') ?: [];
+		$rPackages = PackageService::getAll($GLOBALS['rUserInfo']['member_group_id'], 'mag') ?: [];
 
-        $this->setTitle('MAG Device');
-        $this->render('mag', [
-            'rDevice'      => $rDevice,
-            'rLine'        => $rLine,
-            'rOrigPackage' => $rOrigPackage,
-            'rPackages'    => $rPackages,
-        ]);
-    }
+		$this->setTitle('MAG Device');
+		$this->render('mag', [
+			'rDevice'      => $rDevice,
+			'rLine'        => $rLine,
+			'rOrigPackage' => $rOrigPackage,
+			'rPackages'    => $rPackages,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerMagsController.php b/src/Public/Controllers/Reseller/ResellerMagsController.php
index 3988462c..ef3a27f7 100644
--- a/src/Public/Controllers/Reseller/ResellerMagsController.php
+++ b/src/Public/Controllers/Reseller/ResellerMagsController.php
@@ -12,12 +12,10 @@ namespace XcVm\Public\Controllers\Reseller;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerMagsController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('MAG Devices');
-        $this->render('mags');
-    }
+class ResellerMagsController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('MAG Devices');
+		$this->render('mags');
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerMoviesController.php b/src/Public/Controllers/Reseller/ResellerMoviesController.php
index ab2b24ae..0033c6a6 100644
--- a/src/Public/Controllers/Reseller/ResellerMoviesController.php
+++ b/src/Public/Controllers/Reseller/ResellerMoviesController.php
@@ -14,14 +14,12 @@ use XcVm\Domain\Stream\CategoryService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerMoviesController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Movies');
-        $this->render('movies', [
-            'categories' => CategoryService::getAllByType('movie'),
-        ]);
-    }
+class ResellerMoviesController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Movies');
+		$this->render('movies', [
+			'categories' => CategoryService::getAllByType('movie'),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerPostController.php b/src/Public/Controllers/Reseller/ResellerPostController.php
index a01f2c91..0a1674d4 100644
--- a/src/Public/Controllers/Reseller/ResellerPostController.php
+++ b/src/Public/Controllers/Reseller/ResellerPostController.php
@@ -23,90 +23,88 @@ use XcVm\Domain\User\ResellerAPI;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerPostController extends BaseResellerController
-{
-    public function index()
-    {
-        session_start();
-        session_write_close();
+class ResellerPostController extends BaseResellerController {
+	public function index() {
+		session_start();
+		session_write_close();
 
-        $rAction = RequestManager::get('action') ?? '';
-        $rData = RequestManager::getAll();
-        unset($rData['action']);
+		$rAction = RequestManager::get('action') ?? '';
+		$rData = RequestManager::getAll();
+		unset($rData['action']);
 
-        if (count($rData) === 0) {
-            $rData = json_decode(file_get_contents('php://input'), true);
-        }
+		if (count($rData) === 0) {
+			$rData = json_decode(file_get_contents('php://input'), true);
+		}
 
-        if (!$rData) {
-            echo json_encode(['result' => false]);
-            exit();
-        }
+		if (!$rData) {
+			echo json_encode(['result' => false]);
+			exit();
+		}
 
-        $language = Translator::class;
+		$language = Translator::class;
 
-        switch ($rAction) {
-            case 'edit_profile':
-                $rReturn = ResellerAPI::editResellerProfile($rData);
-                setcookie('hue', $rData['hue'], time() + 315360000);
-                setcookie('theme', $rData['theme'], time() + 315360000);
-                $language::setLanguage($rData['lang']);
+		switch ($rAction) {
+			case 'edit_profile':
+				$rReturn = ResellerAPI::editResellerProfile($rData);
+				setcookie('hue', $rData['hue'], time() + 315360000);
+				setcookie('theme', $rData['theme'], time() + 315360000);
+				$language::setLanguage($rData['lang']);
 
-                if ($rReturn['status'] == STATUS_SUCCESS) {
-                    echo json_encode(['result' => true, 'location' => 'edit_profile?status=' . intval($rReturn['status']), 'status' => $rReturn['status'], 'reload' => true]);
-                    exit();
-                }
-                echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
-                exit();
+				if ($rReturn['status'] == STATUS_SUCCESS) {
+					echo json_encode(['result' => true, 'location' => 'edit_profile?status=' . intval($rReturn['status']), 'status' => $rReturn['status'], 'reload' => true]);
+					exit();
+				}
+				echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
+				exit();
 
-            case 'line':
-                $rReturn = ResellerAPI::processLine($rData);
-                if ($rReturn['status'] == STATUS_SUCCESS) {
-                    echo json_encode(['result' => true, 'location' => 'lines?status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
-                    exit();
-                }
-                echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
-                exit();
+			case 'line':
+				$rReturn = ResellerAPI::processLine($rData);
+				if ($rReturn['status'] == STATUS_SUCCESS) {
+					echo json_encode(['result' => true, 'location' => 'lines?status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
+					exit();
+				}
+				echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
+				exit();
 
-            case 'mag':
-                $rReturn = ResellerAPI::processMAG($rData);
-                if ($rReturn['status'] == STATUS_SUCCESS) {
-                    echo json_encode(['result' => true, 'location' => 'mags?status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
-                    exit();
-                }
-                echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
-                exit();
+			case 'mag':
+				$rReturn = ResellerAPI::processMAG($rData);
+				if ($rReturn['status'] == STATUS_SUCCESS) {
+					echo json_encode(['result' => true, 'location' => 'mags?status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
+					exit();
+				}
+				echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
+				exit();
 
-            case 'enigma':
-                $rReturn = ResellerAPI::processEnigma($rData);
-                if ($rReturn['status'] == STATUS_SUCCESS) {
-                    echo json_encode(['result' => true, 'location' => 'enigmas?status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
-                    exit();
-                }
-                echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
-                exit();
+			case 'enigma':
+				$rReturn = ResellerAPI::processEnigma($rData);
+				if ($rReturn['status'] == STATUS_SUCCESS) {
+					echo json_encode(['result' => true, 'location' => 'enigmas?status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
+					exit();
+				}
+				echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
+				exit();
 
-            case 'ticket':
-                $rReturn = ResellerAPI::submitTicket($rData);
-                if ($rReturn['status'] == STATUS_SUCCESS) {
-                    echo json_encode(['result' => true, 'location' => 'ticket_view?id=' . intval($rReturn['data']['insert_id']) . '&status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
-                    exit();
-                }
-                echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
-                exit();
+			case 'ticket':
+				$rReturn = ResellerAPI::submitTicket($rData);
+				if ($rReturn['status'] == STATUS_SUCCESS) {
+					echo json_encode(['result' => true, 'location' => 'ticket_view?id=' . intval($rReturn['data']['insert_id']) . '&status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
+					exit();
+				}
+				echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
+				exit();
 
-            case 'user':
-                $rReturn = ResellerAPI::processUser($rData);
-                if ($rReturn['status'] == STATUS_SUCCESS) {
-                    echo json_encode(['result' => true, 'location' => 'users?status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
-                    exit();
-                }
-                echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
-                exit();
+			case 'user':
+				$rReturn = ResellerAPI::processUser($rData);
+				if ($rReturn['status'] == STATUS_SUCCESS) {
+					echo json_encode(['result' => true, 'location' => 'users?status=' . intval($rReturn['status']), 'status' => $rReturn['status']]);
+					exit();
+				}
+				echo json_encode(['result' => false, 'data' => $rReturn['data'], 'status' => $rReturn['status']]);
+				exit();
 
-            default:
-                echo json_encode(['result' => false, 'error' => 'Unknown action']);
-                exit();
-        }
-    }
+			default:
+				echo json_encode(['result' => false, 'error' => 'Unknown action']);
+				exit();
+		}
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerRadiosController.php b/src/Public/Controllers/Reseller/ResellerRadiosController.php
index 0e17c9d0..8729ed9f 100644
--- a/src/Public/Controllers/Reseller/ResellerRadiosController.php
+++ b/src/Public/Controllers/Reseller/ResellerRadiosController.php
@@ -14,14 +14,12 @@ use XcVm\Domain\Stream\CategoryService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerRadiosController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Radio Stations');
-        $this->render('radios', [
-            'categories' => CategoryService::getAllByType('radio'),
-        ]);
-    }
+class ResellerRadiosController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Radio Stations');
+		$this->render('radios', [
+			'categories' => CategoryService::getAllByType('radio'),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerResizeController.php b/src/Public/Controllers/Reseller/ResellerResizeController.php
index b1c7703d..1187753f 100644
--- a/src/Public/Controllers/Reseller/ResellerResizeController.php
+++ b/src/Public/Controllers/Reseller/ResellerResizeController.php
@@ -18,16 +18,14 @@ use XcVm\Core\Util\ImageResizeService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerResizeController extends BaseResellerController
-{
-    public function index()
-    {
-        session_write_close();
+class ResellerResizeController extends BaseResellerController {
+	public function index() {
+		session_write_close();
 
-        if (!isset($GLOBALS['rUserInfo']) || !$GLOBALS['rUserInfo']['id']) {
-            exit();
-        }
+		if (!isset($GLOBALS['rUserInfo']) || !$GLOBALS['rUserInfo']['id']) {
+			exit();
+		}
 
-        ImageResizeService::serve(['cacheDir' => IMAGES_PATH . 'admin/']);
-    }
+		ImageResizeService::serve(['cacheDir' => IMAGES_PATH . 'admin/']);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerSessionController.php b/src/Public/Controllers/Reseller/ResellerSessionController.php
index f5d874ca..b4503982 100644
--- a/src/Public/Controllers/Reseller/ResellerSessionController.php
+++ b/src/Public/Controllers/Reseller/ResellerSessionController.php
@@ -22,11 +22,9 @@ namespace XcVm\Public\Controllers\Reseller;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerSessionController extends BaseResellerController
-{
-    public function index()
-    {
-        echo json_encode(['result' => true]);
-        exit;
-    }
+class ResellerSessionController extends BaseResellerController {
+	public function index() {
+		echo json_encode(['result' => true]);
+		exit;
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerStreamsController.php b/src/Public/Controllers/Reseller/ResellerStreamsController.php
index 29ce2d1c..3ce2708b 100644
--- a/src/Public/Controllers/Reseller/ResellerStreamsController.php
+++ b/src/Public/Controllers/Reseller/ResellerStreamsController.php
@@ -14,14 +14,12 @@ use XcVm\Domain\Stream\CategoryService;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerStreamsController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Streams');
-        $this->render('streams', [
-            'categories' => CategoryService::getAllByType('live'),
-        ]);
-    }
+class ResellerStreamsController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Streams');
+		$this->render('streams', [
+			'categories' => CategoryService::getAllByType('live'),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerTableController.php b/src/Public/Controllers/Reseller/ResellerTableController.php
index 9fa2243a..471aaabb 100644
--- a/src/Public/Controllers/Reseller/ResellerTableController.php
+++ b/src/Public/Controllers/Reseller/ResellerTableController.php
@@ -23,66 +23,64 @@ use XcVm\Infrastructure\ResellerTableRenderer;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerTableController extends BaseResellerController
-{
-    public function index()
-    {
-        session_write_close();
+class ResellerTableController extends BaseResellerController {
+	public function index() {
+		session_write_close();
 
-        $rUserInfo = $GLOBALS['rUserInfo'] ?? null;
-        $rPermissions = $GLOBALS['rPermissions'] ?? [];
-        global $db;
+		$rUserInfo = $GLOBALS['rUserInfo'] ?? null;
+		$rPermissions = $GLOBALS['rPermissions'] ?? [];
+		global $db;
 
-        if (!PHP_ERRORS) {
-            if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest') {
-                exit();
-            }
-        }
+		if (!PHP_ERRORS) {
+			if (empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest') {
+				exit();
+			}
+		}
 
-        $rReturn = array('draw' => intval(RequestManager::get('draw')), 'recordsTotal' => 0, 'recordsFiltered' => 0, 'data' => array());
-        $rIsAPI = false;
+		$rReturn = ['draw' => intval(RequestManager::get('draw')), 'recordsTotal' => 0, 'recordsFiltered' => 0, 'data' => []];
+		$rIsAPI = false;
 
-        if (RequestManager::has('api_key')) {
-            $rReturn = array('status' => 'STATUS_SUCCESS', 'data' => array());
-            $db->query('SELECT `id` FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `api_key` = ? AND LENGTH(`api_key`) > 0 AND `is_reseller` = 1 AND `status` = 1;', RequestManager::get('api_key'));
-            if ($db->num_rows() != 0) {
-                $rUserID = $db->get_row()['id'];
-                $rIsAPI = true;
-                require_once MAIN_HOME . 'bootstrap.php';
-                \XC_Bootstrap::boot(\XC_Bootstrap::CONTEXT_ADMIN);
-                $rUserInfo = UserRepository::getRegisteredUserById($rUserID);
-                $rPermissions = array_merge(AuthRepository::getPermissions($rUserInfo['member_group_id']), AuthRepository::getGroupPermissions($rUserInfo['id']));
-                $rPermissions['direct_reports'] = $rPermissions['direct_reports'] ?? [];
-                $rPermissions['all_reports'] = $rPermissions['all_reports'] ?? [];
-                $rPermissions['stream_ids'] = $rPermissions['stream_ids'] ?? [];
-                $rPermissions['category_ids'] = $rPermissions['category_ids'] ?? [];
-                $rPermissions['series_ids'] = $rPermissions['series_ids'] ?? [];
-                $rPermissions['subresellers'] = $rPermissions['subresellers'] ?? [];
-                if (0 < strlen($rUserInfo['timezone'])) {
-                    date_default_timezone_set($rUserInfo['timezone']);
-                }
-            } else {
-                echo json_encode(array('status' => 'STATUS_FAILURE', 'error' => 'Invalid API key.'));
-                exit();
-            }
-        } else {
-            if (!$rUserInfo || !$rUserInfo['id']) {
-                echo json_encode($rReturn);
-                exit();
-            }
-        }
+		if (RequestManager::has('api_key')) {
+			$rReturn = ['status' => 'STATUS_SUCCESS', 'data' => []];
+			$db->query('SELECT `id` FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `api_key` = ? AND LENGTH(`api_key`) > 0 AND `is_reseller` = 1 AND `status` = 1;', RequestManager::get('api_key'));
+			if ($db->num_rows() != 0) {
+				$rUserID = $db->get_row()['id'];
+				$rIsAPI = true;
+				require_once MAIN_HOME . 'bootstrap.php';
+				\XC_Bootstrap::boot(\XC_Bootstrap::CONTEXT_ADMIN);
+				$rUserInfo = UserRepository::getRegisteredUserById($rUserID);
+				$rPermissions = array_merge(AuthRepository::getPermissions($rUserInfo['member_group_id']), AuthRepository::getGroupPermissions($rUserInfo['id']));
+				$rPermissions['direct_reports'] = $rPermissions['direct_reports'] ?? [];
+				$rPermissions['all_reports'] = $rPermissions['all_reports'] ?? [];
+				$rPermissions['stream_ids'] = $rPermissions['stream_ids'] ?? [];
+				$rPermissions['category_ids'] = $rPermissions['category_ids'] ?? [];
+				$rPermissions['series_ids'] = $rPermissions['series_ids'] ?? [];
+				$rPermissions['subresellers'] = $rPermissions['subresellers'] ?? [];
+				if (0 < strlen($rUserInfo['timezone'])) {
+					date_default_timezone_set($rUserInfo['timezone']);
+				}
+			} else {
+				echo json_encode(['status' => 'STATUS_FAILURE', 'error' => 'Invalid API key.']);
+				exit();
+			}
+		} else {
+			if (!$rUserInfo || !$rUserInfo['id']) {
+				echo json_encode($rReturn);
+				exit();
+			}
+		}
 
-        if (!$rUserInfo['id']) {
-            echo json_encode($rReturn);
-            exit();
-        }
+		if (!$rUserInfo['id']) {
+			echo json_encode($rReturn);
+			exit();
+		}
 
-        if (!isset($rUserInfo['reports'])) {
-            echo json_encode($rReturn);
-            exit();
-        }
+		if (!isset($rUserInfo['reports'])) {
+			echo json_encode($rReturn);
+			exit();
+		}
 
-        // Delegate to the legacy table renderer
-        ResellerTableRenderer::render($rReturn, $rIsAPI, $rUserInfo, $rPermissions);
-    }
+		// Delegate to the legacy table renderer
+		ResellerTableRenderer::render($rReturn, $rIsAPI, $rUserInfo, $rPermissions);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerTicketController.php b/src/Public/Controllers/Reseller/ResellerTicketController.php
index 0c8f2cf4..44c755e3 100644
--- a/src/Public/Controllers/Reseller/ResellerTicketController.php
+++ b/src/Public/Controllers/Reseller/ResellerTicketController.php
@@ -17,29 +17,27 @@ use XcVm\Domain\User\TicketRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerTicketController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Ticket');
+class ResellerTicketController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Ticket');
 
-        $rRequest = RequestManager::getAll();
-        $rTicketInfo = null;
+		$rRequest = RequestManager::getAll();
+		$rTicketInfo = null;
 
-        if (isset($rRequest['id'])) {
-            $rTicketInfo = TicketRepository::getById($rRequest['id']);
-            if (!$rTicketInfo) {
-                AdminHelpers::goHome();
-                return;
-            }
-            if (!Authorization::check('user', $rTicketInfo['member_id'])) {
-                exit();
-            }
-        }
+		if (isset($rRequest['id'])) {
+			$rTicketInfo = TicketRepository::getById($rRequest['id']);
+			if (!$rTicketInfo) {
+				AdminHelpers::goHome();
+				return;
+			}
+			if (!Authorization::check('user', $rTicketInfo['member_id'])) {
+				exit();
+			}
+		}
 
-        $this->render('ticket', [
-            'rTicketInfo' => $rTicketInfo,
-        ]);
-    }
+		$this->render('ticket', [
+			'rTicketInfo' => $rTicketInfo,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerTicketViewController.php b/src/Public/Controllers/Reseller/ResellerTicketViewController.php
index f1f87af8..b7409b63 100644
--- a/src/Public/Controllers/Reseller/ResellerTicketViewController.php
+++ b/src/Public/Controllers/Reseller/ResellerTicketViewController.php
@@ -17,35 +17,33 @@ use XcVm\Domain\User\TicketRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerTicketViewController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
+class ResellerTicketViewController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
 
-        $rRequest = RequestManager::getAll();
+		$rRequest = RequestManager::getAll();
 
-        if (!isset($rRequest['id']) || !($rTicketInfo = TicketRepository::getById($rRequest['id']))) {
-            AdminHelpers::goHome();
-            return;
-        }
+		if (!isset($rRequest['id']) || !($rTicketInfo = TicketRepository::getById($rRequest['id']))) {
+			AdminHelpers::goHome();
+			return;
+		}
 
-        if (!Authorization::check('user', $rTicketInfo['member_id'])) {
-            exit();
-        }
+		if (!Authorization::check('user', $rTicketInfo['member_id'])) {
+			exit();
+		}
 
-        // Mark ticket as read
-        global $db;
-        $rUserInfo = $GLOBALS['rUserInfo'];
-        if ($rUserInfo['id'] != $rTicketInfo['member_id']) {
-            $db->query('UPDATE `tickets` SET `admin_read` = 1 WHERE `id` = ?;', $rRequest['id']);
-        } else {
-            $db->query('UPDATE `tickets` SET `user_read` = 1 WHERE `id` = ?;', $rRequest['id']);
-        }
+		// Mark ticket as read
+		global $db;
+		$rUserInfo = $GLOBALS['rUserInfo'];
+		if ($rUserInfo['id'] != $rTicketInfo['member_id']) {
+			$db->query('UPDATE `tickets` SET `admin_read` = 1 WHERE `id` = ?;', $rRequest['id']);
+		} else {
+			$db->query('UPDATE `tickets` SET `user_read` = 1 WHERE `id` = ?;', $rRequest['id']);
+		}
 
-        $this->setTitle('View Ticket');
-        $this->render('ticket_view', [
-            'rTicketInfo' => $rTicketInfo,
-        ]);
-    }
+		$this->setTitle('View Ticket');
+		$this->render('ticket_view', [
+			'rTicketInfo' => $rTicketInfo,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerTicketsController.php b/src/Public/Controllers/Reseller/ResellerTicketsController.php
index 502a43d4..dc5aec44 100644
--- a/src/Public/Controllers/Reseller/ResellerTicketsController.php
+++ b/src/Public/Controllers/Reseller/ResellerTicketsController.php
@@ -14,18 +14,16 @@ use XcVm\Domain\User\TicketRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerTicketsController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Tickets');
+class ResellerTicketsController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Tickets');
 
-        $statusArray = ['CLOSED', 'OPEN', 'RESPONDED TO', 'READ BY ME', 'NEW RESPONSE', 'READ BY ADMIN', 'READ BY USER'];
+		$statusArray = ['CLOSED', 'OPEN', 'RESPONDED TO', 'READ BY ME', 'NEW RESPONSE', 'READ BY ADMIN', 'READ BY USER'];
 
-        $this->render('tickets', [
-            'statusArray' => $statusArray,
-            'tickets'     => TicketRepository::getAll($GLOBALS['rUserInfo']['id']),
-        ]);
-    }
+		$this->render('tickets', [
+			'statusArray' => $statusArray,
+			'tickets'     => TicketRepository::getAll($GLOBALS['rUserInfo']['id']),
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerUserController.php b/src/Public/Controllers/Reseller/ResellerUserController.php
index 027c154e..3079c732 100644
--- a/src/Public/Controllers/Reseller/ResellerUserController.php
+++ b/src/Public/Controllers/Reseller/ResellerUserController.php
@@ -16,39 +16,37 @@ use XcVm\Domain\User\UserRepository;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerUserController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
+class ResellerUserController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
 
-        $rRequest     = $GLOBALS['rRequest'] ?? [];
-        $rUserInfo    = $GLOBALS['rUserInfo'];
-        $rPermissions = &$GLOBALS['rPermissions'];
-        $rUser        = null;
+		$rRequest     = $GLOBALS['rRequest'] ?? [];
+		$rUserInfo    = $GLOBALS['rUserInfo'];
+		$rPermissions = &$GLOBALS['rPermissions'];
+		$rUser        = null;
 
-        if (isset($rRequest['id'])) {
-            $rUser = UserRepository::getRegisteredUserById($rRequest['id']);
+		if (isset($rRequest['id'])) {
+			$rUser = UserRepository::getRegisteredUserById($rRequest['id']);
 
-            if (!$rUser || $rRequest['id'] == $rUserInfo['id']) {
-                AdminHelpers::goHome();
-            }
+			if (!$rUser || $rRequest['id'] == $rUserInfo['id']) {
+				AdminHelpers::goHome();
+			}
 
-            // Remove edited user from reports arrays so they don't appear in owner dropdown
-            if (($rKey = array_search($rUser['id'], $rPermissions['all_reports'])) !== false) {
-                unset($rPermissions['all_reports'][$rKey]);
-            }
-            if (($rKey = array_search($rUser['id'], $rPermissions['direct_reports'])) !== false) {
-                unset($rPermissions['direct_reports'][$rKey]);
-            }
-        }
+			// Remove edited user from reports arrays so they don't appear in owner dropdown
+			if (($rKey = array_search($rUser['id'], $rPermissions['all_reports'])) !== false) {
+				unset($rPermissions['all_reports'][$rKey]);
+			}
+			if (($rKey = array_search($rUser['id'], $rPermissions['direct_reports'])) !== false) {
+				unset($rPermissions['direct_reports'][$rKey]);
+			}
+		}
 
-        $rGroups = GroupService::getAll() ?: [];
+		$rGroups = GroupService::getAll() ?: [];
 
-        $this->setTitle('User');
-        $this->render('user', [
-            'rUser'   => $rUser,
-            'rGroups' => $rGroups,
-        ]);
-    }
+		$this->setTitle('User');
+		$this->render('user', [
+			'rUser'   => $rUser,
+			'rGroups' => $rGroups,
+		]);
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerUserLogsController.php b/src/Public/Controllers/Reseller/ResellerUserLogsController.php
index ceafc5ae..2539c599 100644
--- a/src/Public/Controllers/Reseller/ResellerUserLogsController.php
+++ b/src/Public/Controllers/Reseller/ResellerUserLogsController.php
@@ -12,12 +12,10 @@ namespace XcVm\Public\Controllers\Reseller;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerUserLogsController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('User Logs');
-        $this->render('user_logs');
-    }
+class ResellerUserLogsController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('User Logs');
+		$this->render('user_logs');
+	}
 }
diff --git a/src/Public/Controllers/Reseller/ResellerUsersController.php b/src/Public/Controllers/Reseller/ResellerUsersController.php
index a9a09668..635938cc 100644
--- a/src/Public/Controllers/Reseller/ResellerUsersController.php
+++ b/src/Public/Controllers/Reseller/ResellerUsersController.php
@@ -12,12 +12,10 @@ namespace XcVm\Public\Controllers\Reseller;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-class ResellerUsersController extends BaseResellerController
-{
-    public function index()
-    {
-        $this->requirePermission();
-        $this->setTitle('Users');
-        $this->render('users');
-    }
+class ResellerUsersController extends BaseResellerController {
+	public function index() {
+		$this->requirePermission();
+		$this->setTitle('Users');
+		$this->render('users');
+	}
 }
diff --git a/src/Public/Controllers/Reseller/TableController.php b/src/Public/Controllers/Reseller/TableController.php
index 5ff30deb..add0295c 100644
--- a/src/Public/Controllers/Reseller/TableController.php
+++ b/src/Public/Controllers/Reseller/TableController.php
@@ -29,1835 +29,1836 @@ use XcVm\Infrastructure\Redis\RedisManager;
 session_start();
 session_write_close();
 if (!defined('MAIN_HOME')) {
-    define('MAIN_HOME', dirname(__DIR__, 3) . '/');
-    require_once MAIN_HOME . 'vendor/autoload.php';
+	define('MAIN_HOME', dirname(__DIR__, 3) . '/');
+	require_once MAIN_HOME . 'vendor/autoload.php';
 }
 WebApiBootstrap::init('reseller');
 if (PHP_ERRORS) {
 } else {
-    if (!(empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest')) {
-    } else {
-        exit();
-    }
+	if (!(empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest')) {
+	} else {
+		exit();
+	}
 }
-$rReturn = array('draw' => intval(RequestManager::get('draw')), 'recordsTotal' => 0, 'recordsFiltered' => 0, 'data' => array());
+$rReturn = ['draw' => intval(RequestManager::get('draw')), 'recordsTotal' => 0, 'recordsFiltered' => 0, 'data' => []];
 $rIsAPI = false;
 if (RequestManager::has('api_key')) {
-    $rReturn = array('status' => 'STATUS_SUCCESS', 'data' => array());
-    $db->query('SELECT `id` FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `api_key` = ? AND LENGTH(`api_key`) > 0 AND `is_reseller` = 1 AND `status` = 1;', RequestManager::get('api_key'));
-    if ($db->num_rows() != 0) {
-        $rUserID = $db->get_row()['id'];
-        $rIsAPI = true;
-        require_once MAIN_HOME . 'bootstrap.php';
-        \XC_Bootstrap::boot(\XC_Bootstrap::CONTEXT_ADMIN);
-        $rUserInfo = UserRepository::getRegisteredUserById($rUserID);
-        $rPermissions = array_merge(AuthRepository::getPermissions($rUserInfo['member_group_id']), AuthRepository::getGroupPermissions($rUserInfo['id']));
-        if (0 >= strlen($rUserInfo['timezone'])) {
-        } else {
-            date_default_timezone_set($rUserInfo['timezone']);
-        }
-    } else {
-        echo json_encode(array('status' => 'STATUS_FAILURE', 'error' => 'Invalid API key.'));
-        exit();
-    }
+	$rReturn = ['status' => 'STATUS_SUCCESS', 'data' => []];
+	$db->query('SELECT `id` FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` WHERE `api_key` = ? AND LENGTH(`api_key`) > 0 AND `is_reseller` = 1 AND `status` = 1;', RequestManager::get('api_key'));
+	if ($db->num_rows() != 0) {
+		$rUserID = $db->get_row()['id'];
+		$rIsAPI = true;
+		require_once MAIN_HOME . 'bootstrap.php';
+		\XC_Bootstrap::boot(\XC_Bootstrap::CONTEXT_ADMIN);
+		$rUserInfo = UserRepository::getRegisteredUserById($rUserID);
+		$rPermissions = array_merge(AuthRepository::getPermissions($rUserInfo['member_group_id']), AuthRepository::getGroupPermissions($rUserInfo['id']));
+		if (0 >= strlen($rUserInfo['timezone'])) {
+		} else {
+			date_default_timezone_set($rUserInfo['timezone']);
+		}
+	} else {
+		echo json_encode(['status' => 'STATUS_FAILURE', 'error' => 'Invalid API key.']);
+		exit();
+	}
 } else {
-    if (isset($_SESSION['reseller'])) {
-        include 'functions.php';
-    } else {
-        echo json_encode($rReturn);
-        exit();
-    }
+	if (isset($_SESSION['reseller'])) {
+		include 'functions.php';
+	} else {
+		echo json_encode($rReturn);
+		exit();
+	}
 }
 if (!$rUserInfo['id']) {
-    echo json_encode($rReturn);
-    exit();
+	echo json_encode($rReturn);
+	exit();
 }
 if (isset($rUserInfo['reports'])) {
-    $rType = RequestManager::get('id');
-    $rStart = intval(RequestManager::get('start'));
-    $rLimit = intval(RequestManager::get('length'));
-    if (!(1000 < $rLimit || $rLimit <= 0)) {
-    } else {
-        $rLimit = 1000;
-    }
-    if ($rType == 'lines') {
-        if ($rPermissions['create_line']) {
-            $rOrder = array('`lines`.`id`', '`lines`.`username`', '`lines`.`password`', '`users`.`username`', '`lines`.`enabled` - `lines`.`admin_enabled`', '`active_connections` > 0', '`lines`.`is_trial`', '`active_connections`', '`lines`.`max_connections`', '`lines`.`exp_date`', '`last_activity`', false);
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rWhere = $rWhereV = array();
-            $rWhere[] = '`lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0';
-            $rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
-            if (0 >= strlen(RequestManager::get('search')['value'])) {
-            } else {
-                foreach (range(1, 6) as $rInt) {
-                    $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                }
-                $rWhere[] = '(`lines`.`username` LIKE ? OR `lines`.`password` LIKE ? OR `users`.`username` LIKE ? OR FROM_UNIXTIME(`exp_date`) LIKE ? OR `lines`.`max_connections` LIKE ? OR `lines`.`reseller_notes` LIKE ?)';
-            }
-            if (0 >= strlen(RequestManager::get('filter'))) {
-            } else {
-                if (RequestManager::get('filter') == 1) {
-                    $rWhere[] = '(`lines`.`admin_enabled` = 1 AND `lines`.`enabled` = 1 AND (`lines`.`exp_date` IS NULL OR `lines`.`exp_date` > UNIX_TIMESTAMP()))';
-                } else {
-                    if (RequestManager::get('filter') == 2) {
-                        $rWhere[] = '`lines`.`enabled` = 0';
-                    } else {
-                        if (RequestManager::get('filter') == 3) {
-                            $rWhere[] = '`lines`.`admin_enabled` = 0';
-                        } else {
-                            if (RequestManager::get('filter') == 4) {
-                                $rWhere[] = '(`lines`.`exp_date` IS NOT NULL AND `lines`.`exp_date` <= UNIX_TIMESTAMP())';
-                            } else {
-                                if (RequestManager::get('filter') != 5) {
-                                } else {
-                                    $rWhere[] = '`lines`.`is_trial` = 1';
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            if (0 >= strlen(RequestManager::get('reseller'))) {
-            } else {
-                $rWhere[] = '`lines`.`member_id` = ?';
-                $rWhereV[] = RequestManager::get('reseller');
-            }
-            if (0 < count($rWhere)) {
-                $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-            } else {
-                $rWhereString = '';
-            }
-            $rCountQuery = 'SELECT COUNT(`lines`.`id`) AS `count` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` ' . $rWhereString . ';';
-            if (!$rOrder[$rOrderRow]) {
-            } else {
-                $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-            }
-            $db->query($rCountQuery, ...$rWhereV);
-            if ($db->num_rows() == 1) {
-                $rReturn['recordsTotal'] = $db->get_row()['count'];
-            } else {
-                $rReturn['recordsTotal'] = 0;
-            }
-            $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-            if (0 >= $rReturn['recordsTotal']) {
-            } else {
-                $rQuery = 'SELECT `lines`.`id`, `lines`.`member_id`, `lines`.`last_activity`, `lines`.`last_activity_array`, `lines`.`username`, `lines`.`password`, `lines`.`exp_date`, `lines`.`admin_enabled`, `lines`.`is_restreamer`, `lines`.`enabled`, `lines`.`admin_notes`, `lines`.`reseller_notes`, `lines`.`max_connections`, `lines`.`is_trial`, (SELECT COUNT(*) AS `active_connections` FROM `lines_live` WHERE `user_id` = `lines`.`id` AND `hls_end` = 0) AS `active_connections` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                $db->query($rQuery, ...$rWhereV);
-                if (0 >= $db->num_rows()) {
-                } else {
-                    $rRows = $db->get_rows();
-                    $rActivityIDs = $rLineInfo = $rLineIDs = array();
-                    foreach ($rRows as $rRow) {
-                        $rLineIDs[] = intval($rRow['id']);
-                        $rLineInfo[intval($rRow['id'])] = array('owner_name' => null, 'stream_display_name' => null, 'stream_id' => null, 'last_active' => null);
-                        if ($rLastInfo = json_decode($rRow['last_activity_array'], true)) {
-                            $rLineInfo[intval($rRow['id'])]['stream_id'] = $rLastInfo['stream_id'];
-                            $rLineInfo[intval($rRow['id'])]['last_active'] = $rLastInfo['date_end'];
-                        } else {
-                            if (!$rRow['last_activity']) {
-                            } else {
-                                $rActivityIDs[] = intval($rRow['last_activity']);
-                            }
-                        }
-                    }
-                    if (0 >= count($rLineIDs)) {
-                    } else {
-                        $db->query('SELECT `users`.`username`, `lines`.`id` FROM `users` LEFT JOIN `lines` ON `lines`.`member_id` = `users`.`id` WHERE `lines`.`id` IN (' . implode(',', $rLineIDs) . ');');
-                        foreach ($db->get_rows() as $rRow) {
-                            $rLineInfo[$rRow['id']]['owner_name'] = $rRow['username'];
-                        }
-                        if (SettingsManager::get('redis_handler')) {
-                            $rConnectionCount = array();
-                            $rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
-                            $rStreamIDs = array();
-                            foreach ($rConnectionMap as $rUserID => $rConnections) {
-                                foreach ($rConnections as $rConnection) {
-                                    if (in_array($rConnection['stream_id'], $rStreamIDs)) {
-                                    } else {
-                                        $rStreamIDs[] = intval($rConnection['stream_id']);
-                                    }
-                                }
-                            }
-                            $rStreamMap = array();
-                            if (0 >= count($rStreamIDs)) {
-                            } else {
-                                $db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rStreamIDs) . ');');
-                                foreach ($db->get_rows() as $rRow) {
-                                    $rStreamMap[$rRow['id']] = $rRow['stream_display_name'];
-                                }
-                            }
-                            foreach (array_keys($rConnectionMap) as $rUserID) {
-                                array_multisort(array_column($rConnectionMap[$rUserID], 'date_start'), SORT_DESC, $rConnectionMap[$rUserID]);
-                                $rLineInfo[$rUserID]['stream_display_name'] = $rStreamMap[$rConnectionMap[$rUserID][0]['stream_id']];
-                                $rLineInfo[$rUserID]['stream_id'] = $rConnectionMap[$rUserID][0]['stream_id'];
-                                $rLineInfo[$rUserID]['last_active'] = $rConnectionMap[$rUserID][0]['date_start'];
-                                $rConnectionCount[$rUserID] = count($rConnectionMap[$rUserID]);
-                            }
-                            unset($rConnectionMap);
-                        } else {
-                            $db->query('SELECT `lines_live`.`user_id`, `lines_live`.`stream_id`, `lines_live`.`date_start` AS `last_active`, `streams`.`stream_display_name` FROM `lines_live` LEFT JOIN `streams` ON `streams`.`id` = `lines_live`.`stream_id` INNER JOIN (SELECT `user_id`, MAX(`date_start`) AS `ts` FROM `lines_live` GROUP BY `user_id`) `maxt` ON (`lines_live`.`user_id` = `maxt`.`user_id` AND `lines_live`.`date_start` = `maxt`.`ts`) WHERE `lines_live`.`user_id` IN (' . implode(',', $rLineIDs) . ');');
-                            foreach ($db->get_rows() as $rRow) {
-                                $rLineInfo[$rRow['user_id']]['stream_display_name'] = $rRow['stream_display_name'];
-                                $rLineInfo[$rRow['user_id']]['stream_id'] = $rRow['stream_id'];
-                                $rLineInfo[$rRow['user_id']]['last_active'] = $rRow['last_active'];
-                            }
-                        }
-                    }
-                    if (0 >= count($rActivityIDs)) {
-                    } else {
-                        $db->query('SELECT `user_id`, `stream_id`, `date_end` AS `last_active` FROM `lines_activity` WHERE `activity_id` IN (' . implode(',', $rActivityIDs) . ');');
-                        foreach ($db->get_rows() as $rRow) {
-                            if (isset($rLineInfo[$rRow['user_id']]['stream_id'])) {
-                            } else {
-                                $rLineInfo[$rRow['user_id']]['stream_id'] = $rRow['stream_id'];
-                                $rLineInfo[$rRow['user_id']]['last_active'] = $rRow['last_active'];
-                            }
-                        }
-                    }
-                    foreach ($rRows as $rRow) {
-                        $rRow = array_merge($rRow, $rLineInfo[$rRow['id']]);
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rRow['active_connections'] = (isset($rConnectionCount[$rRow['id']]) ? $rConnectionCount[$rRow['id']] : 0);
-                        }
-                        if (!$rIsAPI) {
-                            if (!$rRow['admin_enabled']) {
-                                $rStatus = '<i class="text-danger fas fa-square tooltip" title="Banned"></i>';
-                            } else {
-                                if (!$rRow['enabled']) {
-                                    $rStatus = '<i class="text-secondary fas fa-square tooltip" title="Disabled"></i>';
-                                } else {
-                                    if ($rRow['exp_date'] && $rRow['exp_date'] < time()) {
-                                        $rStatus = '<i class="text-warning far fa-square tooltip" title="Expired"></i>';
-                                    } else {
-                                        $rStatus = '<i class="text-success fas fa-square tooltip" title="Active"></i>';
-                                    }
-                                }
-                            }
-                            if (0 < $rRow['active_connections']) {
-                                $rActive = '<i class="text-success fas fa-square"></i>';
-                            } else {
-                                $rActive = '<i class="text-secondary far fa-square"></i>';
-                            }
-                            if ($rRow['is_trial']) {
-                                $rTrial = '<i class="text-warning fas fa-square"></i>';
-                            } else {
-                                $rTrial = '<i class="text-secondary far fa-square"></i>';
-                            }
-                            if ($rRow['exp_date']) {
-                                if ($rRow['exp_date'] < time()) {
-                                    $rExpDate = '<span class="expired">' . date($rSettings['date_format'], $rRow['exp_date']) . '<br/><small>' . date('H:i:s', $rRow['exp_date']) . '</small></span>';
-                                } else {
-                                    $rExpDate = date($rSettings['date_format'], $rRow['exp_date']) . "<br/><small class='text-secondary'>" . date('H:i:s', $rRow['exp_date']) . '</small>';
-                                }
-                            } else {
-                                $rExpDate = '&infin;';
-                            }
-                            if (0 < $rRow['active_connections']) {
-                                if ($rPermissions['reseller_client_connection_logs']) {
-                                    $rActiveConnections = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['active_connections'] . '</button></a>';
-                                } else {
-                                    $rActiveConnections = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['active_connections'] . '</button>';
-                                }
-                            } else {
-                                $rActiveConnections = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
-                            }
-                            if ($rRow['max_connections'] == 0) {
-                                $rMaxConnections = "<button type='button' class='btn btn-dark text-white btn-xs waves-effect waves-light'>&infin;</button>";
-                            } else {
-                                $rMaxConnections = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>" . $rRow['max_connections'] . '</button>';
-                            }
-                            $rButtons = '<div class="btn-group">';
-                            $rNotes = '';
-                            if (0 >= strlen($rRow['reseller_notes'])) {
-                            } else {
-                                if (strlen($rNotes) == 0) {
-                                } else {
-                                    $rNotes .= "\n";
-                                }
-                                $rNotes .= $rRow['reseller_notes'];
-                            }
-                            if (0 < strlen($rNotes)) {
-                                $rButtons .= '<button type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" title="' . $rNotes . '"><i class="mdi mdi-note"></i></button>';
-                            } else {
-                                $rButtons .= '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-note"></i></button>';
-                            }
-                            $rButtons .= '<a href="line?id=' . $rRow['id'] . '"><button title="Edit" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip"><i class="mdi mdi-pencil-outline"></i></button></a>';
-                            if (!$rPermissions['allow_download']) {
-                            } else {
-                                $rButtons .= "<button type=\"button\" title=\"Download Playlist\" class=\"btn btn-light waves-effect waves-light btn-xs tooltip\" onClick=\"download('" . $rRow['username'] . "', '" . $rRow['password'] . "');\"><i class=\"mdi mdi-download\"></i></button>";
-                            }
-                            if (!$rPermissions['reseller_client_connection_logs']) {
-                            } else {
-                                if (0 < $rRow['active_connections']) {
-                                    $rButtons .= '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'kill_line');\"><i class=\"fas fa-hammer\"></i></button>";
-                                } else {
-                                    $rButtons .= '<button disabled type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="fas fa-hammer"></i></button>';
-                                }
-                            }
-                            if (!$rRow['is_isplock']) {
-                            } else {
-                                $rButtons .= '<button title="Reset ISP Lock" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'reset_isp');\"><i class=\"mdi mdi-lock-reset\"></i></button>";
-                            }
-                            if ($rRow['enabled']) {
-                                $rButtons .= '<button title="Disable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'disable');\"><i class=\"mdi mdi-lock\"></i></button>";
-                            } else {
-                                $rButtons .= '<button title="Enable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'enable');\"><i class=\"mdi mdi-lock\"></i></button>";
-                            }
-                            $rButtons .= '<button title="Delete" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>";
-                            $rButtons .= '</div>';
-                            if ($rRow['active_connections'] && $rRow['last_active']) {
-                                $rLastActive = "<a href='stream_view?id=" . $rRow['stream_id'] . "'>" . $rRow['stream_display_name'] . "</a><br/><small class='text-secondary'>Online: " . TimeUtils::secondsToTime(time() - $rRow['last_active']) . '</small>';
-                            } else {
-                                if ($rRow['last_active']) {
-                                    $rLastActive = date($rSettings['date_format'], $rRow['last_active']) . "<br/><small class='text-secondary'>" . date('H:i:s', $rRow['last_active']) . '</small>';
-                                } else {
-                                    $rLastActive = 'Never';
-                                }
-                            }
-                            if (in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])))) {
-                                $rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . '</a>';
-                            } else {
-                                $rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . "<br/><small class='text-pink'>(indirect)</small></a>";
-                            }
-                            $rReturn['data'][] = array("<a href='line?id=" . $rRow['id'] . "'>" . $rRow['id'] . '</a>', "<a href='line?id=" . $rRow['id'] . "'>" . $rRow['username'] . '</a>', $rRow['password'], $rOwner, $rStatus, $rActive, $rTrial, $rActiveConnections, $rMaxConnections, $rExpDate, $rLastActive, $rButtons);
-                        } else {
-                            $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                        }
-                    }
-                }
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        exit();
-    }
-    if ($rType == 'mags') {
-        if ($rPermissions['create_mag']) {
-            $rOrder = array('`lines`.`id`', '`lines`.`username`', '`mag_devices`.`mac`', '`mag_devices`.`stb_type`', '`users`.`username`', '`lines`.`enabled`', '`active_connections`', '`lines`.`is_trial`', '`lines`.`exp_date`', false);
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rWhere = $rWhereV = array();
-            $rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
-            if (0 >= strlen(RequestManager::get('search')['value'])) {
-            } else {
-                foreach (range(1, 6) as $rInt) {
-                    $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                }
-                $rWhere[] = '(`lines`.`username` LIKE ? OR `mag_devices`.`mac` LIKE ? OR `mag_devices`.`stb_type` LIKE ? OR `users`.`username` LIKE ? OR FROM_UNIXTIME(`exp_date`) LIKE ? OR `lines`.`reseller_notes` LIKE ?)';
-            }
-            if (0 >= strlen(RequestManager::get('filter'))) {
-            } else {
-                if (RequestManager::get('filter') == 1) {
-                    $rWhere[] = '(`lines`.`admin_enabled` = 1 AND `lines`.`enabled` = 1 AND (`lines`.`exp_date` IS NULL OR `lines`.`exp_date` > UNIX_TIMESTAMP()))';
-                } else {
-                    if (RequestManager::get('filter') == 2) {
-                        $rWhere[] = '`lines`.`enabled` = 0';
-                    } else {
-                        if (RequestManager::get('filter') == 3) {
-                            $rWhere[] = '(`lines`.`exp_date` IS NOT NULL AND `lines`.`exp_date` <= UNIX_TIMESTAMP())';
-                        } else {
-                            if (RequestManager::get('filter') != 4) {
-                            } else {
-                                $rWhere[] = '`lines`.`is_trial` = 1';
-                            }
-                        }
-                    }
-                }
-            }
-            if (0 >= strlen(RequestManager::get('reseller'))) {
-            } else {
-                $rWhere[] = '`lines`.`member_id` = ?';
-                $rWhereV[] = RequestManager::get('reseller');
-            }
-            if (0 < count($rWhere)) {
-                $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-            } else {
-                $rWhereString = '';
-            }
-            if (!$rOrder[$rOrderRow]) {
-            } else {
-                $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-            }
-            $rCountQuery = 'SELECT COUNT(`lines`.`id`) AS `count` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` INNER JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` ' . $rWhereString . ';';
-            $db->query($rCountQuery, ...$rWhereV);
-            if ($db->num_rows() == 1) {
-                $rReturn['recordsTotal'] = $db->get_row()['count'];
-            } else {
-                $rReturn['recordsTotal'] = 0;
-            }
-            $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-            if (0 >= $rReturn['recordsTotal']) {
-            } else {
-                $rQuery = 'SELECT `lines`.`id`, `lines`.`username`, `lines`.`member_id`, `lines`.`is_isplock`, `mag_devices`.`mac`, `mag_devices`.`stb_type`, `mag_devices`.`mag_id`, `lines`.`exp_date`, `lines`.`admin_enabled`, `lines`.`enabled`, `lines`.`reseller_notes`, `lines`.`max_connections`,  `lines`.`is_trial`, `users`.`username` AS `owner_name`, (SELECT count(*) FROM `lines_live` WHERE `lines`.`id` = `lines_live`.`user_id` AND `hls_end` = 0) AS `active_connections` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` INNER JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                $db->query($rQuery, ...$rWhereV);
-                if (0 >= $db->num_rows()) {
-                } else {
-                    $rRows = $db->get_rows();
-                    $rLineIDs = array();
-                    foreach ($rRows as $rRow) {
-                        if (!$rRow['id']) {
-                        } else {
-                            $rLineIDs[] = intval($rRow['id']);
-                        }
-                    }
-                    if (0 >= count($rLineIDs)) {
-                    } else {
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rConnectionCount = array();
-                            $rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
-                            foreach (array_keys($rConnectionMap) as $rUserID) {
-                                $rConnectionCount[$rUserID] = count($rConnectionMap[$rUserID]);
-                            }
-                            unset($rConnectionMap);
-                        }
-                    }
-                    foreach ($rRows as $rRow) {
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rRow['active_connections'] = (isset($rConnectionCount[$rRow['id']]) ? $rConnectionCount[$rRow['id']] : 0);
-                        }
-                        if (!$rIsAPI) {
-                            if (!$rRow['admin_enabled']) {
-                                $rStatus = '<i class="text-danger fas fa-square"></i>';
-                            } else {
-                                if (!$rRow['enabled']) {
-                                    $rStatus = '<i class="text-secondary fas fa-square"></i>';
-                                } else {
-                                    if ($rRow['exp_date'] && $rRow['exp_date'] < time()) {
-                                        $rStatus = '<i class="text-warning far fa-square"></i>';
-                                    } else {
-                                        $rStatus = '<i class="text-success fas fa-square"></i>';
-                                    }
-                                }
-                            }
-                            if (0 < $rRow['active_connections']) {
-                                $rActive = '<i class="text-success fas fa-square"></i>';
-                            } else {
-                                $rActive = '<i class="text-warning far fa-square"></i>';
-                            }
-                            if ($rRow['is_trial']) {
-                                $rTrial = '<i class="text-warning fas fa-square"></i>';
-                            } else {
-                                $rTrial = '<i class="text-secondary far fa-square"></i>';
-                            }
-                            if ($rRow['exp_date']) {
-                                if ($rRow['exp_date'] < time()) {
-                                    $rExpDate = '<span class="expired">' . date($rSettings['date_format'], $rRow['exp_date']) . '<br/><small>' . date('H:i:s', $rRow['exp_date']) . '</small></span>';
-                                } else {
-                                    $rExpDate = date($rSettings['date_format'], $rRow['exp_date']) . "<br/><small class='text-secondary'>" . date('H:i:s', $rRow['exp_date']) . '</small>';
-                                }
-                            } else {
-                                $rExpDate = '&infin;';
-                            }
-                            $rButtons = '<div class="btn-group">';
-                            $rNotes = '';
-                            if (0 >= strlen($rRow['reseller_notes'])) {
-                            } else {
-                                if (strlen($rNotes) == 0) {
-                                } else {
-                                    $rNotes .= "\n";
-                                }
-                                $rNotes .= $rRow['reseller_notes'];
-                            }
-                            if (0 < strlen($rNotes)) {
-                                $rButtons .= '<button type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" title="' . $rNotes . '"><i class="mdi mdi-note"></i></button>';
-                            } else {
-                                $rButtons .= '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-note"></i></button>';
-                            }
-                            $rButtons .= '<button title="MAG Event" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="message(' . $rRow['mag_id'] . ", '" . $rRow['mac'] . "');\"><i class=\"mdi mdi-message-alert\"></i></button>";
-                            $rButtons .= '<a href="mag?id=' . $rRow['mag_id'] . '"><button title="Edit" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip"><i class="mdi mdi-pencil-outline"></i></button></a>';
-                            if (!$rRow['is_isplock']) {
-                            } else {
-                                $rButtons .= '<button title="Reset ISP Lock" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'reset_isp');\"><i class=\"mdi mdi-lock-reset\"></i></button>";
-                            }
-                            if (!$rPermissions['create_line']) {
-                            } else {
-                                $rButtons .= '<button title="Convert to User Line" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'convert');\"><i class=\"fas fa-retweet\"></i></button>";
-                            }
-                            if (!$rPermissions['reseller_client_connection_logs']) {
-                            } else {
-                                if (0 < $rRow['active_connections']) {
-                                    $rButtons .= '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'kill_line');\"><i class=\"fas fa-hammer\"></i></button>";
-                                } else {
-                                    $rButtons .= '<button disabled type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="fas fa-hammer"></i></button>';
-                                }
-                            }
-                            if ($rRow['enabled'] == 1) {
-                                $rButtons .= '<button title="Disable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'disable');\"><i class=\"mdi mdi-lock\"></i></button>";
-                            } else {
-                                $rButtons .= '<button title="Enable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'enable');\"><i class=\"mdi mdi-lock\"></i></button>";
-                            }
-                            $rButtons .= '<button title="Delete" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>";
-                            $rButtons .= '</div>';
-                            if (in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])))) {
-                                $rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . '</a>';
-                            } else {
-                                $rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . "<br/><small class='text-pink'>(indirect)</small></a>";
-                            }
-                            $rReturn['data'][] = array("<a href='mag?id=" . $rRow['mag_id'] . "'>" . $rRow['mag_id'] . '</a>', $rRow['username'], "<a href='mag?id=" . $rRow['mag_id'] . "'>" . $rRow['mac'] . '</a>', $rRow['stb_type'], $rOwner, $rStatus, $rActive, $rTrial, $rExpDate, $rButtons);
-                        } else {
-                            $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                        }
-                    }
-                }
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        exit();
-    }
-    if ($rType == 'enigmas') {
-        if ($rPermissions['create_enigma']) {
-            $rOrder = array('`lines`.`id`', '`lines`.`username`', '`enigma2_devices`.`mac`', '`enigma2_devices`.`public_ip`', '`users`.`username`', '`lines`.`enabled`', '`active_connections`', '`lines`.`is_trial`', '`lines`.`exp_date`', false);
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rWhere = $rWhereV = array();
-            $rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
-            if (0 >= strlen(RequestManager::get('search')['value'])) {
-            } else {
-                foreach (range(1, 6) as $rInt) {
-                    $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                }
-                $rWhere[] = '(`lines`.`username` LIKE ? OR `enigma2_devices`.`mac` LIKE ? OR `enigma2_devices`.`public_ip` LIKE ? OR `users`.`username` LIKE ? OR FROM_UNIXTIME(`exp_date`) LIKE ? OR `lines`.`reseller_notes` LIKE ?)';
-            }
-            if (0 >= strlen(RequestManager::get('filter'))) {
-            } else {
-                if (RequestManager::get('filter') == 1) {
-                    $rWhere[] = '(`lines`.`admin_enabled` = 1 AND `lines`.`enabled` = 1 AND (`lines`.`exp_date` IS NULL OR `lines`.`exp_date` > UNIX_TIMESTAMP()))';
-                } else {
-                    if (RequestManager::get('filter') == 2) {
-                        $rWhere[] = '`lines`.`enabled` = 0';
-                    } else {
-                        if (RequestManager::get('filter') == 3) {
-                            $rWhere[] = '(`lines`.`exp_date` IS NOT NULL AND `lines`.`exp_date` <= UNIX_TIMESTAMP())';
-                        } else {
-                            if (RequestManager::get('filter') != 4) {
-                            } else {
-                                $rWhere[] = '`lines`.`is_trial` = 1';
-                            }
-                        }
-                    }
-                }
-            }
-            if (0 >= strlen(RequestManager::get('reseller'))) {
-            } else {
-                $rWhere[] = '`lines`.`member_id` = ?';
-                $rWhereV[] = RequestManager::get('reseller');
-            }
-            if (0 < count($rWhere)) {
-                $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-            } else {
-                $rWhereString = '';
-            }
-            if (!$rOrder[$rOrderRow]) {
-            } else {
-                $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-            }
-            $rCountQuery = 'SELECT COUNT(`lines`.`id`) AS `count` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` INNER JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` ' . $rWhereString . ';';
-            $db->query($rCountQuery, ...$rWhereV);
-            if ($db->num_rows() == 1) {
-                $rReturn['recordsTotal'] = $db->get_row()['count'];
-            } else {
-                $rReturn['recordsTotal'] = 0;
-            }
-            $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-            if (0 >= $rReturn['recordsTotal']) {
-            } else {
-                $rQuery = 'SELECT `lines`.`id`, `lines`.`username`, `lines`.`member_id`, `lines`.`is_isplock`, `enigma2_devices`.`mac`, `enigma2_devices`.`public_ip`, `enigma2_devices`.`device_id`, `lines`.`exp_date`, `lines`.`admin_enabled`, `lines`.`enabled`, `lines`.`reseller_notes`, `lines`.`max_connections`,  `lines`.`is_trial`, `users`.`username` AS `owner_name`, (SELECT count(*) FROM `lines_live` WHERE `lines`.`id` = `lines_live`.`user_id` AND `hls_end` = 0) AS `active_connections` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` INNER JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                $db->query($rQuery, ...$rWhereV);
-                if (0 >= $db->num_rows()) {
-                } else {
-                    $rRows = $db->get_rows();
-                    $rLineIDs = array();
-                    foreach ($rRows as $rRow) {
-                        if (!$rRow['id']) {
-                        } else {
-                            $rLineIDs[] = intval($rRow['id']);
-                        }
-                    }
-                    if (0 >= count($rLineIDs)) {
-                    } else {
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rConnectionCount = array();
-                            $rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
-                            foreach (array_keys($rConnectionMap) as $rUserID) {
-                                $rConnectionCount[$rUserID] = count($rConnectionMap[$rUserID]);
-                            }
-                            unset($rConnectionMap);
-                        }
-                    }
-                    foreach ($rRows as $rRow) {
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rRow['active_connections'] = (isset($rConnectionCount[$rRow['id']]) ? $rConnectionCount[$rRow['id']] : 0);
-                        }
-                        if (!$rIsAPI) {
-                            if (!$rRow['admin_enabled']) {
-                                $rStatus = '<i class="text-danger fas fa-square"></i>';
-                            } else {
-                                if (!$rRow['enabled']) {
-                                    $rStatus = '<i class="text-secondary fas fa-square"></i>';
-                                } else {
-                                    if ($rRow['exp_date'] && $rRow['exp_date'] < time()) {
-                                        $rStatus = '<i class="text-warning far fa-square"></i>';
-                                    } else {
-                                        $rStatus = '<i class="text-success fas fa-square"></i>';
-                                    }
-                                }
-                            }
-                            if (0 < $rRow['active_connections']) {
-                                $rActive = '<i class="text-success fas fa-square"></i>';
-                            } else {
-                                $rActive = '<i class="text-warning far fa-square"></i>';
-                            }
-                            if ($rRow['is_trial']) {
-                                $rTrial = '<i class="text-warning fas fa-square"></i>';
-                            } else {
-                                $rTrial = '<i class="text-secondary far fa-square"></i>';
-                            }
-                            if ($rRow['exp_date']) {
-                                if ($rRow['exp_date'] < time()) {
-                                    $rExpDate = '<span class="expired">' . date($rSettings['date_format'], $rRow['exp_date']) . '<br/><small>' . date('H:i:s', $rRow['exp_date']) . '</small></span>';
-                                } else {
-                                    $rExpDate = date($rSettings['date_format'], $rRow['exp_date']) . "<br/><small class='text-secondary'>" . date('H:i:s', $rRow['exp_date']) . '</small>';
-                                }
-                            } else {
-                                $rExpDate = '&infin;';
-                            }
-                            $rButtons = '<div class="btn-group">';
-                            $rNotes = '';
-                            if (0 >= strlen($rRow['reseller_notes'])) {
-                            } else {
-                                if (strlen($rNotes) == 0) {
-                                } else {
-                                    $rNotes .= "\n";
-                                }
-                                $rNotes .= $rRow['reseller_notes'];
-                            }
-                            if (0 < strlen($rNotes)) {
-                                $rButtons .= '<button type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" title="' . $rNotes . '"><i class="mdi mdi-note"></i></button>';
-                            } else {
-                                $rButtons .= '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-note"></i></button>';
-                            }
-                            $rButtons .= '<a href="enigma?id=' . $rRow['device_id'] . '"><button title="Edit" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip"><i class="mdi mdi-pencil-outline"></i></button></a>';
-                            if (!$rRow['is_isplock']) {
-                            } else {
-                                $rButtons .= '<button title="Reset ISP Lock" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'reset_isp');\"><i class=\"mdi mdi-lock-reset\"></i></button>";
-                            }
-                            if (!$rPermissions['create_line']) {
-                            } else {
-                                $rButtons .= '<button title="Convert to User Line" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'convert');\"><i class=\"fas fa-retweet\"></i></button>";
-                            }
-                            if (!$rPermissions['reseller_client_connection_logs']) {
-                            } else {
-                                if (0 < $rRow['active_connections']) {
-                                    $rButtons .= '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'kill_line');\"><i class=\"fas fa-hammer\"></i></button>";
-                                } else {
-                                    $rButtons .= '<button disabled type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="fas fa-hammer"></i></button>';
-                                }
-                            }
-                            if ($rRow['enabled'] == 1) {
-                                $rButtons .= '<button title="Disable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'disable');\"><i class=\"mdi mdi-lock\"></i></button>";
-                            } else {
-                                $rButtons .= '<button title="Enable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'enable');\"><i class=\"mdi mdi-lock\"></i></button>";
-                            }
-                            $rButtons .= '<button title="Delete" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>";
-                            $rButtons .= '</div>';
-                            if (in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])))) {
-                                $rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . '</a>';
-                            } else {
-                                $rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . "<br/><small class='text-pink'>(indirect)</small></a>";
-                            }
-                            $rReturn['data'][] = array("<a href='enigma?id=" . $rRow['device_id'] . "'>" . $rRow['device_id'] . '</a>', $rRow['username'], "<a href='enigma?id=" . $rRow['device_id'] . "'>" . $rRow['mac'] . '</a>', "<a onClick=\"whois('" . $rRow['public_ip'] . "');\" href='javascript: void(0);'>" . $rRow['public_ip'] . '</a>', $rOwner, $rStatus, $rActive, $rTrial, $rExpDate, $rButtons);
-                        } else {
-                            $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                        }
-                    }
-                }
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        exit();
-    }
-    if ($rType == 'streams') {
-        if ($rPermissions['can_view_vod']) {
-            $rCategories = CategoryService::getAllByType('live');
-            $rOrder = array('`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false);
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rCreated = RequestManager::has('created');
-            $rWhere = $rWhereV = array();
-            if (0 < count($rPermissions['stream_ids'])) {
-                $rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
-                if ($rCreated) {
-                    $rWhere[] = '`type` = 3';
-                } else {
-                    $rWhere[] = '`type` = 1';
-                }
-                if (0 >= strlen(RequestManager::get('search')['value'])) {
-                } else {
-                    foreach (range(1, 2) as $rInt) {
-                        $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                    }
-                    $rWhere[] = '(`id` LIKE ? OR `stream_display_name` LIKE ?)';
-                }
-                if (0 >= strlen(RequestManager::get('category'))) {
-                } else {
-                    $rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
-                    $rWhereV[] = RequestManager::get('category');
-                }
-                if (!$rOrder[$rOrderRow]) {
-                } else {
-                    $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                    $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-                }
-                if (0 < count($rWhere)) {
-                    $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-                } else {
-                    $rWhereString = '';
-                }
-                $rCountQuery = 'SELECT COUNT(`streams`.`id`) AS `count` FROM `streams` ' . $rWhereString . ';';
-                $db->query($rCountQuery, ...$rWhereV);
-                if ($db->num_rows() == 1) {
-                    $rReturn['recordsTotal'] = $db->get_row()['count'];
-                } else {
-                    $rReturn['recordsTotal'] = 0;
-                }
-                $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-                if (0 >= $rReturn['recordsTotal']) {
-                } else {
-                    $rQuery = 'SELECT `id`, `stream_icon`, `stream_display_name`, `tv_archive_duration`, `tv_archive_server_id`, `category_id`, (SELECT COUNT(*) FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `lines_live`.`stream_id` = `streams`.`id` AND `hls_end` = 0 AND `lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')) AS `clients` FROM `streams` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                    $db->query($rQuery, ...$rWhereV);
-                    if (0 >= $db->num_rows()) {
-                    } else {
-                        $rRows = $db->get_rows();
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rConnectionCount = $rReports = array();
-                            $db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
-                            foreach ($db->get_rows() as $rRow) {
-                                $rReports[] = $rRow['id'];
-                            }
-                            if (0 >= count($rReports)) {
-                            } else {
-                                foreach (ConnectionTracker::getUserConnections($rReports, false) as $rUserID => $rConnections) {
-                                    foreach ($rConnections as $rConnection) {
-                                        $rConnectionCount[$rConnection['stream_id']]++;
-                                    }
-                                }
-                            }
-                        }
-                        foreach ($rRows as $rRow) {
-                            if (!SettingsManager::get('redis_handler')) {
-                            } else {
-                                $rRow['clients'] = ($rConnectionCount[$rRow['id']] ?: 0);
-                            }
-                            if (!$rIsAPI) {
-                                $rCategoryIDs = json_decode($rRow['category_id'], true);
-                                if (0 < strlen(RequestManager::get('category'))) {
-                                    $rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
-                                } else {
-                                    $rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
-                                }
-                                if (1 >= count($rCategoryIDs)) {
-                                } else {
-                                    $rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
-                                }
-                                if (!(0 < $rRow['tv_archive_duration'] && 0 < $rRow['tv_archive_server_id'])) {
-                                } else {
-                                    $rRow['stream_display_name'] .= " <i class='text-danger mdi mdi-record'></i>";
-                                }
-                                if (0 < $rRow['clients']) {
-                                    if ($rPermissions['reseller_client_connection_logs']) {
-                                        $rButtons = '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'purge');\"><i class=\"mdi mdi-hammer\"></i></button>";
-                                        $rClients = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button></a>';
-                                    } else {
-                                        $rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
-                                        $rClients = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button>';
-                                    }
-                                } else {
-                                    $rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
-                                    $rClients = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
-                                }
-                                if (0 < strlen($rRow['stream_icon'])) {
-                                    $rIcon = "<a href='javascript: void(0);' onClick='openImage(this);' data-src='resize?maxw=512&maxh=512&url=" . $rRow['stream_icon'] . "'><img loading='lazy' src='resize?maxw=96&maxh=32&url=" . $rRow['stream_icon'] . "' /></a>";
-                                } else {
-                                    $rIcon = '';
-                                }
-                                $rReturn['data'][] = array($rRow['id'], $rIcon, $rRow['stream_display_name'], $rCategory, $rClients, $rButtons);
-                            } else {
-                                $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                            }
-                        }
-                    }
-                }
-                echo json_encode($rReturn);
-                exit();
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        exit();
-    }
-    if ($rType == 'radios') {
-        if ($rPermissions['can_view_vod']) {
-            $rCategories = CategoryService::getAllByType('radio');
-            $rOrder = array('`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false);
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rWhere = $rWhereV = array();
-            if (0 < count($rPermissions['stream_ids'])) {
-                $rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
-                $rWhere[] = '`type` = 4';
-                if (0 >= strlen(RequestManager::get('search')['value'])) {
-                } else {
-                    foreach (range(1, 2) as $rInt) {
-                        $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                    }
-                    $rWhere[] = '(`id` LIKE ? OR `stream_display_name` LIKE ?)';
-                }
-                if (0 >= strlen(RequestManager::get('category'))) {
-                } else {
-                    $rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
-                    $rWhereV[] = RequestManager::get('category');
-                }
-                if (!$rOrder[$rOrderRow]) {
-                } else {
-                    $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                    $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-                }
-                if (0 < count($rWhere)) {
-                    $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-                } else {
-                    $rWhereString = '';
-                }
-                $rCountQuery = 'SELECT COUNT(`streams`.`id`) AS `count` FROM `streams` ' . $rWhereString . ';';
-                $db->query($rCountQuery, ...$rWhereV);
-                if ($db->num_rows() == 1) {
-                    $rReturn['recordsTotal'] = $db->get_row()['count'];
-                } else {
-                    $rReturn['recordsTotal'] = 0;
-                }
-                $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-                if (0 >= $rReturn['recordsTotal']) {
-                } else {
-                    $rQuery = 'SELECT `id`, `stream_icon`, `stream_display_name`, `category_id`, (SELECT COUNT(*) FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `lines_live`.`stream_id` = `streams`.`id` AND `hls_end` = 0 AND `lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')) AS `clients` FROM `streams` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                    $db->query($rQuery, ...$rWhereV);
-                    if (0 >= $db->num_rows()) {
-                    } else {
-                        $rRows = $db->get_rows();
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rConnectionCount = $rReports = array();
-                            $db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
-                            foreach ($db->get_rows() as $rRow) {
-                                $rReports[] = $rRow['id'];
-                            }
-                            if (0 >= count($rReports)) {
-                            } else {
-                                foreach (ConnectionTracker::getUserConnections($rReports, false) as $rUserID => $rConnections) {
-                                    foreach ($rConnections as $rConnection) {
-                                        $rConnectionCount[$rConnection['stream_id']]++;
-                                    }
-                                }
-                            }
-                        }
-                        foreach ($rRows as $rRow) {
-                            if (!SettingsManager::get('redis_handler')) {
-                            } else {
-                                $rRow['clients'] = ($rConnectionCount[$rRow['id']] ?: 0);
-                            }
-                            if (!$rIsAPI) {
-                                $rCategoryIDs = json_decode($rRow['category_id'], true);
-                                if (0 < strlen(RequestManager::get('category'))) {
-                                    $rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
-                                } else {
-                                    $rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
-                                }
-                                if (1 >= count($rCategoryIDs)) {
-                                } else {
-                                    $rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
-                                }
-                                if (0 < $rRow['clients']) {
-                                    if ($rPermissions['reseller_client_connection_logs']) {
-                                        $rButtons = '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'purge');\"><i class=\"mdi mdi-hammer\"></i></button>";
-                                        $rClients = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button></a>';
-                                    } else {
-                                        $rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
-                                        $rClients = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button>';
-                                    }
-                                } else {
-                                    $rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
-                                    $rClients = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
-                                }
-                                if (0 < strlen($rRow['stream_icon'])) {
-                                    $rIcon = "<a href='javascript: void(0);' onClick='openImage(this);' data-src='resize?maxw=512&maxh=512&url=" . $rRow['stream_icon'] . "'><img loading='lazy' src='resize?maxw=96&maxh=32&url=" . $rRow['stream_icon'] . "' /></a>";
-                                } else {
-                                    $rIcon = '';
-                                }
-                                $rReturn['data'][] = array($rRow['id'], $rIcon, $rRow['stream_display_name'], $rCategory, $rClients, $rButtons);
-                            } else {
-                                $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                            }
-                        }
-                    }
-                }
-                echo json_encode($rReturn);
-                exit();
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        exit();
-    }
-    if ($rType == 'movies') {
-        if ($rPermissions['can_view_vod']) {
-            $rCategories = CategoryService::getAllByType('movie');
-            $rOrder = array('`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false);
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rWhere = $rWhereV = array();
-            if (0 < count($rPermissions['stream_ids'])) {
-                $rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
-                $rWhere[] = '`type` = 2';
-                if (0 >= strlen(RequestManager::get('search')['value'])) {
-                } else {
-                    foreach (range(1, 2) as $rInt) {
-                        $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                    }
-                    $rWhere[] = '(`id` LIKE ? OR `stream_display_name` LIKE ?)';
-                }
-                if (0 >= strlen(RequestManager::get('category'))) {
-                } else {
-                    $rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
-                    $rWhereV[] = RequestManager::get('category');
-                }
-                if (!$rOrder[$rOrderRow]) {
-                } else {
-                    $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                    $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-                }
-                if (0 < count($rWhere)) {
-                    $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-                } else {
-                    $rWhereString = '';
-                }
-                $rCountQuery = 'SELECT COUNT(`streams`.`id`) AS `count` FROM `streams` ' . $rWhereString . ';';
-                $db->query($rCountQuery, ...$rWhereV);
-                if ($db->num_rows() == 1) {
-                    $rReturn['recordsTotal'] = $db->get_row()['count'];
-                } else {
-                    $rReturn['recordsTotal'] = 0;
-                }
-                $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-                if (0 >= $rReturn['recordsTotal']) {
-                } else {
-                    $rQuery = 'SELECT `id`, `stream_icon`, `stream_display_name`, `movie_properties`, `category_id`, (SELECT COUNT(*) FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `lines_live`.`stream_id` = `streams`.`id` AND `hls_end` = 0 AND `lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')) AS `clients` FROM `streams` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                    $db->query($rQuery, ...$rWhereV);
-                    if (0 >= $db->num_rows()) {
-                    } else {
-                        $rRows = $db->get_rows();
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rConnectionCount = $rReports = array();
-                            $db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
-                            foreach ($db->get_rows() as $rRow) {
-                                $rReports[] = $rRow['id'];
-                            }
-                            if (0 >= count($rReports)) {
-                            } else {
-                                foreach (ConnectionTracker::getUserConnections($rReports, false) as $rUserID => $rConnections) {
-                                    foreach ($rConnections as $rConnection) {
-                                        $rConnectionCount[$rConnection['stream_id']]++;
-                                    }
-                                }
-                            }
-                        }
-                        foreach ($rRows as $rRow) {
-                            if (!SettingsManager::get('redis_handler')) {
-                            } else {
-                                $rRow['clients'] = ($rConnectionCount[$rRow['id']] ?: 0);
-                            }
-                            if (!$rIsAPI) {
-                                $rCategoryIDs = json_decode($rRow['category_id'], true);
-                                if (0 < strlen(RequestManager::get('category'))) {
-                                    $rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
-                                } else {
-                                    $rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
-                                }
-                                if (1 >= count($rCategoryIDs)) {
-                                } else {
-                                    $rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
-                                }
-                                if (0 < $rRow['clients']) {
-                                    if ($rPermissions['reseller_client_connection_logs']) {
-                                        $rButtons = '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'purge');\"><i class=\"mdi mdi-hammer\"></i></button>";
-                                        $rClients = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button></a>';
-                                    } else {
-                                        $rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
-                                        $rClients = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button>';
-                                    }
-                                } else {
-                                    $rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
-                                    $rClients = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
-                                }
-                                $rProperties = json_decode($rRow['movie_properties'], true);
-                                if (0 < strlen($rProperties['movie_image'])) {
-                                    $rImage = "<a href='javascript: void(0);' onClick='openImage(this);' data-src='resize?maxw=512&maxh=512&url=" . $rProperties['movie_image'] . "'><img loading='lazy' src='resize?maxh=58&maxw=32&url=" . $rProperties['movie_image'] . "' /></a>";
-                                } else {
-                                    $rImage = '';
-                                }
-                                $rReturn['data'][] = array($rRow['id'], $rImage, $rRow['stream_display_name'], $rCategory, $rClients, $rButtons);
-                            } else {
-                                $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                            }
-                        }
-                    }
-                }
-                echo json_encode($rReturn);
-                exit();
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        exit();
-    }
-    if ($rType == 'episodes') {
-        if ($rPermissions['can_view_vod']) {
-            $rCategories = CategoryService::getAllByType('series');
-            $rOrder = array('`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false);
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rWhere = $rWhereV = array();
-            if (0 < count($rPermissions['stream_ids'])) {
-                $rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
-                $rWhere[] = '`type` = 5';
-                if (0 >= strlen(RequestManager::get('search')['value'])) {
-                } else {
-                    foreach (range(1, 3) as $rInt) {
-                        $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                    }
-                    $rWhere[] = '(`streams`.`id` LIKE ? OR `stream_display_name` LIKE ? OR `streams_series`.`title` LIKE ?)';
-                }
-                if (0 >= strlen(RequestManager::get('category'))) {
-                } else {
-                    $rWhere[] = "JSON_CONTAINS(`streams_series`.`category_id`, ?, '\$')";
-                    $rWhereV[] = RequestManager::get('category');
-                }
-                if (0 >= strlen(RequestManager::get('series'))) {
-                } else {
-                    $rWhere[] = '`streams_series`.`id` = ?';
-                    $rWhereV[] = RequestManager::get('series');
-                }
-                if (!$rOrder[$rOrderRow]) {
-                } else {
-                    $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                    $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-                }
-                if (0 < count($rWhere)) {
-                    $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-                } else {
-                    $rWhereString = '';
-                }
-                $rCountQuery = 'SELECT COUNT(`streams`.`id`) AS `count` FROM `streams` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams`.`id` LEFT JOIN `streams_series` ON `streams_series`.`id` = `streams_episodes`.`series_id` ' . $rWhereString . ';';
-                $db->query($rCountQuery, ...$rWhereV);
-                if ($db->num_rows() == 1) {
-                    $rReturn['recordsTotal'] = $db->get_row()['count'];
-                } else {
-                    $rReturn['recordsTotal'] = 0;
-                }
-                $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-                if (0 >= $rReturn['recordsTotal']) {
-                } else {
-                    $rQuery = 'SELECT `streams`.`id`, `stream_icon`, `stream_display_name`, `movie_properties`, `streams_series`.`category_id`, `streams_series`.`title`, `streams_episodes`.`season_num`, (SELECT COUNT(*) FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `lines_live`.`stream_id` = `streams`.`id` AND `hls_end` = 0 AND `lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')) AS `clients` FROM `streams` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams`.`id` LEFT JOIN `streams_series` ON `streams_series`.`id` = `streams_episodes`.`series_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                    $db->query($rQuery, ...$rWhereV);
-                    if (0 >= $db->num_rows()) {
-                    } else {
-                        $rRows = $db->get_rows();
-                        if (!SettingsManager::get('redis_handler')) {
-                        } else {
-                            $rConnectionCount = $rReports = array();
-                            $db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
-                            foreach ($db->get_rows() as $rRow) {
-                                $rReports[] = $rRow['id'];
-                            }
-                            if (0 >= count($rReports)) {
-                            } else {
-                                foreach (ConnectionTracker::getUserConnections($rReports, false) as $rUserID => $rConnections) {
-                                    foreach ($rConnections as $rConnection) {
-                                        $rConnectionCount[$rConnection['stream_id']]++;
-                                    }
-                                }
-                            }
-                        }
-                        foreach ($rRows as $rRow) {
-                            if (!SettingsManager::get('redis_handler')) {
-                            } else {
-                                $rRow['clients'] = ($rConnectionCount[$rRow['id']] ?: 0);
-                            }
-                            if (!$rIsAPI) {
-                                $rSeriesName = $rRow['title'] . ' - Season ' . $rRow['season_num'];
-                                $rStreamName = '<b>' . $rRow['stream_display_name'] . "</b><br><span style='font-size:11px;'>" . $rSeriesName . '</span>';
-                                $rCategoryIDs = json_decode($rRow['category_id'], true);
-                                if (0 < strlen(RequestManager::get('category'))) {
-                                    $rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
-                                } else {
-                                    $rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
-                                }
-                                if (1 >= count($rCategoryIDs)) {
-                                } else {
-                                    $rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
-                                }
-                                if (0 < $rRow['clients']) {
-                                    if ($rPermissions['reseller_client_connection_logs']) {
-                                        $rButtons = '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'purge');\"><i class=\"mdi mdi-hammer\"></i></button>";
-                                        $rClients = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button></a>';
-                                    } else {
-                                        $rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
-                                        $rClients = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button>';
-                                    }
-                                } else {
-                                    $rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
-                                    $rClients = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
-                                }
-                                $rProperties = json_decode($rRow['movie_properties'], true);
-                                if (0 < strlen($rProperties['movie_image'])) {
-                                    $rImage = "<a href='javascript: void(0);' onClick='openImage(this);' data-src='resize?maxw=512&maxh=512&url=" . $rProperties['movie_image'] . "'><img loading='lazy' src='resize?maxh=58&maxw=32&url=" . $rProperties['movie_image'] . "' /></a>";
-                                } else {
-                                    $rImage = '';
-                                }
-                                $rReturn['data'][] = array($rRow['id'], $rImage, $rStreamName, $rCategory, $rClients, $rButtons);
-                            } else {
-                                $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                            }
-                        }
-                    }
-                }
-                echo json_encode($rReturn);
-                exit();
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        exit();
-    }
-    if ($rType == 'line_activity') {
-        if ($rPermissions['reseller_client_connection_logs']) {
-            $rOrder = array('`username`', '`streams`.`stream_display_name`', '`lines_activity`.`user_agent`', '`lines_activity`.`isp`', '`lines_activity`.`user_ip`', '`lines_activity`.`date_start`', '`lines_activity`.`date_end`', '`lines_activity`.`date_end` - `lines_activity`.`date_start`', '`lines_activity`.`container`');
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rWhere = $rWhereV = array();
-            $rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
-            if (0 >= strlen(RequestManager::get('search')['value'])) {
-            } else {
-                foreach (range(1, 10) as $rInt) {
-                    $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                }
-                $rWhere[] = '(`lines_activity`.`user_agent` LIKE ? OR `lines_activity`.`user_ip` LIKE ? OR `lines_activity`.`container` LIKE ? OR FROM_UNIXTIME(`lines_activity`.`date_start`) LIKE ? OR FROM_UNIXTIME(`lines_activity`.`date_end`) LIKE ? OR `lines_activity`.`geoip_country_code` LIKE ? OR `lines`.`username` LIKE ? OR `mag_devices`.`mac` LIKE ? OR `enigma2_devices`.`mac` LIKE ? OR `streams`.`stream_display_name` LIKE ?)';
-            }
-            if (0 >= strlen(RequestManager::get('range'))) {
-            } else {
-                $rStartTime = substr(RequestManager::get('range'), 0, 10);
-                $rEndTime = substr(RequestManager::get('range'), strlen(RequestManager::get('range')) - 10, 10);
-                if ($rStartTime = strtotime($rStartTime . ' 00:00:00')) {
-                } else {
-                    $rStartTime = null;
-                }
-                if ($rEndTime = strtotime($rEndTime . ' 23:59:59')) {
-                } else {
-                    $rEndTime = null;
-                }
-                if (!($rStartTime && $rEndTime)) {
-                } else {
-                    $rWhere[] = '(`lines_activity`.`date_start` >= ? AND `lines_activity`.`date_end` <= ?)';
-                    $rWhereV[] = $rStartTime;
-                    $rWhereV[] = $rEndTime;
-                }
-            }
-            if (0 >= strlen(RequestManager::get('stream'))) {
-            } else {
-                $rWhere[] = '`lines_activity`.`stream_id` = ?';
-                $rWhereV[] = RequestManager::get('stream');
-            }
-            if (0 >= strlen(RequestManager::get('user'))) {
-            } else {
-                $rWhere[] = '`lines`.`member_id` = ?';
-                $rWhereV[] = RequestManager::get('user');
-            }
-            if (0 >= strlen(RequestManager::get('line'))) {
-            } else {
-                $rWhere[] = '`lines_activity`.`user_id` = ?';
-                $rWhereV[] = RequestManager::get('line');
-            }
-            if (0 < count($rWhere)) {
-                $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-            } else {
-                $rWhereString = '';
-            }
-            if (!$rOrder[$rOrderRow]) {
-            } else {
-                $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-            }
-            $rCountQuery = 'SELECT COUNT(*) AS `count` FROM `lines_activity` LEFT JOIN `lines` ON `lines_activity`.`user_id` = `lines`.`id` LEFT JOIN `streams` ON `lines_activity`.`stream_id` = `streams`.`id` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines_activity`.`user_id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines_activity`.`user_id` ' . $rWhereString . ';';
-            $db->query($rCountQuery, ...$rWhereV);
-            if ($db->num_rows() == 1) {
-                $rReturn['recordsTotal'] = $db->get_row()['count'];
-            } else {
-                $rReturn['recordsTotal'] = 0;
-            }
-            $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-            if (0 >= $rReturn['recordsTotal']) {
-            } else {
-                $rQuery = 'SELECT `mag_devices`.`mag_id`, `enigma2_devices`.`device_id`, `lines`.`is_e2`, `lines`.`is_mag`, `lines_activity`.`activity_id`, `lines_activity`.`container`, `lines_activity`.`isp`, `lines_activity`.`user_id`, `lines_activity`.`stream_id`, `streams`.`series_no`, `lines_activity`.`server_id`, `lines_activity`.`user_agent`, `lines_activity`.`user_ip`, `lines_activity`.`container`, `lines_activity`.`date_start`, `lines_activity`.`date_end`, `lines_activity`.`geoip_country_code`, IF(`lines`.`is_mag`, `mag_devices`.`mac`, IF(`lines`.`is_e2`, `enigma2_devices`.`mac`, `lines`.`username`)) AS `username`, `streams`.`stream_display_name`, `streams`.`type`, `lines`.`is_restreamer` FROM `lines_activity` LEFT JOIN `lines` ON `lines_activity`.`user_id` = `lines`.`id` LEFT JOIN `streams` ON `lines_activity`.`stream_id` = `streams`.`id` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines_activity`.`user_id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines_activity`.`user_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                $db->query($rQuery, ...$rWhereV);
-                if (0 >= $db->num_rows()) {
-                } else {
-                    foreach ($db->get_rows() as $rRow) {
-                        if (!$rIsAPI) {
-                            if ($rRow['is_mag']) {
-                                $rUsername = "<a href='mag?id=" . $rRow['mag_id'] . "'>" . $rRow['username'] . '</a>';
-                            } else {
-                                if ($rRow['is_e2']) {
-                                    $rUsername = "<a href='enigma?id=" . $rRow['device_id'] . "'>" . $rRow['username'] . '</a>';
-                                } else {
-                                    $rUsername = "<a href='line?id=" . $rRow['user_id'] . "'>" . $rRow['username'] . '</a>';
-                                }
-                            }
-                            $rChannel = $rRow['stream_display_name'];
-                            if (0 < strlen($rRow['geoip_country_code'])) {
-                                $rGeoCountry = "<img loading='lazy' src='assets/img/countries/" . strtolower($rRow['geoip_country_code']) . ".png'></img> &nbsp;";
-                            } else {
-                                $rGeoCountry = '';
-                            }
-                            if ($rRow['user_ip']) {
-                                $rIP = $rGeoCountry . "<a onClick=\"whois('" . $rRow['user_ip'] . "');\" href='javascript: void(0);'>" . $rRow['user_ip'] . '</a>';
-                            } else {
-                                $rIP = '';
-                            }
-                            if ($rRow['date_start']) {
-                                $rStart = date($rSettings['datetime_format'], $rRow['date_start']);
-                            } else {
-                                $rStart = '';
-                            }
-                            if ($rRow['date_end']) {
-                                $rStop = date($rSettings['datetime_format'], $rRow['date_end']);
-                            } else {
-                                $rStop = '';
-                            }
-                            $rPlayer = trim(explode('(', $rRow['user_agent'])[0]);
-                            $rDuration = $rRow['date_end'] - $rRow['date_start'];
-                            $rColour = 'success';
-                            if (86400 <= $rDuration) {
-                                $rDuration = sprintf('%02dd %02dh', $rDuration / 86400, ($rDuration / 3600) % 24);
-                                $rColour = 'danger';
-                            } else {
-                                if (3600 <= $rDuration) {
-                                    if (14400 < $rDuration) {
-                                        $rColour = 'warning';
-                                    } else {
-                                        if (43200 >= $rDuration) {
-                                        } else {
-                                            $rColour = 'danger';
-                                        }
-                                    }
-                                    $rDuration = sprintf('%02dh %02dm', $rDuration / 3600, ($rDuration / 60) % 60);
-                                } else {
-                                    $rDuration = sprintf('%02dm %02ds', ($rDuration / 60) % 60, $rDuration % 60);
-                                }
-                            }
-                            $rDuration = "<button type='button' class='btn btn-" . $rColour . " btn-xs waves-effect waves-light btn-fixed'>" . $rDuration . '</button>';
-                            $rReturn['data'][] = array($rUsername, $rChannel, $rPlayer, $rRow['isp'], $rIP, $rStart, $rStop, $rDuration, strtoupper($rRow['container']));
-                        } else {
-                            $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                        }
-                    }
-                }
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        exit();
-    }
-    if ($rType == 'live_connections') {
-        if ($rPermissions['reseller_client_connection_logs']) {
-            $rRows = array();
-            if (SettingsManager::get('redis_handler')) {
-                $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? false : true);
-                $rReports = array();
-                $rUserID = (0 < intval(RequestManager::get('user')) ? intval(RequestManager::get('user')) : null);
-                $rStreamID = (0 < intval(RequestManager::get('stream_id')) ? intval(RequestManager::get('stream_id')) : null);
-                if ($rUserID && in_array($rUserID, $rUserInfo['reports'])) {
-                    $db->query('SELECT `id` FROM `lines` WHERE `member_id` = ?;', $rUserID);
-                } else {
-                    $db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
-                }
-                foreach ($db->get_rows() as $rRow) {
-                    $rReports[] = $rRow['id'];
-                }
-                $rKeys = ConnectionTracker::getUserConnections($rReports, false, true);
-                if (!$rOrderDirection) {
-                } else {
-                    $rKeys = array_reverse($rKeys);
-                }
-                $rKeyCount = count($rKeys);
-                foreach (RedisManager::instance()->mGet($rKeys) as $rRow) {
-                    $rRow = igbinary_unserialize($rRow);
-                    if (is_array($rRow)) {
-                        if ($rFilterBefore) {
-                        } else {
-                            if (!($rStreamID && $rStreamID != $rRow['stream_id'])) {
-                                if (in_array($rRow['user_id'], $rReports)) {
-                                } else {
-                                    $rKeyCount--;
-                                }
-                            } else {
-                                $rKeyCount--;
-                            }
-                        }
-                        $rRow['activity_id'] = $rRow['uuid'];
-                        $rRow['identifier'] = ($rRow['user_id'] ?: $rRow['hmac_id'] . '_' . $rRow['hmac_identifier']);
-                        $rRow['active_time'] = time() - $rRow['date_start'];
-                        $rRow['server_name'] = (ServerRepository::getAll()[$rRow['server_id']]['server_name'] ?: '');
-                        $rRows[] = $rRow;
-                    } else {
-                        $rKeyCount--;
-                    }
-                }
-                $rOrder = array('uuid', 'divergence', 'identifier', 'stream_display_name', 'user_agent', 'isp', 'user_ip', 'active_time', 'container', null);
-                if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                    $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-                } else {
-                    $rOrderRow = 0;
-                }
-                if (!$rOrder[$rOrderRow]) {
-                } else {
-                    array_multisort(array_column($rRows, $rOrder[$rOrderRow]), ($rOrderDirection ? SORT_ASC : SORT_DESC), $rRows);
-                }
-                $rRows = array_slice($rRows, $rStart, $rLimit);
-                $rUUIDs = $rStreamIDs = $rUserIDs = array();
-                foreach ($rRows as $rRow) {
-                    if (!$rRow['stream_id']) {
-                    } else {
-                        $rStreamIDs[] = intval($rRow['stream_id']);
-                    }
-                    if (!$rRow['user_id']) {
-                    } else {
-                        $rUserIDs[] = intval($rRow['user_id']);
-                    }
-                    if (!$rRow['uuid']) {
-                    } else {
-                        $rUUIDs[] = $rRow['uuid'];
-                    }
-                }
-                $rStreamNames = $rDivergenceMap = $rSeriesMap = $rUserMap = array();
-                if (0 >= count($rUserIDs)) {
-                } else {
-                    $db->query('SELECT `lines`.`id`, `lines`.`is_mag`, `lines`.`is_e2`, `lines`.`is_restreamer`, `lines`.`username`, `mag_devices`.`mag_id`, `enigma2_devices`.`device_id` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` WHERE `lines`.`id` IN (' . implode(',', $rUserIDs) . ');');
-                    foreach ($db->get_rows() as $rRow) {
-                        $rUserID = $rRow['id'];
-                        unset($rRow['id']);
-                        $rUserMap[$rUserID] = $rRow;
-                    }
-                }
-                if (0 >= count($rStreamIDs)) {
-                } else {
-                    $db->query('SELECT `stream_id`, `series_id` FROM `streams_episodes` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ');');
-                    foreach ($db->get_rows() as $rRow) {
-                        $rSeriesMap[$rRow['stream_id']] = $rRow['series_id'];
-                    }
-                    $db->query('SELECT `id`, `type`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rStreamIDs) . ');');
-                    foreach ($db->get_rows() as $rRow) {
-                        $rStreamNames[$rRow['id']] = array($rRow['stream_display_name'], $rRow['type']);
-                    }
-                }
-                if (0 >= count($rUUIDs)) {
-                } else {
-                    $db->query("SELECT `uuid`, `divergence` FROM `lines_divergence` WHERE `uuid` IN ('" . implode("','", $rUUIDs) . "');");
-                    foreach ($db->get_rows() as $rRow) {
-                        $rDivergenceMap[$rRow['uuid']] = $rRow['divergence'];
-                    }
-                }
-                $i = 0;
-                while ($i < count($rRows)) {
-                    $rRows[$i]['divergence'] = ($rDivergenceMap[$rRows[$i]['uuid']] ?: 0);
-                    $rRows[$i]['series_no'] = ($rSeriesMap[$rRows[$i]['stream_id']] ?: null);
-                    $rRows[$i]['stream_display_name'] = ($rStreamNames[$rRows[$i]['stream_id']][0] ?: '');
-                    $rRows[$i]['type'] = ($rStreamNames[$rRows[$i]['stream_id']][1] ?: 1);
-                    $rRows[$i] = array_merge($rRows[$i], ($rUserMap[$rRows[$i]['user_id']] ?: array()));
-                    $i++;
-                }
-                $rReturn['recordsTotal'] = $rKeyCount;
-                $rReturn['recordsFiltered'] = ($rIsAPI ? ($rReturn['recordsTotal'] < $rLimit ? $rReturn['recordsTotal'] : $rLimit) : $rReturn['recordsTotal']);
-            } else {
-                $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                $rOrder = array('`lines_live`.`activity_id`', '`lines_live`.`divergence`', '`username`', '`streams`.`stream_display_name`', '`lines_live`.`user_agent`', '`lines_live`.`isp`', '`lines_live`.`user_ip`', 'UNIX_TIMESTAMP() - `lines_live`.`date_start`', '`lines_live`.`container`', false);
-                if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                    $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-                } else {
-                    $rOrderRow = 0;
-                }
-                $rWhere = $rWhereV = array();
-                $rWhere[] = '`hls_end` = 0';
-                $rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
-                if (0 >= strlen(RequestManager::get('search')['value'])) {
-                } else {
-                    foreach (range(1, 9) as $rInt) {
-                        $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                    }
-                    $rWhere[] = '(`lines_live`.`user_agent` LIKE ? OR `lines_live`.`user_ip` LIKE ? OR `lines_live`.`container` LIKE ? OR FROM_UNIXTIME(`lines_live`.`date_start`) LIKE ? OR `lines_live`.`geoip_country_code` LIKE ? OR `lines`.`username` LIKE ? OR `mag_devices`.`mac` LIKE ? OR `enigma2_devices`.`mac` LIKE ? OR `streams`.`stream_display_name` LIKE ?)';
-                }
-                if (0 >= intval(RequestManager::get('stream'))) {
-                } else {
-                    $rWhere[] = '`lines_live`.`stream_id` = ?';
-                    $rWhereV[] = RequestManager::get('stream');
-                }
-                if (0 >= intval(RequestManager::get('user'))) {
-                } else {
-                    $rWhere[] = '`lines`.`member_id` = ?';
-                    $rWhereV[] = RequestManager::get('user');
-                }
-                if (0 >= intval(RequestManager::get('line'))) {
-                } else {
-                    $rWhere[] = '`lines_live`.`user_id` = ?';
-                    $rWhereV[] = RequestManager::get('line');
-                }
-                $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-                if (!$rOrder[$rOrderRow]) {
-                } else {
-                    $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-                }
-                $rCountQuery = 'SELECT COUNT(*) AS `count` FROM `lines_live` LEFT JOIN `lines` ON `lines_live`.`user_id` = `lines`.`id` LEFT JOIN `streams` ON `lines_live`.`stream_id` = `streams`.`id` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines_live`.`user_id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines_live`.`user_id` ' . $rWhereString . ';';
-                $db->query($rCountQuery, ...$rWhereV);
-                if ($db->num_rows() == 1) {
-                    $rReturn['recordsTotal'] = $db->get_row()['count'];
-                } else {
-                    $rReturn['recordsTotal'] = 0;
-                }
-                $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-                if (0 >= $rReturn['recordsTotal']) {
-                } else {
-                    $rQuery = 'SELECT `mag_devices`.`mag_id`, `enigma2_devices`.`device_id`, `lines`.`is_e2`, `lines`.`is_mag`, `lines_live`.`activity_id`, `lines_live`.`divergence`, `lines_live`.`user_id`, `lines_live`.`stream_id`, `streams`.`series_no`, `lines`.`is_restreamer`, `lines_live`.`isp`, `lines_live`.`server_id`, `lines_live`.`user_agent`, `lines_live`.`user_ip`, `lines_live`.`container`, `lines_live`.`uuid`, `lines_live`.`date_start`, `lines_live`.`geoip_country_code`, IF(`lines`.`is_mag`, `mag_devices`.`mac`, IF(`lines`.`is_e2`, `enigma2_devices`.`mac`, `lines`.`username`)) AS `username`, `streams`.`stream_display_name`, `streams`.`type` FROM `lines_live` LEFT JOIN `lines` ON `lines_live`.`user_id` = `lines`.`id` LEFT JOIN `streams` ON `lines_live`.`stream_id` = `streams`.`id` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines_live`.`user_id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines_live`.`user_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                    $db->query($rQuery, ...$rWhereV);
-                    if (0 >= $db->num_rows()) {
-                    } else {
-                        $rRows = $db->get_rows();
-                    }
-                }
-            }
-            if (0 >= count($rRows)) {
-            } else {
-                foreach ($rRows as $rRow) {
-                    if (!$rIsAPI) {
-                        if ($rRow['divergence'] <= 50) {
-                            $rDivergence = '<i class="text-success fas fa-square tooltip" title="' . intval(100 - $rRow['divergence']) . '%"></i>';
-                        } else {
-                            if ($rRow['divergence'] <= 80) {
-                                $rDivergence = '<i class="text-warning fas fa-square tooltip" title="' . intval(100 - $rRow['divergence']) . '%"></i>';
-                            } else {
-                                $rDivergence = '<i class="text-danger fas fa-square tooltip" title="' . intval(100 - $rRow['divergence']) . '%"></i>';
-                            }
-                        }
-                        if ($rRow['is_mag']) {
-                            $rUsername = "<a href='mag?id=" . $rRow['mag_id'] . "'>" . $rRow['username'] . '</a>';
-                        } else {
-                            if ($rRow['is_e2']) {
-                                $rUsername = "<a href='enigma?id=" . $rRow['device_id'] . "'>" . $rRow['username'] . '</a>';
-                            } else {
-                                $rUsername = "<a href='line?id=" . $rRow['user_id'] . "'>" . $rRow['username'] . '</a>';
-                            }
-                        }
-                        $rChannel = $rRow['stream_display_name'];
-                        if (0 < strlen($rRow['geoip_country_code'])) {
-                            $rGeoCountry = "<img loading='lazy' src='assets/img/countries/" . strtolower($rRow['geoip_country_code']) . ".png'></img> &nbsp;";
-                        } else {
-                            $rGeoCountry = '';
-                        }
-                        if ($rRow['user_ip']) {
-                            $rIP = $rGeoCountry . "<a onClick=\"whois('" . $rRow['user_ip'] . "');\" href='javascript: void(0);'>" . $rRow['user_ip'] . '</a>';
-                        } else {
-                            $rIP = '';
-                        }
-                        $rPlayer = trim(explode('(', $rRow['user_agent'])[0]);
-                        $rDuration = intval(time()) - intval($rRow['date_start']);
-                        $rColour = 'success';
-                        if (86400 <= $rDuration) {
-                            $rDuration = sprintf('%02dd %02dh', $rDuration / 86400, ($rDuration / 3600) % 24);
-                            $rColour = 'danger';
-                        } else {
-                            if (3600 <= $rDuration) {
-                                if (14400 < $rDuration) {
-                                    $rColour = 'warning';
-                                } else {
-                                    if (43200 >= $rDuration) {
-                                    } else {
-                                        $rColour = 'danger';
-                                    }
-                                }
-                                $rDuration = sprintf('%02dh %02dm', $rDuration / 3600, ($rDuration / 60) % 60);
-                            } else {
-                                $rDuration = sprintf('%02dm %02ds', ($rDuration / 60) % 60, $rDuration % 60);
-                            }
-                        }
-                        $rDuration = "<button type='button' class='btn btn-" . $rColour . " btn-xs waves-effect waves-light btn-fixed'>" . $rDuration . '</button>';
-                        $rButtons = "<button title=\"Kill Connection\" type=\"button\" class=\"btn btn-light waves-effect waves-light btn-xs tooltip\" onClick=\"api('" . $rRow['uuid'] . "', 'kill');\"><i class=\"fas fa-hammer\"></i></button>";
-                        $rReturn['data'][] = array($rRow['activity_id'], $rDivergence, $rUsername, $rChannel, $rPlayer, $rRow['isp'], $rIP, $rDuration, strtoupper($rRow['container']), $rButtons);
-                    } else {
-                        $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                    }
-                }
-            }
-            echo json_encode($rReturn);
-            exit();
-        } else {
-            exit();
-        }
-    } else {
-        if ($rType == 'reg_user_logs') {
-            $rOrder = array('`users_logs`.`id`', '`users`.`username`', '`users_logs`.`log_id`', '`users_logs`.`type`, `users_logs`.`action`', '`users_logs`.`cost`', '`users_logs`.`credits_after`', '`users_logs`.`date`');
-            if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-            } else {
-                $rOrderRow = 0;
-            }
-            $rWhere = $rWhereV = array();
-            $rWhere[] = '`users_logs`.`owner` IN (' . implode(',', $rUserInfo['reports']) . ')';
-            if (0 >= strlen(RequestManager::get('search')['value'])) {
-            } else {
-                foreach (range(1, 3) as $rInt) {
-                    $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                }
-                $rWhere[] = '(`users`.`username` LIKE ? OR `users_logs`.`type` LIKE ? OR `users_logs`.`action` LIKE ?)';
-            }
-            if (0 >= strlen(RequestManager::get('range'))) {
-            } else {
-                $rStartTime = substr(RequestManager::get('range'), 0, 10);
-                $rEndTime = substr(RequestManager::get('range'), strlen(RequestManager::get('range')) - 10, 10);
-                if ($rStartTime = strtotime($rStartTime . ' 00:00:00')) {
-                } else {
-                    $rStartTime = null;
-                }
-                if ($rEndTime = strtotime($rEndTime . ' 23:59:59')) {
-                } else {
-                    $rEndTime = null;
-                }
-                if (!($rStartTime && $rEndTime)) {
-                } else {
-                    $rWhere[] = '(`users_logs`.`date` >= ? AND `users_logs`.`date` <= ?)';
-                    $rWhereV[] = $rStartTime;
-                    $rWhereV[] = $rEndTime;
-                }
-            }
-            if (0 >= strlen(RequestManager::get('reseller'))) {
-            } else {
-                $rWhere[] = '`users_logs`.`owner` = ?';
-                $rWhereV[] = RequestManager::get('reseller');
-            }
-            if (0 < count($rWhere)) {
-                $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-            } else {
-                $rWhereString = '';
-            }
-            if (!$rOrder[$rOrderRow]) {
-            } else {
-                $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-            }
-            $rCountQuery = 'SELECT COUNT(*) AS `count` FROM `users_logs` LEFT JOIN `users` ON `users`.`id` = `users_logs`.`owner` ' . $rWhereString . ';';
-            $db->query($rCountQuery, ...$rWhereV);
-            if ($db->num_rows() == 1) {
-                $rReturn['recordsTotal'] = $db->get_row()['count'];
-            } else {
-                $rReturn['recordsTotal'] = 0;
-            }
-            $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-            if (0 >= $rReturn['recordsTotal']) {
-            } else {
-                $rPackages = PackageService::getAll();
-                $rQuery = 'SELECT `users`.`username`, `users_logs`.`id`, `users_logs`.`owner`, `users_logs`.`type`, `users_logs`.`action`, `users_logs`.`log_id`, `users_logs`.`package_id`, `users_logs`.`cost`, `users_logs`.`credits_after`, `users_logs`.`date`, `users_logs`.`deleted_info` FROM `users_logs` LEFT JOIN `users` ON `users`.`id` = `users_logs`.`owner` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                $db->query($rQuery, ...$rWhereV);
-                if (0 >= $db->num_rows()) {
-                } else {
-                    foreach ($db->get_rows() as $rRow) {
-                        if (!$rIsAPI) {
-                            if (in_array($rRow['owner'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])))) {
-                                $rOwner = "<a href='user?id=" . intval($rRow['owner']) . "'>" . $rRow['username'] . '</a>';
-                            } else {
-                                $rOwner = "<a href='user?id=" . intval($rRow['owner']) . "'>" . $rRow['username'] . "<br/><small class='text-pink'>(indirect)</small></a>";
-                            }
-                            $rDevice = array('line' => 'User Line', 'mag' => 'MAG Device', 'enigma' => 'Enigma2 Device', 'user' => 'Reseller')[$rRow['type']];
-                            switch ($rRow['action']) {
-                                case 'new':
-                                    if ($rRow['package_id']) {
-                                        $rText = 'Created New ' . $rDevice . ' with Package: ' . $rPackages[$rRow['package_id']]['package_name'];
-                                    } else {
-                                        $rText = 'Created New ' . $rDevice;
-                                    }
-                                    break;
-                                case 'extend':
-                                    if ($rRow['package_id']) {
-                                        $rText = 'Extended ' . $rDevice . ' with Package: ' . $rPackages[$rRow['package_id']]['package_name'];
-                                    } else {
-                                        $rText = 'Extended ' . $rDevice;
-                                    }
-                                    break;
-                                case 'edit':
-                                    $rText = 'Edited ' . $rDevice;
-                                    break;
-                                case 'enable':
-                                    $rText = 'Enabled ' . $rDevice;
-                                    break;
-                                case 'disable':
-                                    $rText = 'Disabled ' . $rDevice;
-                                    break;
-                                case 'delete':
-                                    $rText = 'Deleted ' . $rDevice;
-                                    break;
-                                case 'send_event':
-                                    $rText = 'Sent Event to ' . $rDevice;
-                                    break;
-                                case 'adjust_credits':
-                                    $rText = 'Adjusted Credits by ' . $rRow['cost'];
-                                    break;
-                            }
-                            $rLineInfo = null;
-                            switch ($rRow['type']) {
-                                case 'line':
-                                    $rLine = UserRepository::getLineById($rRow['log_id']);
-                                    if (!$rLine) {
-                                    } else {
-                                        $rLineInfo = "<a href='line?id=" . $rRow['log_id'] . "'>" . $rLine['username'] . '</a>';
-                                    }
-                                    break;
-                                case 'user':
-                                    $rLine = UserRepository::getRegisteredUserById($rRow['log_id']);
-                                    if (!$rLine) {
-                                    } else {
-                                        $rLineInfo = "<a href='user?id=" . $rRow['log_id'] . "'>" . $rLine['username'] . '</a>';
-                                    }
-                                    break;
-                                case 'mag':
-                                    $rLine = MagService::getById($rRow['log_id']);
-                                    if (!$rLine) {
-                                    } else {
-                                        $rLineInfo = "<a href='mag?id=" . $rRow['log_id'] . "'>" . $rLine['mac'] . '</a>';
-                                    }
-                                    break;
-                                case 'enigma':
-                                    $rLine = EnigmaService::getById($rRow['log_id']);
-                                    if (!$rLine) {
-                                    } else {
-                                        $rLineInfo = "<a href='enigma?id=" . $rRow['log_id'] . "'>" . $rLine['mac'] . '</a>';
-                                    }
-                                    break;
-                            }
-                            if ($rLineInfo) {
-                            } else {
-                                $rDeletedInfo = json_decode($rRow['deleted_info'], true);
-                                if (is_array($rDeletedInfo)) {
-                                    if (isset($rDeletedInfo['mac'])) {
-                                        $rLineInfo = "<span class='text-secondary'>" . $rDeletedInfo['mac'] . '</span>';
-                                    } else {
-                                        $rLineInfo = "<span class='text-secondary'>" . $rDeletedInfo['username'] . '</span>';
-                                    }
-                                } else {
-                                    $rLineInfo = "<span class='text-secondary'>DELETED</span>";
-                                }
-                            }
-                            $rReturn['data'][] = array($rRow['id'], $rOwner, $rLineInfo, $rText, number_format($rRow['cost'], 0), number_format($rRow['credits_after'], 0), date($rSettings['datetime_format'], $rRow['date']));
-                        } else {
-                            unset($rRow['deleted_info']);
-                            $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                        }
-                    }
-                }
-            }
-            echo json_encode($rReturn);
-            exit();
-        }
-        if ($rType != 'reg_users') {
-        } else {
-            if ($rPermissions['create_sub_resellers']) {
-                $rOrder = array('`users`.`id`', '`users`.`username`', '`r`.`username`', '`users`.`ip`', '`users`.`status`', '`users`.`credits`', '`user_count`', '`users`.`last_login`', false);
-                if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
-                    $rOrderRow = intval(RequestManager::get('order')[0]['column']);
-                } else {
-                    $rOrderRow = 0;
-                }
-                $rWhere = $rWhereV = array();
-                $rWhere[] = '`users`.`owner_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
-                if (0 >= strlen(RequestManager::get('search')['value'])) {
-                } else {
-                    foreach (range(1, 9) as $rInt) {
-                        $rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
-                    }
-                    $rWhere[] = '(`users`.`id` LIKE ? OR `users`.`username` LIKE ? OR `users`.`notes` LIKE ? OR `r`.`username` LIKE ? OR FROM_UNIXTIME(`users`.`date_registered`) LIKE ? OR FROM_UNIXTIME(`users`.`last_login`) LIKE ? OR `users`.`email` LIKE ? OR `users`.`ip` LIKE ? OR `users_groups`.`group_name` LIKE ?)';
-                }
-                if (0 >= strlen(RequestManager::get('filter'))) {
-                } else {
-                    if (RequestManager::get('filter') == 1) {
-                        $rWhere[] = '`users`.`status` = 1';
-                    } else {
-                        if (RequestManager::get('filter') != 2) {
-                        } else {
-                            $rWhere[] = '`users`.`status` = 0';
-                        }
-                    }
-                }
-                if (0 >= strlen(RequestManager::get('reseller'))) {
-                } else {
-                    $rWhere[] = '`users`.`owner_id` = ?';
-                    $rWhereV[] = RequestManager::get('reseller');
-                }
-                if (0 < count($rWhere)) {
-                    $rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
-                } else {
-                    $rWhereString = '';
-                }
-                if (!$rOrder[$rOrderRow]) {
-                } else {
-                    $rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
-                    $rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
-                }
-                $rCountQuery = 'SELECT COUNT(*) AS `count` FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` LEFT JOIN `users` AS `r` on `r`.`id` = `users`.`owner_id` ' . $rWhereString . ';';
-                $db->query($rCountQuery, ...$rWhereV);
-                if ($db->num_rows() == 1) {
-                    $rReturn['recordsTotal'] = $db->get_row()['count'];
-                } else {
-                    $rReturn['recordsTotal'] = 0;
-                }
-                $rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
-                if (0 >= $rReturn['recordsTotal']) {
-                } else {
-                    $rQuery = 'SELECT `users`.`id`, `users`.`status`, `users_groups`.`is_reseller`, `users`.`notes`, `users`.`owner_id`, `users`.`credits`, `users`.`username`, `users`.`email`, `users`.`ip`, FROM_UNIXTIME(`users`.`date_registered`) AS `date_registered`, FROM_UNIXTIME(`users`.`last_login`) AS `last_login`, `r`.`username` as `owner_username`, `users_groups`.`group_name`, `users`.`status`, (SELECT COUNT(`id`) FROM `lines` WHERE `member_id` = `users`.`id`) AS `user_count` FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` LEFT JOIN `users` AS `r` on `r`.`id` = `users`.`owner_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
-                    $db->query($rQuery, ...$rWhereV);
-                    if (0 >= $db->num_rows()) {
-                    } else {
-                        foreach ($db->get_rows() as $rRow) {
-                            if (!$rIsAPI) {
-                                if ($rRow['status'] == 1) {
-                                    $rStatus = '<i class="text-success fas fa-square"></i>';
-                                } else {
-                                    $rStatus = '<i class="text-secondary fas fa-square"></i>';
-                                }
-                                if ($rRow['last_login']) {
-                                } else {
-                                    $rRow['last_login'] = 'NEVER';
-                                }
-                                $rButtons = '<div class="btn-group">';
-                                if (0 < strlen($rRow['notes'])) {
-                                    $rButtons .= '<button type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" title="' . $rRow['notes'] . '"><i class="mdi mdi-note"></i></button>';
-                                } else {
-                                    $rButtons .= '<button disabled type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-note"></i></button>';
-                                }
-                                if (in_array($rRow['id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])))) {
-                                    $rButtons .= '<button title="Adjust Credits" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="addCredits(' . $rRow['id'] . ", '" . addslashes($rRow['username']) . "', " . intval($rRow['credits']) . ');"><i class="mdi mdi-coin"></i></button>';
-                                    $rUsername = "<a href='user?id=" . intval($rRow['id']) . "'>" . $rRow['username'] . '</a>';
-                                } else {
-                                    $rButtons .= '<button title="Adjust Credits" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="addCredits(' . $rRow['id'] . ", '" . addslashes($rRow['username']) . "', " . intval($rRow['credits']) . ', true);"><i class="mdi mdi-coin"></i></button>';
-                                    $rUsername = "<a href='user?id=" . intval($rRow['id']) . "'>" . $rRow['username'] . "<br/><small class='text-pink'>(indirect)</small></a>";
-                                }
-                                $rButtons .= '<a href="user?id=' . $rRow['id'] . '"><button title="Edit" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip"><i class="mdi mdi-pencil-outline"></i></button></a>';
-                                if ($rRow['status'] == 1) {
-                                    $rButtons .= '<button title="Disable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'disable');\"><i class=\"mdi mdi-lock\"></i></button>";
-                                } else {
-                                    $rButtons .= '<button title="Enable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'enable');\"><i class=\"mdi mdi-lock\"></i></button>";
-                                }
-                                if (!$rPermissions['delete_users']) {
-                                } else {
-                                    $rButtons .= '<button title="Delete" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>";
-                                }
-                                $rButtons .= '</div>';
-                                if (0 < strlen($rRow['ip'])) {
-                                    $rIP = "<a onClick=\"whois('" . $rRow['ip'] . "');\" href='javascript: void(0);'>" . $rRow['ip'] . '</a>';
-                                } else {
-                                    $rIP = '';
-                                }
-                                if ($rRow['is_reseller']) {
-                                    $rCredits = '<button type="button" class="btn btn-info btn-xs waves-effect waves-light">' . number_format($rRow['credits'], 0) . '</button>';
-                                } else {
-                                    $rCredits = '<button type="button" class="btn btn-secondary btn-xs waves-effect waves-light">-</button>';
-                                }
-                                if (0 < $rRow['user_count']) {
-                                    $rUserCount = '<button type="button" class="btn btn-info btn-xs waves-effect waves-light">' . number_format($rRow['user_count'], 0) . '</button>';
-                                } else {
-                                    $rUserCount = '<button type="button" class="btn btn-secondary btn-xs waves-effect waves-light">0</button>';
-                                }
-                                if (in_array($rRow['owner_id'], array_merge($rPermissions['direct_reports'], array($rUserInfo['id'])))) {
-                                    $rOwner = "<a href='user?id=" . intval($rRow['owner_id']) . "'>" . $rRow['owner_username'] . '</a>';
-                                } else {
-                                    $rOwner = "<a href='user?id=" . intval($rRow['owner_id']) . "'>" . $rRow['owner_username'] . "<br/><small class='text-pink'>(indirect)</small></a>";
-                                }
-                                $rReturn['data'][] = array("<a href='user?id=" . intval($rRow['id']) . "'>" . $rRow['id'] . '</a>', $rUsername, $rOwner, $rIP, $rStatus, $rCredits, $rUserCount, $rRow['last_login'], $rButtons);
-                            } else {
-                                $rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
-                            }
-                        }
-                    }
-                }
-                echo json_encode($rReturn);
-                exit();
-            }
-            exit();
-        }
-    }
+	$rType = RequestManager::get('id');
+	$rStart = intval(RequestManager::get('start'));
+	$rLimit = intval(RequestManager::get('length'));
+	if (!(1000 < $rLimit || $rLimit <= 0)) {
+	} else {
+		$rLimit = 1000;
+	}
+	if ($rType == 'lines') {
+		if ($rPermissions['create_line']) {
+			$rOrder = ['`lines`.`id`', '`lines`.`username`', '`lines`.`password`', '`users`.`username`', '`lines`.`enabled` - `lines`.`admin_enabled`', '`active_connections` > 0', '`lines`.`is_trial`', '`active_connections`', '`lines`.`max_connections`', '`lines`.`exp_date`', '`last_activity`', false];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rWhere = $rWhereV = [];
+			$rWhere[] = '`lines`.`is_mag` = 0 AND `lines`.`is_e2` = 0';
+			$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
+			if (0 >= strlen(RequestManager::get('search')['value'])) {
+			} else {
+				foreach (range(1, 6) as $rInt) {
+					$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+				}
+				$rWhere[] = '(`lines`.`username` LIKE ? OR `lines`.`password` LIKE ? OR `users`.`username` LIKE ? OR FROM_UNIXTIME(`exp_date`) LIKE ? OR `lines`.`max_connections` LIKE ? OR `lines`.`reseller_notes` LIKE ?)';
+			}
+			if (0 >= strlen(RequestManager::get('filter'))) {
+			} else {
+				if (RequestManager::get('filter') == 1) {
+					$rWhere[] = '(`lines`.`admin_enabled` = 1 AND `lines`.`enabled` = 1 AND (`lines`.`exp_date` IS NULL OR `lines`.`exp_date` > UNIX_TIMESTAMP()))';
+				} else {
+					if (RequestManager::get('filter') == 2) {
+						$rWhere[] = '`lines`.`enabled` = 0';
+					} else {
+						if (RequestManager::get('filter') == 3) {
+							$rWhere[] = '`lines`.`admin_enabled` = 0';
+						} else {
+							if (RequestManager::get('filter') == 4) {
+								$rWhere[] = '(`lines`.`exp_date` IS NOT NULL AND `lines`.`exp_date` <= UNIX_TIMESTAMP())';
+							} else {
+								if (RequestManager::get('filter') != 5) {
+								} else {
+									$rWhere[] = '`lines`.`is_trial` = 1';
+								}
+							}
+						}
+					}
+				}
+			}
+			if (0 >= strlen(RequestManager::get('reseller'))) {
+			} else {
+				$rWhere[] = '`lines`.`member_id` = ?';
+				$rWhereV[] = RequestManager::get('reseller');
+			}
+			if (0 < count($rWhere)) {
+				$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+			} else {
+				$rWhereString = '';
+			}
+			$rCountQuery = 'SELECT COUNT(`lines`.`id`) AS `count` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` ' . $rWhereString . ';';
+			if (!$rOrder[$rOrderRow]) {
+			} else {
+				$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+				$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+			}
+			$db->query($rCountQuery, ...$rWhereV);
+			if ($db->num_rows() == 1) {
+				$rReturn['recordsTotal'] = $db->get_row()['count'];
+			} else {
+				$rReturn['recordsTotal'] = 0;
+			}
+			$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+			if (0 >= $rReturn['recordsTotal']) {
+			} else {
+				$rQuery = 'SELECT `lines`.`id`, `lines`.`member_id`, `lines`.`last_activity`, `lines`.`last_activity_array`, `lines`.`username`, `lines`.`password`, `lines`.`exp_date`, `lines`.`admin_enabled`, `lines`.`is_restreamer`, `lines`.`enabled`, `lines`.`admin_notes`, `lines`.`reseller_notes`, `lines`.`max_connections`, `lines`.`is_trial`, (SELECT COUNT(*) AS `active_connections` FROM `lines_live` WHERE `user_id` = `lines`.`id` AND `hls_end` = 0) AS `active_connections` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+				$db->query($rQuery, ...$rWhereV);
+				if (0 >= $db->num_rows()) {
+				} else {
+					$rRows = $db->get_rows();
+					$rActivityIDs = $rLineInfo = $rLineIDs = [];
+					foreach ($rRows as $rRow) {
+						$rLineIDs[] = intval($rRow['id']);
+						$rLineInfo[intval($rRow['id'])] = ['owner_name' => null, 'stream_display_name' => null, 'stream_id' => null, 'last_active' => null];
+						if ($rLastInfo = json_decode($rRow['last_activity_array'], true)) {
+							$rLineInfo[intval($rRow['id'])]['stream_id'] = $rLastInfo['stream_id'];
+							$rLineInfo[intval($rRow['id'])]['last_active'] = $rLastInfo['date_end'];
+						} else {
+							if (!$rRow['last_activity']) {
+							} else {
+								$rActivityIDs[] = intval($rRow['last_activity']);
+							}
+						}
+					}
+					if (0 >= count($rLineIDs)) {
+					} else {
+						$db->query('SELECT `users`.`username`, `lines`.`id` FROM `users` LEFT JOIN `lines` ON `lines`.`member_id` = `users`.`id` WHERE `lines`.`id` IN (' . implode(',', $rLineIDs) . ');');
+						foreach ($db->get_rows() as $rRow) {
+							$rLineInfo[$rRow['id']]['owner_name'] = $rRow['username'];
+						}
+						if (SettingsManager::get('redis_handler')) {
+							$rConnectionCount = [];
+							$rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
+							$rStreamIDs = [];
+							foreach ($rConnectionMap as $rUserID => $rConnections) {
+								foreach ($rConnections as $rConnection) {
+									if (in_array($rConnection['stream_id'], $rStreamIDs)) {
+									} else {
+										$rStreamIDs[] = intval($rConnection['stream_id']);
+									}
+								}
+							}
+							$rStreamMap = [];
+							if (0 >= count($rStreamIDs)) {
+							} else {
+								$db->query('SELECT `id`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rStreamIDs) . ');');
+								foreach ($db->get_rows() as $rRow) {
+									$rStreamMap[$rRow['id']] = $rRow['stream_display_name'];
+								}
+							}
+							foreach (array_keys($rConnectionMap) as $rUserID) {
+								array_multisort(array_column($rConnectionMap[$rUserID], 'date_start'), SORT_DESC, $rConnectionMap[$rUserID]);
+								$rLineInfo[$rUserID]['stream_display_name'] = $rStreamMap[$rConnectionMap[$rUserID][0]['stream_id']];
+								$rLineInfo[$rUserID]['stream_id'] = $rConnectionMap[$rUserID][0]['stream_id'];
+								$rLineInfo[$rUserID]['last_active'] = $rConnectionMap[$rUserID][0]['date_start'];
+								$rConnectionCount[$rUserID] = count($rConnectionMap[$rUserID]);
+							}
+							unset($rConnectionMap);
+						} else {
+							$db->query('SELECT `lines_live`.`user_id`, `lines_live`.`stream_id`, `lines_live`.`date_start` AS `last_active`, `streams`.`stream_display_name` FROM `lines_live` LEFT JOIN `streams` ON `streams`.`id` = `lines_live`.`stream_id` INNER JOIN (SELECT `user_id`, MAX(`date_start`) AS `ts` FROM `lines_live` GROUP BY `user_id`) `maxt` ON (`lines_live`.`user_id` = `maxt`.`user_id` AND `lines_live`.`date_start` = `maxt`.`ts`) WHERE `lines_live`.`user_id` IN (' . implode(',', $rLineIDs) . ');');
+							foreach ($db->get_rows() as $rRow) {
+								$rLineInfo[$rRow['user_id']]['stream_display_name'] = $rRow['stream_display_name'];
+								$rLineInfo[$rRow['user_id']]['stream_id'] = $rRow['stream_id'];
+								$rLineInfo[$rRow['user_id']]['last_active'] = $rRow['last_active'];
+							}
+						}
+					}
+					if (0 >= count($rActivityIDs)) {
+					} else {
+						$db->query('SELECT `user_id`, `stream_id`, `date_end` AS `last_active` FROM `lines_activity` WHERE `activity_id` IN (' . implode(',', $rActivityIDs) . ');');
+						foreach ($db->get_rows() as $rRow) {
+							if (isset($rLineInfo[$rRow['user_id']]['stream_id'])) {
+							} else {
+								$rLineInfo[$rRow['user_id']]['stream_id'] = $rRow['stream_id'];
+								$rLineInfo[$rRow['user_id']]['last_active'] = $rRow['last_active'];
+							}
+						}
+					}
+					foreach ($rRows as $rRow) {
+						$rRow = array_merge($rRow, $rLineInfo[$rRow['id']]);
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rRow['active_connections'] = (isset($rConnectionCount[$rRow['id']]) ? $rConnectionCount[$rRow['id']] : 0);
+						}
+						if (!$rIsAPI) {
+							if (!$rRow['admin_enabled']) {
+								$rStatus = '<i class="text-danger fas fa-square tooltip" title="Banned"></i>';
+							} else {
+								if (!$rRow['enabled']) {
+									$rStatus = '<i class="text-secondary fas fa-square tooltip" title="Disabled"></i>';
+								} else {
+									if ($rRow['exp_date'] && $rRow['exp_date'] < time()) {
+										$rStatus = '<i class="text-warning far fa-square tooltip" title="Expired"></i>';
+									} else {
+										$rStatus = '<i class="text-success fas fa-square tooltip" title="Active"></i>';
+									}
+								}
+							}
+							if (0 < $rRow['active_connections']) {
+								$rActive = '<i class="text-success fas fa-square"></i>';
+							} else {
+								$rActive = '<i class="text-secondary far fa-square"></i>';
+							}
+							if ($rRow['is_trial']) {
+								$rTrial = '<i class="text-warning fas fa-square"></i>';
+							} else {
+								$rTrial = '<i class="text-secondary far fa-square"></i>';
+							}
+							if ($rRow['exp_date']) {
+								if ($rRow['exp_date'] < time()) {
+									$rExpDate = '<span class="expired">' . date($rSettings['date_format'], $rRow['exp_date']) . '<br/><small>' . date('H:i:s', $rRow['exp_date']) . '</small></span>';
+								} else {
+									$rExpDate = date($rSettings['date_format'], $rRow['exp_date']) . "<br/><small class='text-secondary'>" . date('H:i:s', $rRow['exp_date']) . '</small>';
+								}
+							} else {
+								$rExpDate = '&infin;';
+							}
+							if (0 < $rRow['active_connections']) {
+								if ($rPermissions['reseller_client_connection_logs']) {
+									$rActiveConnections = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['active_connections'] . '</button></a>';
+								} else {
+									$rActiveConnections = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['active_connections'] . '</button>';
+								}
+							} else {
+								$rActiveConnections = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
+							}
+							if ($rRow['max_connections'] == 0) {
+								$rMaxConnections = "<button type='button' class='btn btn-dark text-white btn-xs waves-effect waves-light'>&infin;</button>";
+							} else {
+								$rMaxConnections = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>" . $rRow['max_connections'] . '</button>';
+							}
+							$rButtons = '<div class="btn-group">';
+							$rNotes = '';
+							if (0 >= strlen($rRow['reseller_notes'])) {
+							} else {
+								if (strlen($rNotes) == 0) {
+								} else {
+									$rNotes .= "\n";
+								}
+								$rNotes .= $rRow['reseller_notes'];
+							}
+							if (0 < strlen($rNotes)) {
+								$rButtons .= '<button type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" title="' . $rNotes . '"><i class="mdi mdi-note"></i></button>';
+							} else {
+								$rButtons .= '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-note"></i></button>';
+							}
+							$rButtons .= '<a href="line?id=' . $rRow['id'] . '"><button title="Edit" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip"><i class="mdi mdi-pencil-outline"></i></button></a>';
+							if (!$rPermissions['allow_download']) {
+							} else {
+								$rButtons .= "<button type=\"button\" title=\"Download Playlist\" class=\"btn btn-light waves-effect waves-light btn-xs tooltip\" onClick=\"download('" . $rRow['username'] . "', '" . $rRow['password'] . "');\"><i class=\"mdi mdi-download\"></i></button>";
+							}
+							if (!$rPermissions['reseller_client_connection_logs']) {
+							} else {
+								if (0 < $rRow['active_connections']) {
+									$rButtons .= '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'kill_line');\"><i class=\"fas fa-hammer\"></i></button>";
+								} else {
+									$rButtons .= '<button disabled type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="fas fa-hammer"></i></button>';
+								}
+							}
+							if (!$rRow['is_isplock']) {
+							} else {
+								$rButtons .= '<button title="Reset ISP Lock" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'reset_isp');\"><i class=\"mdi mdi-lock-reset\"></i></button>";
+							}
+							if ($rRow['enabled']) {
+								$rButtons .= '<button title="Disable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'disable');\"><i class=\"mdi mdi-lock\"></i></button>";
+							} else {
+								$rButtons .= '<button title="Enable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'enable');\"><i class=\"mdi mdi-lock\"></i></button>";
+							}
+							$rButtons .= '<button title="Delete" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>";
+							$rButtons .= '</div>';
+							if ($rRow['active_connections'] && $rRow['last_active']) {
+								$rLastActive = "<a href='stream_view?id=" . $rRow['stream_id'] . "'>" . $rRow['stream_display_name'] . "</a><br/><small class='text-secondary'>Online: " . TimeUtils::secondsToTime(time() - $rRow['last_active']) . '</small>';
+							} else {
+								if ($rRow['last_active']) {
+									$rLastActive = date($rSettings['date_format'], $rRow['last_active']) . "<br/><small class='text-secondary'>" . date('H:i:s', $rRow['last_active']) . '</small>';
+								} else {
+									$rLastActive = 'Never';
+								}
+							}
+							if (in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]))) {
+								$rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . '</a>';
+							} else {
+								$rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . "<br/><small class='text-pink'>(indirect)</small></a>";
+							}
+							$rReturn['data'][] = ["<a href='line?id=" . $rRow['id'] . "'>" . $rRow['id'] . '</a>', "<a href='line?id=" . $rRow['id'] . "'>" . $rRow['username'] . '</a>', $rRow['password'], $rOwner, $rStatus, $rActive, $rTrial, $rActiveConnections, $rMaxConnections, $rExpDate, $rLastActive, $rButtons];
+						} else {
+							$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+						}
+					}
+				}
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		exit();
+	}
+	if ($rType == 'mags') {
+		if ($rPermissions['create_mag']) {
+			$rOrder = ['`lines`.`id`', '`lines`.`username`', '`mag_devices`.`mac`', '`mag_devices`.`stb_type`', '`users`.`username`', '`lines`.`enabled`', '`active_connections`', '`lines`.`is_trial`', '`lines`.`exp_date`', false];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rWhere = $rWhereV = [];
+			$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
+			if (0 >= strlen(RequestManager::get('search')['value'])) {
+			} else {
+				foreach (range(1, 6) as $rInt) {
+					$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+				}
+				$rWhere[] = '(`lines`.`username` LIKE ? OR `mag_devices`.`mac` LIKE ? OR `mag_devices`.`stb_type` LIKE ? OR `users`.`username` LIKE ? OR FROM_UNIXTIME(`exp_date`) LIKE ? OR `lines`.`reseller_notes` LIKE ?)';
+			}
+			if (0 >= strlen(RequestManager::get('filter'))) {
+			} else {
+				if (RequestManager::get('filter') == 1) {
+					$rWhere[] = '(`lines`.`admin_enabled` = 1 AND `lines`.`enabled` = 1 AND (`lines`.`exp_date` IS NULL OR `lines`.`exp_date` > UNIX_TIMESTAMP()))';
+				} else {
+					if (RequestManager::get('filter') == 2) {
+						$rWhere[] = '`lines`.`enabled` = 0';
+					} else {
+						if (RequestManager::get('filter') == 3) {
+							$rWhere[] = '(`lines`.`exp_date` IS NOT NULL AND `lines`.`exp_date` <= UNIX_TIMESTAMP())';
+						} else {
+							if (RequestManager::get('filter') != 4) {
+							} else {
+								$rWhere[] = '`lines`.`is_trial` = 1';
+							}
+						}
+					}
+				}
+			}
+			if (0 >= strlen(RequestManager::get('reseller'))) {
+			} else {
+				$rWhere[] = '`lines`.`member_id` = ?';
+				$rWhereV[] = RequestManager::get('reseller');
+			}
+			if (0 < count($rWhere)) {
+				$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+			} else {
+				$rWhereString = '';
+			}
+			if (!$rOrder[$rOrderRow]) {
+			} else {
+				$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+				$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+			}
+			$rCountQuery = 'SELECT COUNT(`lines`.`id`) AS `count` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` INNER JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` ' . $rWhereString . ';';
+			$db->query($rCountQuery, ...$rWhereV);
+			if ($db->num_rows() == 1) {
+				$rReturn['recordsTotal'] = $db->get_row()['count'];
+			} else {
+				$rReturn['recordsTotal'] = 0;
+			}
+			$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+			if (0 >= $rReturn['recordsTotal']) {
+			} else {
+				$rQuery = 'SELECT `lines`.`id`, `lines`.`username`, `lines`.`member_id`, `lines`.`is_isplock`, `mag_devices`.`mac`, `mag_devices`.`stb_type`, `mag_devices`.`mag_id`, `lines`.`exp_date`, `lines`.`admin_enabled`, `lines`.`enabled`, `lines`.`reseller_notes`, `lines`.`max_connections`,  `lines`.`is_trial`, `users`.`username` AS `owner_name`, (SELECT count(*) FROM `lines_live` WHERE `lines`.`id` = `lines_live`.`user_id` AND `hls_end` = 0) AS `active_connections` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` INNER JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+				$db->query($rQuery, ...$rWhereV);
+				if (0 >= $db->num_rows()) {
+				} else {
+					$rRows = $db->get_rows();
+					$rLineIDs = [];
+					foreach ($rRows as $rRow) {
+						if (!$rRow['id']) {
+						} else {
+							$rLineIDs[] = intval($rRow['id']);
+						}
+					}
+					if (0 >= count($rLineIDs)) {
+					} else {
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rConnectionCount = [];
+							$rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
+							foreach (array_keys($rConnectionMap) as $rUserID) {
+								$rConnectionCount[$rUserID] = count($rConnectionMap[$rUserID]);
+							}
+							unset($rConnectionMap);
+						}
+					}
+					foreach ($rRows as $rRow) {
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rRow['active_connections'] = (isset($rConnectionCount[$rRow['id']]) ? $rConnectionCount[$rRow['id']] : 0);
+						}
+						if (!$rIsAPI) {
+							if (!$rRow['admin_enabled']) {
+								$rStatus = '<i class="text-danger fas fa-square"></i>';
+							} else {
+								if (!$rRow['enabled']) {
+									$rStatus = '<i class="text-secondary fas fa-square"></i>';
+								} else {
+									if ($rRow['exp_date'] && $rRow['exp_date'] < time()) {
+										$rStatus = '<i class="text-warning far fa-square"></i>';
+									} else {
+										$rStatus = '<i class="text-success fas fa-square"></i>';
+									}
+								}
+							}
+							if (0 < $rRow['active_connections']) {
+								$rActive = '<i class="text-success fas fa-square"></i>';
+							} else {
+								$rActive = '<i class="text-warning far fa-square"></i>';
+							}
+							if ($rRow['is_trial']) {
+								$rTrial = '<i class="text-warning fas fa-square"></i>';
+							} else {
+								$rTrial = '<i class="text-secondary far fa-square"></i>';
+							}
+							if ($rRow['exp_date']) {
+								if ($rRow['exp_date'] < time()) {
+									$rExpDate = '<span class="expired">' . date($rSettings['date_format'], $rRow['exp_date']) . '<br/><small>' . date('H:i:s', $rRow['exp_date']) . '</small></span>';
+								} else {
+									$rExpDate = date($rSettings['date_format'], $rRow['exp_date']) . "<br/><small class='text-secondary'>" . date('H:i:s', $rRow['exp_date']) . '</small>';
+								}
+							} else {
+								$rExpDate = '&infin;';
+							}
+							$rButtons = '<div class="btn-group">';
+							$rNotes = '';
+							if (0 >= strlen($rRow['reseller_notes'])) {
+							} else {
+								if (strlen($rNotes) == 0) {
+								} else {
+									$rNotes .= "\n";
+								}
+								$rNotes .= $rRow['reseller_notes'];
+							}
+							if (0 < strlen($rNotes)) {
+								$rButtons .= '<button type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" title="' . $rNotes . '"><i class="mdi mdi-note"></i></button>';
+							} else {
+								$rButtons .= '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-note"></i></button>';
+							}
+							$rButtons .= '<button title="MAG Event" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="message(' . $rRow['mag_id'] . ", '" . $rRow['mac'] . "');\"><i class=\"mdi mdi-message-alert\"></i></button>";
+							$rButtons .= '<a href="mag?id=' . $rRow['mag_id'] . '"><button title="Edit" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip"><i class="mdi mdi-pencil-outline"></i></button></a>';
+							if (!$rRow['is_isplock']) {
+							} else {
+								$rButtons .= '<button title="Reset ISP Lock" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'reset_isp');\"><i class=\"mdi mdi-lock-reset\"></i></button>";
+							}
+							if (!$rPermissions['create_line']) {
+							} else {
+								$rButtons .= '<button title="Convert to User Line" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'convert');\"><i class=\"fas fa-retweet\"></i></button>";
+							}
+							if (!$rPermissions['reseller_client_connection_logs']) {
+							} else {
+								if (0 < $rRow['active_connections']) {
+									$rButtons .= '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'kill_line');\"><i class=\"fas fa-hammer\"></i></button>";
+								} else {
+									$rButtons .= '<button disabled type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="fas fa-hammer"></i></button>';
+								}
+							}
+							if ($rRow['enabled'] == 1) {
+								$rButtons .= '<button title="Disable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'disable');\"><i class=\"mdi mdi-lock\"></i></button>";
+							} else {
+								$rButtons .= '<button title="Enable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'enable');\"><i class=\"mdi mdi-lock\"></i></button>";
+							}
+							$rButtons .= '<button title="Delete" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['mag_id'] . ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>";
+							$rButtons .= '</div>';
+							if (in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]))) {
+								$rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . '</a>';
+							} else {
+								$rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . "<br/><small class='text-pink'>(indirect)</small></a>";
+							}
+							$rReturn['data'][] = ["<a href='mag?id=" . $rRow['mag_id'] . "'>" . $rRow['mag_id'] . '</a>', $rRow['username'], "<a href='mag?id=" . $rRow['mag_id'] . "'>" . $rRow['mac'] . '</a>', $rRow['stb_type'], $rOwner, $rStatus, $rActive, $rTrial, $rExpDate, $rButtons];
+						} else {
+							$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+						}
+					}
+				}
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		exit();
+	}
+	if ($rType == 'enigmas') {
+		if ($rPermissions['create_enigma']) {
+			$rOrder = ['`lines`.`id`', '`lines`.`username`', '`enigma2_devices`.`mac`', '`enigma2_devices`.`public_ip`', '`users`.`username`', '`lines`.`enabled`', '`active_connections`', '`lines`.`is_trial`', '`lines`.`exp_date`', false];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rWhere = $rWhereV = [];
+			$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
+			if (0 >= strlen(RequestManager::get('search')['value'])) {
+			} else {
+				foreach (range(1, 6) as $rInt) {
+					$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+				}
+				$rWhere[] = '(`lines`.`username` LIKE ? OR `enigma2_devices`.`mac` LIKE ? OR `enigma2_devices`.`public_ip` LIKE ? OR `users`.`username` LIKE ? OR FROM_UNIXTIME(`exp_date`) LIKE ? OR `lines`.`reseller_notes` LIKE ?)';
+			}
+			if (0 >= strlen(RequestManager::get('filter'))) {
+			} else {
+				if (RequestManager::get('filter') == 1) {
+					$rWhere[] = '(`lines`.`admin_enabled` = 1 AND `lines`.`enabled` = 1 AND (`lines`.`exp_date` IS NULL OR `lines`.`exp_date` > UNIX_TIMESTAMP()))';
+				} else {
+					if (RequestManager::get('filter') == 2) {
+						$rWhere[] = '`lines`.`enabled` = 0';
+					} else {
+						if (RequestManager::get('filter') == 3) {
+							$rWhere[] = '(`lines`.`exp_date` IS NOT NULL AND `lines`.`exp_date` <= UNIX_TIMESTAMP())';
+						} else {
+							if (RequestManager::get('filter') != 4) {
+							} else {
+								$rWhere[] = '`lines`.`is_trial` = 1';
+							}
+						}
+					}
+				}
+			}
+			if (0 >= strlen(RequestManager::get('reseller'))) {
+			} else {
+				$rWhere[] = '`lines`.`member_id` = ?';
+				$rWhereV[] = RequestManager::get('reseller');
+			}
+			if (0 < count($rWhere)) {
+				$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+			} else {
+				$rWhereString = '';
+			}
+			if (!$rOrder[$rOrderRow]) {
+			} else {
+				$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+				$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+			}
+			$rCountQuery = 'SELECT COUNT(`lines`.`id`) AS `count` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` INNER JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` ' . $rWhereString . ';';
+			$db->query($rCountQuery, ...$rWhereV);
+			if ($db->num_rows() == 1) {
+				$rReturn['recordsTotal'] = $db->get_row()['count'];
+			} else {
+				$rReturn['recordsTotal'] = 0;
+			}
+			$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+			if (0 >= $rReturn['recordsTotal']) {
+			} else {
+				$rQuery = 'SELECT `lines`.`id`, `lines`.`username`, `lines`.`member_id`, `lines`.`is_isplock`, `enigma2_devices`.`mac`, `enigma2_devices`.`public_ip`, `enigma2_devices`.`device_id`, `lines`.`exp_date`, `lines`.`admin_enabled`, `lines`.`enabled`, `lines`.`reseller_notes`, `lines`.`max_connections`,  `lines`.`is_trial`, `users`.`username` AS `owner_name`, (SELECT count(*) FROM `lines_live` WHERE `lines`.`id` = `lines_live`.`user_id` AND `hls_end` = 0) AS `active_connections` FROM `lines` LEFT JOIN `users` ON `users`.`id` = `lines`.`member_id` INNER JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+				$db->query($rQuery, ...$rWhereV);
+				if (0 >= $db->num_rows()) {
+				} else {
+					$rRows = $db->get_rows();
+					$rLineIDs = [];
+					foreach ($rRows as $rRow) {
+						if (!$rRow['id']) {
+						} else {
+							$rLineIDs[] = intval($rRow['id']);
+						}
+					}
+					if (0 >= count($rLineIDs)) {
+					} else {
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rConnectionCount = [];
+							$rConnectionMap = ConnectionTracker::getUserConnections($rLineIDs, false);
+							foreach (array_keys($rConnectionMap) as $rUserID) {
+								$rConnectionCount[$rUserID] = count($rConnectionMap[$rUserID]);
+							}
+							unset($rConnectionMap);
+						}
+					}
+					foreach ($rRows as $rRow) {
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rRow['active_connections'] = (isset($rConnectionCount[$rRow['id']]) ? $rConnectionCount[$rRow['id']] : 0);
+						}
+						if (!$rIsAPI) {
+							if (!$rRow['admin_enabled']) {
+								$rStatus = '<i class="text-danger fas fa-square"></i>';
+							} else {
+								if (!$rRow['enabled']) {
+									$rStatus = '<i class="text-secondary fas fa-square"></i>';
+								} else {
+									if ($rRow['exp_date'] && $rRow['exp_date'] < time()) {
+										$rStatus = '<i class="text-warning far fa-square"></i>';
+									} else {
+										$rStatus = '<i class="text-success fas fa-square"></i>';
+									}
+								}
+							}
+							if (0 < $rRow['active_connections']) {
+								$rActive = '<i class="text-success fas fa-square"></i>';
+							} else {
+								$rActive = '<i class="text-warning far fa-square"></i>';
+							}
+							if ($rRow['is_trial']) {
+								$rTrial = '<i class="text-warning fas fa-square"></i>';
+							} else {
+								$rTrial = '<i class="text-secondary far fa-square"></i>';
+							}
+							if ($rRow['exp_date']) {
+								if ($rRow['exp_date'] < time()) {
+									$rExpDate = '<span class="expired">' . date($rSettings['date_format'], $rRow['exp_date']) . '<br/><small>' . date('H:i:s', $rRow['exp_date']) . '</small></span>';
+								} else {
+									$rExpDate = date($rSettings['date_format'], $rRow['exp_date']) . "<br/><small class='text-secondary'>" . date('H:i:s', $rRow['exp_date']) . '</small>';
+								}
+							} else {
+								$rExpDate = '&infin;';
+							}
+							$rButtons = '<div class="btn-group">';
+							$rNotes = '';
+							if (0 >= strlen($rRow['reseller_notes'])) {
+							} else {
+								if (strlen($rNotes) == 0) {
+								} else {
+									$rNotes .= "\n";
+								}
+								$rNotes .= $rRow['reseller_notes'];
+							}
+							if (0 < strlen($rNotes)) {
+								$rButtons .= '<button type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" title="' . $rNotes . '"><i class="mdi mdi-note"></i></button>';
+							} else {
+								$rButtons .= '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-note"></i></button>';
+							}
+							$rButtons .= '<a href="enigma?id=' . $rRow['device_id'] . '"><button title="Edit" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip"><i class="mdi mdi-pencil-outline"></i></button></a>';
+							if (!$rRow['is_isplock']) {
+							} else {
+								$rButtons .= '<button title="Reset ISP Lock" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'reset_isp');\"><i class=\"mdi mdi-lock-reset\"></i></button>";
+							}
+							if (!$rPermissions['create_line']) {
+							} else {
+								$rButtons .= '<button title="Convert to User Line" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'convert');\"><i class=\"fas fa-retweet\"></i></button>";
+							}
+							if (!$rPermissions['reseller_client_connection_logs']) {
+							} else {
+								if (0 < $rRow['active_connections']) {
+									$rButtons .= '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'kill_line');\"><i class=\"fas fa-hammer\"></i></button>";
+								} else {
+									$rButtons .= '<button disabled type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="fas fa-hammer"></i></button>';
+								}
+							}
+							if ($rRow['enabled'] == 1) {
+								$rButtons .= '<button title="Disable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'disable');\"><i class=\"mdi mdi-lock\"></i></button>";
+							} else {
+								$rButtons .= '<button title="Enable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'enable');\"><i class=\"mdi mdi-lock\"></i></button>";
+							}
+							$rButtons .= '<button title="Delete" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['device_id'] . ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>";
+							$rButtons .= '</div>';
+							if (in_array($rRow['member_id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]))) {
+								$rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . '</a>';
+							} else {
+								$rOwner = "<a href='user?id=" . intval($rRow['member_id']) . "'>" . $rRow['owner_name'] . "<br/><small class='text-pink'>(indirect)</small></a>";
+							}
+							$rReturn['data'][] = ["<a href='enigma?id=" . $rRow['device_id'] . "'>" . $rRow['device_id'] . '</a>', $rRow['username'], "<a href='enigma?id=" . $rRow['device_id'] . "'>" . $rRow['mac'] . '</a>', "<a onClick=\"whois('" . $rRow['public_ip'] . "');\" href='javascript: void(0);'>" . $rRow['public_ip'] . '</a>', $rOwner, $rStatus, $rActive, $rTrial, $rExpDate, $rButtons];
+						} else {
+							$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+						}
+					}
+				}
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		exit();
+	}
+	if ($rType == 'streams') {
+		if ($rPermissions['can_view_vod']) {
+			$rCategories = CategoryService::getAllByType('live');
+			$rOrder = ['`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rCreated = RequestManager::has('created');
+			$rWhere = $rWhereV = [];
+			if (0 < count($rPermissions['stream_ids'])) {
+				$rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
+				if ($rCreated) {
+					$rWhere[] = '`type` = 3';
+				} else {
+					$rWhere[] = '`type` = 1';
+				}
+				if (0 >= strlen(RequestManager::get('search')['value'])) {
+				} else {
+					foreach (range(1, 2) as $rInt) {
+						$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+					}
+					$rWhere[] = '(`id` LIKE ? OR `stream_display_name` LIKE ?)';
+				}
+				if (0 >= strlen(RequestManager::get('category'))) {
+				} else {
+					$rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
+					$rWhereV[] = RequestManager::get('category');
+				}
+				if (!$rOrder[$rOrderRow]) {
+				} else {
+					$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+					$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+				}
+				if (0 < count($rWhere)) {
+					$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+				} else {
+					$rWhereString = '';
+				}
+				$rCountQuery = 'SELECT COUNT(`streams`.`id`) AS `count` FROM `streams` ' . $rWhereString . ';';
+				$db->query($rCountQuery, ...$rWhereV);
+				if ($db->num_rows() == 1) {
+					$rReturn['recordsTotal'] = $db->get_row()['count'];
+				} else {
+					$rReturn['recordsTotal'] = 0;
+				}
+				$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+				if (0 >= $rReturn['recordsTotal']) {
+				} else {
+					$rQuery = 'SELECT `id`, `stream_icon`, `stream_display_name`, `tv_archive_duration`, `tv_archive_server_id`, `category_id`, (SELECT COUNT(*) FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `lines_live`.`stream_id` = `streams`.`id` AND `hls_end` = 0 AND `lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')) AS `clients` FROM `streams` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+					$db->query($rQuery, ...$rWhereV);
+					if (0 >= $db->num_rows()) {
+					} else {
+						$rRows = $db->get_rows();
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rConnectionCount = $rReports = [];
+							$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
+							foreach ($db->get_rows() as $rRow) {
+								$rReports[] = $rRow['id'];
+							}
+							if (0 >= count($rReports)) {
+							} else {
+								foreach (ConnectionTracker::getUserConnections($rReports, false) as $rUserID => $rConnections) {
+									foreach ($rConnections as $rConnection) {
+										$rConnectionCount[$rConnection['stream_id']]++;
+									}
+								}
+							}
+						}
+						foreach ($rRows as $rRow) {
+							if (!SettingsManager::get('redis_handler')) {
+							} else {
+								$rRow['clients'] = ($rConnectionCount[$rRow['id']] ?: 0);
+							}
+							if (!$rIsAPI) {
+								$rCategoryIDs = json_decode($rRow['category_id'], true);
+								if (0 < strlen(RequestManager::get('category'))) {
+									$rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
+								} else {
+									$rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
+								}
+								if (1 >= count($rCategoryIDs)) {
+								} else {
+									$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
+								}
+								if (!(0 < $rRow['tv_archive_duration'] && 0 < $rRow['tv_archive_server_id'])) {
+								} else {
+									$rRow['stream_display_name'] .= " <i class='text-danger mdi mdi-record'></i>";
+								}
+								if (0 < $rRow['clients']) {
+									if ($rPermissions['reseller_client_connection_logs']) {
+										$rButtons = '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'purge');\"><i class=\"mdi mdi-hammer\"></i></button>";
+										$rClients = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button></a>';
+									} else {
+										$rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
+										$rClients = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button>';
+									}
+								} else {
+									$rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
+									$rClients = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
+								}
+								if (0 < strlen($rRow['stream_icon'])) {
+									$rIcon = "<a href='javascript: void(0);' onClick='openImage(this);' data-src='resize?maxw=512&maxh=512&url=" . $rRow['stream_icon'] . "'><img loading='lazy' src='resize?maxw=96&maxh=32&url=" . $rRow['stream_icon'] . "' /></a>";
+								} else {
+									$rIcon = '';
+								}
+								$rReturn['data'][] = [$rRow['id'], $rIcon, $rRow['stream_display_name'], $rCategory, $rClients, $rButtons];
+							} else {
+								$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+							}
+						}
+					}
+				}
+				echo json_encode($rReturn);
+				exit();
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		exit();
+	}
+	if ($rType == 'radios') {
+		if ($rPermissions['can_view_vod']) {
+			$rCategories = CategoryService::getAllByType('radio');
+			$rOrder = ['`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rWhere = $rWhereV = [];
+			if (0 < count($rPermissions['stream_ids'])) {
+				$rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
+				$rWhere[] = '`type` = 4';
+				if (0 >= strlen(RequestManager::get('search')['value'])) {
+				} else {
+					foreach (range(1, 2) as $rInt) {
+						$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+					}
+					$rWhere[] = '(`id` LIKE ? OR `stream_display_name` LIKE ?)';
+				}
+				if (0 >= strlen(RequestManager::get('category'))) {
+				} else {
+					$rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
+					$rWhereV[] = RequestManager::get('category');
+				}
+				if (!$rOrder[$rOrderRow]) {
+				} else {
+					$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+					$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+				}
+				if (0 < count($rWhere)) {
+					$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+				} else {
+					$rWhereString = '';
+				}
+				$rCountQuery = 'SELECT COUNT(`streams`.`id`) AS `count` FROM `streams` ' . $rWhereString . ';';
+				$db->query($rCountQuery, ...$rWhereV);
+				if ($db->num_rows() == 1) {
+					$rReturn['recordsTotal'] = $db->get_row()['count'];
+				} else {
+					$rReturn['recordsTotal'] = 0;
+				}
+				$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+				if (0 >= $rReturn['recordsTotal']) {
+				} else {
+					$rQuery = 'SELECT `id`, `stream_icon`, `stream_display_name`, `category_id`, (SELECT COUNT(*) FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `lines_live`.`stream_id` = `streams`.`id` AND `hls_end` = 0 AND `lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')) AS `clients` FROM `streams` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+					$db->query($rQuery, ...$rWhereV);
+					if (0 >= $db->num_rows()) {
+					} else {
+						$rRows = $db->get_rows();
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rConnectionCount = $rReports = [];
+							$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
+							foreach ($db->get_rows() as $rRow) {
+								$rReports[] = $rRow['id'];
+							}
+							if (0 >= count($rReports)) {
+							} else {
+								foreach (ConnectionTracker::getUserConnections($rReports, false) as $rUserID => $rConnections) {
+									foreach ($rConnections as $rConnection) {
+										$rConnectionCount[$rConnection['stream_id']]++;
+									}
+								}
+							}
+						}
+						foreach ($rRows as $rRow) {
+							if (!SettingsManager::get('redis_handler')) {
+							} else {
+								$rRow['clients'] = ($rConnectionCount[$rRow['id']] ?: 0);
+							}
+							if (!$rIsAPI) {
+								$rCategoryIDs = json_decode($rRow['category_id'], true);
+								if (0 < strlen(RequestManager::get('category'))) {
+									$rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
+								} else {
+									$rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
+								}
+								if (1 >= count($rCategoryIDs)) {
+								} else {
+									$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
+								}
+								if (0 < $rRow['clients']) {
+									if ($rPermissions['reseller_client_connection_logs']) {
+										$rButtons = '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'purge');\"><i class=\"mdi mdi-hammer\"></i></button>";
+										$rClients = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button></a>';
+									} else {
+										$rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
+										$rClients = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button>';
+									}
+								} else {
+									$rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
+									$rClients = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
+								}
+								if (0 < strlen($rRow['stream_icon'])) {
+									$rIcon = "<a href='javascript: void(0);' onClick='openImage(this);' data-src='resize?maxw=512&maxh=512&url=" . $rRow['stream_icon'] . "'><img loading='lazy' src='resize?maxw=96&maxh=32&url=" . $rRow['stream_icon'] . "' /></a>";
+								} else {
+									$rIcon = '';
+								}
+								$rReturn['data'][] = [$rRow['id'], $rIcon, $rRow['stream_display_name'], $rCategory, $rClients, $rButtons];
+							} else {
+								$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+							}
+						}
+					}
+				}
+				echo json_encode($rReturn);
+				exit();
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		exit();
+	}
+	if ($rType == 'movies') {
+		if ($rPermissions['can_view_vod']) {
+			$rCategories = CategoryService::getAllByType('movie');
+			$rOrder = ['`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rWhere = $rWhereV = [];
+			if (0 < count($rPermissions['stream_ids'])) {
+				$rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
+				$rWhere[] = '`type` = 2';
+				if (0 >= strlen(RequestManager::get('search')['value'])) {
+				} else {
+					foreach (range(1, 2) as $rInt) {
+						$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+					}
+					$rWhere[] = '(`id` LIKE ? OR `stream_display_name` LIKE ?)';
+				}
+				if (0 >= strlen(RequestManager::get('category'))) {
+				} else {
+					$rWhere[] = "JSON_CONTAINS(`category_id`, ?, '\$')";
+					$rWhereV[] = RequestManager::get('category');
+				}
+				if (!$rOrder[$rOrderRow]) {
+				} else {
+					$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+					$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+				}
+				if (0 < count($rWhere)) {
+					$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+				} else {
+					$rWhereString = '';
+				}
+				$rCountQuery = 'SELECT COUNT(`streams`.`id`) AS `count` FROM `streams` ' . $rWhereString . ';';
+				$db->query($rCountQuery, ...$rWhereV);
+				if ($db->num_rows() == 1) {
+					$rReturn['recordsTotal'] = $db->get_row()['count'];
+				} else {
+					$rReturn['recordsTotal'] = 0;
+				}
+				$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+				if (0 >= $rReturn['recordsTotal']) {
+				} else {
+					$rQuery = 'SELECT `id`, `stream_icon`, `stream_display_name`, `movie_properties`, `category_id`, (SELECT COUNT(*) FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `lines_live`.`stream_id` = `streams`.`id` AND `hls_end` = 0 AND `lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')) AS `clients` FROM `streams` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+					$db->query($rQuery, ...$rWhereV);
+					if (0 >= $db->num_rows()) {
+					} else {
+						$rRows = $db->get_rows();
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rConnectionCount = $rReports = [];
+							$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
+							foreach ($db->get_rows() as $rRow) {
+								$rReports[] = $rRow['id'];
+							}
+							if (0 >= count($rReports)) {
+							} else {
+								foreach (ConnectionTracker::getUserConnections($rReports, false) as $rUserID => $rConnections) {
+									foreach ($rConnections as $rConnection) {
+										$rConnectionCount[$rConnection['stream_id']]++;
+									}
+								}
+							}
+						}
+						foreach ($rRows as $rRow) {
+							if (!SettingsManager::get('redis_handler')) {
+							} else {
+								$rRow['clients'] = ($rConnectionCount[$rRow['id']] ?: 0);
+							}
+							if (!$rIsAPI) {
+								$rCategoryIDs = json_decode($rRow['category_id'], true);
+								if (0 < strlen(RequestManager::get('category'))) {
+									$rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
+								} else {
+									$rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
+								}
+								if (1 >= count($rCategoryIDs)) {
+								} else {
+									$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
+								}
+								if (0 < $rRow['clients']) {
+									if ($rPermissions['reseller_client_connection_logs']) {
+										$rButtons = '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'purge');\"><i class=\"mdi mdi-hammer\"></i></button>";
+										$rClients = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button></a>';
+									} else {
+										$rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
+										$rClients = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button>';
+									}
+								} else {
+									$rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
+									$rClients = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
+								}
+								$rProperties = json_decode($rRow['movie_properties'], true);
+								if (0 < strlen($rProperties['movie_image'])) {
+									$rImage = "<a href='javascript: void(0);' onClick='openImage(this);' data-src='resize?maxw=512&maxh=512&url=" . $rProperties['movie_image'] . "'><img loading='lazy' src='resize?maxh=58&maxw=32&url=" . $rProperties['movie_image'] . "' /></a>";
+								} else {
+									$rImage = '';
+								}
+								$rReturn['data'][] = [$rRow['id'], $rImage, $rRow['stream_display_name'], $rCategory, $rClients, $rButtons];
+							} else {
+								$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+							}
+						}
+					}
+				}
+				echo json_encode($rReturn);
+				exit();
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		exit();
+	}
+	if ($rType == 'episodes') {
+		if ($rPermissions['can_view_vod']) {
+			$rCategories = CategoryService::getAllByType('series');
+			$rOrder = ['`id`', false, '`stream_display_name`', '`category_id`', '`clients`', false];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rWhere = $rWhereV = [];
+			if (0 < count($rPermissions['stream_ids'])) {
+				$rWhere[] = '`streams`.`id` IN (' . implode(',', array_map('intval', $rPermissions['stream_ids'])) . ')';
+				$rWhere[] = '`type` = 5';
+				if (0 >= strlen(RequestManager::get('search')['value'])) {
+				} else {
+					foreach (range(1, 3) as $rInt) {
+						$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+					}
+					$rWhere[] = '(`streams`.`id` LIKE ? OR `stream_display_name` LIKE ? OR `streams_series`.`title` LIKE ?)';
+				}
+				if (0 >= strlen(RequestManager::get('category'))) {
+				} else {
+					$rWhere[] = "JSON_CONTAINS(`streams_series`.`category_id`, ?, '\$')";
+					$rWhereV[] = RequestManager::get('category');
+				}
+				if (0 >= strlen(RequestManager::get('series'))) {
+				} else {
+					$rWhere[] = '`streams_series`.`id` = ?';
+					$rWhereV[] = RequestManager::get('series');
+				}
+				if (!$rOrder[$rOrderRow]) {
+				} else {
+					$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+					$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+				}
+				if (0 < count($rWhere)) {
+					$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+				} else {
+					$rWhereString = '';
+				}
+				$rCountQuery = 'SELECT COUNT(`streams`.`id`) AS `count` FROM `streams` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams`.`id` LEFT JOIN `streams_series` ON `streams_series`.`id` = `streams_episodes`.`series_id` ' . $rWhereString . ';';
+				$db->query($rCountQuery, ...$rWhereV);
+				if ($db->num_rows() == 1) {
+					$rReturn['recordsTotal'] = $db->get_row()['count'];
+				} else {
+					$rReturn['recordsTotal'] = 0;
+				}
+				$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+				if (0 >= $rReturn['recordsTotal']) {
+				} else {
+					$rQuery = 'SELECT `streams`.`id`, `stream_icon`, `stream_display_name`, `movie_properties`, `streams_series`.`category_id`, `streams_series`.`title`, `streams_episodes`.`season_num`, (SELECT COUNT(*) FROM `lines_live` LEFT JOIN `lines` ON `lines`.`id` = `lines_live`.`user_id` WHERE `lines_live`.`stream_id` = `streams`.`id` AND `hls_end` = 0 AND `lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')) AS `clients` FROM `streams` LEFT JOIN `streams_episodes` ON `streams_episodes`.`stream_id` = `streams`.`id` LEFT JOIN `streams_series` ON `streams_series`.`id` = `streams_episodes`.`series_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+					$db->query($rQuery, ...$rWhereV);
+					if (0 >= $db->num_rows()) {
+					} else {
+						$rRows = $db->get_rows();
+						if (!SettingsManager::get('redis_handler')) {
+						} else {
+							$rConnectionCount = $rReports = [];
+							$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
+							foreach ($db->get_rows() as $rRow) {
+								$rReports[] = $rRow['id'];
+							}
+							if (0 >= count($rReports)) {
+							} else {
+								foreach (ConnectionTracker::getUserConnections($rReports, false) as $rUserID => $rConnections) {
+									foreach ($rConnections as $rConnection) {
+										$rConnectionCount[$rConnection['stream_id']]++;
+									}
+								}
+							}
+						}
+						foreach ($rRows as $rRow) {
+							if (!SettingsManager::get('redis_handler')) {
+							} else {
+								$rRow['clients'] = ($rConnectionCount[$rRow['id']] ?: 0);
+							}
+							if (!$rIsAPI) {
+								$rSeriesName = $rRow['title'] . ' - Season ' . $rRow['season_num'];
+								$rStreamName = '<b>' . $rRow['stream_display_name'] . "</b><br><span style='font-size:11px;'>" . $rSeriesName . '</span>';
+								$rCategoryIDs = json_decode($rRow['category_id'], true);
+								if (0 < strlen(RequestManager::get('category'))) {
+									$rCategory = ($rCategories[intval(RequestManager::get('category'))]['category_name'] ?: 'No Category');
+								} else {
+									$rCategory = ($rCategories[$rCategoryIDs[0]]['category_name'] ?: 'No Category');
+								}
+								if (1 >= count($rCategoryIDs)) {
+								} else {
+									$rCategory .= ' (+' . (count($rCategoryIDs) - 1) . ' others)';
+								}
+								if (0 < $rRow['clients']) {
+									if ($rPermissions['reseller_client_connection_logs']) {
+										$rButtons = '<button title="Kill Connections" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'purge');\"><i class=\"mdi mdi-hammer\"></i></button>";
+										$rClients = "<a href='javascript: void(0);' onClick='viewLiveConnections(" . intval($rRow['id']) . ");'><button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button></a>';
+									} else {
+										$rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
+										$rClients = "<button type='button' class='btn btn-info btn-xs waves-effect waves-light'>" . $rRow['clients'] . '</button>';
+									}
+								} else {
+									$rButtons = '<button type="button" disabled class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-hammer"></i></button>';
+									$rClients = "<button type='button' class='btn btn-secondary btn-xs waves-effect waves-light'>0</button>";
+								}
+								$rProperties = json_decode($rRow['movie_properties'], true);
+								if (0 < strlen($rProperties['movie_image'])) {
+									$rImage = "<a href='javascript: void(0);' onClick='openImage(this);' data-src='resize?maxw=512&maxh=512&url=" . $rProperties['movie_image'] . "'><img loading='lazy' src='resize?maxh=58&maxw=32&url=" . $rProperties['movie_image'] . "' /></a>";
+								} else {
+									$rImage = '';
+								}
+								$rReturn['data'][] = [$rRow['id'], $rImage, $rStreamName, $rCategory, $rClients, $rButtons];
+							} else {
+								$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+							}
+						}
+					}
+				}
+				echo json_encode($rReturn);
+				exit();
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		exit();
+	}
+	if ($rType == 'line_activity') {
+		if ($rPermissions['reseller_client_connection_logs']) {
+			$rOrder = ['`username`', '`streams`.`stream_display_name`', '`lines_activity`.`user_agent`', '`lines_activity`.`isp`', '`lines_activity`.`user_ip`', '`lines_activity`.`date_start`', '`lines_activity`.`date_end`', '`lines_activity`.`date_end` - `lines_activity`.`date_start`', '`lines_activity`.`container`'];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rWhere = $rWhereV = [];
+			$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
+			if (0 >= strlen(RequestManager::get('search')['value'])) {
+			} else {
+				foreach (range(1, 10) as $rInt) {
+					$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+				}
+				$rWhere[] = '(`lines_activity`.`user_agent` LIKE ? OR `lines_activity`.`user_ip` LIKE ? OR `lines_activity`.`container` LIKE ? OR FROM_UNIXTIME(`lines_activity`.`date_start`) LIKE ? OR FROM_UNIXTIME(`lines_activity`.`date_end`) LIKE ? OR `lines_activity`.`geoip_country_code` LIKE ? OR `lines`.`username` LIKE ? OR `mag_devices`.`mac` LIKE ? OR `enigma2_devices`.`mac` LIKE ? OR `streams`.`stream_display_name` LIKE ?)';
+			}
+			if (0 >= strlen(RequestManager::get('range'))) {
+			} else {
+				$rStartTime = substr(RequestManager::get('range'), 0, 10);
+				$rEndTime = substr(RequestManager::get('range'), strlen(RequestManager::get('range')) - 10, 10);
+				if ($rStartTime = strtotime($rStartTime . ' 00:00:00')) {
+				} else {
+					$rStartTime = null;
+				}
+				if ($rEndTime = strtotime($rEndTime . ' 23:59:59')) {
+				} else {
+					$rEndTime = null;
+				}
+				if (!($rStartTime && $rEndTime)) {
+				} else {
+					$rWhere[] = '(`lines_activity`.`date_start` >= ? AND `lines_activity`.`date_end` <= ?)';
+					$rWhereV[] = $rStartTime;
+					$rWhereV[] = $rEndTime;
+				}
+			}
+			if (0 >= strlen(RequestManager::get('stream'))) {
+			} else {
+				$rWhere[] = '`lines_activity`.`stream_id` = ?';
+				$rWhereV[] = RequestManager::get('stream');
+			}
+			if (0 >= strlen(RequestManager::get('user'))) {
+			} else {
+				$rWhere[] = '`lines`.`member_id` = ?';
+				$rWhereV[] = RequestManager::get('user');
+			}
+			if (0 >= strlen(RequestManager::get('line'))) {
+			} else {
+				$rWhere[] = '`lines_activity`.`user_id` = ?';
+				$rWhereV[] = RequestManager::get('line');
+			}
+			if (0 < count($rWhere)) {
+				$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+			} else {
+				$rWhereString = '';
+			}
+			if (!$rOrder[$rOrderRow]) {
+			} else {
+				$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+				$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+			}
+			$rCountQuery = 'SELECT COUNT(*) AS `count` FROM `lines_activity` LEFT JOIN `lines` ON `lines_activity`.`user_id` = `lines`.`id` LEFT JOIN `streams` ON `lines_activity`.`stream_id` = `streams`.`id` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines_activity`.`user_id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines_activity`.`user_id` ' . $rWhereString . ';';
+			$db->query($rCountQuery, ...$rWhereV);
+			if ($db->num_rows() == 1) {
+				$rReturn['recordsTotal'] = $db->get_row()['count'];
+			} else {
+				$rReturn['recordsTotal'] = 0;
+			}
+			$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+			if (0 >= $rReturn['recordsTotal']) {
+			} else {
+				$rQuery = 'SELECT `mag_devices`.`mag_id`, `enigma2_devices`.`device_id`, `lines`.`is_e2`, `lines`.`is_mag`, `lines_activity`.`activity_id`, `lines_activity`.`container`, `lines_activity`.`isp`, `lines_activity`.`user_id`, `lines_activity`.`stream_id`, `streams`.`series_no`, `lines_activity`.`server_id`, `lines_activity`.`user_agent`, `lines_activity`.`user_ip`, `lines_activity`.`container`, `lines_activity`.`date_start`, `lines_activity`.`date_end`, `lines_activity`.`geoip_country_code`, IF(`lines`.`is_mag`, `mag_devices`.`mac`, IF(`lines`.`is_e2`, `enigma2_devices`.`mac`, `lines`.`username`)) AS `username`, `streams`.`stream_display_name`, `streams`.`type`, `lines`.`is_restreamer` FROM `lines_activity` LEFT JOIN `lines` ON `lines_activity`.`user_id` = `lines`.`id` LEFT JOIN `streams` ON `lines_activity`.`stream_id` = `streams`.`id` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines_activity`.`user_id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines_activity`.`user_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+				$db->query($rQuery, ...$rWhereV);
+				if (0 >= $db->num_rows()) {
+				} else {
+					foreach ($db->get_rows() as $rRow) {
+						if (!$rIsAPI) {
+							if ($rRow['is_mag']) {
+								$rUsername = "<a href='mag?id=" . $rRow['mag_id'] . "'>" . $rRow['username'] . '</a>';
+							} else {
+								if ($rRow['is_e2']) {
+									$rUsername = "<a href='enigma?id=" . $rRow['device_id'] . "'>" . $rRow['username'] . '</a>';
+								} else {
+									$rUsername = "<a href='line?id=" . $rRow['user_id'] . "'>" . $rRow['username'] . '</a>';
+								}
+							}
+							$rChannel = $rRow['stream_display_name'];
+							if (0 < strlen($rRow['geoip_country_code'])) {
+								$rGeoCountry = "<img loading='lazy' src='assets/img/countries/" . strtolower($rRow['geoip_country_code']) . ".png'></img> &nbsp;";
+							} else {
+								$rGeoCountry = '';
+							}
+							if ($rRow['user_ip']) {
+								$rIP = $rGeoCountry . "<a onClick=\"whois('" . $rRow['user_ip'] . "');\" href='javascript: void(0);'>" . $rRow['user_ip'] . '</a>';
+							} else {
+								$rIP = '';
+							}
+							if ($rRow['date_start']) {
+								$rStart = date($rSettings['datetime_format'], $rRow['date_start']);
+							} else {
+								$rStart = '';
+							}
+							if ($rRow['date_end']) {
+								$rStop = date($rSettings['datetime_format'], $rRow['date_end']);
+							} else {
+								$rStop = '';
+							}
+							$rPlayer = trim(explode('(', $rRow['user_agent'])[0]);
+							$rDuration = $rRow['date_end'] - $rRow['date_start'];
+							$rColour = 'success';
+							if (86400 <= $rDuration) {
+								$rDuration = sprintf('%02dd %02dh', $rDuration / 86400, ($rDuration / 3600) % 24);
+								$rColour = 'danger';
+							} else {
+								if (3600 <= $rDuration) {
+									if (14400 < $rDuration) {
+										$rColour = 'warning';
+									} else {
+										if (43200 >= $rDuration) {
+										} else {
+											$rColour = 'danger';
+										}
+									}
+									$rDuration = sprintf('%02dh %02dm', $rDuration / 3600, ($rDuration / 60) % 60);
+								} else {
+									$rDuration = sprintf('%02dm %02ds', ($rDuration / 60) % 60, $rDuration % 60);
+								}
+							}
+							$rDuration = "<button type='button' class='btn btn-" . $rColour . " btn-xs waves-effect waves-light btn-fixed'>" . $rDuration . '</button>';
+							$rReturn['data'][] = [$rUsername, $rChannel, $rPlayer, $rRow['isp'], $rIP, $rStart, $rStop, $rDuration, strtoupper($rRow['container'])];
+						} else {
+							$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+						}
+					}
+				}
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		exit();
+	}
+	if ($rType == 'live_connections') {
+		if ($rPermissions['reseller_client_connection_logs']) {
+			$rRows = [];
+			if (SettingsManager::get('redis_handler')) {
+				$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? false : true);
+				$rReports = [];
+				$rUserID = (0 < intval(RequestManager::get('user')) ? intval(RequestManager::get('user')) : null);
+				$rStreamID = (0 < intval(RequestManager::get('stream_id')) ? intval(RequestManager::get('stream_id')) : null);
+				if ($rUserID && in_array($rUserID, $rUserInfo['reports'])) {
+					$db->query('SELECT `id` FROM `lines` WHERE `member_id` = ?;', $rUserID);
+				} else {
+					$db->query('SELECT `id` FROM `lines` WHERE `member_id` IN (' . implode(',', $rUserInfo['reports']) . ');');
+				}
+				foreach ($db->get_rows() as $rRow) {
+					$rReports[] = $rRow['id'];
+				}
+				$rKeys = ConnectionTracker::getUserConnections($rReports, false, true);
+				if (!$rOrderDirection) {
+				} else {
+					$rKeys = array_reverse($rKeys);
+				}
+				$rKeyCount = count($rKeys);
+				foreach (RedisManager::instance()->mGet($rKeys) as $rRow) {
+					$rRow = igbinary_unserialize($rRow);
+					if (is_array($rRow)) {
+						if ($rFilterBefore) {
+						} else {
+							if (!($rStreamID && $rStreamID != $rRow['stream_id'])) {
+								if (in_array($rRow['user_id'], $rReports)) {
+								} else {
+									$rKeyCount--;
+								}
+							} else {
+								$rKeyCount--;
+							}
+						}
+						$rRow['activity_id'] = $rRow['uuid'];
+						$rRow['identifier'] = ($rRow['user_id'] ?: $rRow['hmac_id'] . '_' . $rRow['hmac_identifier']);
+						$rRow['active_time'] = time() - $rRow['date_start'];
+						$rRow['server_name'] = (ServerRepository::getAll()[$rRow['server_id']]['server_name'] ?: '');
+						$rRows[] = $rRow;
+					} else {
+						$rKeyCount--;
+					}
+				}
+				$rOrder = ['uuid', 'divergence', 'identifier', 'stream_display_name', 'user_agent', 'isp', 'user_ip', 'active_time', 'container', null];
+				if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+					$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+				} else {
+					$rOrderRow = 0;
+				}
+				if (!$rOrder[$rOrderRow]) {
+				} else {
+					array_multisort(array_column($rRows, $rOrder[$rOrderRow]), ($rOrderDirection ? SORT_ASC : SORT_DESC), $rRows);
+				}
+				$rRows = array_slice($rRows, $rStart, $rLimit);
+				$rUUIDs = $rStreamIDs = $rUserIDs = [];
+				foreach ($rRows as $rRow) {
+					if (!$rRow['stream_id']) {
+					} else {
+						$rStreamIDs[] = intval($rRow['stream_id']);
+					}
+					if (!$rRow['user_id']) {
+					} else {
+						$rUserIDs[] = intval($rRow['user_id']);
+					}
+					if (!$rRow['uuid']) {
+					} else {
+						$rUUIDs[] = $rRow['uuid'];
+					}
+				}
+				$rStreamNames = $rDivergenceMap = $rSeriesMap = $rUserMap = [];
+				if (0 >= count($rUserIDs)) {
+				} else {
+					$db->query('SELECT `lines`.`id`, `lines`.`is_mag`, `lines`.`is_e2`, `lines`.`is_restreamer`, `lines`.`username`, `mag_devices`.`mag_id`, `enigma2_devices`.`device_id` FROM `lines` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines`.`id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines`.`id` WHERE `lines`.`id` IN (' . implode(',', $rUserIDs) . ');');
+					foreach ($db->get_rows() as $rRow) {
+						$rUserID = $rRow['id'];
+						unset($rRow['id']);
+						$rUserMap[$rUserID] = $rRow;
+					}
+				}
+				if (0 >= count($rStreamIDs)) {
+				} else {
+					$db->query('SELECT `stream_id`, `series_id` FROM `streams_episodes` WHERE `stream_id` IN (' . implode(',', $rStreamIDs) . ');');
+					foreach ($db->get_rows() as $rRow) {
+						$rSeriesMap[$rRow['stream_id']] = $rRow['series_id'];
+					}
+					$db->query('SELECT `id`, `type`, `stream_display_name` FROM `streams` WHERE `id` IN (' . implode(',', $rStreamIDs) . ');');
+					foreach ($db->get_rows() as $rRow) {
+						$rStreamNames[$rRow['id']] = [$rRow['stream_display_name'], $rRow['type']];
+					}
+				}
+				if (0 >= count($rUUIDs)) {
+				} else {
+					$db->query("SELECT `uuid`, `divergence` FROM `lines_divergence` WHERE `uuid` IN ('" . implode("','", $rUUIDs) . "');");
+					foreach ($db->get_rows() as $rRow) {
+						$rDivergenceMap[$rRow['uuid']] = $rRow['divergence'];
+					}
+				}
+				$i = 0;
+				while ($i < count($rRows)) {
+					$rRows[$i]['divergence'] = ($rDivergenceMap[$rRows[$i]['uuid']] ?: 0);
+					$rRows[$i]['series_no'] = ($rSeriesMap[$rRows[$i]['stream_id']] ?: null);
+					$rRows[$i]['stream_display_name'] = ($rStreamNames[$rRows[$i]['stream_id']][0] ?: '');
+					$rRows[$i]['type'] = ($rStreamNames[$rRows[$i]['stream_id']][1] ?: 1);
+					$rRows[$i] = array_merge($rRows[$i], ($rUserMap[$rRows[$i]['user_id']] ?: []));
+					$i++;
+				}
+				$rReturn['recordsTotal'] = $rKeyCount;
+				$rReturn['recordsFiltered'] = ($rIsAPI ? ($rReturn['recordsTotal'] < $rLimit ? $rReturn['recordsTotal'] : $rLimit) : $rReturn['recordsTotal']);
+			} else {
+				$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+				$rOrder = ['`lines_live`.`activity_id`', '`lines_live`.`divergence`', '`username`', '`streams`.`stream_display_name`', '`lines_live`.`user_agent`', '`lines_live`.`isp`', '`lines_live`.`user_ip`', 'UNIX_TIMESTAMP() - `lines_live`.`date_start`', '`lines_live`.`container`', false];
+				if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+					$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+				} else {
+					$rOrderRow = 0;
+				}
+				$rWhere = $rWhereV = [];
+				$rWhere[] = '`hls_end` = 0';
+				$rWhere[] = '`lines`.`member_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
+				if (0 >= strlen(RequestManager::get('search')['value'])) {
+				} else {
+					foreach (range(1, 9) as $rInt) {
+						$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+					}
+					$rWhere[] = '(`lines_live`.`user_agent` LIKE ? OR `lines_live`.`user_ip` LIKE ? OR `lines_live`.`container` LIKE ? OR FROM_UNIXTIME(`lines_live`.`date_start`) LIKE ? OR `lines_live`.`geoip_country_code` LIKE ? OR `lines`.`username` LIKE ? OR `mag_devices`.`mac` LIKE ? OR `enigma2_devices`.`mac` LIKE ? OR `streams`.`stream_display_name` LIKE ?)';
+				}
+				if (0 >= intval(RequestManager::get('stream'))) {
+				} else {
+					$rWhere[] = '`lines_live`.`stream_id` = ?';
+					$rWhereV[] = RequestManager::get('stream');
+				}
+				if (0 >= intval(RequestManager::get('user'))) {
+				} else {
+					$rWhere[] = '`lines`.`member_id` = ?';
+					$rWhereV[] = RequestManager::get('user');
+				}
+				if (0 >= intval(RequestManager::get('line'))) {
+				} else {
+					$rWhere[] = '`lines_live`.`user_id` = ?';
+					$rWhereV[] = RequestManager::get('line');
+				}
+				$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+				if (!$rOrder[$rOrderRow]) {
+				} else {
+					$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+				}
+				$rCountQuery = 'SELECT COUNT(*) AS `count` FROM `lines_live` LEFT JOIN `lines` ON `lines_live`.`user_id` = `lines`.`id` LEFT JOIN `streams` ON `lines_live`.`stream_id` = `streams`.`id` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines_live`.`user_id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines_live`.`user_id` ' . $rWhereString . ';';
+				$db->query($rCountQuery, ...$rWhereV);
+				if ($db->num_rows() == 1) {
+					$rReturn['recordsTotal'] = $db->get_row()['count'];
+				} else {
+					$rReturn['recordsTotal'] = 0;
+				}
+				$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+				if (0 >= $rReturn['recordsTotal']) {
+				} else {
+					$rQuery = 'SELECT `mag_devices`.`mag_id`, `enigma2_devices`.`device_id`, `lines`.`is_e2`, `lines`.`is_mag`, `lines_live`.`activity_id`, `lines_live`.`divergence`, `lines_live`.`user_id`, `lines_live`.`stream_id`, `streams`.`series_no`, `lines`.`is_restreamer`, `lines_live`.`isp`, `lines_live`.`server_id`, `lines_live`.`user_agent`, `lines_live`.`user_ip`, `lines_live`.`container`, `lines_live`.`uuid`, `lines_live`.`date_start`, `lines_live`.`geoip_country_code`, IF(`lines`.`is_mag`, `mag_devices`.`mac`, IF(`lines`.`is_e2`, `enigma2_devices`.`mac`, `lines`.`username`)) AS `username`, `streams`.`stream_display_name`, `streams`.`type` FROM `lines_live` LEFT JOIN `lines` ON `lines_live`.`user_id` = `lines`.`id` LEFT JOIN `streams` ON `lines_live`.`stream_id` = `streams`.`id` LEFT JOIN `mag_devices` ON `mag_devices`.`user_id` = `lines_live`.`user_id` LEFT JOIN `enigma2_devices` ON `enigma2_devices`.`user_id` = `lines_live`.`user_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+					$db->query($rQuery, ...$rWhereV);
+					if (0 >= $db->num_rows()) {
+					} else {
+						$rRows = $db->get_rows();
+					}
+				}
+			}
+			if (0 >= count($rRows)) {
+			} else {
+				foreach ($rRows as $rRow) {
+					if (!$rIsAPI) {
+						if ($rRow['divergence'] <= 50) {
+							$rDivergence = '<i class="text-success fas fa-square tooltip" title="' . intval(100 - $rRow['divergence']) . '%"></i>';
+						} else {
+							if ($rRow['divergence'] <= 80) {
+								$rDivergence = '<i class="text-warning fas fa-square tooltip" title="' . intval(100 - $rRow['divergence']) . '%"></i>';
+							} else {
+								$rDivergence = '<i class="text-danger fas fa-square tooltip" title="' . intval(100 - $rRow['divergence']) . '%"></i>';
+							}
+						}
+						if ($rRow['is_mag']) {
+							$rUsername = "<a href='mag?id=" . $rRow['mag_id'] . "'>" . $rRow['username'] . '</a>';
+						} else {
+							if ($rRow['is_e2']) {
+								$rUsername = "<a href='enigma?id=" . $rRow['device_id'] . "'>" . $rRow['username'] . '</a>';
+							} else {
+								$rUsername = "<a href='line?id=" . $rRow['user_id'] . "'>" . $rRow['username'] . '</a>';
+							}
+						}
+						$rChannel = $rRow['stream_display_name'];
+						if (0 < strlen($rRow['geoip_country_code'])) {
+							$rGeoCountry = "<img loading='lazy' src='assets/img/countries/" . strtolower($rRow['geoip_country_code']) . ".png'></img> &nbsp;";
+						} else {
+							$rGeoCountry = '';
+						}
+						if ($rRow['user_ip']) {
+							$rIP = $rGeoCountry . "<a onClick=\"whois('" . $rRow['user_ip'] . "');\" href='javascript: void(0);'>" . $rRow['user_ip'] . '</a>';
+						} else {
+							$rIP = '';
+						}
+						$rPlayer = trim(explode('(', $rRow['user_agent'])[0]);
+						$rDuration = intval(time()) - intval($rRow['date_start']);
+						$rColour = 'success';
+						if (86400 <= $rDuration) {
+							$rDuration = sprintf('%02dd %02dh', $rDuration / 86400, ($rDuration / 3600) % 24);
+							$rColour = 'danger';
+						} else {
+							if (3600 <= $rDuration) {
+								if (14400 < $rDuration) {
+									$rColour = 'warning';
+								} else {
+									if (43200 >= $rDuration) {
+									} else {
+										$rColour = 'danger';
+									}
+								}
+								$rDuration = sprintf('%02dh %02dm', $rDuration / 3600, ($rDuration / 60) % 60);
+							} else {
+								$rDuration = sprintf('%02dm %02ds', ($rDuration / 60) % 60, $rDuration % 60);
+							}
+						}
+						$rDuration = "<button type='button' class='btn btn-" . $rColour . " btn-xs waves-effect waves-light btn-fixed'>" . $rDuration . '</button>';
+						$rButtons = "<button title=\"Kill Connection\" type=\"button\" class=\"btn btn-light waves-effect waves-light btn-xs tooltip\" onClick=\"api('" . $rRow['uuid'] . "', 'kill');\"><i class=\"fas fa-hammer\"></i></button>";
+						$rReturn['data'][] = [$rRow['activity_id'], $rDivergence, $rUsername, $rChannel, $rPlayer, $rRow['isp'], $rIP, $rDuration, strtoupper($rRow['container']), $rButtons];
+					} else {
+						$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+					}
+				}
+			}
+			echo json_encode($rReturn);
+			exit();
+		} else {
+			exit();
+		}
+	} else {
+		if ($rType == 'reg_user_logs') {
+			$rOrder = ['`users_logs`.`id`', '`users`.`username`', '`users_logs`.`log_id`', '`users_logs`.`type`, `users_logs`.`action`', '`users_logs`.`cost`', '`users_logs`.`credits_after`', '`users_logs`.`date`'];
+			if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+				$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+			} else {
+				$rOrderRow = 0;
+			}
+			$rWhere = $rWhereV = [];
+			$rWhere[] = '`users_logs`.`owner` IN (' . implode(',', $rUserInfo['reports']) . ')';
+			if (0 >= strlen(RequestManager::get('search')['value'])) {
+			} else {
+				foreach (range(1, 3) as $rInt) {
+					$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+				}
+				$rWhere[] = '(`users`.`username` LIKE ? OR `users_logs`.`type` LIKE ? OR `users_logs`.`action` LIKE ?)';
+			}
+			if (0 >= strlen(RequestManager::get('range'))) {
+			} else {
+				$rStartTime = substr(RequestManager::get('range'), 0, 10);
+				$rEndTime = substr(RequestManager::get('range'), strlen(RequestManager::get('range')) - 10, 10);
+				if ($rStartTime = strtotime($rStartTime . ' 00:00:00')) {
+				} else {
+					$rStartTime = null;
+				}
+				if ($rEndTime = strtotime($rEndTime . ' 23:59:59')) {
+				} else {
+					$rEndTime = null;
+				}
+				if (!($rStartTime && $rEndTime)) {
+				} else {
+					$rWhere[] = '(`users_logs`.`date` >= ? AND `users_logs`.`date` <= ?)';
+					$rWhereV[] = $rStartTime;
+					$rWhereV[] = $rEndTime;
+				}
+			}
+			if (0 >= strlen(RequestManager::get('reseller'))) {
+			} else {
+				$rWhere[] = '`users_logs`.`owner` = ?';
+				$rWhereV[] = RequestManager::get('reseller');
+			}
+			if (0 < count($rWhere)) {
+				$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+			} else {
+				$rWhereString = '';
+			}
+			if (!$rOrder[$rOrderRow]) {
+			} else {
+				$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+				$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+			}
+			$rCountQuery = 'SELECT COUNT(*) AS `count` FROM `users_logs` LEFT JOIN `users` ON `users`.`id` = `users_logs`.`owner` ' . $rWhereString . ';';
+			$db->query($rCountQuery, ...$rWhereV);
+			if ($db->num_rows() == 1) {
+				$rReturn['recordsTotal'] = $db->get_row()['count'];
+			} else {
+				$rReturn['recordsTotal'] = 0;
+			}
+			$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+			if (0 >= $rReturn['recordsTotal']) {
+			} else {
+				$rPackages = PackageService::getAll();
+				$rQuery = 'SELECT `users`.`username`, `users_logs`.`id`, `users_logs`.`owner`, `users_logs`.`type`, `users_logs`.`action`, `users_logs`.`log_id`, `users_logs`.`package_id`, `users_logs`.`cost`, `users_logs`.`credits_after`, `users_logs`.`date`, `users_logs`.`deleted_info` FROM `users_logs` LEFT JOIN `users` ON `users`.`id` = `users_logs`.`owner` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+				$db->query($rQuery, ...$rWhereV);
+				if (0 >= $db->num_rows()) {
+				} else {
+					foreach ($db->get_rows() as $rRow) {
+						if (!$rIsAPI) {
+							if (in_array($rRow['owner'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]))) {
+								$rOwner = "<a href='user?id=" . intval($rRow['owner']) . "'>" . $rRow['username'] . '</a>';
+							} else {
+								$rOwner = "<a href='user?id=" . intval($rRow['owner']) . "'>" . $rRow['username'] . "<br/><small class='text-pink'>(indirect)</small></a>";
+							}
+							$rDevice = ['line' => 'User Line', 'mag' => 'MAG Device', 'enigma' => 'Enigma2 Device', 'user' => 'Reseller'][$rRow['type']];
+							switch ($rRow['action']) {
+								case 'new':
+									if ($rRow['package_id']) {
+										$rText = 'Created New ' . $rDevice . ' with Package: ' . $rPackages[$rRow['package_id']]['package_name'];
+									} else {
+										$rText = 'Created New ' . $rDevice;
+									}
+									break;
+								case 'extend':
+									if ($rRow['package_id']) {
+										$rText = 'Extended ' . $rDevice . ' with Package: ' . $rPackages[$rRow['package_id']]['package_name'];
+									} else {
+										$rText = 'Extended ' . $rDevice;
+									}
+									break;
+								case 'edit':
+									$rText = 'Edited ' . $rDevice;
+									break;
+								case 'enable':
+									$rText = 'Enabled ' . $rDevice;
+									break;
+								case 'disable':
+									$rText = 'Disabled ' . $rDevice;
+									break;
+								case 'delete':
+									$rText = 'Deleted ' . $rDevice;
+									break;
+								case 'send_event':
+									$rText = 'Sent Event to ' . $rDevice;
+									break;
+								case 'adjust_credits':
+									$rText = 'Adjusted Credits by ' . $rRow['cost'];
+									break;
+							}
+							$rLineInfo = null;
+							switch ($rRow['type']) {
+								case 'line':
+									$rLine = UserRepository::getLineById($rRow['log_id']);
+									if (!$rLine) {
+									} else {
+										$rLineInfo = "<a href='line?id=" . $rRow['log_id'] . "'>" . $rLine['username'] . '</a>';
+									}
+									break;
+								case 'user':
+									$rLine = UserRepository::getRegisteredUserById($rRow['log_id']);
+									if (!$rLine) {
+									} else {
+										$rLineInfo = "<a href='user?id=" . $rRow['log_id'] . "'>" . $rLine['username'] . '</a>';
+									}
+									break;
+								case 'mag':
+									$rLine = MagService::getById($rRow['log_id']);
+									if (!$rLine) {
+									} else {
+										$rLineInfo = "<a href='mag?id=" . $rRow['log_id'] . "'>" . $rLine['mac'] . '</a>';
+									}
+									break;
+								case 'enigma':
+									$rLine = EnigmaService::getById($rRow['log_id']);
+									if (!$rLine) {
+									} else {
+										$rLineInfo = "<a href='enigma?id=" . $rRow['log_id'] . "'>" . $rLine['mac'] . '</a>';
+									}
+									break;
+							}
+							if ($rLineInfo) {
+							} else {
+								$rDeletedInfo = json_decode($rRow['deleted_info'], true);
+								if (is_array($rDeletedInfo)) {
+									if (isset($rDeletedInfo['mac'])) {
+										$rLineInfo = "<span class='text-secondary'>" . $rDeletedInfo['mac'] . '</span>';
+									} else {
+										$rLineInfo = "<span class='text-secondary'>" . $rDeletedInfo['username'] . '</span>';
+									}
+								} else {
+									$rLineInfo = "<span class='text-secondary'>DELETED</span>";
+								}
+							}
+							$rReturn['data'][] = [$rRow['id'], $rOwner, $rLineInfo, $rText, number_format($rRow['cost'], 0), number_format($rRow['credits_after'], 0), date($rSettings['datetime_format'], $rRow['date'])];
+						} else {
+							unset($rRow['deleted_info']);
+							$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+						}
+					}
+				}
+			}
+			echo json_encode($rReturn);
+			exit();
+		}
+		if ($rType != 'reg_users') {
+		} else {
+			if ($rPermissions['create_sub_resellers']) {
+				$rOrder = ['`users`.`id`', '`users`.`username`', '`r`.`username`', '`users`.`ip`', '`users`.`status`', '`users`.`credits`', '`user_count`', '`users`.`last_login`', false];
+				if (RequestManager::has('order') && 0 < strlen(RequestManager::get('order')[0]['column'])) {
+					$rOrderRow = intval(RequestManager::get('order')[0]['column']);
+				} else {
+					$rOrderRow = 0;
+				}
+				$rWhere = $rWhereV = [];
+				$rWhere[] = '`users`.`owner_id` IN (' . implode(',', $rUserInfo['reports']) . ')';
+				if (0 >= strlen(RequestManager::get('search')['value'])) {
+				} else {
+					foreach (range(1, 9) as $rInt) {
+						$rWhereV[] = '%' . RequestManager::get('search')['value'] . '%';
+					}
+					$rWhere[] = '(`users`.`id` LIKE ? OR `users`.`username` LIKE ? OR `users`.`notes` LIKE ? OR `r`.`username` LIKE ? OR FROM_UNIXTIME(`users`.`date_registered`) LIKE ? OR FROM_UNIXTIME(`users`.`last_login`) LIKE ? OR `users`.`email` LIKE ? OR `users`.`ip` LIKE ? OR `users_groups`.`group_name` LIKE ?)';
+				}
+				if (0 >= strlen(RequestManager::get('filter'))) {
+				} else {
+					if (RequestManager::get('filter') == 1) {
+						$rWhere[] = '`users`.`status` = 1';
+					} else {
+						if (RequestManager::get('filter') != 2) {
+						} else {
+							$rWhere[] = '`users`.`status` = 0';
+						}
+					}
+				}
+				if (0 >= strlen(RequestManager::get('reseller'))) {
+				} else {
+					$rWhere[] = '`users`.`owner_id` = ?';
+					$rWhereV[] = RequestManager::get('reseller');
+				}
+				if (0 < count($rWhere)) {
+					$rWhereString = 'WHERE ' . implode(' AND ', $rWhere);
+				} else {
+					$rWhereString = '';
+				}
+				if (!$rOrder[$rOrderRow]) {
+				} else {
+					$rOrderDirection = (strtolower(RequestManager::get('order')[0]['dir']) === 'desc' ? 'desc' : 'asc');
+					$rOrderBy = 'ORDER BY ' . $rOrder[$rOrderRow] . ' ' . $rOrderDirection;
+				}
+				$rCountQuery = 'SELECT COUNT(*) AS `count` FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` LEFT JOIN `users` AS `r` on `r`.`id` = `users`.`owner_id` ' . $rWhereString . ';';
+				$db->query($rCountQuery, ...$rWhereV);
+				if ($db->num_rows() == 1) {
+					$rReturn['recordsTotal'] = $db->get_row()['count'];
+				} else {
+					$rReturn['recordsTotal'] = 0;
+				}
+				$rReturn['recordsFiltered'] = $rReturn['recordsTotal'];
+				if (0 >= $rReturn['recordsTotal']) {
+				} else {
+					$rQuery = 'SELECT `users`.`id`, `users`.`status`, `users_groups`.`is_reseller`, `users`.`notes`, `users`.`owner_id`, `users`.`credits`, `users`.`username`, `users`.`email`, `users`.`ip`, FROM_UNIXTIME(`users`.`date_registered`) AS `date_registered`, FROM_UNIXTIME(`users`.`last_login`) AS `last_login`, `r`.`username` as `owner_username`, `users_groups`.`group_name`, `users`.`status`, (SELECT COUNT(`id`) FROM `lines` WHERE `member_id` = `users`.`id`) AS `user_count` FROM `users` LEFT JOIN `users_groups` ON `users_groups`.`group_id` = `users`.`member_group_id` LEFT JOIN `users` AS `r` on `r`.`id` = `users`.`owner_id` ' . $rWhereString . ' ' . $rOrderBy . ' LIMIT ' . $rStart . ', ' . $rLimit . ';';
+					$db->query($rQuery, ...$rWhereV);
+					if (0 >= $db->num_rows()) {
+					} else {
+						foreach ($db->get_rows() as $rRow) {
+							if (!$rIsAPI) {
+								if ($rRow['status'] == 1) {
+									$rStatus = '<i class="text-success fas fa-square"></i>';
+								} else {
+									$rStatus = '<i class="text-secondary fas fa-square"></i>';
+								}
+								if ($rRow['last_login']) {
+								} else {
+									$rRow['last_login'] = 'NEVER';
+								}
+								$rButtons = '<div class="btn-group">';
+								if (0 < strlen($rRow['notes'])) {
+									$rButtons .= '<button type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" title="' . $rRow['notes'] . '"><i class="mdi mdi-note"></i></button>';
+								} else {
+									$rButtons .= '<button disabled type="button" class="btn btn-light waves-effect waves-light btn-xs"><i class="mdi mdi-note"></i></button>';
+								}
+								if (in_array($rRow['id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]))) {
+									$rButtons .= '<button title="Adjust Credits" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="addCredits(' . $rRow['id'] . ", '" . addslashes($rRow['username']) . "', " . intval($rRow['credits']) . ');"><i class="mdi mdi-coin"></i></button>';
+									$rUsername = "<a href='user?id=" . intval($rRow['id']) . "'>" . $rRow['username'] . '</a>';
+								} else {
+									$rButtons .= '<button title="Adjust Credits" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="addCredits(' . $rRow['id'] . ", '" . addslashes($rRow['username']) . "', " . intval($rRow['credits']) . ', true);"><i class="mdi mdi-coin"></i></button>';
+									$rUsername = "<a href='user?id=" . intval($rRow['id']) . "'>" . $rRow['username'] . "<br/><small class='text-pink'>(indirect)</small></a>";
+								}
+								$rButtons .= '<a href="user?id=' . $rRow['id'] . '"><button title="Edit" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip"><i class="mdi mdi-pencil-outline"></i></button></a>';
+								if ($rRow['status'] == 1) {
+									$rButtons .= '<button title="Disable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'disable');\"><i class=\"mdi mdi-lock\"></i></button>";
+								} else {
+									$rButtons .= '<button title="Enable" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'enable');\"><i class=\"mdi mdi-lock\"></i></button>";
+								}
+								if (!$rPermissions['delete_users']) {
+								} else {
+									$rButtons .= '<button title="Delete" type="button" class="btn btn-light waves-effect waves-light btn-xs tooltip" onClick="api(' . $rRow['id'] . ", 'delete');\"><i class=\"mdi mdi-close\"></i></button>";
+								}
+								$rButtons .= '</div>';
+								if (0 < strlen($rRow['ip'])) {
+									$rIP = "<a onClick=\"whois('" . $rRow['ip'] . "');\" href='javascript: void(0);'>" . $rRow['ip'] . '</a>';
+								} else {
+									$rIP = '';
+								}
+								if ($rRow['is_reseller']) {
+									$rCredits = '<button type="button" class="btn btn-info btn-xs waves-effect waves-light">' . number_format($rRow['credits'], 0) . '</button>';
+								} else {
+									$rCredits = '<button type="button" class="btn btn-secondary btn-xs waves-effect waves-light">-</button>';
+								}
+								if (0 < $rRow['user_count']) {
+									$rUserCount = '<button type="button" class="btn btn-info btn-xs waves-effect waves-light">' . number_format($rRow['user_count'], 0) . '</button>';
+								} else {
+									$rUserCount = '<button type="button" class="btn btn-secondary btn-xs waves-effect waves-light">0</button>';
+								}
+								if (in_array($rRow['owner_id'], array_merge($rPermissions['direct_reports'], [$rUserInfo['id']]))) {
+									$rOwner = "<a href='user?id=" . intval($rRow['owner_id']) . "'>" . $rRow['owner_username'] . '</a>';
+								} else {
+									$rOwner = "<a href='user?id=" . intval($rRow['owner_id']) . "'>" . $rRow['owner_username'] . "<br/><small class='text-pink'>(indirect)</small></a>";
+								}
+								$rReturn['data'][] = ["<a href='user?id=" . intval($rRow['id']) . "'>" . $rRow['id'] . '</a>', $rUsername, $rOwner, $rIP, $rStatus, $rCredits, $rUserCount, $rRow['last_login'], $rButtons];
+							} else {
+								$rReturn['data'][] = filterrow($rRow, RequestManager::get('show_columns'), RequestManager::get('hide_columns'));
+							}
+						}
+					}
+				}
+				echo json_encode($rReturn);
+				exit();
+			}
+			exit();
+		}
+	}
 } else {
-    echo json_encode($rReturn);
-    exit();
+	echo json_encode($rReturn);
+	exit();
 }
+
 function filterRow($rRow, $rShow, $rHide) {
-    if ($rShow || $rHide) {
-        $rReturn = array();
-        foreach (array_keys($rRow) as $rKey) {
-            if ($rShow) {
-                if (!in_array($rKey, $rShow)) {
-                } else {
-                    $rReturn[$rKey] = $rRow[$rKey];
-                }
-            } else {
-                if (!$rHide) {
-                } else {
-                    if (in_array($rKey, $rHide)) {
-                    } else {
-                        $rReturn[$rKey] = $rRow[$rKey];
-                    }
-                }
-            }
-        }
-        return $rReturn;
-    } else {
-        return $rRow;
-    }
+	if ($rShow || $rHide) {
+		$rReturn = [];
+		foreach (array_keys($rRow) as $rKey) {
+			if ($rShow) {
+				if (!in_array($rKey, $rShow)) {
+				} else {
+					$rReturn[$rKey] = $rRow[$rKey];
+				}
+			} else {
+				if (!$rHide) {
+				} else {
+					if (in_array($rKey, $rHide)) {
+					} else {
+						$rReturn[$rKey] = $rRow[$rKey];
+					}
+				}
+			}
+		}
+		return $rReturn;
+	} else {
+		return $rRow;
+	}
 }
diff --git a/src/Public/admin/api.php b/src/Public/admin/api.php
index 0d26b6eb..52ff31cf 100644
--- a/src/Public/admin/api.php
+++ b/src/Public/admin/api.php
@@ -42,10 +42,10 @@ switch ($rAction) {
 	case 'server':
 		switch ($rSubAction) {
 			case 'list':
-				$rOutput = array();
+				$rOutput = [];
 
 				foreach ($rAllServers as $rServerID => $rServerInfo) {
-					$rOutput[] = array('id' => $rServerID, 'server_name' => $rServerInfo['server_name'], 'online' => $rServerInfo['server_online'], 'info' => json_decode($rServerInfo['server_hardware'], true));
+					$rOutput[] = ['id' => $rServerID, 'server_name' => $rServerInfo['server_name'], 'online' => $rServerInfo['server_online'], 'info' => json_decode($rServerInfo['server_hardware'], true)];
 				}
 				echo json_encode($rOutput);
 
@@ -68,23 +68,23 @@ switch ($rAction) {
 				$rReq = RequestManager::getAll();
 				$rStreamIDs = !empty($rReq['stream_ids'])
 					? array_map('intval', $rReq['stream_ids'])
-					: array(intval($rReq['stream_id'] ?? 0));
+					: [intval($rReq['stream_id'] ?? 0)];
 				$rServerID = intval($rReq['server_id'] ?? -1);
 				$rServerIDs = !empty($rReq['servers'])
 					? array_map('intval', $rReq['servers'])
-					: ($rServerID > 0 ? array($rServerID) : array_keys($rAllServers));
+					: ($rServerID > 0 ? [$rServerID] : array_keys($rAllServers));
 				$rForce = ($rReq['force'] ?? false);
-				$rURLs = array();
+				$rURLs = [];
 
 				foreach ($rServerIDs as $rServerID) {
-					$rPostData = array('function' => $rSubAction, 'stream_ids' => $rStreamIDs);
+					$rPostData = ['function' => $rSubAction, 'stream_ids' => $rStreamIDs];
 					if ($rSubAction === 'start') {
 						$rPostData['force'] = $rForce;
 					}
-					$rURLs[$rServerID] = array('url' => $rAllServers[$rServerID]['api_url_ip'] . '&action=vod', 'postdata' => $rPostData);
+					$rURLs[$rServerID] = ['url' => $rAllServers[$rServerID]['api_url_ip'] . '&action=vod', 'postdata' => $rPostData];
 				}
 				CurlClient::getMultiCURL($rURLs);
-				echo json_encode(array('result' => true));
+				echo json_encode(['result' => true]);
 
 				exit();
 		}
@@ -94,37 +94,37 @@ switch ($rAction) {
 	case 'stream':
 		switch ($rSubAction) {
 			case 'start':
-				$rStreamIDs = array_map('intval', RequestManager::get('stream_ids') ?? array());
+				$rStreamIDs = array_map('intval', RequestManager::get('stream_ids') ?? []);
 				$rServerIDs = (empty(RequestManager::get('servers')) ? array_keys($rAllServers) : array_map('intval', RequestManager::get('servers')));
-				$rURLs = array();
+				$rURLs = [];
 
 				foreach ($rServerIDs as $rServerID) {
-					$rURLs[$rServerID] = array('url' => $rAllServers[$rServerID]['api_url_ip'] . '&action=stream', 'postdata' => array('function' => $rSubAction, 'stream_ids' => $rStreamIDs));
+					$rURLs[$rServerID] = ['url' => $rAllServers[$rServerID]['api_url_ip'] . '&action=stream', 'postdata' => ['function' => $rSubAction, 'stream_ids' => $rStreamIDs]];
 				}
 				CurlClient::getMultiCURL($rURLs);
-				echo json_encode(array('result' => true));
+				echo json_encode(['result' => true]);
 
 				exit();
 
 			case 'stop':
-				$rStreamIDs = array_map('intval', RequestManager::get('stream_ids') ?? array());
+				$rStreamIDs = array_map('intval', RequestManager::get('stream_ids') ?? []);
 				$rServerIDs = (empty(RequestManager::get('servers')) ? array_keys($rAllServers) : array_map('intval', RequestManager::get('servers')));
-				$rURLs = array();
+				$rURLs = [];
 
 				foreach ($rServerIDs as $rServerID) {
-					$rURLs[$rServerID] = array('url' => $rAllServers[$rServerID]['api_url_ip'] . '&action=stream', 'postdata' => array('function' => $rSubAction, 'stream_ids' => $rStreamIDs));
+					$rURLs[$rServerID] = ['url' => $rAllServers[$rServerID]['api_url_ip'] . '&action=stream', 'postdata' => ['function' => $rSubAction, 'stream_ids' => $rStreamIDs]];
 				}
 				CurlClient::getMultiCURL($rURLs);
-				echo json_encode(array('result' => true));
+				echo json_encode(['result' => true]);
 
 				exit();
 
 			case 'list':
-				$rOutput = array();
+				$rOutput = [];
 				$db->query('SELECT id,stream_display_name FROM `streams` WHERE type <> 2');
 
 				foreach ($db->get_rows() as $rRow) {
-					$rOutput[] = array('id' => $rRow['id'], 'stream_name' => $rRow['stream_display_name']);
+					$rOutput[] = ['id' => $rRow['id'], 'stream_name' => $rRow['stream_display_name']];
 				}
 				echo json_encode($rOutput);
 
@@ -133,7 +133,7 @@ switch ($rAction) {
 			case 'offline':
 				$db->query('SELECT t1.stream_status,t1.server_id,t1.stream_id  FROM `streams_servers` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id AND t2.type <> 2 WHERE t1.stream_status <> 0');
 				$rStreams = $db->get_rows(true, 'stream_id', false, 'server_id');
-				$rOutput = array();
+				$rOutput = [];
 
 				foreach ($rStreams as $rStreamID => $rStreamServers) {
 					$rOutput[$rStreamID] = array_keys($rStreamServers);
@@ -145,7 +145,7 @@ switch ($rAction) {
 			case 'online':
 				$db->query('SELECT t1.stream_status,t1.server_id,t1.stream_id FROM `streams_servers` t1 INNER JOIN `streams` t2 ON t2.id = t1.stream_id AND t2.type <> 2 WHERE t1.pid > 0 AND t1.stream_status = 0');
 				$rStreams = $db->get_rows(true, 'stream_id', false, 'server_id');
-				$rOutput = array();
+				$rOutput = [];
 
 				foreach ($rStreams as $rStreamID => $rStreamServers) {
 					$rOutput[$rStreamID] = array_keys($rStreamServers);
@@ -166,12 +166,12 @@ switch ($rAction) {
 					$rUserInfo = UserRepository::getUserInfo(false, $rUsername, $rPassword, true, true);
 
 					if (!empty($rUserInfo)) {
-						echo json_encode(array('result' => true, 'user_info' => $rUserInfo));
+						echo json_encode(['result' => true, 'user_info' => $rUserInfo]);
 					} else {
-						echo json_encode(array('result' => false, 'error' => 'NOT EXISTS'));
+						echo json_encode(['result' => false, 'error' => 'NOT EXISTS']);
 					}
 				} else {
-					echo json_encode(array('result' => false, 'error' => 'PARAMETER ERROR (user/pass)'));
+					echo json_encode(['result' => false, 'error' => 'PARAMETER ERROR (user/pass)']);
 				}
 
 				break;
@@ -194,6 +194,7 @@ switch ($rAction) {
 	default:
 		break;
 }
+
 function shutdown() {
 	global $db;
 
diff --git a/src/Public/admin/live.php b/src/Public/admin/live.php
index 1c4ddc6b..810584ff 100644
--- a/src/Public/admin/live.php
+++ b/src/Public/admin/live.php
@@ -28,7 +28,7 @@ header('Access-Control-Allow-Origin: *');
 set_time_limit(0);
 $rIP = NetworkUtils::getUserIP();
 $rPID = getmypid();
-$rSegmentSettings = array('seg_time' => intval(SettingsManager::get('seg_time')), 'seg_list_size' => intval(SettingsManager::get('seg_list_size')), 'seg_delete_threshold' => intval(SettingsManager::get('seg_delete_threshold')));
+$rSegmentSettings = ['seg_time' => intval(SettingsManager::get('seg_time')), 'seg_list_size' => intval(SettingsManager::get('seg_list_size')), 'seg_delete_threshold' => intval(SettingsManager::get('seg_delete_threshold'))];
 
 if (SettingsManager::get('use_buffer') == 0) {
 	header('X-Accel-Buffering: no');
diff --git a/src/Public/admin/proxy_api.php b/src/Public/admin/proxy_api.php
index 44f7e813..f261950a 100644
--- a/src/Public/admin/proxy_api.php
+++ b/src/Public/admin/proxy_api.php
@@ -17,7 +17,7 @@ use XcVm\Infrastructure\Database\DatabaseFactory;
  */
 
 set_time_limit(0);
-$rSignals = array();
+$rSignals = [];
 
 if (BlocklistService::isProxy($_SERVER['REMOTE_ADDR'])) {
 	$db = new DatabaseHandler();
@@ -37,7 +37,7 @@ if (BlocklistService::isProxy($_SERVER['REMOTE_ADDR'])) {
 	}
 
 	$rAddresses = $_POST['addresses'];
-	$rHardware = array('total_ram' => $rStats['total_mem'], 'total_used' => $rStats['total_mem_used'], 'cores' => $rStats['cpu_cores'], 'threads' => $rStats['cpu_cores'], 'kernel' => $rStats['kernel'], 'total_running_streams' => $rStats['total_running_streams'], 'cpu_name' => $rStats['cpu_name'], 'cpu_usage' => $rStats['cpu'], 'network_speed' => $rStats['network_speed'], 'bytes_sent' => $rStats['bytes_sent'], 'bytes_received' => $rStats['bytes_received']);
+	$rHardware = ['total_ram' => $rStats['total_mem'], 'total_used' => $rStats['total_mem_used'], 'cores' => $rStats['cpu_cores'], 'threads' => $rStats['cpu_cores'], 'kernel' => $rStats['kernel'], 'total_running_streams' => $rStats['total_running_streams'], 'cpu_name' => $rStats['cpu_name'], 'cpu_usage' => $rStats['cpu'], 'network_speed' => $rStats['network_speed'], 'bytes_sent' => $rStats['bytes_sent'], 'bytes_received' => $rStats['bytes_received']];
 	$rPing = (pingserver($rServers[$rServerIDRequest]['server_ip'], $rServers[$rServerIDRequest]['http_broadcast_port']) ?: 0);
 
 	if ($rPing < 0) {
@@ -67,8 +67,6 @@ if (BlocklistService::isProxy($_SERVER['REMOTE_ADDR'])) {
 	$db->query('UPDATE `servers` SET `connections` = ?, `users` = ?, `ping` = ?,`server_hardware` = ?,`whitelist_ips` = ?, `interfaces` = ?, `watchdog_data` = ?, `last_check_ago` = ? WHERE `id` = ?', $rConnections, $rUsers, $rPing, json_encode($rHardware), json_encode($rAddresses), json_encode($rStats['interfaces']), json_encode($rStats, JSON_PARTIAL_OUTPUT_ON_ERROR), time(), $rServerIDRequest);
 
 	if ($db->query("SELECT `signal_id`, `custom_data` FROM `signals` WHERE `server_id` = ? AND `custom_data` <> '' ORDER BY signal_id ASC;", $rServerIDRequest)) {
-
-
 		if (0 < $db->num_rows()) {
 			foreach ($db->get_rows() as $rRow) {
 				$rData = json_decode($rRow['custom_data'], true);
diff --git a/src/Public/admin/thumb.php b/src/Public/admin/thumb.php
index e724bbf0..ec82a502 100644
--- a/src/Public/admin/thumb.php
+++ b/src/Public/admin/thumb.php
@@ -38,7 +38,7 @@ if (!empty(RequestManager::get('uitoken'))) {
 $db = new DatabaseHandler();
 DatabaseFactory::set($db);
 $rStreamID = intval(RequestManager::get('stream'));
-$rStream = array();
+$rStream = [];
 $db->query('SELECT * FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type AND t2.live = 1 LEFT JOIN `profiles` t4 ON t1.transcode_profile_id = t4.profile_id WHERE t1.direct_source = 0 AND t1.id = ?', $rStreamID);
 
 if ($db->num_rows() <= 0) {
diff --git a/src/Public/admin/timeshift.php b/src/Public/admin/timeshift.php
index 16fd6505..807eb219 100644
--- a/src/Public/admin/timeshift.php
+++ b/src/Public/admin/timeshift.php
@@ -74,7 +74,7 @@ if (0 < $db->num_rows()) {
 	$db->close_mysql();
 
 	if (empty($rRequestData['segment'])) {
-		$rQueue = array();
+		$rQueue = [];
 		$rFile = ARCHIVE_PATH . $rStreamID . '/' . gmdate('Y-m-d:H-i', $rTimestamp) . '.ts';
 
 		if (empty($rStreamID) || empty($rTimestamp) || empty($rDuration)) {
@@ -85,14 +85,14 @@ if (0 < $db->num_rows()) {
 			generate404();
 		}
 
-		$rQueue = array();
+		$rQueue = [];
 		$i = 0;
 
 		while ($i < $rDuration) {
 			$rFile = ARCHIVE_PATH . $rStreamID . '/' . gmdate('Y-m-d:H-i', $rTimestamp + $i * 60) . '.ts';
 
 			if (file_exists($rFile)) {
-				$rQueue[] = array('filename' => $rFile, 'filesize' => filesize($rFile));
+				$rQueue[] = ['filename' => $rFile, 'filesize' => filesize($rFile)];
 			}
 
 			$i++;
diff --git a/src/Public/index.php b/src/Public/index.php
index 9a0c485f..cc64db92 100644
--- a/src/Public/index.php
+++ b/src/Public/index.php
@@ -34,7 +34,7 @@ use XcVm\Public\Controllers\Player\PortalController;
 
 // 1. MAIN_HOME
 if (!defined('MAIN_HOME')) {
-    define('MAIN_HOME', dirname(__DIR__) . '/');
+	define('MAIN_HOME', dirname(__DIR__) . '/');
 }
 
 // 1b. Autoloader
@@ -52,140 +52,140 @@ $accessCode = null;
 $rawScope   = null;
 
 if (!empty($_SERVER['XC_SCOPE'])) {
-    // Режим A: access code (nginx XC_SCOPE/XC_CODE)
-    $rawScope   = $_SERVER['XC_SCOPE'];
-    $accessCode = $_SERVER['XC_CODE'] ?? null;
+	// Режим A: access code (nginx XC_SCOPE/XC_CODE)
+	$rawScope   = $_SERVER['XC_SCOPE'];
+	$accessCode = $_SERVER['XC_CODE'] ?? null;
 
-    $scopeMap = [
-        'admin'                => 'admin',
-        'reseller'             => 'reseller',
-        'ministra'             => 'ministra',
-        'ministra/new'         => 'ministra',
-        'includes/api/admin'   => 'admin',
-        'includes/api/reseller' => 'reseller',
-        'player'               => 'player',
-        'portal'               => 'portal',
-    ];
+	$scopeMap = [
+		'admin'                => 'admin',
+		'reseller'             => 'reseller',
+		'ministra'             => 'ministra',
+		'ministra/new'         => 'ministra',
+		'includes/api/admin'   => 'admin',
+		'includes/api/reseller' => 'reseller',
+		'player'               => 'player',
+		'portal'               => 'portal',
+	];
 
-    $scope = $scopeMap[$rawScope] ?? 'admin';
+	$scope = $scopeMap[$rawScope] ?? 'admin';
 
-    if ($accessCode && preg_match('#^/' . preg_quote($accessCode, '#') . '(?:/(.*))?$#', $urlPath, $m)) {
-        $pageName = isset($m[1]) ? trim($m[1], '/') : '';
-    } else {
-        $pageName = trim($urlPath, '/');
-        $parts = explode('/', $pageName, 2);
-        $pageName = $parts[1] ?? '';
-    }
+	if ($accessCode && preg_match('#^/' . preg_quote($accessCode, '#') . '(?:/(.*))?$#', $urlPath, $m)) {
+		$pageName = isset($m[1]) ? trim($m[1], '/') : '';
+	} else {
+		$pageName = trim($urlPath, '/');
+		$parts = explode('/', $pageName, 2);
+		$pageName = $parts[1] ?? '';
+	}
 } elseif (preg_match('#^/(admin|reseller|portal)(?:/(.*))?$#', $urlPath, $m)) {
-    // Режим B: прямой URL /admin/... или /reseller/... или /portal/...
-    $scope    = $m[1];
-    $pageName = isset($m[2]) ? trim($m[2], '/') : '';
+	// Режим B: прямой URL /admin/... или /reseller/... или /portal/...
+	$scope    = $m[1];
+	$pageName = isset($m[2]) ? trim($m[2], '/') : '';
 } else {
-    // Режим C: access code без XC_SCOPE (fallback admin)
-    $selfDir = basename(dirname($_SERVER['PHP_SELF'] ?? ''));
+	// Режим C: access code без XC_SCOPE (fallback admin)
+	$selfDir = basename(dirname($_SERVER['PHP_SELF'] ?? ''));
 
-    if (!in_array($selfDir, ['admin', 'reseller'], true)) {
-        $accessCode = $selfDir;
-    } else {
-        $scope = $selfDir;
-    }
+	if (!in_array($selfDir, ['admin', 'reseller'], true)) {
+		$accessCode = $selfDir;
+	} else {
+		$scope = $selfDir;
+	}
 
-    $parts = explode('/', trim($urlPath, '/'));
-    array_shift($parts);
-    $pageName = implode('/', $parts);
+	$parts = explode('/', trim($urlPath, '/'));
+	array_shift($parts);
+	$pageName = implode('/', $parts);
 }
 
 $pageName = preg_replace('/\.php$/', '', $pageName);
 
 if ($pageName === '') {
-    $pageName = 'index';
+	$pageName = 'index';
 }
 
 // 3. REST API (access code type 3/4) — dispatch до редиректа и роутера
 if (isset($rawScope) && in_array($rawScope, ['includes/api/admin', 'includes/api/reseller'], true)) {
-    require_once MAIN_HOME . 'bootstrap.php';
-    XC_Bootstrap::boot(XC_Bootstrap::CONTEXT_ADMIN);
-    // Boot modules (no router → registries only, no route side-effects) so a
-    // module-owned serverSide table (TableRegistry) is reachable over the REST API.
-    if (class_exists(ModuleLoader::class)) {
-        $rApiModuleLoader = new ModuleLoader();
-        $rApiModuleLoader->loadAll();
-        $rApiModuleLoader->bootAll(XC_Bootstrap::getContainer());
-    }
-    if ($rawScope === 'includes/api/admin') {
-        $controller = new AdminApiController();
-    } else {
-        $controller = new ResellerRestApiController();
-    }
-    $controller->index();
-    exit;
+	require_once MAIN_HOME . 'bootstrap.php';
+	XC_Bootstrap::boot(XC_Bootstrap::CONTEXT_ADMIN);
+	// Boot modules (no router → registries only, no route side-effects) so a
+	// module-owned serverSide table (TableRegistry) is reachable over the REST API.
+	if (class_exists(ModuleLoader::class)) {
+		$rApiModuleLoader = new ModuleLoader();
+		$rApiModuleLoader->loadAll();
+		$rApiModuleLoader->bootAll(XC_Bootstrap::getContainer());
+	}
+	if ($rawScope === 'includes/api/admin') {
+		$controller = new AdminApiController();
+	} else {
+		$controller = new ResellerRestApiController();
+	}
+	$controller->index();
+	exit;
 }
 
 // 4. Redirect /CODE/ → /CODE/login (иначе relative assets ломаются)
 if (
-    $pageName === 'index' && $accessCode && in_array($scope, ['admin', 'reseller'], true)
-    && ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'GET'
+	$pageName === 'index' && $accessCode && in_array($scope, ['admin', 'reseller'], true)
+	&& ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'GET'
 ) {
-    header('Location: /' . $accessCode . '/login');
-    exit;
+	header('Location: /' . $accessCode . '/login');
+	exit;
 }
 
 // 4b. Player / Portal: /CODE (без завершающего слэша) → /CODE/
 if (
-    $accessCode && in_array($scope, ['player', 'portal'], true)
-    && ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'GET'
-    && rtrim(parse_url($_SERVER['REQUEST_URI'] ?? '', PHP_URL_PATH) ?: '', '/') === '/' . $accessCode
-    && substr(parse_url($_SERVER['REQUEST_URI'] ?? '', PHP_URL_PATH) ?: '', -1) !== '/'
+	$accessCode && in_array($scope, ['player', 'portal'], true)
+	&& ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'GET'
+	&& rtrim(parse_url($_SERVER['REQUEST_URI'] ?? '', PHP_URL_PATH) ?: '', '/') === '/' . $accessCode
+	&& substr(parse_url($_SERVER['REQUEST_URI'] ?? '', PHP_URL_PATH) ?: '', -1) !== '/'
 ) {
-    $query = (string) parse_url($_SERVER['REQUEST_URI'] ?? '', PHP_URL_QUERY);
-    header('Location: /' . $accessCode . '/' . ($query !== '' ? '?' . $query : ''));
-    exit;
+	$query = (string) parse_url($_SERVER['REQUEST_URI'] ?? '', PHP_URL_QUERY);
+	header('Location: /' . $accessCode . '/' . ($query !== '' ? '?' . $query : ''));
+	exit;
 }
 
 if (!defined('PAGE_NAME')) {
-    define('PAGE_NAME', $pageName);
+	define('PAGE_NAME', $pageName);
 }
 
 // 5. Статические ресурсы (fallback для неверной nginx-конфигурации)
 $ext = pathinfo($pageName, PATHINFO_EXTENSION);
 if (in_array($ext, ['css', 'js', 'png', 'jpg', 'jpeg', 'gif', 'svg', 'ico', 'woff', 'woff2', 'ttf', 'eot', 'map'], true)) {
-    http_response_code(404);
-    exit;
+	http_response_code(404);
+	exit;
 }
 
 // 6. Streaming / web API (XC_SCOPE=api, XC_API={endpoint})
 // Each entry: [controller class, bootstrap kind]. `::class` yields the resolved
 // FQN, so `new $class()` works without a manual namespace prefix.
 if (isset($rawScope) && $rawScope === 'api' && !empty($_SERVER['XC_API'])) {
-    $rApiName = $_SERVER['XC_API'];
-    $rApiEndpoints = [
-        'player_api' => [PlayerApiController::class,   'stream'],
-        'enigma2'    => [Enigma2ApiController::class,  'web'],
-        'xplugin'    => [XPluginApiController::class,  'web'],
-        'epg'        => [EpgApiController::class,      'web'],
-        'playlist'    => [PlaylistApiController::class,   'web'],
-        'internal'    => [InternalApiController::class,   'web'],
-        'active_code' => [ActiveCodeApiController::class, 'web'],
-    ];
+	$rApiName = $_SERVER['XC_API'];
+	$rApiEndpoints = [
+		'player_api' => [PlayerApiController::class,   'stream'],
+		'enigma2'    => [Enigma2ApiController::class,  'web'],
+		'xplugin'    => [XPluginApiController::class,  'web'],
+		'epg'        => [EpgApiController::class,      'web'],
+		'playlist'    => [PlaylistApiController::class,   'web'],
+		'internal'    => [InternalApiController::class,   'web'],
+		'active_code' => [ActiveCodeApiController::class, 'web'],
+	];
 
-    if (!isset($rApiEndpoints[$rApiName])) {
-        http_response_code(404);
-        exit;
-    }
+	if (!isset($rApiEndpoints[$rApiName])) {
+		http_response_code(404);
+		exit;
+	}
 
-    [$rControllerClass, $rBootstrapKind] = $rApiEndpoints[$rApiName];
-    $rFilename = ($rApiName === 'internal') ? 'api' : $rApiName;
+	[$rControllerClass, $rBootstrapKind] = $rApiEndpoints[$rApiName];
+	$rFilename = ($rApiName === 'internal') ? 'api' : $rApiName;
 
-    if ($rBootstrapKind === 'stream') {
-        StreamingRequestBootstrap::init($rFilename);
-    } else {
-        WebApiBootstrap::init($rFilename);
-    }
+	if ($rBootstrapKind === 'stream') {
+		StreamingRequestBootstrap::init($rFilename);
+	} else {
+		WebApiBootstrap::init($rFilename);
+	}
 
-    $controller = new $rControllerClass();
-    register_shutdown_function([$controller, 'shutdown']);
-    $controller->index();
-    exit;
+	$controller = new $rControllerClass();
+	register_shutdown_function([$controller, 'shutdown']);
+	$controller->index();
+	exit;
 }
 
 // 6b. Stalker STB compatibility. The box firmware pings <portal_base>/server/load.php
@@ -195,21 +195,21 @@ if (isset($rawScope) && $rawScope === 'api' && !empty($_SERVER['XC_API'])) {
 // to the same /server/... path and self-loops — the STB hangs on "authorization".
 // Redirect them to the portal in the SAME base (portal.php answers the handshake).
 if ($scope === 'ministra') {
-    $rReqPath = (string) parse_url($_SERVER['REQUEST_URI'] ?? '', PHP_URL_PATH);
-    if (preg_match('#/server/(load\.php|login)$#', $rReqPath)) {
-        $rPortalBase = preg_replace('#/server/[^/]+$#', '/', $rReqPath);
-        $rQuery = $_SERVER['QUERY_STRING'] ?? '';
-        header('Location: ' . $rPortalBase . 'portal.php' . ($rQuery !== '' ? '?' . $rQuery : ''), true, 302);
-        exit;
-    }
+	$rReqPath = (string) parse_url($_SERVER['REQUEST_URI'] ?? '', PHP_URL_PATH);
+	if (preg_match('#/server/(load\.php|login)$#', $rReqPath)) {
+		$rPortalBase = preg_replace('#/server/[^/]+$#', '/', $rReqPath);
+		$rQuery = $_SERVER['QUERY_STRING'] ?? '';
+		header('Location: ' . $rPortalBase . 'portal.php' . ($rQuery !== '' ? '?' . $rQuery : ''), true, 302);
+		exit;
+	}
 }
 
 // 6c. Subscriber Activation Portal (public access, no admin/reseller session required)
 if ($scope === 'portal') {
-    WebApiBootstrap::init('portal');
-    $portalController = new PortalController();
-    $portalController->index();
-    exit;
+	WebApiBootstrap::init('portal');
+	$portalController = new PortalController();
+	$portalController->index();
+	exit;
 }
 
 // 7. Scope bootstrap — working directory + session/functions files
@@ -217,24 +217,24 @@ $adminDir = ($scope === 'admin') ? MAIN_HOME . 'Public/Views/admin/' : MAIN_HOME
 @chdir(is_dir($adminDir) ? $adminDir : MAIN_HOME);
 
 if ($scope === 'player') {
-    $noBootstrapPages = ['login'];
+	$noBootstrapPages = ['login'];
 } else {
-    $noBootstrapPages = ['login', 'setup', 'database', 'index', 'session'];
+	$noBootstrapPages = ['login', 'setup', 'database', 'index', 'session'];
 }
 
 // 7a. Страницы без bootstrap (имеют свой)
 // ВАЖНО: НЕ загружаем includes/admin.php — require_once пропустит повторную
 // загрузку в legacy-файлах и переменные ($db и др.) не будут определены.
 if (in_array($pageName, $noBootstrapPages, true)) {
-    $router = Router::getInstance();
-    require_once __DIR__ . '/routes/' . $scope . '.php';
-    $method = $_SERVER['REQUEST_METHOD'] ?? 'GET';
-    if ($router->dispatch($pageName, $method)) {
-        exit;
-    }
-    http_response_code(404);
-    echo '404 Not Found';
-    exit;
+	$router = Router::getInstance();
+	require_once __DIR__ . '/routes/' . $scope . '.php';
+	$method = $_SERVER['REQUEST_METHOD'] ?? 'GET';
+	if ($router->dispatch($pageName, $method)) {
+		exit;
+	}
+	http_response_code(404);
+	echo '404 Not Found';
+	exit;
 }
 
 // 7b. Bootstrap the request scope: session lifecycle → framework + user context.
@@ -248,38 +248,38 @@ $routesDir = __DIR__ . '/routes/';
 
 $routeFile = $routesDir . $scope . '.php';
 if (file_exists($routeFile)) {
-    require_once $routeFile;
+	require_once $routeFile;
 }
 
 // API-маршруты (общие для admin и reseller)
 $apiRouteFile = $routesDir . 'api.php';
 if (file_exists($apiRouteFile)) {
-    require_once $apiRouteFile;
+	require_once $apiRouteFile;
 }
 
 // 9. Module web boot (M-1)
 if (in_array($scope, ['admin', 'reseller'], true) && class_exists(ModuleLoader::class)) {
-    $moduleLoader = new ModuleLoader();
-    $router->beginModuleRegistration();
-    $moduleLoader->loadAll();
-    $moduleLoader->bootAll(XC_Bootstrap::getContainer(), $router);
-    $router->endModuleRegistration();
+	$moduleLoader = new ModuleLoader();
+	$router->beginModuleRegistration();
+	$moduleLoader->loadAll();
+	$moduleLoader->bootAll(XC_Bootstrap::getContainer(), $router);
+	$router->endModuleRegistration();
 
-    $routeCollisions = $router->drainRouteCollisions();
-    if (!empty($routeCollisions)) {
-        $isDevelopment = defined('DEVELOPMENT') ? (bool) constant('DEVELOPMENT') : false;
-        if ($isDevelopment) {
-            $collisionKeys = [];
-            foreach ($routeCollisions as $routeCollision) {
-                $collisionKeys[] = $routeCollision['type'] . ':' . $routeCollision['key'];
-            }
+	$routeCollisions = $router->drainRouteCollisions();
+	if (!empty($routeCollisions)) {
+		$isDevelopment = defined('DEVELOPMENT') ? (bool) constant('DEVELOPMENT') : false;
+		if ($isDevelopment) {
+			$collisionKeys = [];
+			foreach ($routeCollisions as $routeCollision) {
+				$collisionKeys[] = $routeCollision['type'] . ':' . $routeCollision['key'];
+			}
 
-            $collisionMessage = 'Module route collisions detected (core priority preserved): ' . implode(', ', $collisionKeys);
-            error_log($collisionMessage);
+			$collisionMessage = 'Module route collisions detected (core priority preserved): ' . implode(', ', $collisionKeys);
+			error_log($collisionMessage);
 
-            trigger_error($collisionMessage, E_USER_WARNING);
-        }
-    }
+			trigger_error($collisionMessage, E_USER_WARNING);
+		}
+	}
 }
 
 // 10. Dispatch
@@ -288,21 +288,21 @@ $method = $_SERVER['REQUEST_METHOD'] ?? 'GET';
 // Module API routes take priority over legacy AjaxController.
 // dispatchApi must run BEFORE dispatch('api') because dispatch() exits inside AjaxController.
 if ($pageName === 'api' && !empty($_REQUEST['action'])) {
-    $action = $_REQUEST['action'];
-    if ($router->dispatchApi($action)) {
-        exit;
-    }
+	$action = $_REQUEST['action'];
+	if ($router->dispatchApi($action)) {
+		exit;
+	}
 }
 
 if ($router->dispatch($pageName, $method)) {
-    exit;
+	exit;
 }
 
 // 11. 404
 http_response_code(404);
 
 if (function_exists('generate404')) {
-    generate404();
+	generate404();
 } else {
-    echo '404 Not Found';
+	echo '404 Not Found';
 }
diff --git a/src/Public/progress/index.php b/src/Public/progress/index.php
index 33cc81e2..c158e02b 100644
--- a/src/Public/progress/index.php
+++ b/src/Public/progress/index.php
@@ -29,7 +29,7 @@ if (!($_SERVER['REMOTE_ADDR'] != '127.0.0.1' || empty($_GET['stream_id']) || emp
 
 $rStreamID = intval($_GET['stream_id']);
 $rData = array_filter(array_map('trim', explode("\n", $rPost)));
-$rOutput = array();
+$rOutput = [];
 
 foreach ($rData as $rRow) {
 	$rParts = explode('=', $rRow, 2);
diff --git a/src/Public/routes/admin.php b/src/Public/routes/admin.php
index de18d803..a40344c6 100644
--- a/src/Public/routes/admin.php
+++ b/src/Public/routes/admin.php
@@ -321,90 +321,90 @@ $router->any('api', [AjaxController::class, 'index']);
 // ─── Admin-ajax API actions (consumed via $router->dispatchApi() fallback) ───
 
 $router->api('tmdb_search', [TmdbController::class, 'search']);
-$router->api('tmdb',        [TmdbController::class, 'details']);
+$router->api('tmdb', [TmdbController::class, 'details']);
 
 // ─── Cache & Handlers ──────────────────────────────
 $router->api('regenerate_cache', [CacheAjaxController::class, 'regenerate']);
-$router->api('enable_cache',     [CacheAjaxController::class, 'enableCache']);
-$router->api('disable_cache',    [CacheAjaxController::class, 'disableCache']);
-$router->api('enable_handler',   [CacheAjaxController::class, 'enableHandler']);
-$router->api('disable_handler',  [CacheAjaxController::class, 'disableHandler']);
-$router->api('clear_redis',      [CacheAjaxController::class, 'clearRedis']);
+$router->api('enable_cache', [CacheAjaxController::class, 'enableCache']);
+$router->api('disable_cache', [CacheAjaxController::class, 'disableCache']);
+$router->api('enable_handler', [CacheAjaxController::class, 'enableHandler']);
+$router->api('disable_handler', [CacheAjaxController::class, 'disableHandler']);
+$router->api('clear_redis', [CacheAjaxController::class, 'clearRedis']);
 
 // ─── Servers & Ops ─────────────────────────────────
-$router->api('rtmp_ip',              [ServerAjaxController::class, 'rtmpIp']);
-$router->api('rollback_versions',    [ServerAjaxController::class, 'rollbackVersions']);
-$router->api('server',               [ServerAjaxController::class, 'server']);
-$router->api('proxy',                [ServerAjaxController::class, 'proxy']);
-$router->api('fingerprint',          [ServerAjaxController::class, 'fingerprint']);
+$router->api('rtmp_ip', [ServerAjaxController::class, 'rtmpIp']);
+$router->api('rollback_versions', [ServerAjaxController::class, 'rollbackVersions']);
+$router->api('server', [ServerAjaxController::class, 'server']);
+$router->api('proxy', [ServerAjaxController::class, 'proxy']);
+$router->api('fingerprint', [ServerAjaxController::class, 'fingerprint']);
 $router->api('restart_all_services', [ServerAjaxController::class, 'restartAllServices']);
-$router->api('restart_services',     [ServerAjaxController::class, 'restartServices']);
-$router->api('reboot_server',        [ServerAjaxController::class, 'rebootServer']);
-$router->api('update_binaries',      [ServerAjaxController::class, 'updateBinaries']);
-$router->api('server_view',          [ServerAjaxController::class, 'serverView']);
-$router->api('server_stats',         [ServerAjaxController::class, 'serverStats']);
-$router->api('rtmp_kill',            [ServerAjaxController::class, 'rtmpKill']);
-$router->api('install_status',       [ServerAjaxController::class, 'installStatus']);
-$router->api('reinstall_server',     [ServerAjaxController::class, 'reinstallServer']);
-$router->api('fpm_status',           [ServerAjaxController::class, 'fpmStatus']);
-$router->api('update_all_servers',   [ServerAjaxController::class, 'updateAllServers']);
-$router->api('update_all_binaries',  [ServerAjaxController::class, 'updateAllBinaries']);
+$router->api('restart_services', [ServerAjaxController::class, 'restartServices']);
+$router->api('reboot_server', [ServerAjaxController::class, 'rebootServer']);
+$router->api('update_binaries', [ServerAjaxController::class, 'updateBinaries']);
+$router->api('server_view', [ServerAjaxController::class, 'serverView']);
+$router->api('server_stats', [ServerAjaxController::class, 'serverStats']);
+$router->api('rtmp_kill', [ServerAjaxController::class, 'rtmpKill']);
+$router->api('install_status', [ServerAjaxController::class, 'installStatus']);
+$router->api('reinstall_server', [ServerAjaxController::class, 'reinstallServer']);
+$router->api('fpm_status', [ServerAjaxController::class, 'fpmStatus']);
+$router->api('update_all_servers', [ServerAjaxController::class, 'updateAllServers']);
+$router->api('update_all_binaries', [ServerAjaxController::class, 'updateAllBinaries']);
 
 // ─── Blocklists & Security ─────────────────────────
-$router->api('useragent',    [BlocklistAjaxController::class, 'useragent']);
-$router->api('isp',          [BlocklistAjaxController::class, 'isp']);
+$router->api('useragent', [BlocklistAjaxController::class, 'useragent']);
+$router->api('isp', [BlocklistAjaxController::class, 'isp']);
 $router->api('mysql_syslog', [BlocklistAjaxController::class, 'mysqlSyslog']);
-$router->api('ip',           [BlocklistAjaxController::class, 'ip']);
-$router->api('ip_whois',     [BlocklistAjaxController::class, 'ipWhois']);
-$router->api('asn',          [BlocklistAjaxController::class, 'asn']);
+$router->api('ip', [BlocklistAjaxController::class, 'ip']);
+$router->api('ip_whois', [BlocklistAjaxController::class, 'ipWhois']);
+$router->api('asn', [BlocklistAjaxController::class, 'asn']);
 $router->api('decrypt_text', [BlocklistAjaxController::class, 'decryptText']);
 
 // ─── Devices ───────────────────────────────────────
-$router->api('mag',        [DeviceAjaxController::class, 'mag']);
-$router->api('enigma',     [DeviceAjaxController::class, 'enigma']);
-$router->api('mag_event',  [DeviceAjaxController::class, 'magEvent']);
+$router->api('mag', [DeviceAjaxController::class, 'mag']);
+$router->api('enigma', [DeviceAjaxController::class, 'enigma']);
+$router->api('mag_event', [DeviceAjaxController::class, 'magEvent']);
 $router->api('send_event', [DeviceAjaxController::class, 'sendEvent']);
 
 // ─── EPG ───────────────────────────────────────────
-$router->api('epg',                [EpgAjaxController::class, 'epg']);
-$router->api('epglist',            [EpgAjaxController::class, 'epglist']);
-$router->api('force_epg',          [EpgAjaxController::class, 'forceEpg']);
-$router->api('epg_auto_assign',    [EpgAjaxController::class, 'epgAutoAssign']);
-$router->api('epg_categories',     [EpgAjaxController::class, 'epgCategories']);
+$router->api('epg', [EpgAjaxController::class, 'epg']);
+$router->api('epglist', [EpgAjaxController::class, 'epglist']);
+$router->api('force_epg', [EpgAjaxController::class, 'forceEpg']);
+$router->api('epg_auto_assign', [EpgAjaxController::class, 'epgAutoAssign']);
+$router->api('epg_categories', [EpgAjaxController::class, 'epgCategories']);
 $router->api('provider_import_epg', [EpgAjaxController::class, 'providerImportEpg']);
-$router->api('get_epg',            [EpgAjaxController::class, 'getEpg']);
-$router->api('get_programme',      [EpgAjaxController::class, 'getProgramme']);
+$router->api('get_epg', [EpgAjaxController::class, 'getEpg']);
+$router->api('get_programme', [EpgAjaxController::class, 'getProgramme']);
 
 // ─── Packages, Bouquets & Groups ───────────────────
-$router->api('package',            [PackageAjaxController::class, 'package']);
-$router->api('code',               [PackageAjaxController::class, 'code']);
-$router->api('hmac',               [PackageAjaxController::class, 'hmac']);
-$router->api('group',              [PackageAjaxController::class, 'group']);
-$router->api('bouquet',            [PackageAjaxController::class, 'bouquet']);
-$router->api('category',           [PackageAjaxController::class, 'category']);
-$router->api('get_package',        [PackageAjaxController::class, 'getPackage']);
-$router->api('get_package_trial',  [PackageAjaxController::class, 'getPackageTrial']);
+$router->api('package', [PackageAjaxController::class, 'package']);
+$router->api('code', [PackageAjaxController::class, 'code']);
+$router->api('hmac', [PackageAjaxController::class, 'hmac']);
+$router->api('group', [PackageAjaxController::class, 'group']);
+$router->api('bouquet', [PackageAjaxController::class, 'bouquet']);
+$router->api('category', [PackageAjaxController::class, 'category']);
+$router->api('get_package', [PackageAjaxController::class, 'getPackage']);
+$router->api('get_package_trial', [PackageAjaxController::class, 'getPackageTrial']);
 
 // ─── Active Codes ──────────────────────────────────
-$router->api('active_code_details',       [ActiveCodeDetailsController::class, 'index']);
-$router->api('generate_active_codes',     [ActiveCodeAjaxController::class, 'generate']);
+$router->api('active_code_details', [ActiveCodeDetailsController::class, 'index']);
+$router->api('generate_active_codes', [ActiveCodeAjaxController::class, 'generate']);
 $router->api('active_codes_batch_action', [ActiveCodeAjaxController::class, 'batchAction']);
-$router->api('active_codes_export_txt',   [ActiveCodeAjaxController::class, 'exportTxt']);
+$router->api('active_codes_export_txt', [ActiveCodeAjaxController::class, 'exportTxt']);
 
 // ─── Stats & Graphs ────────────────────────────────
-$router->api('graph_stats',  [StatsAjaxController::class, 'graphStats']);
-$router->api('stats',        [StatsAjaxController::class, 'stats']);
-$router->api('header_stats',  [StatsAjaxController::class, 'headerStats']);
+$router->api('graph_stats', [StatsAjaxController::class, 'graphStats']);
+$router->api('stats', [StatsAjaxController::class, 'stats']);
+$router->api('header_stats', [StatsAjaxController::class, 'headerStats']);
 $router->api('save_ui_prefs', [StatsAjaxController::class, 'saveUiPrefs']);
 
 // ─── Backups, Logs & Reports ───────────────────────
-$router->api('clear_logs',           [BackupAjaxController::class, 'clearLogs']);
-$router->api('backup',               [BackupAjaxController::class, 'backup']);
-$router->api('report',               [BackupAjaxController::class, 'report']);
-$router->api('download_panel_logs',  [BackupAjaxController::class, 'downloadPanelLogs']);
+$router->api('clear_logs', [BackupAjaxController::class, 'clearLogs']);
+$router->api('backup', [BackupAjaxController::class, 'backup']);
+$router->api('report', [BackupAjaxController::class, 'report']);
+$router->api('download_panel_logs', [BackupAjaxController::class, 'downloadPanelLogs']);
 
 // ─── Providers ─────────────────────────────────────
-$router->api('provider',         [ProviderAjaxController::class, 'provider']);
+$router->api('provider', [ProviderAjaxController::class, 'provider']);
 $router->api('provider_streams', [ProviderAjaxController::class, 'providerStreams']);
 
 // ─── Search ────────────────────────────────────────
@@ -414,38 +414,38 @@ $router->api('search', [SearchAjaxController::class, 'search']);
 $router->api('multi', [MultiAjaxController::class, 'multi']);
 
 // ─── Misc ──────────────────────────────────────────
-$router->api('process',          [MiscAjaxController::class, 'process']);
-$router->api('profile',          [MiscAjaxController::class, 'profile']);
-$router->api('reguserlist',      [MiscAjaxController::class, 'reguserlist']);
-$router->api('userlist',         [MiscAjaxController::class, 'userlist']);
-$router->api('listdir',          [MiscAjaxController::class, 'listdir']);
-$router->api('queue',            [MiscAjaxController::class, 'queue']);
+$router->api('process', [MiscAjaxController::class, 'process']);
+$router->api('profile', [MiscAjaxController::class, 'profile']);
+$router->api('reguserlist', [MiscAjaxController::class, 'reguserlist']);
+$router->api('userlist', [MiscAjaxController::class, 'userlist']);
+$router->api('listdir', [MiscAjaxController::class, 'listdir']);
+$router->api('queue', [MiscAjaxController::class, 'queue']);
 $router->api('delete_recording', [MiscAjaxController::class, 'deleteRecording']);
-$router->api('clear_failures',   [MiscAjaxController::class, 'clearFailures']);
+$router->api('clear_failures', [MiscAjaxController::class, 'clearFailures']);
 
 // ─── Users & Lines ─────────────────────────────────
-$router->api('line',           [UserAjaxController::class, 'line']);
-$router->api('line_activity',  [UserAjaxController::class, 'lineActivity']);
+$router->api('line', [UserAjaxController::class, 'line']);
+$router->api('line_activity', [UserAjaxController::class, 'lineActivity']);
 $router->api('adjust_credits', [UserAjaxController::class, 'adjustCredits']);
-$router->api('reg_user',       [UserAjaxController::class, 'regUser']);
-$router->api('ticket',         [UserAjaxController::class, 'ticket']);
+$router->api('reg_user', [UserAjaxController::class, 'regUser']);
+$router->api('ticket', [UserAjaxController::class, 'ticket']);
 
 // ─── Streams & VOD ─────────────────────────────────
-$router->api('stream',  [StreamAjaxController::class, 'stream']);
-$router->api('movie',   [StreamAjaxController::class, 'movie']);
+$router->api('stream', [StreamAjaxController::class, 'stream']);
+$router->api('movie', [StreamAjaxController::class, 'movie']);
 $router->api('episode', [StreamAjaxController::class, 'episode']);
-$router->api('series',  [StreamAjaxController::class, 'series']);
+$router->api('series', [StreamAjaxController::class, 'series']);
 
 // ─── Stream Tools, Lists & Reviews ─────────────────
 $router->api('review_selection', [StreamToolsAjaxController::class, 'reviewSelection']);
-$router->api('review_bouquet',   [StreamToolsAjaxController::class, 'reviewBouquet']);
-$router->api('serieslist',       [StreamToolsAjaxController::class, 'serieslist']);
-$router->api('streamlist',       [StreamToolsAjaxController::class, 'streamlist']);
-$router->api('adaptivelist',     [StreamToolsAjaxController::class, 'adaptivelist']);
-$router->api('titlesync',        [StreamToolsAjaxController::class, 'titlesync']);
-$router->api('probe_stream',     [StreamToolsAjaxController::class, 'probeStream']);
-$router->api('check_stream',     [StreamToolsAjaxController::class, 'checkStream']);
-$router->api('get_episode_ids',  [StreamToolsAjaxController::class, 'getEpisodeIds']);
+$router->api('review_bouquet', [StreamToolsAjaxController::class, 'reviewBouquet']);
+$router->api('serieslist', [StreamToolsAjaxController::class, 'serieslist']);
+$router->api('streamlist', [StreamToolsAjaxController::class, 'streamlist']);
+$router->api('adaptivelist', [StreamToolsAjaxController::class, 'adaptivelist']);
+$router->api('titlesync', [StreamToolsAjaxController::class, 'titlesync']);
+$router->api('probe_stream', [StreamToolsAjaxController::class, 'probeStream']);
+$router->api('check_stream', [StreamToolsAjaxController::class, 'checkStream']);
+$router->api('get_episode_ids', [StreamToolsAjaxController::class, 'getEpisodeIds']);
 
 // ─── No-bootstrap pages (login, setup, database, session) ────
 
@@ -453,4 +453,4 @@ $router->get('session', [SessionController::class, 'index']);
 $router->any('login', [LoginController::class, 'index']);
 $router->any('setup', [SetupController::class, 'index']);
 $router->any('database', [SetupController::class, 'database']);
-$router->get('index', [LoginController::class, 'index']);
\ No newline at end of file
+$router->get('index', [LoginController::class, 'index']);
diff --git a/src/Public/stream/auth.php b/src/Public/stream/auth.php
index a29320ce..f27faeba 100644
--- a/src/Public/stream/auth.php
+++ b/src/Public/stream/auth.php
@@ -106,7 +106,7 @@ if (isset($_GET['utc'])) {
 $rType = (isset($_GET['type']) ? $_GET['type'] : 'live');
 $rStreamID = intval($_GET['stream']);
 $rExtension = (isset($_GET['extension']) ? strtolower(preg_replace('/[^A-Za-z0-9 ]/', '', trim($_GET['extension']))) : null);
-if (!$rExtension && in_array($rType, array('movie', 'series', 'subtitle'))) {
+if (!$rExtension && in_array($rType, ['movie', 'series', 'subtitle'])) {
 	if (preg_match('/^(\d+)\/(?:segment_|seg_)(\d+)\.(ts|m4s)$/', $_GET['stream'], $matches)) {
 		$rStreamID = intval($matches[1]);
 		$_GET['segment'] = intval($matches[2]);
@@ -146,7 +146,7 @@ if ($rExtension) {
 	if (($rSettings['enable_cache'] && !$rSettings['show_not_on_air_video'] && file_exists(CACHE_TMP_PATH . 'servers'))) {
 		$rServers = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'servers'));
 		$rStream = (igbinary_unserialize(file_get_contents(STREAMS_TMP_PATH . 'stream_' . $rStreamID)) ?: null);
-		$rAvailableServers = array();
+		$rAvailableServers = [];
 
 		// Catch-up is served from the archive server, whether or not the channel
 		// is live anywhere right now. (This compared against 'archive', a type the
@@ -175,7 +175,7 @@ if ($rExtension) {
 						$rAvailableServers[] = $rServerID;
 					}
 				} else {
-					if ((($serverStream['on_demand'] == 1 && $serverStream['stream_status'] != 1) || ((int)$serverStream['pid'] > 0 && $serverStream['stream_status'] == 0)) && $serverStream['to_analyze'] == 0 && (int)$serverStream['delay_available_at'] <= time() && $rServerInfo['timeshift_only'] == 0 || ($rStream['info']['direct_source'] == 1 && $rStream['info']['direct_proxy'] == 1)) {
+					if ((($serverStream['on_demand'] == 1 && $serverStream['stream_status'] != 1) || ((int) $serverStream['pid'] > 0 && $serverStream['stream_status'] == 0)) && $serverStream['to_analyze'] == 0 && (int) $serverStream['delay_available_at'] <= time() && $rServerInfo['timeshift_only'] == 0 || ($rStream['info']['direct_source'] == 1 && $rStream['info']['direct_proxy'] == 1)) {
 						$rAvailableServers[] = $rServerID;
 					}
 				}
@@ -230,7 +230,7 @@ if ($rExtension) {
 		$rUserInfo = UserRepository::getStreamingUserInfo($rSettings, $rCached, $rBouquets, null, $rAccessToken, null, false, false, $rIP);
 	} else {
 		if (isset($rRequest['hmac'])) {
-			if (!in_array($rType, array('live', 'movie', 'series'))) {
+			if (!in_array($rType, ['live', 'movie', 'series'])) {
 				$rDeny = false;
 				generateError('INVALID_TYPE_TOKEN');
 			}
@@ -248,7 +248,7 @@ if ($rExtension) {
 			$rIsHMAC = AuthService::validateHMAC($rRequest['hmac'], $rExpiry, $rStreamID, $rExtension, $rIP, $rHMACIP, $rIdentifier, $rMaxConnections);
 
 			if ($rIsHMAC) {
-				$rUserInfo = array('id' => null, 'is_restreamer' => 0, 'force_server_id' => 0, 'con_isp_name' => null, 'max_connections' => $rMaxConnections);
+				$rUserInfo = ['id' => null, 'is_restreamer' => 0, 'force_server_id' => 0, 'con_isp_name' => null, 'max_connections' => $rMaxConnections];
 
 				if ($rSettings['show_isps']) {
 					$rISPLock = GeoIPService::getISP($rIP);
@@ -300,10 +300,10 @@ if ($rExtension) {
 			if (!(is_null($rUserInfo['exp_date']) || $rUserInfo['exp_date'] > time())) {
 				DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'USER_EXPIRED', $rIP);
 
-				if (in_array($rType, array('live', 'timeshift'))) {
+				if (in_array($rType, ['live', 'timeshift'])) {
 					OffAirHandler::showVideoServer('show_expired_video', 'expired_video_path', $rExtension, $rUserInfo, $rIP, $rCountryCode, $rUserInfo['con_isp_name'], SERVER_ID);
 				} else {
-					if (in_array($rType, array('movie', 'series'))) {
+					if (in_array($rType, ['movie', 'series'])) {
 						OffAirHandler::showVideoServer('show_expired_video', 'expired_video_path', 'ts', $rUserInfo, $rIP, $rCountryCode, $rUserInfo['con_isp_name'], SERVER_ID);
 					} else {
 						generateError('EXPIRED');
@@ -314,10 +314,10 @@ if ($rExtension) {
 			if ($rUserInfo['admin_enabled'] == 0) {
 				DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'USER_BAN', $rIP);
 
-				if (in_array($rType, array('live', 'timeshift'))) {
+				if (in_array($rType, ['live', 'timeshift'])) {
 					OffAirHandler::showVideoServer('show_banned_video', 'banned_video_path', $rExtension, $rUserInfo, $rIP, $rCountryCode, $rUserInfo['con_isp_name'], SERVER_ID);
 				} else {
-					if (in_array($rType, array('movie', 'series'))) {
+					if (in_array($rType, ['movie', 'series'])) {
 						OffAirHandler::showVideoServer('show_banned_video', 'banned_video_path', 'ts', $rUserInfo, $rIP, $rCountryCode, $rUserInfo['con_isp_name'], SERVER_ID);
 					} else {
 						generateError('BANNED');
@@ -328,10 +328,10 @@ if ($rExtension) {
 			if ($rUserInfo['enabled'] == 0) {
 				DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'USER_DISABLED', $rIP);
 
-				if (in_array($rType, array('live', 'timeshift'))) {
+				if (in_array($rType, ['live', 'timeshift'])) {
 					OffAirHandler::showVideoServer('show_banned_video', 'banned_video_path', $rExtension, $rUserInfo, $rIP, $rCountryCode, $rUserInfo['con_isp_name'], SERVER_ID);
 				} else {
-					if (in_array($rType, array('movie', 'series'))) {
+					if (in_array($rType, ['movie', 'series'])) {
 						OffAirHandler::showVideoServer('show_banned_video', 'banned_video_path', 'ts', $rUserInfo, $rIP, $rCountryCode, $rUserInfo['con_isp_name'], SERVER_ID);
 					} else {
 						generateError('DISABLED');
@@ -376,12 +376,12 @@ if ($rExtension) {
 				}
 
 				if ($rUserInfo['isp_violate']) {
-					DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'ISP_LOCK_FAILED', $rIP, json_encode(array('old' => $rUserInfo['isp_desc'], 'new' => $rUserInfo['con_isp_name'])));
+					DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'ISP_LOCK_FAILED', $rIP, json_encode(['old' => $rUserInfo['isp_desc'], 'new' => $rUserInfo['con_isp_name']]));
 					generateError('ISP_BLOCKED');
 				}
 
 				if ($rUserInfo['isp_is_server'] && !$rUserInfo['is_restreamer']) {
-					DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'BLOCKED_ASN', $rIP, json_encode(array('user_agent' => $rUserAgent, 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn'])), true);
+					DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'BLOCKED_ASN', $rIP, json_encode(['user_agent' => $rUserAgent, 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn']]), true);
 					generateError('ASN_BLOCKED');
 				}
 
@@ -399,19 +399,19 @@ if ($rExtension) {
 				}
 			}
 
-			if (!in_array($rType, array('thumb', 'subtitle'))) {
+			if (!in_array($rType, ['thumb', 'subtitle'])) {
 				if (!($rUserInfo['is_restreamer'] || in_array($rIP, $rAllowedIPs))) {
 					if (($rSettings['block_streaming_servers'] || $rSettings['block_proxies'])) {
 						$rCIDR = GeoIPService::matchCIDR($rUserInfo['isp_asn'], $rIP);
 
 						if ($rCIDR) {
 							if (($rSettings['block_streaming_servers'] && $rCIDR[3]) && !$rCIDR[4]) {
-								DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'HOSTING_DETECT', $rIP, json_encode(array('user_agent' => $rUserAgent, 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn'])), true);
+								DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'HOSTING_DETECT', $rIP, json_encode(['user_agent' => $rUserAgent, 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn']]), true);
 								generateError('HOSTING_DETECT');
 							}
 
 							if (($rSettings['block_proxies'] && $rCIDR[4])) {
-								DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'PROXY_DETECT', $rIP, json_encode(array('user_agent' => $rUserAgent, 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn'])), true);
+								DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'PROXY_DETECT', $rIP, json_encode(['user_agent' => $rUserAgent, 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn']]), true);
 								generateError('PROXY_DETECT');
 							}
 						}
@@ -427,7 +427,7 @@ if ($rExtension) {
 						}
 
 						if (($rSettings['restream_deny_unauthorised'] || $rSettings['detect_restream_block_user'])) {
-							DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'RESTREAM_DETECT', $rIP, json_encode(array('user_agent' => $rUserAgent, 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn'])), true);
+							DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'RESTREAM_DETECT', $rIP, json_encode(['user_agent' => $rUserAgent, 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn']]), true);
 							generateError('RESTREAM_DETECT');
 						}
 					}
@@ -509,9 +509,9 @@ if ($rExtension) {
 						$rAdaptive = json_decode((string) ($rChannelInfo['adaptive_link'] ?? ''), true);
 
 						if (!$rIsHMAC && is_array($rAdaptive) && 0 < count($rAdaptive)) {
-							$rParts = array();
+							$rParts = [];
 
-							foreach (array_merge(array($rStreamID), $rAdaptive) as $rAdaptiveID) {
+							foreach (array_merge([$rStreamID], $rAdaptive) as $rAdaptiveID) {
 								if ($rAdaptiveID != $rStreamID) {
 									$rAdaptiveInfo = StreamRedirector::redirectStream($rCached, $rSettings, $rServers, $rAdaptiveID, $rExtension, $rUserInfo, $rCountryCode, $rUserInfo['con_isp_name'], 'live');
 									if (!is_array($rAdaptiveInfo) || empty($rAdaptiveInfo['redirect_id'])) {
@@ -540,7 +540,7 @@ if ($rExtension) {
 								$rHeight = intval($rStreamInfo['codecs']['video']['height'] ?? 0);
 
 								if ((0 < $rBitrate && 0 < $rHeight && 0 < $rWidth)) {
-									$rTokenData = array('stream_id' => $rAdaptiveID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'pid' => $rPID, 'channel_info' => array('redirect_id' => $rAdaptiveInfo['redirect_id'], 'originator_id' => ($rAdaptiveInfo['originator_id'] ?? null), 'pid' => $rAdaptiveInfo['pid'], 'on_demand' => $rAdaptiveInfo['on_demand'], 'monitor_pid' => $rAdaptiveInfo['monitor_pid']), 'user_info' => array('id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_id' => $rUserInfo['pair_id'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']), 'external_device' => $rExternalDevice, 'activity_start' => $rActivityStart, 'country_code' => $rCountryCode, 'video_codec' => ($rStreamInfo['codecs']['video']['codec_name'] ?? 'h264'), 'uuid' => $rUUID, 'adaptive' => array($rChannelInfo['redirect_id'], $rStreamID));
+									$rTokenData = ['stream_id' => $rAdaptiveID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'pid' => $rPID, 'channel_info' => ['redirect_id' => $rAdaptiveInfo['redirect_id'], 'originator_id' => ($rAdaptiveInfo['originator_id'] ?? null), 'pid' => $rAdaptiveInfo['pid'], 'on_demand' => $rAdaptiveInfo['on_demand'], 'monitor_pid' => $rAdaptiveInfo['monitor_pid']], 'user_info' => ['id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_id' => $rUserInfo['pair_id'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']], 'external_device' => $rExternalDevice, 'activity_start' => $rActivityStart, 'country_code' => $rCountryCode, 'video_codec' => ($rStreamInfo['codecs']['video']['codec_name'] ?? 'h264'), 'uuid' => $rUUID, 'adaptive' => [$rChannelInfo['redirect_id'], $rStreamID]];
 									$rStreamURL = (string) $rURL . '/auth/' . Encryption::mintToken(json_encode($rTokenData), $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
 									$rParts[$rBitrate] = '#EXT-X-STREAM-INF:BANDWIDTH=' . $rBitrate . ',RESOLUTION=' . $rWidth . 'x' . $rHeight . "\n" . $rStreamURL;
 								}
@@ -562,9 +562,9 @@ if ($rExtension) {
 							exit();
 						} else {
 							if (!$rIsHMAC) {
-								$rTokenData = array('stream_id' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'pid' => $rPID, 'channel_info' => array('redirect_id' => $rChannelInfo['redirect_id'], 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'on_demand' => $rChannelInfo['on_demand'], 'llod' => ($rChannelInfo['llod'] ?? 0), 'monitor_pid' => $rChannelInfo['monitor_pid']), 'user_info' => array('id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_id' => $rUserInfo['pair_id'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']), 'external_device' => $rExternalDevice, 'activity_start' => $rActivityStart, 'country_code' => $rCountryCode, 'video_codec' => $rVideoCodec, 'uuid' => $rUUID);
+								$rTokenData = ['stream_id' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'pid' => $rPID, 'channel_info' => ['redirect_id' => $rChannelInfo['redirect_id'], 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'on_demand' => $rChannelInfo['on_demand'], 'llod' => ($rChannelInfo['llod'] ?? 0), 'monitor_pid' => $rChannelInfo['monitor_pid']], 'user_info' => ['id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_id' => $rUserInfo['pair_id'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']], 'external_device' => $rExternalDevice, 'activity_start' => $rActivityStart, 'country_code' => $rCountryCode, 'video_codec' => $rVideoCodec, 'uuid' => $rUUID];
 							} else {
-								$rTokenData = array('stream_id' => $rStreamID, 'hmac_hash' => $rRequest['hmac'], 'hmac_id' => $rIsHMAC, 'identifier' => $rIdentifier, 'extension' => $rExtension, 'channel_info' => array('redirect_id' => $rChannelInfo['redirect_id'], 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'on_demand' => $rChannelInfo['on_demand'], 'llod' => ($rChannelInfo['llod'] ?? 0), 'monitor_pid' => $rChannelInfo['monitor_pid']), 'user_info' => $rUserInfo, 'pid' => $rPID, 'external_device' => $rExternalDevice, 'activity_start' => $rActivityStart, 'country_code' => $rCountryCode, 'video_codec' => $rVideoCodec, 'uuid' => $rUUID);
+								$rTokenData = ['stream_id' => $rStreamID, 'hmac_hash' => $rRequest['hmac'], 'hmac_id' => $rIsHMAC, 'identifier' => $rIdentifier, 'extension' => $rExtension, 'channel_info' => ['redirect_id' => $rChannelInfo['redirect_id'], 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'on_demand' => $rChannelInfo['on_demand'], 'llod' => ($rChannelInfo['llod'] ?? 0), 'monitor_pid' => $rChannelInfo['monitor_pid']], 'user_info' => $rUserInfo, 'pid' => $rPID, 'external_device' => $rExternalDevice, 'activity_start' => $rActivityStart, 'country_code' => $rCountryCode, 'video_codec' => $rVideoCodec, 'uuid' => $rUUID];
 							}
 
 							$rToken = Encryption::mintToken(json_encode($rTokenData), $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
@@ -585,9 +585,9 @@ if ($rExtension) {
 						}
 
 						if (!$rIsHMAC) {
-							$rTokenData = array('stream_id' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'channel_info' => array('stream_id' => $rChannelInfo['stream_id'], 'redirect_id' => ($rChannelInfo['redirect_id'] ?: null), 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'on_demand' => $rChannelInfo['on_demand'], 'llod' => ($rChannelInfo['llod'] ?? 0), 'monitor_pid' => $rChannelInfo['monitor_pid'], 'proxy' => $rChannelInfo['direct_proxy']), 'user_info' => array('id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_id' => $rUserInfo['pair_id'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']), 'pid' => $rPID, 'prebuffer' => $rPrebuffer, 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'external_device' => $rExternalDevice, 'video_codec' => $rVideoCodec, 'uuid' => $rUUID);
+							$rTokenData = ['stream_id' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'channel_info' => ['stream_id' => $rChannelInfo['stream_id'], 'redirect_id' => ($rChannelInfo['redirect_id'] ?: null), 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'on_demand' => $rChannelInfo['on_demand'], 'llod' => ($rChannelInfo['llod'] ?? 0), 'monitor_pid' => $rChannelInfo['monitor_pid'], 'proxy' => $rChannelInfo['direct_proxy']], 'user_info' => ['id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_id' => $rUserInfo['pair_id'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']], 'pid' => $rPID, 'prebuffer' => $rPrebuffer, 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'external_device' => $rExternalDevice, 'video_codec' => $rVideoCodec, 'uuid' => $rUUID];
 						} else {
-							$rTokenData = array('stream_id' => $rStreamID, 'hmac_hash' => $rRequest['hmac'], 'hmac_id' => $rIsHMAC, 'identifier' => $rIdentifier, 'extension' => $rExtension, 'channel_info' => array('stream_id' => $rChannelInfo['stream_id'], 'redirect_id' => ($rChannelInfo['redirect_id'] ?: null), 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'on_demand' => $rChannelInfo['on_demand'], 'llod' => ($rChannelInfo['llod'] ?? 0), 'monitor_pid' => $rChannelInfo['monitor_pid'], 'proxy' => $rChannelInfo['direct_proxy']), 'user_info' => $rUserInfo, 'pid' => $rPID, 'prebuffer' => $rPrebuffer, 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'external_device' => $rExternalDevice, 'video_codec' => $rVideoCodec, 'uuid' => $rUUID);
+							$rTokenData = ['stream_id' => $rStreamID, 'hmac_hash' => $rRequest['hmac'], 'hmac_id' => $rIsHMAC, 'identifier' => $rIdentifier, 'extension' => $rExtension, 'channel_info' => ['stream_id' => $rChannelInfo['stream_id'], 'redirect_id' => ($rChannelInfo['redirect_id'] ?: null), 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'on_demand' => $rChannelInfo['on_demand'], 'llod' => ($rChannelInfo['llod'] ?? 0), 'monitor_pid' => $rChannelInfo['monitor_pid'], 'proxy' => $rChannelInfo['direct_proxy']], 'user_info' => $rUserInfo, 'pid' => $rPID, 'prebuffer' => $rPrebuffer, 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'external_device' => $rExternalDevice, 'video_codec' => $rVideoCodec, 'uuid' => $rUUID];
 						}
 
 						$rToken = Encryption::mintToken(json_encode($rTokenData), $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
@@ -632,9 +632,9 @@ if ($rExtension) {
 				}
 
 				if (!$rIsHMAC) {
-					$rTokenData = array('stream_id' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'type' => $rType, 'pid' => $rPID, 'channel_info' => array('stream_id' => $rChannelInfo['stream_id'], 'bitrate' => $rChannelInfo['bitrate'], 'target_container' => $rChannelInfo['target_container'], 'redirect_id' => $rChannelInfo['redirect_id'], 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'proxy' => ($rChannelInfo['direct_proxy'] ? json_decode($rChannelInfo['stream_source'], true)[0] : null)), 'user_info' => array('id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_id' => $rUserInfo['pair_id'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']), 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'is_mag' => $rIsMag, 'uuid' => $rUUID, 'http_range' => (isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : null));
+					$rTokenData = ['stream_id' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'type' => $rType, 'pid' => $rPID, 'channel_info' => ['stream_id' => $rChannelInfo['stream_id'], 'bitrate' => $rChannelInfo['bitrate'], 'target_container' => $rChannelInfo['target_container'], 'redirect_id' => $rChannelInfo['redirect_id'], 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'proxy' => ($rChannelInfo['direct_proxy'] ? json_decode($rChannelInfo['stream_source'], true)[0] : null)], 'user_info' => ['id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_id' => $rUserInfo['pair_id'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']], 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'is_mag' => $rIsMag, 'uuid' => $rUUID, 'http_range' => (isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : null)];
 				} else {
-					$rTokenData = array('stream_id' => $rStreamID, 'hmac_hash' => $rRequest['hmac'], 'hmac_id' => $rIsHMAC, 'identifier' => $rIdentifier, 'extension' => $rExtension, 'type' => $rType, 'pid' => $rPID, 'channel_info' => array('stream_id' => $rChannelInfo['stream_id'], 'bitrate' => $rChannelInfo['bitrate'], 'target_container' => $rChannelInfo['target_container'], 'redirect_id' => $rChannelInfo['redirect_id'], 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'proxy_source' => ($rChannelInfo['direct_proxy'] ? json_decode($rChannelInfo['stream_source'], true)[0] : null)), 'user_info' => $rUserInfo, 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'is_mag' => $rIsMag, 'uuid' => $rUUID, 'http_range' => (isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : null));
+					$rTokenData = ['stream_id' => $rStreamID, 'hmac_hash' => $rRequest['hmac'], 'hmac_id' => $rIsHMAC, 'identifier' => $rIdentifier, 'extension' => $rExtension, 'type' => $rType, 'pid' => $rPID, 'channel_info' => ['stream_id' => $rChannelInfo['stream_id'], 'bitrate' => $rChannelInfo['bitrate'], 'target_container' => $rChannelInfo['target_container'], 'redirect_id' => $rChannelInfo['redirect_id'], 'originator_id' => ($rChannelInfo['originator_id'] ?? null), 'pid' => $rChannelInfo['pid'], 'proxy_source' => ($rChannelInfo['direct_proxy'] ? json_decode($rChannelInfo['stream_source'], true)[0] : null)], 'user_info' => $rUserInfo, 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'is_mag' => $rIsMag, 'uuid' => $rUUID, 'http_range' => (isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : null)];
 				}
 
 				if (isset($_GET['segment'])) {
@@ -693,7 +693,7 @@ if ($rExtension) {
 						generateError('HLS_DISABLED');
 					}
 
-					$rTokenData = array('stream' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'pid' => $rPID, 'start' => $rStartDate, 'duration' => $rDuration, 'redirect_id' => $rRedirectID, 'originator_id' => $rOriginatorID, 'user_info' => array('id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_line_info' => $rUserInfo['pair_line_info'], 'pair_id' => $rUserInfo['pair_id'], 'active_cons' => $rUserInfo['active_cons'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']), 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'uuid' => $rUUID, 'http_range' => (isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : null));
+					$rTokenData = ['stream' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'pid' => $rPID, 'start' => $rStartDate, 'duration' => $rDuration, 'redirect_id' => $rRedirectID, 'originator_id' => $rOriginatorID, 'user_info' => ['id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_line_info' => $rUserInfo['pair_line_info'], 'pair_id' => $rUserInfo['pair_id'], 'active_cons' => $rUserInfo['active_cons'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']], 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'uuid' => $rUUID, 'http_range' => (isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : null)];
 					$rToken = Encryption::mintToken(json_encode($rTokenData), $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
 
 					if ($rSettings['allow_cdn_access']) {
@@ -712,7 +712,7 @@ if ($rExtension) {
 					}
 
 					$rActivityStart = time();
-					$rTokenData = array('stream' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'pid' => $rPID, 'start' => $rStartDate, 'duration' => $rDuration, 'redirect_id' => $rRedirectID, 'originator_id' => $rOriginatorID, 'user_info' => array('id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_line_info' => $rUserInfo['pair_line_info'], 'pair_id' => $rUserInfo['pair_id'], 'active_cons' => $rUserInfo['active_cons'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']), 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'uuid' => $rUUID, 'http_range' => (isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : null));
+					$rTokenData = ['stream' => $rStreamID, 'username' => $rUserInfo['username'], 'password' => $rUserInfo['password'], 'extension' => $rExtension, 'pid' => $rPID, 'start' => $rStartDate, 'duration' => $rDuration, 'redirect_id' => $rRedirectID, 'originator_id' => $rOriginatorID, 'user_info' => ['id' => $rUserInfo['id'], 'max_connections' => $rUserInfo['max_connections'], 'pair_line_info' => $rUserInfo['pair_line_info'], 'pair_id' => $rUserInfo['pair_id'], 'active_cons' => $rUserInfo['active_cons'], 'con_isp_name' => $rUserInfo['con_isp_name'], 'is_restreamer' => $rUserInfo['is_restreamer']], 'country_code' => $rCountryCode, 'activity_start' => $rActivityStart, 'uuid' => $rUUID, 'http_range' => (isset($_SERVER['HTTP_RANGE']) ? $_SERVER['HTTP_RANGE'] : null)];
 					$rToken = Encryption::mintToken(json_encode($rTokenData), $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
 
 					if ($rSettings['allow_cdn_access']) {
@@ -735,7 +735,7 @@ if ($rExtension) {
 				$db->query('SELECT * FROM `streams` t1 INNER JOIN `streams_types` t2 ON t2.type_id = t1.type AND t2.live = 1 LEFT JOIN `profiles` t4 ON t1.transcode_profile_id = t4.profile_id WHERE t1.direct_source = 0 AND t1.id = ?', $rStreamID);
 
 				if (0 < $db->num_rows()) {
-					$rStreamInfo = array('info' => $db->get_row());
+					$rStreamInfo = ['info' => $db->get_row()];
 				}
 			}
 
@@ -747,7 +747,7 @@ if ($rExtension) {
 				generateError('THUMBNAILS_NOT_ENABLED');
 			}
 
-			$rTokenData = array('stream' => $rStreamID, 'expires' => time() + 5);
+			$rTokenData = ['stream' => $rStreamID, 'expires' => time() + 5];
 			$rOriginatorID = null;
 
 			if (($rServers[$rStreamInfo['info']['vframes_server_id']]['enable_proxy'] && (!$rUserInfo['is_restreamer'] || !$rSettings['restreamer_bypass_proxy']))) {
@@ -785,7 +785,7 @@ if ($rExtension) {
 				}
 
 				$rURL = StreamRedirector::getStreamingURL($rSettings, $rServers, $rChannelInfo['redirect_id'], ($rChannelInfo['originator_id'] ?? null), $rForceHTTP, $rUserID);
-				$rTokenData = array('stream_id' => $rStreamID, 'sub_id' => intval($rRequest['sid'] ?? 0), 'webvtt' => intval($rRequest['webvtt'] ?? 0), 'expires' => time() + 5);
+				$rTokenData = ['stream_id' => $rStreamID, 'sub_id' => intval($rRequest['sid'] ?? 0), 'webvtt' => intval($rRequest['webvtt'] ?? 0), 'expires' => time() + 5];
 				$rToken = Encryption::mintToken(json_encode($rTokenData), $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
 				header('Location: ' . $rURL . '/subauth/' . $rToken);
 
diff --git a/src/Public/stream/key.php b/src/Public/stream/key.php
index 02513a7b..c93ca754 100644
--- a/src/Public/stream/key.php
+++ b/src/Public/stream/key.php
@@ -16,7 +16,9 @@ use XcVm\Core\Util\Encryption;
 header('Access-Control-Allow-Origin: *');
 $rSettings = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'settings'));
 $rServers = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'servers'));
-if (!defined('SERVER_ID')) define('SERVER_ID', intval(ConfigReader::get('server_id')));
+if (!defined('SERVER_ID')) {
+	define('SERVER_ID', intval(ConfigReader::get('server_id')));
+}
 
 if (empty($rSettings['live_streaming_pass'])) {
 	generate404();
@@ -37,6 +39,7 @@ if (isset($_GET['token'])) {
 }
 
 generate404();
+
 function getuserip() {
 	return $_SERVER['REMOTE_ADDR'];
 }
diff --git a/src/Public/stream/live.php b/src/Public/stream/live.php
index 01157196..40b1f22b 100644
--- a/src/Public/stream/live.php
+++ b/src/Public/stream/live.php
@@ -33,479 +33,481 @@ unset($rSettings["server_hardware"]);
 StreamAuthMiddleware::sendStreamHeaders($rSettings, $rServers);
 
 $rCreateExpiration = ($rSettings["create_expiration"] ?: 5);
-$rProxyID = NULL;
+$rProxyID = null;
 $rServerID = SERVER_ID;
 $rIP = $_SERVER['REMOTE_ADDR'];
 $rUserAgent = (empty($_SERVER["HTTP_USER_AGENT"]) ? '' : htmlentities(trim($_SERVER["HTTP_USER_AGENT"])));
-$rConSpeedFile = NULL;
+$rConSpeedFile = null;
 $rDivergence = 0;
 $rCloseCon = false;
 $rPID = getmypid();
 $rStartTime = time();
-$rVideoCodec = NULL;
+$rVideoCodec = null;
 
 if (isset($rRequest["token"])) {
-    $rTokenData = StreamAuthMiddleware::decryptToken($rRequest["token"], $rSettings, $rServers, $rIP);
+	$rTokenData = StreamAuthMiddleware::decryptToken($rRequest["token"], $rSettings, $rServers, $rIP);
 
-    if (!isset($rTokenData["video_path"])) {
-        if (isset($rTokenData["hmac_id"])) {
-            $rIsHMAC = $rTokenData["hmac_id"];
-            $rIdentifier = $rTokenData["identifier"];
-            $rUsername = null;
-            $rPassword = null;
-        } else {
-            $rIsHMAC = null;
-            $rIdentifier = null;
-            $rUsername = $rTokenData["username"];
-            $rPassword = $rTokenData["password"];
-        }
+	if (!isset($rTokenData["video_path"])) {
+		if (isset($rTokenData["hmac_id"])) {
+			$rIsHMAC = $rTokenData["hmac_id"];
+			$rIdentifier = $rTokenData["identifier"];
+			$rUsername = null;
+			$rPassword = null;
+		} else {
+			$rIsHMAC = null;
+			$rIdentifier = null;
+			$rUsername = $rTokenData["username"];
+			$rPassword = $rTokenData["password"];
+		}
 
-        $rStreamID = intval($rTokenData["stream_id"]);
-        OffAirHandler::forStream($rStreamID);
-        $rExtension = $rTokenData["extension"];
-        $rChannelInfo = $rTokenData["channel_info"];
-        $rUserInfo = $rTokenData["user_info"];
-        $rActivityStart = $rTokenData["activity_start"];
-        $rExternalDevice = $rTokenData["external_device"];
-        $rVideoCodec = $rTokenData["video_codec"];
-        $rCountryCode = $rTokenData["country_code"];
-        $rPlaylist = "";
-    } else {
-        header("Content-Type: video/mp2t");
-        readfile($rTokenData["video_path"]);
+		$rStreamID = intval($rTokenData["stream_id"]);
+		OffAirHandler::forStream($rStreamID);
+		$rExtension = $rTokenData["extension"];
+		$rChannelInfo = $rTokenData["channel_info"];
+		$rUserInfo = $rTokenData["user_info"];
+		$rActivityStart = $rTokenData["activity_start"];
+		$rExternalDevice = $rTokenData["external_device"];
+		$rVideoCodec = $rTokenData["video_codec"];
+		$rCountryCode = $rTokenData["country_code"];
+		$rPlaylist = "";
+	} else {
+		header("Content-Type: video/mp2t");
+		readfile($rTokenData["video_path"]);
 
-        exit();
-    }
+		exit();
+	}
 } else {
-    generateError("NO_TOKEN_SPECIFIED");
+	generateError("NO_TOKEN_SPECIFIED");
 }
 
-if (!in_array($rExtension, array('ts', 'm3u8'))) {
-    $rExtension = $rSettings["api_container"];
+if (!in_array($rExtension, ['ts', 'm3u8'])) {
+	$rExtension = $rSettings["api_container"];
 }
 
 if (($rChannelInfo["proxy"] ?? false) && $rExtension != "ts") {
-    generateError("USER_DISALLOW_EXT");
+	generateError("USER_DISALLOW_EXT");
 }
 
 if ($rSettings["use_buffer"] == 0) {
-    header("X-Accel-Buffering: no");
+	header("X-Accel-Buffering: no");
 }
 
 if ($rChannelInfo) {
-    if ($rChannelInfo["originator_id"]) {
-        $rServerID = $rChannelInfo["originator_id"];
-        $rProxyID = $rChannelInfo["redirect_id"];
-    } else {
-        $rServerID = ($rChannelInfo["redirect_id"] ?: SERVER_ID);
-        $rProxyID = NULL;
-    }
+	if ($rChannelInfo["originator_id"]) {
+		$rServerID = $rChannelInfo["originator_id"];
+		$rProxyID = $rChannelInfo["redirect_id"];
+	} else {
+		$rServerID = ($rChannelInfo["redirect_id"] ?: SERVER_ID);
+		$rProxyID = null;
+	}
 
-    // Fanout (ADR 0002/0003, P2): route proxy-mode live TS through the xc_fanout
-    // daemon when it is reachable — there is NO settings flag; the switch is the
-    // daemon itself. If its control socket is present AND registering the source
-    // succeeds, this stream is committed to the daemon path: we skip the whole
-    // legacy startProxy/startMonitor block below (the daemon owns the producer —
-    // starts the puller on the first viewer, stops it after the last leaves) and
-    // no streams_servers pid is written, so the streams cron leaves it alone; the
-    // delivery arm then hands the byte path to nginx via X-Accel-Redirect.
-    //
-    // Deciding on *registration success* (not just socket presence) makes the
-    // fallback correct: a stopped/unreachable daemon (or a stale socket after a
-    // hard kill, or a stream with no source) leaves $rFanout false, so the FULL
-    // legacy path runs — startProxy producer included. Stopping the daemon is
-    // therefore the rollback: every stream falls back automatically, no flag.
-    $rFanout = false;
-    if (!empty($rChannelInfo["proxy"]) && file_exists(FANOUT_CTL_SOCK)) {
-        DatabaseFactory::connect();
-        $db->query('SELECT `stream_source` FROM `streams` WHERE `id` = ?', $rStreamID);
-        $rStreamRow = ($db->num_rows() > 0 ? $db->get_row() : array());
-        $db->query('SELECT t1.*, t2.* FROM `streams_options` t1, `streams_arguments` t2 WHERE t1.stream_id = ? AND t1.argument_id = t2.id', $rStreamID);
-        $rStreamArguments = $db->get_rows(true, 'argument_key');
-        $rSource = FanoutClient::buildSource($rStreamRow, $rStreamArguments);
-        $rFanout = !empty($rSource["urls"]) && FanoutClient::register($rStreamID, $rSource);
+	// Fanout (ADR 0002/0003, P2): route proxy-mode live TS through the xc_fanout
+	// daemon when it is reachable — there is NO settings flag; the switch is the
+	// daemon itself. If its control socket is present AND registering the source
+	// succeeds, this stream is committed to the daemon path: we skip the whole
+	// legacy startProxy/startMonitor block below (the daemon owns the producer —
+	// starts the puller on the first viewer, stops it after the last leaves) and
+	// no streams_servers pid is written, so the streams cron leaves it alone; the
+	// delivery arm then hands the byte path to nginx via X-Accel-Redirect.
+	//
+	// Deciding on *registration success* (not just socket presence) makes the
+	// fallback correct: a stopped/unreachable daemon (or a stale socket after a
+	// hard kill, or a stream with no source) leaves $rFanout false, so the FULL
+	// legacy path runs — startProxy producer included. Stopping the daemon is
+	// therefore the rollback: every stream falls back automatically, no flag.
+	$rFanout = false;
+	if (!empty($rChannelInfo["proxy"]) && file_exists(FANOUT_CTL_SOCK)) {
+		DatabaseFactory::connect();
+		$db->query('SELECT `stream_source` FROM `streams` WHERE `id` = ?', $rStreamID);
+		$rStreamRow = ($db->num_rows() > 0 ? $db->get_row() : []);
+		$db->query('SELECT t1.*, t2.* FROM `streams_options` t1, `streams_arguments` t2 WHERE t1.stream_id = ? AND t1.argument_id = t2.id', $rStreamID);
+		$rStreamArguments = $db->get_rows(true, 'argument_key');
+		$rSource = FanoutClient::buildSource($rStreamRow, $rStreamArguments);
+		$rFanout = !empty($rSource["urls"]) && FanoutClient::register($rStreamID, $rSource);
 
-        // Off-air parity (ADR 0003, Phase C): prewarm the daemon puller and wait
-        // for the source to actually produce. A running-but-dead source shows the
-        // not-on-air page here, exactly like the legacy startProxy path (whose
-        // viewer would otherwise hang on an empty stream). Bounded by
-        // on_demand_wait_time; a warm stream returns immediately.
-        if ($rFanout && !FanoutClient::probe($rStreamID, max(1, intval($rSettings["on_demand_wait_time"] ?: 5)) * 1000)) {
-            OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
-        }
-    }
+		// Off-air parity (ADR 0003, Phase C): prewarm the daemon puller and wait
+		// for the source to actually produce. A running-but-dead source shows the
+		// not-on-air page here, exactly like the legacy startProxy path (whose
+		// viewer would otherwise hang on an empty stream). Bounded by
+		// on_demand_wait_time; a warm stream returns immediately.
+		if ($rFanout && !FanoutClient::probe($rStreamID, max(1, intval($rSettings["on_demand_wait_time"] ?: 5)) * 1000)) {
+			OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+		}
+	}
 
-    if (file_exists(STREAMS_PATH . $rStreamID . "_.pid")) {
-        $rChannelInfo["pid"] = intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.pid"));
-    }
+	if (file_exists(STREAMS_PATH . $rStreamID . "_.pid")) {
+		$rChannelInfo["pid"] = intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.pid"));
+	}
 
-    if (file_exists(STREAMS_PATH . $rStreamID . "_.monitor")) {
-        $rChannelInfo["monitor_pid"] = intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.monitor"));
-    }
+	if (file_exists(STREAMS_PATH . $rStreamID . "_.monitor")) {
+		$rChannelInfo["monitor_pid"] = intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.monitor"));
+	}
 
-    if ($rSettings["on_demand_instant_off"] && $rChannelInfo["on_demand"] == 1) {
-        ConnectionTracker::addToQueue($rStreamID, $rPID);
-    }
+	if ($rSettings["on_demand_instant_off"] && $rChannelInfo["on_demand"] == 1) {
+		ConnectionTracker::addToQueue($rStreamID, $rPID);
+	}
 
-    if (!$rFanout && !ProcessManager::isStreamAlive($rChannelInfo["pid"], $rStreamID)) {
-        $rChannelInfo["pid"] = NULL;
+	if (!$rFanout && !ProcessManager::isStreamAlive($rChannelInfo["pid"], $rStreamID)) {
+		$rChannelInfo["pid"] = null;
 
-        if ($rChannelInfo["on_demand"] == 1) {
-            // One viewer starts a stopped stream; others arriving meanwhile wait
-            // here, then read the monitor it started (see lockOnDemandStart).
-            $rStartLock = StreamProcess::lockOnDemandStart($rStreamID);
-            if ($rStartLock) {
-                AsyncFileOperations::clearFileCache();
-                $rChannelInfo["monitor_pid"] = (intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.monitor", false)) ?: $rChannelInfo["monitor_pid"]);
-            }
+		if ($rChannelInfo["on_demand"] == 1) {
+			// One viewer starts a stopped stream; others arriving meanwhile wait
+			// here, then read the monitor it started (see lockOnDemandStart).
+			$rStartLock = StreamProcess::lockOnDemandStart($rStreamID);
+			if ($rStartLock) {
+				AsyncFileOperations::clearFileCache();
+				$rChannelInfo["monitor_pid"] = (intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.monitor", false)) ?: $rChannelInfo["monitor_pid"]);
+			}
 
-            // Watched = a live PHP monitor, or the fanout supervisor (whose pid
-            // the PHP check rightly rejects). Either way, do not start another.
-            if (!StreamProcess::isWatched($rStreamID, $rChannelInfo["monitor_pid"])) {
-                if (($rActivityStart + $rCreateExpiration) - intval($rServers[SERVER_ID]["time_offset"]) < time()) {
-                    generateError("TOKEN_EXPIRED");
-                }
+			// Watched = a live PHP monitor, or the fanout supervisor (whose pid
+			// the PHP check rightly rejects). Either way, do not start another.
+			if (!StreamProcess::isWatched($rStreamID, $rChannelInfo["monitor_pid"])) {
+				if (($rActivityStart + $rCreateExpiration) - intval($rServers[SERVER_ID]["time_offset"]) < time()) {
+					generateError("TOKEN_EXPIRED");
+				}
 
-                // Both pids are dead (checked above), so their files are leftovers
-                // of the last run — e.g. a monitor that gave up under
-                // on_demand_failure_exit. Clear them, or the waits below would read
-                // them back as the new monitor/producer before it wrote its own.
-                @unlink(STREAMS_PATH . $rStreamID . "_.monitor");
-                @unlink(STREAMS_PATH . $rStreamID . "_.pid");
-                AsyncFileOperations::clearFileCache();
+				// Both pids are dead (checked above), so their files are leftovers
+				// of the last run — e.g. a monitor that gave up under
+				// on_demand_failure_exit. Clear them, or the waits below would read
+				// them back as the new monitor/producer before it wrote its own.
+				@unlink(STREAMS_PATH . $rStreamID . "_.monitor");
+				@unlink(STREAMS_PATH . $rStreamID . "_.pid");
+				AsyncFileOperations::clearFileCache();
 
-                DatabaseFactory::connect(); // the hand-over reads the stream's config
-                if (StreamProcess::startMonitor($rStreamID) === StreamProcess::MONITOR_FANOUT) {
-                    // The daemon is the monitor: there is no _.monitor file to wait
-                    // for, and waiting its full three seconds would be pure latency
-                    // on the viewer's connect. It writes _.pid as it launches.
-                    $rChannelInfo["monitor_pid"] = -1;
-                } elseif (AsyncFileOperations::awaitFileExists(STREAMS_PATH . $rStreamID . "_.monitor", 300, 10)) {
-                    $rChannelInfo["monitor_pid"] = (intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.monitor")) ?: NULL);
-                }
-            } elseif (!$rChannelInfo["monitor_pid"]) {
-                $rChannelInfo["monitor_pid"] = -1; // supervised; its pid is the daemon's
-            }
-            // The monitor is up (or known to be failing): the viewers waiting
-            // behind this one can see it now.
-            StreamProcess::unlockOnDemandStart($rStartLock);
+				DatabaseFactory::connect(); // the hand-over reads the stream's config
+				if (StreamProcess::startMonitor($rStreamID) === StreamProcess::MONITOR_FANOUT) {
+					// The daemon is the monitor: there is no _.monitor file to wait
+					// for, and waiting its full three seconds would be pure latency
+					// on the viewer's connect. It writes _.pid as it launches.
+					$rChannelInfo["monitor_pid"] = -1;
+				} elseif (AsyncFileOperations::awaitFileExists(STREAMS_PATH . $rStreamID . "_.monitor", 300, 10)) {
+					$rChannelInfo["monitor_pid"] = (intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.monitor")) ?: null);
+				}
+			} elseif (!$rChannelInfo["monitor_pid"]) {
+				$rChannelInfo["monitor_pid"] = -1; // supervised; its pid is the daemon's
+			}
+			// The monitor is up (or known to be failing): the viewers waiting
+			// behind this one can see it now.
+			StreamProcess::unlockOnDemandStart($rStartLock);
 
-            if (!$rChannelInfo["monitor_pid"]) {
-                OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
-            }
+			if (!$rChannelInfo["monitor_pid"]) {
+				OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+			}
 
-            // The producer's pid appears once the monitor has probed the source and
-            // launched it, which can take most of the on-demand wait on its own (a
-            // 10 s analyze window for a non-LLOD start) — so the wait is the
-            // configured on_demand_wait_time, not a fixed ~6 s.
-            $rPidWaitMs = max(1, intval($rSettings["on_demand_wait_time"])) * 1000;
-            AsyncFileOperations::awaitFileExists(STREAMS_PATH . intval($rStreamID) . "_.pid", intdiv($rPidWaitMs, 20), 20);
-            $rChannelInfo["pid"] = (intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.pid", false)) ?: NULL);
+			// The producer's pid appears once the monitor has probed the source and
+			// launched it, which can take most of the on-demand wait on its own (a
+			// 10 s analyze window for a non-LLOD start) — so the wait is the
+			// configured on_demand_wait_time, not a fixed ~6 s.
+			$rPidWaitMs = max(1, intval($rSettings["on_demand_wait_time"])) * 1000;
+			AsyncFileOperations::awaitFileExists(STREAMS_PATH . intval($rStreamID) . "_.pid", intdiv($rPidWaitMs, 20), 20);
+			$rChannelInfo["pid"] = (intval(AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.pid", false)) ?: null);
 
-            if (!$rChannelInfo["pid"]) {
-                OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
-            }
-        } else {
-            // Non-on-demand: proxy streams are daemon-only now (ADR 0003, Phase E
-            // — the legacy ProxyCommand producer was removed). If we reach here
-            // $rFanout is false, i.e. the daemon is unreachable, so show
-            // not-on-air (the keepalive brings the daemon back in ~2s). A dead
-            // non-proxy stream is likewise not-on-air.
-            OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
-        }
-    }
+			if (!$rChannelInfo["pid"]) {
+				OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+			}
+		} else {
+			// Non-on-demand: proxy streams are daemon-only now (ADR 0003, Phase E
+			// — the legacy ProxyCommand producer was removed). If we reach here
+			// $rFanout is false, i.e. the daemon is unreachable, so show
+			// not-on-air (the keepalive brings the daemon back in ~2s). A dead
+			// non-proxy stream is likewise not-on-air.
+			OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+		}
+	}
 
-    if (!isset($rChannelInfo["proxy"]) || !$rChannelInfo["proxy"]) {
-        $rPlaylist = STREAMS_PATH . $rStreamID . "_.m3u8";
+	if (!isset($rChannelInfo["proxy"]) || !$rChannelInfo["proxy"]) {
+		$rPlaylist = STREAMS_PATH . $rStreamID . "_.m3u8";
 
-        if ($rExtension == "ts") {
-            if (!file_exists($rPlaylist)) {
-                $rFirstTS = STREAMS_PATH . $rStreamID . "_0.ts";
-                $rFirstAlt = STREAMS_PATH . $rStreamID . "_0.m4s";
-                $maxRetries = intval($rSettings["on_demand_wait_time"]) * 10;
+		if ($rExtension == "ts") {
+			if (!file_exists($rPlaylist)) {
+				$rFirstTS = STREAMS_PATH . $rStreamID . "_0.ts";
+				$rFirstAlt = STREAMS_PATH . $rStreamID . "_0.m4s";
+				$maxRetries = intval($rSettings["on_demand_wait_time"]) * 10;
 
-                // Use async file monitoring instead of busy-wait loop
-                $foundFile = AsyncFileOperations::awaitAnyFileExists([$rFirstTS, $rFirstAlt], $maxRetries, 100);
+				// Use async file monitoring instead of busy-wait loop
+				$foundFile = AsyncFileOperations::awaitAnyFileExists([$rFirstTS, $rFirstAlt], $maxRetries, 100);
 
-                if (!$foundFile) {
-                    generateError("WAIT_TIME_EXPIRED");
-                } else {
-                    // Verify stream is still running
-                    if (!(StreamProcess::isWatched($rStreamID, $rChannelInfo["monitor_pid"]) && ProcessManager::isStreamAlive($rChannelInfo["pid"], $rStreamID))) {
-                        OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
-                    }
-                }
-            }
-        } else {
-            $maxRetries = intval($rSettings["on_demand_wait_time"]) * 10;
-            $foundFile = AsyncFileOperations::awaitAnyFileExists([$rPlaylist], $maxRetries, 100);
+				if (!$foundFile) {
+					generateError("WAIT_TIME_EXPIRED");
+				} else {
+					// Verify stream is still running
+					if (!(StreamProcess::isWatched($rStreamID, $rChannelInfo["monitor_pid"]) && ProcessManager::isStreamAlive($rChannelInfo["pid"], $rStreamID))) {
+						OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+					}
+				}
+			}
+		} else {
+			$maxRetries = intval($rSettings["on_demand_wait_time"]) * 10;
+			$foundFile = AsyncFileOperations::awaitAnyFileExists([$rPlaylist], $maxRetries, 100);
 
-            if (!$foundFile) {
-                generateError("WAIT_TIME_EXPIRED");
-            }
-        }
+			if (!$foundFile) {
+				generateError("WAIT_TIME_EXPIRED");
+			}
+		}
 
-        if (!$rChannelInfo["pid"]) {
-            $pidContent = AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.pid");
-            $rChannelInfo["pid"] = $pidContent ? (intval($pidContent) ?: NULL) : NULL;
-        }
-    }
+		if (!$rChannelInfo["pid"]) {
+			$pidContent = AsyncFileOperations::readFile(STREAMS_PATH . $rStreamID . "_.pid");
+			$rChannelInfo["pid"] = $pidContent ? (intval($pidContent) ?: null) : null;
+		}
+	}
 
-    $rExecutionTime = time() - $rStartTime;
-    $rExpiresAt = ($rActivityStart + $rCreateExpiration + $rExecutionTime) - intval($rServers[SERVER_ID]["time_offset"]);
+	$rExecutionTime = time() - $rStartTime;
+	$rExpiresAt = ($rActivityStart + $rCreateExpiration + $rExecutionTime) - intval($rServers[SERVER_ID]["time_offset"]);
 
-    if ($rSettings["redis_handler"]) {
-        RedisManager::ensureConnected();
-    } else {
-        DatabaseFactory::connect();
-    }
+	if ($rSettings["redis_handler"]) {
+		RedisManager::ensureConnected();
+	} else {
+		DatabaseFactory::connect();
+	}
 
-    if ($rSettings["disallow_2nd_ip_con"] && !$rUserInfo["is_restreamer"] && ($rUserInfo["max_connections"] <= $rSettings["disallow_2nd_ip_max"] && 0 < $rUserInfo["max_connections"] || $rSettings["disallow_2nd_ip_max"] == 0)) {
-        $rAcceptIP = NULL;
+	if ($rSettings["disallow_2nd_ip_con"] && !$rUserInfo["is_restreamer"] && ($rUserInfo["max_connections"] <= $rSettings["disallow_2nd_ip_max"] && 0 < $rUserInfo["max_connections"] || $rSettings["disallow_2nd_ip_max"] == 0)) {
+		$rAcceptIP = null;
 
-        if ($rSettings["redis_handler"]) {
-            $rConnections = ConnectionTracker::getLineConnections($rUserInfo["id"], true);
+		if ($rSettings["redis_handler"]) {
+			$rConnections = ConnectionTracker::getLineConnections($rUserInfo["id"], true);
 
-            if (count($rConnections) > 0) {
-                $rDate = array_column($rConnections, "date_start");
-                array_multisort($rDate, SORT_ASC, $rConnections);
-                $rAcceptIP = $rConnections[0]["user_ip"];
-            }
-        } else {
-            // The FIRST connection's IP is the accepted one — as the Redis path
-            // above picks it (oldest date_start); this used to take the newest.
-            $db->query('SELECT `user_ip` FROM `lines_live` WHERE `user_id` = ? AND `hls_end` = 0 ORDER BY `activity_id` ASC LIMIT 1;', $rUserInfo["id"]);
+			if (count($rConnections) > 0) {
+				$rDate = array_column($rConnections, "date_start");
+				array_multisort($rDate, SORT_ASC, $rConnections);
+				$rAcceptIP = $rConnections[0]["user_ip"];
+			}
+		} else {
+			// The FIRST connection's IP is the accepted one — as the Redis path
+			// above picks it (oldest date_start); this used to take the newest.
+			$db->query('SELECT `user_ip` FROM `lines_live` WHERE `user_id` = ? AND `hls_end` = 0 ORDER BY `activity_id` ASC LIMIT 1;', $rUserInfo["id"]);
 
-            if ($db->num_rows() == 1) {
-                $rAcceptIP = $db->get_row()["user_ip"];
-            }
-        }
+			if ($db->num_rows() == 1) {
+				$rAcceptIP = $db->get_row()["user_ip"];
+			}
+		}
 
-        $rIPMatch = NetworkUtils::ipMatches($rSettings["ip_subnet_match"], $rAcceptIP, $rIP);
+		$rIPMatch = NetworkUtils::ipMatches($rSettings["ip_subnet_match"], $rAcceptIP, $rIP);
 
-        if ($rAcceptIP && !$rIPMatch) {
-            DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "USER_ALREADY_CONNECTED", $rIP);
-            OffAirHandler::showVideoServer("show_connected_video", "connected_video_path", $rExtension, $rUserInfo, $rIP, $rCountryCode, $rUserInfo["con_isp_name"], $rServerID, $rProxyID);
-        }
-    }
+		if ($rAcceptIP && !$rIPMatch) {
+			DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "USER_ALREADY_CONNECTED", $rIP);
+			OffAirHandler::showVideoServer("show_connected_video", "connected_video_path", $rExtension, $rUserInfo, $rIP, $rCountryCode, $rUserInfo["con_isp_name"], $rServerID, $rProxyID);
+		}
+	}
 
-    // Deterministic HLS connection id (see ConnectionTracker::hlsConnectionKey):
-    // repeated playlist requests / channel re-selects by the same player reuse
-    // ONE tracked connection instead of piling up a fresh random-uuid row each
-    // time — which the reaper clears only slowly, ballooning the live count on
-    // channel switch. Overriding the token uuid here (before $rConnCtx) keeps the
-    // connection id, segment auth and the heartbeat file consistent. TS/VOD keep
-    // their per-request random uuid.
-    if ($rExtension === "m3u8") {
-        $rTokenData["uuid"] = ConnectionTracker::hlsConnectionKey($rIsHMAC, $rIdentifier, $rUserInfo["id"], $rStreamID, $rIP, $rUserAgent);
-    }
+	// Deterministic HLS connection id (see ConnectionTracker::hlsConnectionKey):
+	// repeated playlist requests / channel re-selects by the same player reuse
+	// ONE tracked connection instead of piling up a fresh random-uuid row each
+	// time — which the reaper clears only slowly, ballooning the live count on
+	// channel switch. Overriding the token uuid here (before $rConnCtx) keeps the
+	// connection id, segment auth and the heartbeat file consistent. TS/VOD keep
+	// their per-request random uuid.
+	if ($rExtension === "m3u8") {
+		$rTokenData["uuid"] = ConnectionTracker::hlsConnectionKey($rIsHMAC, $rIdentifier, $rUserInfo["id"], $rStreamID, $rIP, $rUserAgent);
+	}
 
-    // Shared connection context for ConnectionTracker::createLive(); the HLS
-    // and TS switch arms differ only in the container and pid they pass.
-    $rConnCtx = array(
-        "is_hmac" => $rIsHMAC,
-        "identifier" => $rIdentifier,
-        "user_id" => $rUserInfo["id"],
-        "stream_id" => $rStreamID,
-        "server_id" => $rServerID,
-        "proxy_id" => $rProxyID,
-        "user_agent" => $rUserAgent,
-        "user_ip" => $rIP,
-        "date_start" => $rActivityStart,
-        "geoip_country_code" => $rCountryCode,
-        "isp" => $rUserInfo["con_isp_name"],
-        "external_device" => $rExternalDevice,
-        "on_demand" => $rChannelInfo["on_demand"],
-        "uuid" => $rTokenData["uuid"],
-        "adaptive" => isset($rTokenData["adaptive"]),
-        "time_offset" => intval($rServers[SERVER_ID]["time_offset"]),
-    );
+	// Shared connection context for ConnectionTracker::createLive(); the HLS
+	// and TS switch arms differ only in the container and pid they pass.
+	$rConnCtx = [
+		"is_hmac" => $rIsHMAC,
+		"identifier" => $rIdentifier,
+		"user_id" => $rUserInfo["id"],
+		"stream_id" => $rStreamID,
+		"server_id" => $rServerID,
+		"proxy_id" => $rProxyID,
+		"user_agent" => $rUserAgent,
+		"user_ip" => $rIP,
+		"date_start" => $rActivityStart,
+		"geoip_country_code" => $rCountryCode,
+		"isp" => $rUserInfo["con_isp_name"],
+		"external_device" => $rExternalDevice,
+		"on_demand" => $rChannelInfo["on_demand"],
+		"uuid" => $rTokenData["uuid"],
+		"adaptive" => isset($rTokenData["adaptive"]),
+		"time_offset" => intval($rServers[SERVER_ID]["time_offset"]),
+	];
 
-    switch ($rExtension) {
-        case "m3u8":
-            $rConnection = ConnectionTracker::lookupLive($rSettings, $rConnCtx, "hls", false, true, true);
-            if (!isset($rConnection)) {
-                if (time() > $rExpiresAt) {
-                    generateError("TOKEN_EXPIRED");
-                }
+	switch ($rExtension) {
+		case "m3u8":
+			$rConnection = ConnectionTracker::lookupLive($rSettings, $rConnCtx, "hls", false, true, true);
+			if (!isset($rConnection)) {
+				if (time() > $rExpiresAt) {
+					generateError("TOKEN_EXPIRED");
+				}
 
-                $rResult = ConnectionTracker::createLive($rSettings, $rConnCtx, "hls", NULL);
-            } else {
-                $rIPMatch = NetworkUtils::ipMatches($rSettings["ip_subnet_match"], $rConnection["user_ip"], $rIP);
+				$rResult = ConnectionTracker::createLive($rSettings, $rConnCtx, "hls", null);
+			} else {
+				$rIPMatch = NetworkUtils::ipMatches($rSettings["ip_subnet_match"], $rConnection["user_ip"], $rIP);
 
-                if (!$rIPMatch && $rSettings["restrict_same_ip"]) {
-                    DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "IP_MISMATCH", $rIP);
-                    generateError("IP_MISMATCH");
-                }
+				if (!$rIPMatch && $rSettings["restrict_same_ip"]) {
+					DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "IP_MISMATCH", $rIP);
+					generateError("IP_MISMATCH");
+				}
 
-                $rResult = ConnectionTracker::updateLive($rSettings, $rConnection, array("server_id" => $rServerID, "proxy_id" => $rProxyID, "hls_last_read" => time() - intval($rServers[SERVER_ID]["time_offset"])));
-            }
+				$rResult = ConnectionTracker::updateLive($rSettings, $rConnection, ["server_id" => $rServerID, "proxy_id" => $rProxyID, "hls_last_read" => time() - intval($rServers[SERVER_ID]["time_offset"])]);
+			}
 
-            if (!$rResult) {
-                DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "LINE_CREATE_FAIL", $rIP, $rSettings["redis_handler"] ? "redis unavailable: connection tracking write failed" : $db->error());
-                generateError("LINE_CREATE_FAIL");
-            }
+			if (!$rResult) {
+				DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "LINE_CREATE_FAIL", $rIP, $rSettings["redis_handler"] ? "redis unavailable: connection tracking write failed" : $db->error());
+				generateError("LINE_CREATE_FAIL");
+			}
 
-            StreamAuth::validateConnections($rUserInfo, $rIsHMAC, $rIdentifier, $rIP, $rUserAgent, $rTokenData["uuid"]);
+			StreamAuth::validateConnections($rUserInfo, $rIsHMAC, $rIdentifier, $rIP, $rUserAgent, $rTokenData["uuid"]);
 
-            if ($rSettings["redis_handler"]) {
-                RedisManager::closeInstance();
-            } else {
-                DatabaseFactory::close();
-            }
+			if ($rSettings["redis_handler"]) {
+				RedisManager::closeInstance();
+			} else {
+				DatabaseFactory::close();
+			}
 
-            // Client HLS is daemon-only (ADR 0003, Phase E). When the stream is
-            // fed, serve the daemon's in-RAM segmenter playlist (plain or AES-128,
-            // both produced by the daemon), tokenized into auth'd /hls/<token> URLs
-            // that segment.php proxies from the daemon. A daemon that's down / not
-            // fed ⇒ not-on-air, same as the TS arm. The on-disk HLS stays only for
-            // timeshift/thumbnail/.analyse/MonitorCommand, never served to clients.
-            $rHLS = false;
-            if (file_exists(FANOUT_CTL_SOCK) && FanoutClient::isStreamFed($rStreamID)) {
-                $rDaemonPl = FanoutClient::hlsPlaylist($rStreamID);
-                if ($rDaemonPl !== NULL) {
-                    $rHLS = HLSGenerator::tokenizeDaemonPlaylist($rDaemonPl, $rSettings, (isset($rUsername) ? $rUsername : NULL), (isset($rPassword) ? $rPassword : NULL), $rStreamID, $rTokenData["uuid"], $rIP, $rIsHMAC, $rIdentifier, $rVideoCodec, intval($rChannelInfo["on_demand"]), $rServerID, $rProxyID);
-                }
-            }
+			// Client HLS is daemon-only (ADR 0003, Phase E). When the stream is
+			// fed, serve the daemon's in-RAM segmenter playlist (plain or AES-128,
+			// both produced by the daemon), tokenized into auth'd /hls/<token> URLs
+			// that segment.php proxies from the daemon. A daemon that's down / not
+			// fed ⇒ not-on-air, same as the TS arm. The on-disk HLS stays only for
+			// timeshift/thumbnail/.analyse/MonitorCommand, never served to clients.
+			$rHLS = false;
+			if (file_exists(FANOUT_CTL_SOCK) && FanoutClient::isStreamFed($rStreamID)) {
+				$rDaemonPl = FanoutClient::hlsPlaylist($rStreamID);
+				if ($rDaemonPl !== null) {
+					$rHLS = HLSGenerator::tokenizeDaemonPlaylist($rDaemonPl, $rSettings, (isset($rUsername) ? $rUsername : null), (isset($rPassword) ? $rPassword : null), $rStreamID, $rTokenData["uuid"], $rIP, $rIsHMAC, $rIdentifier, $rVideoCodec, intval($rChannelInfo["on_demand"]), $rServerID, $rProxyID);
+				}
+			}
 
-            if ($rHLS) {
-                touch(CONS_TMP_PATH . $rTokenData["uuid"]);
-                while (ob_get_level()) {
-                    ob_end_clean();
-                }
-                header("Content-Type: application/x-mpegurl");
-                header("Content-Length: " . strlen($rHLS));
-                header("Cache-Control: no-store, no-cache, must-revalidate");
-                echo $rHLS;
-            } else {
-                OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
-            }
+			if ($rHLS) {
+				touch(CONS_TMP_PATH . $rTokenData["uuid"]);
+				while (ob_get_level()) {
+					ob_end_clean();
+				}
+				header("Content-Type: application/x-mpegurl");
+				header("Content-Length: " . strlen($rHLS));
+				header("Cache-Control: no-store, no-cache, must-revalidate");
+				echo $rHLS;
+			} else {
+				OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+			}
 
-            exit();
+			exit();
 
-        default:
-            // Decide TS delivery once: daemon (proxy already registered+probed,
-            // or non-proxy fed) vs the legacy per-viewer feed. Daemon-served TS
-            // connections are recorded with pid=0 — their auth worker returns
-            // immediately under X-Accel, so the reaper's isRunning(pid) check
-            // can't track them; the fanout_sync daemon reconciles pid=0 rows
-            // against the daemon's live-connection set (see UsersCronJob).
-            $rTSDaemon = false;
-            if ($rChannelInfo["proxy"]) {
-                $rTSDaemon = $rFanout;
-            } elseif (file_exists(FANOUT_CTL_SOCK) && FanoutClient::isStreamFed($rStreamID)) {
-                $rTSDaemon = true;
-            }
-            $rConnPID = $rTSDaemon ? 0 : $rPID;
+		default:
+			// Decide TS delivery once: daemon (proxy already registered+probed,
+			// or non-proxy fed) vs the legacy per-viewer feed. Daemon-served TS
+			// connections are recorded with pid=0 — their auth worker returns
+			// immediately under X-Accel, so the reaper's isRunning(pid) check
+			// can't track them; the fanout_sync daemon reconciles pid=0 rows
+			// against the daemon's live-connection set (see UsersCronJob).
+			$rTSDaemon = false;
+			if ($rChannelInfo["proxy"]) {
+				$rTSDaemon = $rFanout;
+			} elseif (file_exists(FANOUT_CTL_SOCK) && FanoutClient::isStreamFed($rStreamID)) {
+				$rTSDaemon = true;
+			}
+			$rConnPID = $rTSDaemon ? 0 : $rPID;
 
-            $rConnection = ConnectionTracker::lookupLive($rSettings, $rConnCtx, $rExtension, true, false, false);
-            if (!isset($rConnection)) {
-                if (time() > $rExpiresAt) {
-                    generateError("TOKEN_EXPIRED");
-                }
-                $rResult = ConnectionTracker::createLive($rSettings, $rConnCtx, $rExtension, $rConnPID);
-            } else {
-                $rIPMatch = NetworkUtils::ipMatches($rSettings["ip_subnet_match"], $rConnection["user_ip"], $rIP);
+			$rConnection = ConnectionTracker::lookupLive($rSettings, $rConnCtx, $rExtension, true, false, false);
+			if (!isset($rConnection)) {
+				if (time() > $rExpiresAt) {
+					generateError("TOKEN_EXPIRED");
+				}
+				$rResult = ConnectionTracker::createLive($rSettings, $rConnCtx, $rExtension, $rConnPID);
+			} else {
+				$rIPMatch = NetworkUtils::ipMatches($rSettings["ip_subnet_match"], $rConnection["user_ip"], $rIP);
 
-                if (!$rIPMatch && $rSettings["restrict_same_ip"]) {
-                    DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "IP_MISMATCH", $rIP);
-                    generateError("IP_MISMATCH");
-                }
+				if (!$rIPMatch && $rSettings["restrict_same_ip"]) {
+					DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "IP_MISMATCH", $rIP);
+					generateError("IP_MISMATCH");
+				}
 
-                if (ProcessManager::isRunning($rConnection["pid"], "php-fpm") && $rPID != $rConnection["pid"] && is_numeric($rConnection["pid"]) && 0 < $rConnection["pid"]) {
-                    posix_kill(intval($rConnection["pid"]), 9);
-                }
+				if (ProcessManager::isRunning($rConnection["pid"], "php-fpm") && $rPID != $rConnection["pid"] && is_numeric($rConnection["pid"]) && 0 < $rConnection["pid"]) {
+					posix_kill(intval($rConnection["pid"]), 9);
+				}
 
-                $rResult = ConnectionTracker::updateLive($rSettings, $rConnection, array("pid" => $rConnPID, "hls_last_read" => time() - intval($rServers[SERVER_ID]["time_offset"])));
-            }
+				$rResult = ConnectionTracker::updateLive($rSettings, $rConnection, ["pid" => $rConnPID, "hls_last_read" => time() - intval($rServers[SERVER_ID]["time_offset"])]);
+			}
 
-            if (!$rResult) {
-                DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "LINE_CREATE_FAIL", $rIP, $rSettings["redis_handler"] ? "redis unavailable: connection tracking write failed" : $db->error());
-                generateError("LINE_CREATE_FAIL");
-            }
+			if (!$rResult) {
+				DatabaseLogger::clientLog($rStreamID, $rUserInfo["id"], "LINE_CREATE_FAIL", $rIP, $rSettings["redis_handler"] ? "redis unavailable: connection tracking write failed" : $db->error());
+				generateError("LINE_CREATE_FAIL");
+			}
 
-            StreamAuth::validateConnections($rUserInfo, $rIsHMAC, $rIdentifier, $rIP, $rUserAgent, $rTokenData["uuid"]);
+			StreamAuth::validateConnections($rUserInfo, $rIsHMAC, $rIdentifier, $rIP, $rUserAgent, $rTokenData["uuid"]);
 
-            if ($rSettings["redis_handler"]) {
-                RedisManager::closeInstance();
-            } else {
-                DatabaseFactory::close();
-            }
+			if ($rSettings["redis_handler"]) {
+				RedisManager::closeInstance();
+			} else {
+				DatabaseFactory::close();
+			}
 
-            $rCloseCon = true;
+			$rCloseCon = true;
 
-            if ($rSettings["monitor_connection_status"]) {
-                ob_implicit_flush(true);
-                while (ob_get_level()) ob_end_clean();
-            }
+			if ($rSettings["monitor_connection_status"]) {
+				ob_implicit_flush(true);
+				while (ob_get_level()) {
+					ob_end_clean();
+				}
+			}
 
-            touch(CONS_TMP_PATH . $rTokenData["uuid"]);
+			touch(CONS_TMP_PATH . $rTokenData["uuid"]);
 
-            if ($rChannelInfo["proxy"]) {
-                // ────────────────────────────────────────────────────────────────
-                // Proxy streams are daemon-only (ADR 0003, Phase E — the legacy
-                // ProxyCommand producer + socket relay were removed). Auth is done
-                // and the source was already registered + probed with the daemon
-                // above (that set $rFanout; an unreachable/dead daemon already went
-                // not-on-air). Hand the byte path to nginx → daemon via
-                // X-Accel-Redirect; the FPM worker is freed the instant we return.
-                // ────────────────────────────────────────────────────────────────
-                if (!$rFanout) {
-                    OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
-                }
-                // client_prebuffer / restreamer_prebuffer (seconds) → the daemon
-                // front-loads that much keyframe-aligned history on join, filling
-                // the player's cache. Without it the daemon sends only the current
-                // GOP (~1s, "no cache"). Same hand-off contract as the non-proxy
-                // $rTSDaemon branch below; the daemon clamps to its retention ceiling.
-                $rDaemonPrebuffer = $rUserInfo["is_restreamer"]
-                    ? (!empty($rTokenData["prebuffer"])
-                        ? intval($rSegmentSettings["seg_time"] ?? 0)
-                        : intval($rSettings["restreamer_prebuffer"] ?? 0))
-                    : intval($rSettings["client_prebuffer"] ?? 0);
-                header("Content-Type: video/mp2t");
-                header("X-Accel-Buffering: no");
-                header("X-Accel-Redirect: /xc_fanout/" . rawurlencode((string) $rStreamID) . "?c=" . rawurlencode($rTokenData["uuid"]) . "&prebuffer=" . $rDaemonPrebuffer . "&vc=" . rawurlencode((string) $rVideoCodec));
-                exit;
-            }
+			if ($rChannelInfo["proxy"]) {
+				// ────────────────────────────────────────────────────────────────
+				// Proxy streams are daemon-only (ADR 0003, Phase E — the legacy
+				// ProxyCommand producer + socket relay were removed). Auth is done
+				// and the source was already registered + probed with the daemon
+				// above (that set $rFanout; an unreachable/dead daemon already went
+				// not-on-air). Hand the byte path to nginx → daemon via
+				// X-Accel-Redirect; the FPM worker is freed the instant we return.
+				// ────────────────────────────────────────────────────────────────
+				if (!$rFanout) {
+					OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+				}
+				// client_prebuffer / restreamer_prebuffer (seconds) → the daemon
+				// front-loads that much keyframe-aligned history on join, filling
+				// the player's cache. Without it the daemon sends only the current
+				// GOP (~1s, "no cache"). Same hand-off contract as the non-proxy
+				// $rTSDaemon branch below; the daemon clamps to its retention ceiling.
+				$rDaemonPrebuffer = $rUserInfo["is_restreamer"]
+					? (!empty($rTokenData["prebuffer"])
+						? intval($rSegmentSettings["seg_time"] ?? 0)
+						: intval($rSettings["restreamer_prebuffer"] ?? 0))
+					: intval($rSettings["client_prebuffer"] ?? 0);
+				header("Content-Type: video/mp2t");
+				header("X-Accel-Buffering: no");
+				header("X-Accel-Redirect: /xc_fanout/" . rawurlencode((string) $rStreamID) . "?c=" . rawurlencode($rTokenData["uuid"]) . "&prebuffer=" . $rDaemonPrebuffer . "&vc=" . rawurlencode((string) $rVideoCodec));
+				exit;
+			}
 
-            // ────────────────────────────────────────────────────────────────
-            // Non-proxy fanout hand-off (ADR 0003, A3). The stream's ffmpeg tees
-            // its mpegts into the xc_fanout daemon (A2) from the same process that
-            // writes the on-disk HLS, so once we reach delivery (playlist ready
-            // above) the daemon has data. If it's reachable and serving this
-            // stream, hand the byte path to nginx→daemon via X-Accel-Redirect —
-            // like proxy mode. Non-proxy TS is daemon-only (ADR 0003, Phase E — the
-            // legacy per-viewer .ts chase-read was removed); daemon down / not fed
-            // ⇒ not-on-air, same as the proxy arm.
-            // ────────────────────────────────────────────────────────────────
-            if ($rTSDaemon) {
-                // client_prebuffer / restreamer_prebuffer (seconds) → the daemon
-                // front-loads that much keyframe-aligned history on join, filling
-                // the player's cache. The X-Accel hand-off must pass them through or
-                // they would be lost
-                // (the daemon otherwise sends only the current GOP). The daemon
-                // clamps the value to its own retention ceiling.
-                $rDaemonPrebuffer = $rUserInfo["is_restreamer"]
-                    ? (!empty($rTokenData["prebuffer"])
-                        ? intval($rSegmentSettings["seg_time"] ?? 0)
-                        : intval($rSettings["restreamer_prebuffer"] ?? 0))
-                    : intval($rSettings["client_prebuffer"] ?? 0);
-                header("Content-Type: video/mp2t");
-                header("X-Accel-Buffering: no");
-                header("X-Accel-Redirect: /xc_fanout/" . rawurlencode((string) $rStreamID) . "?c=" . rawurlencode($rTokenData["uuid"]) . "&prebuffer=" . $rDaemonPrebuffer . "&vc=" . rawurlencode((string) $rVideoCodec));
-                exit;
-            }
+			// ────────────────────────────────────────────────────────────────
+			// Non-proxy fanout hand-off (ADR 0003, A3). The stream's ffmpeg tees
+			// its mpegts into the xc_fanout daemon (A2) from the same process that
+			// writes the on-disk HLS, so once we reach delivery (playlist ready
+			// above) the daemon has data. If it's reachable and serving this
+			// stream, hand the byte path to nginx→daemon via X-Accel-Redirect —
+			// like proxy mode. Non-proxy TS is daemon-only (ADR 0003, Phase E — the
+			// legacy per-viewer .ts chase-read was removed); daemon down / not fed
+			// ⇒ not-on-air, same as the proxy arm.
+			// ────────────────────────────────────────────────────────────────
+			if ($rTSDaemon) {
+				// client_prebuffer / restreamer_prebuffer (seconds) → the daemon
+				// front-loads that much keyframe-aligned history on join, filling
+				// the player's cache. The X-Accel hand-off must pass them through or
+				// they would be lost
+				// (the daemon otherwise sends only the current GOP). The daemon
+				// clamps the value to its own retention ceiling.
+				$rDaemonPrebuffer = $rUserInfo["is_restreamer"]
+					? (!empty($rTokenData["prebuffer"])
+						? intval($rSegmentSettings["seg_time"] ?? 0)
+						: intval($rSettings["restreamer_prebuffer"] ?? 0))
+					: intval($rSettings["client_prebuffer"] ?? 0);
+				header("Content-Type: video/mp2t");
+				header("X-Accel-Buffering: no");
+				header("X-Accel-Redirect: /xc_fanout/" . rawurlencode((string) $rStreamID) . "?c=" . rawurlencode($rTokenData["uuid"]) . "&prebuffer=" . $rDaemonPrebuffer . "&vc=" . rawurlencode((string) $rVideoCodec));
+				exit;
+			}
 
-            // ────────────────────────────────────────────────────────────────
-            // Non-proxy TS is daemon-only now (ADR 0003, Phase E — the legacy
-            // per-viewer .ts chase-read was removed). Reaching here means the
-            // daemon isn't serving this stream ($rTSDaemon false), so show
-            // not-on-air, exactly like the proxy arm above. Stopping the daemon
-            // is the rollback (git revert this commit).
-            // ────────────────────────────────────────────────────────────────
-            OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
-    }
+			// ────────────────────────────────────────────────────────────────
+			// Non-proxy TS is daemon-only now (ADR 0003, Phase E — the legacy
+			// per-viewer .ts chase-read was removed). Reaching here means the
+			// daemon isn't serving this stream ($rTSDaemon false), so show
+			// not-on-air, exactly like the proxy arm above. Stopping the daemon
+			// is the rollback (git revert this commit).
+			// ────────────────────────────────────────────────────────────────
+			OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+	}
 } else {
-    OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
+	OffAirHandler::showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID, $rProxyID);
 }
diff --git a/src/Public/stream/probe.php b/src/Public/stream/probe.php
index 9bbd3443..9fc3ff44 100644
--- a/src/Public/stream/probe.php
+++ b/src/Public/stream/probe.php
@@ -160,7 +160,7 @@ if (isset($rRequest['data'])) {
 			}
 
 			$rInfo = json_decode($rInfo, true);
-			echo json_encode(array('codecs' => $rInfo['codecs'] ?? null, 'container' => $rInfo['container'] ?? null, 'bitrate' => $rInfo['bitrate'] ?? null));
+			echo json_encode(['codecs' => $rInfo['codecs'] ?? null, 'container' => $rInfo['container'] ?? null, 'bitrate' => $rInfo['bitrate'] ?? null]);
 
 			exit();
 		}
@@ -168,6 +168,7 @@ if (isset($rRequest['data'])) {
 }
 
 generate404();
+
 function shutdown() {
 	global $db;
 	if (is_object($db)) {
diff --git a/src/Public/stream/rtmp.php b/src/Public/stream/rtmp.php
index 03c104ea..7ce3899c 100644
--- a/src/Public/stream/rtmp.php
+++ b/src/Public/stream/rtmp.php
@@ -126,7 +126,7 @@ if (!($_GET['addr'] == '127.0.0.1' && $_GET['call'] == 'publish')) {
 
 																		if ($rSettings['redis_handler']) {
 																			RedisManager::ensureConnected();
-																			$rConnectionData = array('user_id' => $rUserInfo['id'], 'stream_id' => $rStreamID, 'server_id' => SERVER_ID, 'proxy_id' => 0, 'user_agent' => '', 'user_ip' => $rIP, 'container' => $rExtension, 'pid' => $rRequest['clientid'], 'date_start' => time() - intval($rServers[SERVER_ID]['time_offset']), 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => $rExternalDevice, 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => $rChannelInfo['on_demand'], 'identity' => $rUserInfo['id'], 'uuid' => md5($rRequest['clientid']));
+																			$rConnectionData = ['user_id' => $rUserInfo['id'], 'stream_id' => $rStreamID, 'server_id' => SERVER_ID, 'proxy_id' => 0, 'user_agent' => '', 'user_ip' => $rIP, 'container' => $rExtension, 'pid' => $rRequest['clientid'], 'date_start' => time() - intval($rServers[SERVER_ID]['time_offset']), 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => $rExternalDevice, 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => $rChannelInfo['on_demand'], 'identity' => $rUserInfo['id'], 'uuid' => md5($rRequest['clientid'])];
 																			$rResult = ConnectionTracker::createConnection($rConnectionData);
 																		} else {
 																			$rResult = $db->query('INSERT INTO `lines_live` (`user_id`,`stream_id`,`server_id`,`proxy_id`,`user_agent`,`user_ip`,`container`,`pid`,`uuid`,`date_start`,`geoip_country_code`,`isp`,`external_device`,`hls_last_read`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)', $rUserInfo['id'], $rStreamID, SERVER_ID, 0, '', $rIP, $rExtension, $rRequest['clientid'], md5($rRequest['clientid']), time(), $rCountryCode, $rUserInfo['con_isp_name'], $rExternalDevice, time() - intval($rServers[SERVER_ID]['time_offset']));
@@ -161,13 +161,13 @@ if (!($_GET['addr'] == '127.0.0.1' && $_GET['call'] == 'publish')) {
 																exit();
 															}
 														} else {
-															DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'BLOCKED_ASN', $rIP, json_encode(array('user_agent' => '', 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn'])), true);
+															DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'BLOCKED_ASN', $rIP, json_encode(['user_agent' => '', 'isp' => $rUserInfo['con_isp_name'], 'asn' => $rUserInfo['isp_asn']]), true);
 															http_response_code(404);
 
 															exit();
 														}
 													} else {
-														DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'ISP_LOCK_FAILED', $rIP, json_encode(array('old' => $rUserInfo['isp_desc'], 'new' => $rUserInfo['con_isp_name'])));
+														DatabaseLogger::clientLog($rStreamID, $rUserInfo['id'], 'ISP_LOCK_FAILED', $rIP, json_encode(['old' => $rUserInfo['isp_desc'], 'new' => $rUserInfo['con_isp_name']]));
 														http_response_code(404);
 
 														exit();
diff --git a/src/Public/stream/segment.php b/src/Public/stream/segment.php
index 84e0fb59..3fce8947 100644
--- a/src/Public/stream/segment.php
+++ b/src/Public/stream/segment.php
@@ -19,7 +19,9 @@ set_time_limit(0);
 
 $rSettings = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'settings'));
 $rServers = igbinary_unserialize(file_get_contents(CACHE_TMP_PATH . 'servers'));
-if (!defined('SERVER_ID')) define('SERVER_ID', intval(ConfigReader::get('server_id')));
+if (!defined('SERVER_ID')) {
+	define('SERVER_ID', intval(ConfigReader::get('server_id')));
+}
 
 if (empty($rSettings['live_streaming_pass'])) {
 	generate404();
@@ -169,6 +171,7 @@ if (isset($_GET['token'])) {
 }
 
 generate404();
+
 function getuserip() {
 	return $_SERVER['REMOTE_ADDR'];
 }
diff --git a/src/Public/stream/subtitle.php b/src/Public/stream/subtitle.php
index d7e80fcf..bc94f134 100644
--- a/src/Public/stream/subtitle.php
+++ b/src/Public/stream/subtitle.php
@@ -76,6 +76,7 @@ if ($rStreamID && file_exists(VOD_PATH . $rStreamID . '_' . $rSubID . '.srt')) {
 }
 
 generateError('THUMBNAIL_DOESNT_EXIST');
+
 function convertVTT($rSubtitle) {
 	$rLines = explode("\n", $rSubtitle);
 	$rLength = count($rLines);
diff --git a/src/Public/stream/timeshift.php b/src/Public/stream/timeshift.php
index 38a78ee8..ea79fb8c 100644
--- a/src/Public/stream/timeshift.php
+++ b/src/Public/stream/timeshift.php
@@ -97,7 +97,7 @@ if (file_exists($rFile) && is_readable($rFile)) {
 	generateError('ARCHIVE_DOESNT_EXIST');
 }
 
-$rQueue = array();
+$rQueue = [];
 
 // Batch check files using async operations
 for ($i = 0; $i < $rDuration; $i++) {
@@ -106,7 +106,7 @@ for ($i = 0; $i < $rDuration; $i++) {
 	if (@stat($rFile) !== false) {
 		$fileSize = AsyncFileOperations::getFileSize($rFile);
 		if ($fileSize !== false) {
-			$rQueue[] = array('filename' => $rFile, 'filesize' => $fileSize);
+			$rQueue[] = ['filename' => $rFile, 'filesize' => $fileSize];
 		}
 	}
 }
@@ -158,7 +158,7 @@ if ($rUserInfo) {
 				}
 
 				if ($rSettings['redis_handler']) {
-					$rConnectionData = array('user_id' => $rUserInfo['id'], 'stream_id' => $rStreamID, 'server_id' => $rServerID, 'proxy_id' => $rProxyID, 'user_agent' => $rUserAgent, 'user_ip' => $rIP, 'container' => 'hls', 'pid' => null, 'date_start' => $rActivityStart, 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => '', 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => 0, 'identity' => $rUserInfo['id'], 'uuid' => $rTokenData['uuid']);
+					$rConnectionData = ['user_id' => $rUserInfo['id'], 'stream_id' => $rStreamID, 'server_id' => $rServerID, 'proxy_id' => $rProxyID, 'user_agent' => $rUserAgent, 'user_ip' => $rIP, 'container' => 'hls', 'pid' => null, 'date_start' => $rActivityStart, 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => '', 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => 0, 'identity' => $rUserInfo['id'], 'uuid' => $rTokenData['uuid']];
 					$rResult = ConnectionTracker::createConnection($rConnectionData);
 				} else {
 					$rResult = $db->query('INSERT INTO `lines_live` (`user_id`,`stream_id`,`server_id`,`proxy_id`,`user_agent`,`user_ip`,`container`,`pid`,`uuid`,`date_start`,`geoip_country_code`,`isp`,`external_device`,`hls_last_read`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?);', $rUserInfo['id'], $rStreamID, $rServerID, $rProxyID, $rUserAgent, $rIP, 'hls', null, $rTokenData['uuid'], $rActivityStart, $rCountryCode, $rUserInfo['con_isp_name'], '', time() - intval($rServers[SERVER_ID]['time_offset']));
@@ -173,7 +173,7 @@ if ($rUserInfo) {
 				}
 
 				if ($rSettings['redis_handler']) {
-					$rChanges = array('hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']));
+					$rChanges = ['hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset'])];
 
 					if ($rConnection = ConnectionTracker::updateConnection($rConnection, $rChanges, 'open')) {
 						$rResult = true;
@@ -246,7 +246,7 @@ if ($rUserInfo) {
 				}
 
 				if ($rSettings['redis_handler']) {
-					$rConnectionData = array('user_id' => $rUserInfo['id'], 'stream_id' => $rStreamID, 'server_id' => $rServerID, 'proxy_id' => $rProxyID, 'user_agent' => $rUserAgent, 'user_ip' => $rIP, 'container' => $rExtension, 'pid' => $rPID, 'date_start' => $rActivityStart, 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => '', 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => 0, 'identity' => $rUserInfo['id'], 'uuid' => $rTokenData['uuid']);
+					$rConnectionData = ['user_id' => $rUserInfo['id'], 'stream_id' => $rStreamID, 'server_id' => $rServerID, 'proxy_id' => $rProxyID, 'user_agent' => $rUserAgent, 'user_ip' => $rIP, 'container' => $rExtension, 'pid' => $rPID, 'date_start' => $rActivityStart, 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => '', 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => 0, 'identity' => $rUserInfo['id'], 'uuid' => $rTokenData['uuid']];
 					$rResult = ConnectionTracker::createConnection($rConnectionData);
 				} else {
 					$rResult = $db->query('INSERT INTO `lines_live` (`user_id`,`stream_id`,`server_id`,`proxy_id`,`user_agent`,`user_ip`,`container`,`pid`,`uuid`,`date_start`,`geoip_country_code`,`isp`,`external_device`,`hls_last_read`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)', $rUserInfo['id'], $rStreamID, $rServerID, $rProxyID, $rUserAgent, $rIP, $rExtension, $rPID, $rTokenData['uuid'], $rActivityStart, $rCountryCode, $rUserInfo['con_isp_name'], '', time() - intval($rServers[SERVER_ID]['time_offset']));
@@ -270,7 +270,7 @@ if ($rUserInfo) {
 				}
 
 				if ($rSettings['redis_handler']) {
-					$rChanges = array('pid' => $rPID, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']));
+					$rChanges = ['pid' => $rPID, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset'])];
 
 					if ($rConnection = ConnectionTracker::updateConnection($rConnection, $rChanges, 'open')) {
 						$rResult = true;
@@ -397,8 +397,6 @@ if ($rUserInfo) {
 					if (!($rSettings['monitor_connection_status'] && 5 <= time() - $rTimeChecked)) {
 					} else {
 						if (connection_status() == CONNECTION_NORMAL) {
-
-
 							$rTimeChecked = time();
 						} else {
 							exit();
diff --git a/src/Public/stream/vod.php b/src/Public/stream/vod.php
index 94d04810..c233554c 100644
--- a/src/Public/stream/vod.php
+++ b/src/Public/stream/vod.php
@@ -126,14 +126,14 @@ if ($rChannelInfo) {
 
 		if (!isset($rIsHMAC) && is_null($rIsHMAC)) {
 			if ($rSettings['redis_handler']) {
-				$rConnectionData = array('user_id' => $rUserInfo['id'], 'stream_id' => $rStreamID, 'server_id' => $rServerID, 'proxy_id' => $rProxyID, 'user_agent' => $rUserAgent, 'user_ip' => $rIP, 'container' => 'VOD', 'pid' => $rPID, 'date_start' => $rActivityStart, 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => '', 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => 0, 'identity' => $rUserInfo['id'], 'uuid' => $rTokenData['uuid']);
+				$rConnectionData = ['user_id' => $rUserInfo['id'], 'stream_id' => $rStreamID, 'server_id' => $rServerID, 'proxy_id' => $rProxyID, 'user_agent' => $rUserAgent, 'user_ip' => $rIP, 'container' => 'VOD', 'pid' => $rPID, 'date_start' => $rActivityStart, 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => '', 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => 0, 'identity' => $rUserInfo['id'], 'uuid' => $rTokenData['uuid']];
 				$rResult = ConnectionTracker::createConnection($rConnectionData);
 			} else {
 				$rResult = $db->query('INSERT INTO `lines_live` (`user_id`,`stream_id`,`server_id`,`proxy_id`,`user_agent`,`user_ip`,`container`,`pid`,`uuid`,`date_start`,`geoip_country_code`,`isp`,`hls_last_read`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?);', $rUserInfo['id'], $rStreamID, $rServerID, $rProxyID, $rUserAgent, $rIP, 'VOD', $rPID, $rTokenData['uuid'], $rActivityStart, $rCountryCode, $rUserInfo['con_isp_name'], time() - intval($rServers[SERVER_ID]['time_offset']));
 			}
 		} else {
 			if ($rSettings['redis_handler']) {
-				$rConnectionData = array('hmac_id' => $rIsHMAC, 'hmac_identifier' => $rIdentifier, 'stream_id' => $rStreamID, 'server_id' => $rServerID, 'proxy_id' => $rProxyID, 'user_agent' => $rUserAgent, 'user_ip' => $rIP, 'container' => 'VOD', 'pid' => $rPID, 'date_start' => $rActivityStart, 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => '', 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => 0, 'identity' => $rIsHMAC . '_' . $rIdentifier, 'uuid' => $rTokenData['uuid']);
+				$rConnectionData = ['hmac_id' => $rIsHMAC, 'hmac_identifier' => $rIdentifier, 'stream_id' => $rStreamID, 'server_id' => $rServerID, 'proxy_id' => $rProxyID, 'user_agent' => $rUserAgent, 'user_ip' => $rIP, 'container' => 'VOD', 'pid' => $rPID, 'date_start' => $rActivityStart, 'geoip_country_code' => $rCountryCode, 'isp' => $rUserInfo['con_isp_name'], 'external_device' => '', 'hls_end' => 0, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']), 'on_demand' => 0, 'identity' => $rIsHMAC . '_' . $rIdentifier, 'uuid' => $rTokenData['uuid']];
 				$rResult = ConnectionTracker::createConnection($rConnectionData);
 			} else {
 				$rResult = $db->query('INSERT INTO `lines_live` (`hmac_id`,`hmac_identifier`,`stream_id`,`server_id`,`proxy_id`,`user_agent`,`user_ip`,`container`,`pid`,`uuid`,`date_start`,`geoip_country_code`,`isp`,`hls_last_read`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)', $rIsHMAC, $rIdentifier, $rStreamID, $rServerID, $rProxyID, $rUserAgent, $rIP, 'VOD', $rPID, $rTokenData['uuid'], $rActivityStart, $rCountryCode, $rUserInfo['con_isp_name'], time() - intval($rServers[SERVER_ID]['time_offset']));
@@ -157,7 +157,7 @@ if ($rChannelInfo) {
 		}
 
 		if ($rSettings['redis_handler']) {
-			$rChanges = array('pid' => $rPID, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']));
+			$rChanges = ['pid' => $rPID, 'hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset'])];
 
 			if ($rConnection = ConnectionTracker::updateConnection($rConnection, $rChanges, 'open')) {
 				$rResult = true;
@@ -310,8 +310,6 @@ if ($rChannelInfo) {
 				if (!($rSettings['monitor_connection_status'] && 5 <= time() - $rTimeChecked)) {
 				} else {
 					if (connection_status() == CONNECTION_NORMAL) {
-
-
 						$rTimeChecked = time();
 					} else {
 						exit();
@@ -362,9 +360,9 @@ if ($rChannelInfo) {
 		// Content-Length as an array after a redirect. The final response's
 		// headers are kept; the body is not downloaded.
 		$rSourceUA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:101.0) Gecko/20100101 Firefox/101.0';
-		$rHeaders = array();
+		$rHeaders = [];
 		$ch = curl_init($rDirectProxy);
-		curl_setopt_array($ch, array(
+		curl_setopt_array($ch, [
 			CURLOPT_FOLLOWLOCATION => true,
 			CURLOPT_MAXREDIRS => 20,
 			CURLOPT_CONNECTTIMEOUT => 10,
@@ -373,7 +371,7 @@ if ($rChannelInfo) {
 			CURLOPT_USERAGENT => $rSourceUA,
 			CURLOPT_HEADERFUNCTION => static function ($rHandle, $rLine) use (&$rHeaders) {
 				if (preg_match('#^HTTP/\S+\s+\d+#i', $rLine)) {
-					$rHeaders = array(); // a redirect hop: only the final response counts
+					$rHeaders = []; // a redirect hop: only the final response counts
 				} elseif (strpos($rLine, ':') !== false) {
 					[$rName, $rValue] = explode(':', $rLine, 2);
 					$rHeaders[strtolower(trim($rName))] = trim($rValue);
@@ -383,7 +381,7 @@ if ($rChannelInfo) {
 			CURLOPT_WRITEFUNCTION => static function () {
 				return 0; // headers only: stop at the first body byte
 			},
-		));
+		]);
 		curl_exec($ch);
 		$rDirectProxy = (string) (curl_getinfo($ch, CURLINFO_EFFECTIVE_URL) ?: $rDirectProxy);
 		curl_close($ch);
@@ -391,7 +389,7 @@ if ($rChannelInfo) {
 		$rSize = intval($rHeaders['content-length'] ?? 0);
 		$rContentType = strtolower(trim(explode(';', (string) ($rHeaders['content-type'] ?? ''))[0]));
 
-		if (0 < $rSize && in_array($rContentType, array('video/mp4', 'video/x-matroska', 'video/x-msvideo', 'video/3gpp', 'video/x-flv', 'video/x-ms-wmv', 'video/quicktime', 'video/mp2t', 'video/mpeg', 'application/octet-stream'), true)) {
+		if (0 < $rSize && in_array($rContentType, ['video/mp4', 'video/x-matroska', 'video/x-msvideo', 'video/3gpp', 'video/x-flv', 'video/x-ms-wmv', 'video/quicktime', 'video/mp2t', 'video/mpeg', 'application/octet-stream'], true)) {
 			header('Content-Type: ' . $rContentType);
 			$rServe = HttpRange::sendHeaders(HttpRange::parse($_SERVER['HTTP_RANGE'] ?? null, $rSize), $rSize);
 			if ($rServe === null) {
@@ -402,7 +400,7 @@ if ($rChannelInfo) {
 			$ch = curl_init();
 			if (0 < $rStart || $rEnd < $rSize - 1) {
 				// Ask the source for exactly the range this response promises.
-				curl_setopt($ch, CURLOPT_HTTPHEADER, array('Range: bytes=' . $rStart . '-' . $rEnd));
+				curl_setopt($ch, CURLOPT_HTTPHEADER, ['Range: bytes=' . $rStart . '-' . $rEnd]);
 			}
 
 			if (512 * 1024 * 1024 >= $rSize) {
diff --git a/src/Streaming/AsyncFileOperations.php b/src/Streaming/AsyncFileOperations.php
index 62de93e8..38c4dc87 100644
--- a/src/Streaming/AsyncFileOperations.php
+++ b/src/Streaming/AsyncFileOperations.php
@@ -25,237 +25,236 @@ namespace XcVm\Streaming;
  */
 
 class AsyncFileOperations {
-    /**
-     * File existence cache with TTL
-     * @var array
-     */
-    private static $fileCache = [];
+	/**
+	 * File existence cache with TTL
+	 * @var array
+	 */
+	private static $fileCache = [];
 
-    /**
-     * Cache TTL in seconds (100 ms) — compared against microtime(true) deltas.
-     * (It was 100000, read as seconds: a "100 ms" cache that lasted 27 hours.)
-     * @var float
-     */
-    private static $cacheTTL = 0.1;
+	/**
+	 * Cache TTL in seconds (100 ms) — compared against microtime(true) deltas.
+	 * (It was 100000, read as seconds: a "100 ms" cache that lasted 27 hours.)
+	 * @var float
+	 */
+	private static $cacheTTL = 0.1;
 
-    /**
-     * Non-blocking file existence check with intelligent polling
-     * Uses inotify if available, otherwise cached checks
-     * 
-     * @param string $file File path to check
-     * @param int $maxRetries Maximum retry attempts
-     * @param int $delayMs Delay between retries in milliseconds
-     * @return bool
-     */
-    public static function awaitFileExists($file, $maxRetries = 300, $delayMs = 10) {
-        // First, quick check
-        if (file_exists($file)) {
-            self::clearFileCache($file);
-            return true;
-        }
+	/**
+	 * Non-blocking file existence check with intelligent polling
+	 * Uses inotify if available, otherwise cached checks
+	 *
+	 * @param string $file File path to check
+	 * @param int $maxRetries Maximum retry attempts
+	 * @param int $delayMs Delay between retries in milliseconds
+	 * @return bool
+	 */
+	public static function awaitFileExists(string $file, int $maxRetries = 300, int $delayMs = 10) {
+		// First, quick check
+		if (file_exists($file)) {
+			self::clearFileCache($file);
+			return true;
+		}
 
-        // Try inotify monitoring if available
-        if (function_exists('inotify_init')) {
-            return self::awaitFileWithInotify($file, $maxRetries, $delayMs);
-        }
+		// Try inotify monitoring if available
+		if (function_exists('inotify_init')) {
+			return self::awaitFileWithInotify($file, $maxRetries, $delayMs);
+		}
 
-        // Fallback to optimized polling
-        return self::awaitFileWithPolling($file, $maxRetries, $delayMs);
-    }
+		// Fallback to optimized polling
+		return self::awaitFileWithPolling($file, $maxRetries, $delayMs);
+	}
 
-    /**
-     * Wait for file using inotify (Linux)
-     * Zero-CPU-usage waiting when file system changes
-     * 
-     * @param string $file File path to monitor
-     * @param int $maxRetries Maximum retry attempts
-     * @param int $delayMs Delay between fallback polls
-     * @return bool
-     */
-    private static function awaitFileWithInotify($file, $maxRetries, $delayMs) {
-        try {
-            $directory = dirname($file);
+	/**
+	 * Wait for file using inotify (Linux)
+	 * Zero-CPU-usage waiting when file system changes
+	 *
+	 * @param string $file File path to monitor
+	 * @param int $maxRetries Maximum retry attempts
+	 * @param int $delayMs Delay between fallback polls
+	 * @return bool
+	 */
+	private static function awaitFileWithInotify(string $file, int $maxRetries, int $delayMs) {
+		try {
+			$directory = dirname($file);
 
-            $inotify = @inotify_init();
-            if ($inotify === false) {
-                return self::awaitFileWithPolling($file, $maxRetries, $delayMs);
-            }
+			$inotify = @inotify_init();
+			if ($inotify === false) {
+				return self::awaitFileWithPolling($file, $maxRetries, $delayMs);
+			}
 
-            // Watch directory for file creation
-            @inotify_add_watch($inotify, $directory, IN_CREATE | IN_MOVED_TO | IN_CLOSE_WRITE);
+			// Watch directory for file creation
+			@inotify_add_watch($inotify, $directory, IN_CREATE | IN_MOVED_TO | IN_CLOSE_WRITE);
 
-            // The budget is TIME (maxRetries × delayMs, as for polling), and every
-            // wait is bounded: a blocking inotify_read() never returned when the
-            // file was not created, and counting events instead of time let a busy
-            // directory use up the retries in milliseconds.
-            $deadline = microtime(true) + max(1, $maxRetries) * max(1, $delayMs) / 1000;
-            $slice = max(1000, $delayMs * 1000);
-            while (true) {
-                clearstatcache(true, $file);
-                if (file_exists($file)) {
-                    @fclose($inotify);
-                    self::clearFileCache($file);
-                    return true;
-                }
-                $left = $deadline - microtime(true);
-                if ($left <= 0) {
-                    break;
-                }
-                $read = array($inotify);
-                $write = $except = null;
-                $wait = (int) min($slice, $left * 1000000);
-                if (@stream_select($read, $write, $except, 0, $wait) > 0) {
-                    @inotify_read($inotify); // drain; the loop re-checks the file
-                }
-            }
+			// The budget is TIME (maxRetries × delayMs, as for polling), and every
+			// wait is bounded: a blocking inotify_read() never returned when the
+			// file was not created, and counting events instead of time let a busy
+			// directory use up the retries in milliseconds.
+			$deadline = microtime(true) + max(1, $maxRetries) * max(1, $delayMs) / 1000;
+			$slice = max(1000, $delayMs * 1000);
+			while (true) {
+				clearstatcache(true, $file);
+				if (file_exists($file)) {
+					@fclose($inotify);
+					self::clearFileCache($file);
+					return true;
+				}
+				$left = $deadline - microtime(true);
+				if ($left <= 0) {
+					break;
+				}
+				$read = [$inotify];
+				$write = $except = null;
+				$wait = (int) min($slice, $left * 1000000);
+				if (@stream_select($read, $write, $except, 0, $wait) > 0) {
+					@inotify_read($inotify); // drain; the loop re-checks the file
+				}
+			}
 
-            @fclose($inotify);
-            return false;
-        } catch (\Throwable $e) {
-            return self::awaitFileWithPolling($file, $maxRetries, $delayMs);
-        }
-    }
+			@fclose($inotify);
+			return false;
+		} catch (\Throwable $e) {
+			return self::awaitFileWithPolling($file, $maxRetries, $delayMs);
+		}
+	}
 
-    /**
-     * Wait for file using optimized polling
-     * Efficient busy-wait replacement that reduces CPU usage
-     * 
-     * @param string $file File path to check
-     * @param int $maxRetries Maximum retry attempts
-     * @param int $delayMs Delay between retries in milliseconds
-     * @return bool
-     */
-    private static function awaitFileWithPolling($file, $maxRetries = 300, $delayMs = 10) {
-        $microDelay = max(1000, $delayMs * 1000); // Convert to microseconds
+	/**
+	 * Wait for file using optimized polling
+	 * Efficient busy-wait replacement that reduces CPU usage
+	 *
+	 * @param string $file File path to check
+	 * @param int $maxRetries Maximum retry attempts
+	 * @param int $delayMs Delay between retries in milliseconds
+	 * @return bool
+	 */
+	private static function awaitFileWithPolling(string $file, int $maxRetries = 300, int $delayMs = 10) {
+		$microDelay = max(1000, $delayMs * 1000); // Convert to microseconds
 
-        for ($i = 0; $i < $maxRetries; $i++) {
-            // Check with stat() for better performance
-            clearstatcache(true, $file);
-            if (@stat($file) !== false) {
-                self::clearFileCache($file); // a later readFile() must see the new file
-                return true;
-            }
+		for ($i = 0; $i < $maxRetries; $i++) {
+			// Check with stat() for better performance
+			clearstatcache(true, $file);
+			if (@stat($file) !== false) {
+				self::clearFileCache($file); // a later readFile() must see the new file
+				return true;
+			}
 
-            // Use adaptive sleep/usleep with early exit on events
-            usleep($microDelay);
-        }
+			// Use adaptive sleep/usleep with early exit on events
+			usleep($microDelay);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Non-blocking read file content
-     * Returns false if file doesn't exist or unreadable
-     * 
-     * @param string $file File path
-     * @param bool $useCache Use cache if available
-     * @return string|false
-     */
-    public static function readFile($file, $useCache = true) {
-        // Check cache first
-        if ($useCache && isset(self::$fileCache[$file])) {
-            $cached = self::$fileCache[$file];
-            if (microtime(true) - $cached['time'] < self::$cacheTTL) {
-                return $cached['content'];
-            }
-            unset(self::$fileCache[$file]);
-        }
+	/**
+	 * Non-blocking read file content
+	 * Returns false if file doesn't exist or unreadable
+	 *
+	 * @param string $file File path
+	 * @param bool $useCache Use cache if available
+	 * @return string|false
+	 */
+	public static function readFile(string $file, bool $useCache = true) {
+		// Check cache first
+		if ($useCache && isset(self::$fileCache[$file])) {
+			$cached = self::$fileCache[$file];
+			if (microtime(true) - $cached['time'] < self::$cacheTTL) {
+				return $cached['content'];
+			}
+			unset(self::$fileCache[$file]);
+		}
 
-        // Use stat for quick check
-        $stat = @stat($file);
-        if ($stat === false) {
-            return false;
-        }
+		// Use stat for quick check
+		$stat = @stat($file);
+		if ($stat === false) {
+			return false;
+		}
 
-        // Read with size limit to prevent memory issues
-        $maxReadSize = 1024 * 1024; // 1MB limit
-        if ($stat['size'] > $maxReadSize) {
-            return false;
-        }
+		// Read with size limit to prevent memory issues
+		$maxReadSize = 1024 * 1024; // 1MB limit
+		if ($stat['size'] > $maxReadSize) {
+			return false;
+		}
 
-        $content = @file_get_contents($file);
+		$content = @file_get_contents($file);
 
-        if ($content !== false && $useCache) {
-            self::$fileCache[$file] = [
-                'content' => $content,
-                'time' => microtime(true)
-            ];
-        }
+		if ($content !== false && $useCache) {
+			self::$fileCache[$file] = [
+				'content' => $content,
+				'time' => microtime(true)
+			];
+		}
 
-        return $content;
-    }
+		return $content;
+	}
 
-    /**
-     * Wait for ANY file from list to exist
-     * Returns on first match or after timeout
-     * 
-     * @param array $files Array of file paths
-     * @param int $maxRetries Maximum retry attempts
-     * @param int $delayMs Delay between retries
-     * @return string|false File path that exists, or false
-     */
-    public static function awaitAnyFileExists(array $files, $maxRetries = 300, $delayMs = 10) {
-        $microDelay = max(1000, $delayMs * 1000);
+	/**
+	 * Wait for ANY file from list to exist
+	 * Returns on first match or after timeout
+	 *
+	 * @param array $files Array of file paths
+	 * @param int $maxRetries Maximum retry attempts
+	 * @param int $delayMs Delay between retries
+	 * @return string|false File path that exists, or false
+	 */
+	public static function awaitAnyFileExists(array $files, int $maxRetries = 300, int $delayMs = 10) {
+		$microDelay = max(1000, $delayMs * 1000);
 
-        for ($i = 0; $i < $maxRetries; $i++) {
-            foreach ($files as $file) {
-                clearstatcache(true, $file);
-                if (@stat($file) !== false) {
-                    self::clearFileCache($file);
-                    return $file;
-                }
-            }
-            usleep($microDelay);
-        }
+		for ($i = 0; $i < $maxRetries; $i++) {
+			foreach ($files as $file) {
+				clearstatcache(true, $file);
+				if (@stat($file) !== false) {
+					self::clearFileCache($file);
+					return $file;
+				}
+			}
+			usleep($microDelay);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Clear cache for specific file
-     * @param string $file File path
-     */
-    public static function clearFileCache($file = null) {
-        if ($file === null) {
-            self::$fileCache = [];
-        } else {
-            unset(self::$fileCache[$file]);
-        }
-    }
+	/**
+	 * Clear cache for specific file
+	 * @param string $file File path
+	 */
+	public static function clearFileCache(string $file = null) {
+		if ($file === null) {
+			self::$fileCache = [];
+		} else {
+			unset(self::$fileCache[$file]);
+		}
+	}
 
-    /**
-     * Replacement for usleep with select()
-     * More CPU-efficient than usleep in loops
-     * 
-     * @param int $microseconds Sleep duration
-     */
-    public static function efficientSleep($microseconds) {
-        if ($microseconds < 1000) {
-            usleep($microseconds);
-            return;
-        }
+	/**
+	 * Replacement for usleep with select()
+	 * More CPU-efficient than usleep in loops
+	 *
+	 * @param int $microseconds Sleep duration
+	 */
+	public static function efficientSleep(int $microseconds) {
+		if ($microseconds < 1000) {
+			usleep($microseconds);
+			return;
+		}
 
-        // Use time_nanosleep() if available for precise non-blocking sleep
-        if (function_exists('time_nanosleep')) {
-            $sec = intdiv($microseconds, 1000000);
-            $nsec = ($microseconds % 1000000) * 1000; // convert microsec to nanosec
-            // suppress warnings on interrupted sleep
-            @time_nanosleep($sec, $nsec);
-            return;
-        }
+		// Use time_nanosleep() if available for precise non-blocking sleep
+		if (function_exists('time_nanosleep')) {
+			$sec = intdiv($microseconds, 1000000);
+			$nsec = ($microseconds % 1000000) * 1000; // convert microsec to nanosec
+			// suppress warnings on interrupted sleep
+			@time_nanosleep($sec, $nsec);
+			return;
+		}
 
-        // Fallback to usleep
-        usleep($microseconds);
-    }
-
-    /**
-     * Non-blocking file size check
-     * @param string $file File path
-     * @return int|false File size or false
-     */
-    public static function getFileSize($file) {
-        $stat = @stat($file);
-        return $stat !== false ? $stat['size'] : false;
-    }
+		// Fallback to usleep
+		usleep($microseconds);
+	}
 
+	/**
+	 * Non-blocking file size check
+	 * @param string $file File path
+	 * @return int|false File size or false
+	 */
+	public static function getFileSize(string $file) {
+		$stat = @stat($file);
+		return $stat !== false ? $stat['size'] : false;
+	}
 }
diff --git a/src/Streaming/Auth/StreamAuth.php b/src/Streaming/Auth/StreamAuth.php
index 70d89044..117fd6c9 100644
--- a/src/Streaming/Auth/StreamAuth.php
+++ b/src/Streaming/Auth/StreamAuth.php
@@ -18,7 +18,7 @@ use XcVm\Streaming\Protection\ConnectionLimiter;
 class StreamAuth {
 	public static function checkAccess($rUserInfo, $rUserIP, $rCountryCode, $rUserISP = '') {
 		global $rServers;
-		$rAvailableServers = array();
+		$rAvailableServers = [];
 		foreach ($rServers as $rServerID => $rServerInfo) {
 			if ($rServerInfo['server_online'] && $rServerInfo['server_type'] == 0) {
 				$rAvailableServers[] = $rServerID;
@@ -31,7 +31,7 @@ class StreamAuth {
 
 		shuffle($rAvailableServers);
 		$rServerCapacity = ConnectionTracker::getCapacity();
-		$rAcceptServers = array();
+		$rAcceptServers = [];
 
 		foreach ($rAvailableServers as $rServerID) {
 			$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
@@ -55,7 +55,7 @@ class StreamAuth {
 			return $rUserInfo['force_server_id'];
 		}
 
-		$rPriorityServers = array();
+		$rPriorityServers = [];
 		$rRedirectID = null;
 		foreach (array_keys($rAcceptServers) as $rServerID) {
 			if ($rServers[$rServerID]['enable_geoip'] == 1) {
@@ -104,7 +104,7 @@ class StreamAuth {
 	 * @param string|null $rUUID      The current connection's uuid, which is never evicted.
 	 * @return void
 	 */
-	public static function validateConnections($rUserInfo, $rIsHMAC = false, $rIdentifier = '', $rIP = null, $rUserAgent = null, $rUUID = null) {
+	public static function validateConnections(array $rUserInfo, mixed $rIsHMAC = false, ?string $rIdentifier = '', ?string $rIP = null, ?string $rUserAgent = null, ?string $rUUID = null) {
 		if ($rUserInfo['max_connections'] != 0) {
 			if (!$rIsHMAC) {
 				if (!empty($rUserInfo['pair_id'])) {
diff --git a/src/Streaming/Auth/StreamAuthMiddleware.php b/src/Streaming/Auth/StreamAuthMiddleware.php
index 2db1c8dc..080d5db2 100644
--- a/src/Streaming/Auth/StreamAuthMiddleware.php
+++ b/src/Streaming/Auth/StreamAuthMiddleware.php
@@ -22,62 +22,61 @@ use XcVm\Core\Util\Encryption;
  */
 
 class StreamAuthMiddleware {
+	/**
+	 * Отправка общих streaming response headers.
+	 *
+	 * Дублировалось в live.php, vod.php, timeshift.php (~25 строк каждый).
+	 */
+	public static function sendStreamHeaders($rSettings, $rServers) {
+		header('Access-Control-Allow-Origin: *');
 
-    /**
-     * Отправка общих streaming response headers.
-     *
-     * Дублировалось в live.php, vod.php, timeshift.php (~25 строк каждый).
-     */
-    public static function sendStreamHeaders($rSettings, $rServers) {
-        header('Access-Control-Allow-Origin: *');
+		if (!empty($rSettings['send_server_header'])) {
+			header('Server: ' . $rSettings['send_server_header']);
+		}
 
-        if (!empty($rSettings['send_server_header'])) {
-            header('Server: ' . $rSettings['send_server_header']);
-        }
+		if ($rSettings['send_protection_headers']) {
+			header('X-XSS-Protection: 0');
+			header('X-Content-Type-Options: nosniff');
+		}
 
-        if ($rSettings['send_protection_headers']) {
-            header('X-XSS-Protection: 0');
-            header('X-Content-Type-Options: nosniff');
-        }
+		if ($rSettings['send_altsvc_header']) {
+			header('Alt-Svc: h3-29=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,h3-T051=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,h3-Q050=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,h3-Q046=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,h3-Q043=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,quic=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000; v="46,43"');
+		}
 
-        if ($rSettings['send_altsvc_header']) {
-            header('Alt-Svc: h3-29=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,h3-T051=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,h3-Q050=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,h3-Q046=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,h3-Q043=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000,quic=":' . $rServers[SERVER_ID]['https_broadcast_port'] . '"; ma=2592000; v="46,43"');
-        }
+		if (empty($rSettings['send_unique_header_domain']) && !filter_var(HOST, FILTER_VALIDATE_IP)) {
+			$rSettings['send_unique_header_domain'] = '.' . HOST;
+		}
 
-        if (empty($rSettings['send_unique_header_domain']) && !filter_var(HOST, FILTER_VALIDATE_IP)) {
-            $rSettings['send_unique_header_domain'] = '.' . HOST;
-        }
+		if (!empty($rSettings['send_unique_header'])) {
+			$rExpires = new \DateTime('+6 months', new \DateTimeZone('GMT'));
+			header('Set-Cookie: ' . $rSettings['send_unique_header'] . '=' . Encryption::randomString(11) . '; Domain=' . $rSettings['send_unique_header_domain'] . '; Expires=' . $rExpires->format(DATE_RFC2822) . '; Path=/; Secure; HttpOnly; SameSite=none');
+		}
+	}
 
-        if (!empty($rSettings['send_unique_header'])) {
-            $rExpires = new \DateTime('+6 months', new \DateTimeZone('GMT'));
-            header('Set-Cookie: ' . $rSettings['send_unique_header'] . '=' . Encryption::randomString(11) . '; Domain=' . $rSettings['send_unique_header_domain'] . '; Expires=' . $rExpires->format(DATE_RFC2822) . '; Path=/; Secure; HttpOnly; SameSite=none');
-        }
-    }
+	/**
+	 * Дешифровка токена и базовая валидация (формат + срок действия).
+	 *
+	 * @param string $rToken       Зашифрованный токен из запроса
+	 * @param array  $rSettings    Настройки (нужен live_streaming_pass)
+	 * @param array  $rServers     Серверы (нужен time_offset)
+	 * @param string $rIP          IP клиента для логирования
+	 * @return array               Расшифрованные данные токена
+	 */
+	public static function decryptToken(string $rToken, array $rSettings, array $rServers, string $rIP) {
+		$rTokenData = json_decode(
+			Encryption::readToken($rToken, $rSettings['live_streaming_pass'], OPENSSL_EXTRA, empty($rSettings['secure_stream_tokens'])),
+			true
+		);
 
-    /**
-     * Дешифровка токена и базовая валидация (формат + срок действия).
-     *
-     * @param string $rToken       Зашифрованный токен из запроса
-     * @param array  $rSettings    Настройки (нужен live_streaming_pass)
-     * @param array  $rServers     Серверы (нужен time_offset)
-     * @param string $rIP          IP клиента для логирования
-     * @return array               Расшифрованные данные токена
-     */
-    public static function decryptToken($rToken, $rSettings, $rServers, $rIP) {
-        $rTokenData = json_decode(
-            Encryption::readToken($rToken, $rSettings['live_streaming_pass'], OPENSSL_EXTRA, empty($rSettings['secure_stream_tokens'])),
-            true
-        );
+		if (!is_array($rTokenData)) {
+			DatabaseLogger::clientLog(0, 0, 'LB_TOKEN_INVALID', $rIP);
+			generateError('LB_TOKEN_INVALID');
+		}
 
-        if (!is_array($rTokenData)) {
-            DatabaseLogger::clientLog(0, 0, 'LB_TOKEN_INVALID', $rIP);
-            generateError('LB_TOKEN_INVALID');
-        }
+		if (isset($rTokenData['expires']) && $rTokenData['expires'] < time() - intval($rServers[SERVER_ID]['time_offset'])) {
+			generateError('TOKEN_EXPIRED');
+		}
 
-        if (isset($rTokenData['expires']) && $rTokenData['expires'] < time() - intval($rServers[SERVER_ID]['time_offset'])) {
-            generateError('TOKEN_EXPIRED');
-        }
-
-        return $rTokenData;
-    }
+		return $rTokenData;
+	}
 }
diff --git a/src/Streaming/Balancer/ProxySelector.php b/src/Streaming/Balancer/ProxySelector.php
index 4ae7ddb4..08b83d25 100644
--- a/src/Streaming/Balancer/ProxySelector.php
+++ b/src/Streaming/Balancer/ProxySelector.php
@@ -21,7 +21,7 @@ class ProxySelector {
 			return null;
 		}
 		$rServerCapacity = ConnectionTracker::getCapacity(true);
-		$rAcceptServers = array();
+		$rAcceptServers = [];
 		foreach ($rProxies as $rServerID) {
 			$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
 			if ($rOnlineClients == 0) {
@@ -37,7 +37,7 @@ class ProxySelector {
 		$rValues = array_values($rAcceptServers);
 		array_multisort($rValues, SORT_ASC, $rKeys, SORT_ASC);
 		$rAcceptServers = array_combine($rKeys, $rValues);
-		$rPriorityServers = array();
+		$rPriorityServers = [];
 		foreach (array_keys($rAcceptServers) as $rServerID) {
 			if ($rServers[$rServerID]['enable_geoip'] == 1) {
 				if (in_array($rCountryCode, $rServers[$rServerID]['geoip_countries'])) {
diff --git a/src/Streaming/Codec/FFprobeRunner.php b/src/Streaming/Codec/FFprobeRunner.php
index 98f7888a..1f01d6fb 100644
--- a/src/Streaming/Codec/FFprobeRunner.php
+++ b/src/Streaming/Codec/FFprobeRunner.php
@@ -13,7 +13,7 @@ namespace XcVm\Streaming\Codec;
  */
 
 class FFprobeRunner {
-	public static function probeStream($rSourceURL, $rFetchArguments = array(), $rPrepend = '', $rParse = true) {
+	public static function probeStream($rSourceURL, $rFetchArguments = [], $rPrepend = '', $rParse = true) {
 		global $rSettings, $rFFPROBE;
 		$rAnalyseDuration = abs(intval($rSettings['stream_max_analyze']));
 		$rProbesize = abs(intval($rSettings['probesize']));
@@ -35,7 +35,7 @@ class FFprobeRunner {
 			return false;
 		}
 		if (empty($rCodecs['codecs'])) {
-			$rOutput = array();
+			$rOutput = [];
 			$rOutput['codecs']['video'] = '';
 			$rOutput['codecs']['audio'] = '';
 			$rOutput['container'] = $rCodecs['format']['format_name'];
@@ -55,7 +55,7 @@ class FFprobeRunner {
 						} else {
 							if (isset($rOutput['codecs'][$rCodec['codec_type']])) {
 							} else {
-								$rOutput['codecs'][$rCodec['codec_type']] = array();
+								$rOutput['codecs'][$rCodec['codec_type']] = [];
 							}
 							$rOutput['codecs'][$rCodec['codec_type']][] = $rCodec;
 						}
diff --git a/src/Streaming/Codec/FfmpegBinaries.php b/src/Streaming/Codec/FfmpegBinaries.php
index bdeafd31..ce2152c3 100644
--- a/src/Streaming/Codec/FfmpegBinaries.php
+++ b/src/Streaming/Codec/FfmpegBinaries.php
@@ -23,7 +23,6 @@ namespace XcVm\Streaming\Codec;
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 class FfmpegBinaries {
-
 	/** Encoder-name substrings that mark a hardware (GPU/accelerated) encoder. */
 	private const HW_ENCODER_MARKERS = ['_nvenc', 'nvenc_', '_qsv', '_vaapi', '_amf', '_videotoolbox', '_mf'];
 
@@ -81,7 +80,7 @@ class FfmpegBinaries {
 	 * A binary swap bumps the folder mtime and changes this, invalidating the cache.
 	 */
 	private static function fingerprint(): string {
-		$rParts = array();
+		$rParts = [];
 		foreach (self::versionDirs() as $rVersion => $rDir) {
 			$rParts[] = $rVersion . ':' . (@filemtime($rDir . 'ffmpeg') ?: 0);
 		}
@@ -96,8 +95,8 @@ class FfmpegBinaries {
 	 */
 	private static function versionDirs(): array {
 		$rBase = self::baseDir();
-		$rOut = array();
-		foreach (glob($rBase . '*', GLOB_ONLYDIR) ?: array() as $rDir) {
+		$rOut = [];
+		foreach (glob($rBase . '*', GLOB_ONLYDIR) ?: [] as $rDir) {
 			$rVersion = basename($rDir);
 			if (!preg_match('/^\d+\.\d+$/', $rVersion)) {
 				continue; // skip backups / non-version folders
@@ -117,16 +116,16 @@ class FfmpegBinaries {
 	 * @return array<string, array{version: string, gpu: bool, encoders: string[], banner: string}>
 	 */
 	private static function scan(): array {
-		$rOut = array();
+		$rOut = [];
 		foreach (self::versionDirs() as $rVersion => $rDir) {
 			$rBinary = $rDir . 'ffmpeg';
 			$rEncoders = self::hwEncoders($rBinary);
-			$rOut[$rVersion] = array(
+			$rOut[$rVersion] = [
 				'version'  => $rVersion,
 				'gpu'      => count($rEncoders) > 0,
 				'encoders' => $rEncoders,
 				'banner'   => self::banner($rBinary),
-			);
+			];
 		}
 		return $rOut;
 	}
@@ -145,7 +144,7 @@ class FfmpegBinaries {
 	 */
 	private static function hwEncoders(string $rBinary): array {
 		$rOut = (string) @shell_exec('timeout 5 ' . escapeshellarg($rBinary) . ' -hide_banner -encoders 2>/dev/null');
-		$rEncoders = array();
+		$rEncoders = [];
 		foreach (explode("\n", $rOut) as $rRow) {
 			// ` V....D h264_nvenc  NVIDIA NVENC H.264 encoder`
 			if (!preg_match('/^\s*[VASFXBD.]{6}\s+(\S+)/', $rRow, $rMatch)) {
@@ -175,7 +174,7 @@ class FfmpegBinaries {
 
 	/** Best-effort atomic cache write; failure is non-fatal (rescans next time). */
 	private static function writeCache(string $rFingerprint, array $rVersions): void {
-		$rJson = json_encode(array('fingerprint' => $rFingerprint, 'versions' => $rVersions), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+		$rJson = json_encode(['fingerprint' => $rFingerprint, 'versions' => $rVersions], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 		if ($rJson === false) {
 			return;
 		}
diff --git a/src/Streaming/Codec/FfmpegPaths.php b/src/Streaming/Codec/FfmpegPaths.php
index 244bc74a..91182a23 100644
--- a/src/Streaming/Codec/FfmpegPaths.php
+++ b/src/Streaming/Codec/FfmpegPaths.php
@@ -16,8 +16,11 @@ namespace XcVm\Streaming\Codec;
 
 class FfmpegPaths {
 	private static $cpu = null;
+
 	private static $gpu = null;
+
 	private static $probe = null;
+
 	private static $resolved = false;
 
 	/**
@@ -36,7 +39,7 @@ class FfmpegPaths {
 	 * @param string      $cpuVersion e.g. '8.0', '7.1', '4.0'
 	 * @param string|null $gpuVersion GPU ffmpeg version, or null to reuse the CPU build
 	 */
-	public static function resolve($cpuVersion, $gpuVersion = null) {
+	public static function resolve(string $cpuVersion, ?string $gpuVersion = null) {
 		if (self::$resolved) {
 			return;
 		}
@@ -57,7 +60,7 @@ class FfmpegPaths {
 	 * @param string $version Version folder name (e.g. '8.0')
 	 * @param string $name    'ffmpeg' or 'ffprobe'
 	 */
-	private static function binary($version, $name): ?string {
+	private static function binary(string $version, string $name): ?string {
 		if (!is_string($version) || !preg_match('/^\d+\.\d+$/', $version)) {
 			return null;
 		}
diff --git a/src/Streaming/Delivery/HLSGenerator.php b/src/Streaming/Delivery/HLSGenerator.php
index 335bca7a..57220d31 100644
--- a/src/Streaming/Delivery/HLSGenerator.php
+++ b/src/Streaming/Delivery/HLSGenerator.php
@@ -27,7 +27,7 @@ class HLSGenerator {
 	 * @param string $rPlaylist Raw daemon m3u8.
 	 * @return string|false Tokenized playlist, or false if it has no segments.
 	 */
-	public static function tokenizeDaemonPlaylist($rPlaylist, $rSettings, $rUsername, $rPassword, $rStreamID, $rUUID, $rIP, $rIsHMAC, $rIdentifier, $rVideoCodec, $rOnDemand, $rServerID, $rProxyID) {
+	public static function tokenizeDaemonPlaylist(string $rPlaylist, $rSettings, $rUsername, $rPassword, $rStreamID, $rUUID, $rIP, $rIsHMAC, $rIdentifier, $rVideoCodec, $rOnDemand, $rServerID, $rProxyID) {
 		$rPrefix = ($rProxyID ? '/' . md5($rProxyID . '_' . $rServerID . '_' . OPENSSL_EXTRA) : '');
 		$rReplaced = 0;
 
diff --git a/src/Streaming/Delivery/HlsSequence.php b/src/Streaming/Delivery/HlsSequence.php
index 7bfb9a28..d42a7636 100644
--- a/src/Streaming/Delivery/HlsSequence.php
+++ b/src/Streaming/Delivery/HlsSequence.php
@@ -164,7 +164,7 @@ class HlsSequence {
 			$rSeq = $rMin;
 		}
 
-		$rNext = array('base' => $rBase, 'last' => $rSeq);
+		$rNext = ['base' => $rBase, 'last' => $rSeq];
 		if ($rNow !== null) {
 			$rNext['daemon'] = $rDaemonSeq;
 			$rNext['at'] = $rNow;
diff --git a/src/Streaming/Delivery/HttpRange.php b/src/Streaming/Delivery/HttpRange.php
index dadd1952..8fdccdaf 100644
--- a/src/Streaming/Delivery/HttpRange.php
+++ b/src/Streaming/Delivery/HttpRange.php
@@ -45,7 +45,7 @@ final class HttpRange {
 			if ($rLength <= 0) {
 				return false;
 			}
-			return array(max(0, $rSize - $rLength), $rSize - 1);
+			return [max(0, $rSize - $rLength), $rSize - 1];
 		}
 
 		$rFirst = (int) $rParts[1];
@@ -53,7 +53,7 @@ final class HttpRange {
 		if ($rFirst >= $rSize || $rLast < $rFirst) {
 			return false;
 		}
-		return array($rFirst, $rLast);
+		return [$rFirst, $rLast];
 	}
 
 	/**
@@ -64,7 +64,7 @@ final class HttpRange {
 	 * @param int                           $rSize  Resource size in bytes.
 	 * @return array{0:int,1:int}|null [first, last] to send, or null after a 416 (send no body).
 	 */
-	public static function sendHeaders($rRange, int $rSize): ?array {
+	public static function sendHeaders(array|false|null $rRange, int $rSize): ?array {
 		header('Accept-Ranges: bytes');
 		if ($rRange === false) {
 			header('HTTP/1.1 416 Requested Range Not Satisfiable');
@@ -73,7 +73,7 @@ final class HttpRange {
 		}
 		if ($rRange === null) {
 			header('Content-Length: ' . $rSize);
-			return array(0, $rSize - 1);
+			return [0, $rSize - 1];
 		}
 		header('HTTP/1.1 206 Partial Content');
 		header('Content-Range: bytes ' . $rRange[0] . '-' . $rRange[1] . '/' . $rSize);
diff --git a/src/Streaming/Delivery/OffAirHandler.php b/src/Streaming/Delivery/OffAirHandler.php
index 4875b66f..5a031bf0 100644
--- a/src/Streaming/Delivery/OffAirHandler.php
+++ b/src/Streaming/Delivery/OffAirHandler.php
@@ -80,7 +80,7 @@ class OffAirHandler {
 	 * @param int|null $rProxyID     Proxy id.
 	 * @return void
 	 */
-	public static function showNotOnAir($rExtension, $rUserInfo, $rIP, $rCountryCode, $rServerID = null, $rProxyID = null) {
+	public static function showNotOnAir(string $rExtension, array $rUserInfo, string $rIP, string $rCountryCode, ?int $rServerID = null, ?int $rProxyID = null) {
 		self::showVideoServer("show_not_on_air_video", "not_on_air_video_path", $rExtension, $rUserInfo, $rIP, $rCountryCode, $rUserInfo["con_isp_name"], $rServerID, $rProxyID);
 	}
 
@@ -127,7 +127,7 @@ class OffAirHandler {
 		if ($rOriginatorID && !$rServers[$rOriginatorID]['is_main']) {
 			$rURL .= '/' . md5($rServerID . '_' . $rOriginatorID . '_' . OPENSSL_EXTRA);
 		}
-		$rTokenData = array('expires' => time() + 10, 'video_path' => $rVideoPath);
+		$rTokenData = ['expires' => time() + 10, 'video_path' => $rVideoPath];
 		$rToken = Encryption::mintToken(json_encode($rTokenData), $rSettings['live_streaming_pass'], OPENSSL_EXTRA, !empty($rSettings['secure_stream_tokens']));
 		if ($rExtension == 'm3u8') {
 			if (self::$rHlsStreamID !== null) {
diff --git a/src/Streaming/Delivery/StreamRedirector.php b/src/Streaming/Delivery/StreamRedirector.php
index c5359bb5..74b73030 100644
--- a/src/Streaming/Delivery/StreamRedirector.php
+++ b/src/Streaming/Delivery/StreamRedirector.php
@@ -20,7 +20,7 @@ class StreamRedirector {
 		// The server map can arrive null during a transient cache rebuild; keep it an
 		// array so the array_key_exists()/foreach below neither fatal nor warn.
 		if (!is_array($rServers)) {
-			$rServers = array();
+			$rServers = [];
 		}
 		if ($rCached) {
 			$rRaw = @file_get_contents(STREAMS_TMP_PATH . 'stream_' . $rStreamID);
@@ -36,11 +36,11 @@ class StreamRedirector {
 		}
 
 		$rStream['info']['bouquets'] = $rStream['bouquets'];
-		$rStreamServers = (is_array($rStream['servers'] ?? null) ? $rStream['servers'] : array());
-		$rAvailableServers = array();
+		$rStreamServers = (is_array($rStream['servers'] ?? null) ? $rStream['servers'] : []);
+		$rAvailableServers = [];
 		if ($rType == 'archive') {
 			if (0 < $rStream['info']['tv_archive_duration'] && 0 < $rStream['info']['tv_archive_server_id'] && array_key_exists($rStream['info']['tv_archive_server_id'], $rServers)) {
-				$rAvailableServers = array($rStream['info']['tv_archive_server_id']);
+				$rAvailableServers = [$rStream['info']['tv_archive_server_id']];
 			}
 		} else {
 			if (!(($rStream['info']['direct_source'] ?? 0) == 1 && ($rStream['info']['direct_proxy'] ?? 0) == 0)) {
@@ -73,7 +73,7 @@ class StreamRedirector {
 
 		shuffle($rAvailableServers);
 		$rServerCapacity = ConnectionTracker::getCapacity();
-		$rAcceptServers = array();
+		$rAcceptServers = [];
 		foreach ($rAvailableServers as $rServerID) {
 			$rOnlineClients = (isset($rServerCapacity[$rServerID]['online_clients']) ? $rServerCapacity[$rServerID]['online_clients'] : 0);
 			if ($rOnlineClients == 0) {
@@ -86,7 +86,7 @@ class StreamRedirector {
 			if ($rType == 'archive') {
 				return null;
 			}
-			return array();
+			return [];
 		}
 		$rKeys = array_keys($rAcceptServers);
 		$rValues = array_values($rAcceptServers);
@@ -98,7 +98,7 @@ class StreamRedirector {
 			if (isset($rUserInfo) && $rUserInfo['force_server_id'] != 0 && array_key_exists($rUserInfo['force_server_id'], $rAcceptServers)) {
 				$rRedirectID = $rUserInfo['force_server_id'];
 			} else {
-				$rPriorityServers = array();
+				$rPriorityServers = [];
 				foreach (array_keys($rAcceptServers) as $rServerID) {
 					if ($rServers[$rServerID]['enable_geoip'] == 1) {
 						if (in_array($rCountryCode, $rServers[$rServerID]['geoip_countries'])) {
@@ -154,12 +154,12 @@ class StreamRedirector {
 
 	private static function getStreamData($rStreamID) {
 		global $db;
-		$rOutput = array();
+		$rOutput = [];
 		$db->query('SELECT * FROM `streams` t1 LEFT JOIN `streams_types` t2 ON t2.type_id = t1.type WHERE t1.`id` = ?', $rStreamID);
 		if (0 >= $db->num_rows()) {
 		} else {
 			$rStreamInfo = $db->get_row();
-			$rServersData = array();
+			$rServersData = [];
 			if (!($rStreamInfo['direct_source'] == 0 || $rStreamInfo['direct_proxy'] == 1)) {
 			} else {
 				$db->query('SELECT * FROM `streams_servers` WHERE `stream_id` = ?', $rStreamID);
@@ -175,7 +175,7 @@ class StreamRedirector {
 		return (!empty($rOutput) ? $rOutput : false);
 	}
 
-	public static function getStreamingURL($rSettings, $rServers, $rServerID = null, $rOriginatorID = null, $rForceHTTP = false, $rUserID = null) { 
+	public static function getStreamingURL($rSettings, $rServers, $rServerID = null, $rOriginatorID = null, $rForceHTTP = false, $rUserID = null) {
 		//$rUserID is used to redirect clients with different subdomain to the LB server
 		if (!isset($rServerID)) {
 			$rServerID = SERVER_ID;
@@ -196,7 +196,7 @@ class StreamRedirector {
 			if ($rServers[$rServerID]['random_ip'] && 0 < count($rServers[$rServerID]['domains']['urls'])) {
 				$rDomain = $rServers[$rServerID]['domains']['urls'][array_rand($rServers[$rServerID]['domains']['urls'])];
 				//line_id : 10 => wildcard.lb1.com => 10.lb1.com
-				if($rUserID && strpos($rDomain, 'wildcard.') !== false) { 
+				if ($rUserID && strpos($rDomain, 'wildcard.') !== false) {
 					$rDomain = str_replace('wildcard.', $rUserID . '.', $rDomain);
 				}
 			}
diff --git a/src/Streaming/Fanout/FanoutClient.php b/src/Streaming/Fanout/FanoutClient.php
index 5b9ebe75..5fba96ea 100644
--- a/src/Streaming/Fanout/FanoutClient.php
+++ b/src/Streaming/Fanout/FanoutClient.php
@@ -517,9 +517,9 @@ class FanoutClient {
 		if (!is_array($rData) || !isset($rData['streams']) || !is_array($rData['streams'])) {
 			return null;
 		}
-		$rFeatures = (isset($rData['features']) && is_array($rData['features'])) ? array_map('strval', $rData['features']) : array();
+		$rFeatures = (isset($rData['features']) && is_array($rData['features'])) ? array_map('strval', $rData['features']) : [];
 		self::$features = $rFeatures;
-		return array('accepting' => !empty($rData['accepting']), 'daemon_pid' => intval($rData['daemon_pid'] ?? 0), 'features' => $rFeatures, 'streams' => $rData['streams']);
+		return ['accepting' => !empty($rData['accepting']), 'daemon_pid' => intval($rData['daemon_pid'] ?? 0), 'features' => $rFeatures, 'streams' => $rData['streams']];
 	}
 
 	/**
@@ -574,7 +574,7 @@ class FanoutClient {
 	 * @return bool True when the daemon queued the switch.
 	 */
 	public static function forceSource(int $rStreamID, int $rIndex): bool {
-		$rCode = self::request('POST', '/monitor/' . $rStreamID . '/source', json_encode(array('index' => $rIndex)), 1, 3)['code'];
+		$rCode = self::request('POST', '/monitor/' . $rStreamID . '/source', json_encode(['index' => $rIndex]), 1, 3)['code'];
 		return $rCode >= 200 && $rCode < 300;
 	}
 
@@ -590,7 +590,7 @@ class FanoutClient {
 	 */
 	private static function request(string $rMethod, string $rPath, ?string $rBody, int $rConnect, int $rTimeout): array {
 		if (!function_exists('curl_init') || !defined('FANOUT_CTL_SOCK') || !file_exists(FANOUT_CTL_SOCK)) {
-			return array('code' => 0, 'body' => null, 'errno' => -1);
+			return ['code' => 0, 'body' => null, 'errno' => -1];
 		}
 		$rCurl = curl_init();
 		curl_setopt_array($rCurl, [
@@ -609,7 +609,7 @@ class FanoutClient {
 		$rCode = (int) curl_getinfo($rCurl, CURLINFO_HTTP_CODE);
 		$rErrno = curl_errno($rCurl);
 		curl_close($rCurl);
-		return array('code' => $rCode, 'body' => is_string($rResponse) ? $rResponse : null, 'errno' => $rErrno);
+		return ['code' => $rCode, 'body' => is_string($rResponse) ? $rResponse : null, 'errno' => $rErrno];
 	}
 
 	/**
diff --git a/src/Streaming/Fanout/FanoutConfig.php b/src/Streaming/Fanout/FanoutConfig.php
index 56777b47..194c420f 100644
--- a/src/Streaming/Fanout/FanoutConfig.php
+++ b/src/Streaming/Fanout/FanoutConfig.php
@@ -48,7 +48,7 @@ class FanoutConfig {
 
 		// Snapshot the current config (empty on a missing/torn file — the daemon
 		// will re-seed the rest of the schema on its next load).
-		$rSnapshot = array();
+		$rSnapshot = [];
 		if (is_file($rPath)) {
 			$rDecoded = json_decode((string) @file_get_contents($rPath), true);
 			if (is_array($rDecoded)) {
@@ -104,8 +104,8 @@ class FanoutConfig {
 		// A join that asks for as much as the ring holds starts in the block the next
 		// keyframe prunes, and a viewer slower than one GOP there is dropped: a
 		// prebuffer gets a segment of headroom on top.
-		$rNeeds = array(2 * $rSegTime, $rHlsWindow * $rSegTime);
-		foreach (array('client_prebuffer', 'restreamer_prebuffer', 'fanout_default_prebuffer_sec') as $rKey) {
+		$rNeeds = [2 * $rSegTime, $rHlsWindow * $rSegTime];
+		foreach (['client_prebuffer', 'restreamer_prebuffer', 'fanout_default_prebuffer_sec'] as $rKey) {
 			$rPrebuffer = max(0, (int) ($rSettings[$rKey] ?? 0));
 			if ($rPrebuffer > 0) {
 				$rNeeds[] = $rPrebuffer + $rSegTime;
@@ -120,7 +120,7 @@ class FanoutConfig {
 			$rRatio = 1.0;
 		}
 
-		return array(
+		return [
 			'prebuffer_max_sec'     => $rRing,
 			'hls_target_sec'        => $rSegTime,
 			'hls_window'            => $rHlsWindow,
@@ -136,7 +136,7 @@ class FanoutConfig {
 			// Whether the daemon accepts streams handed over for supervision
 			// (StreamProcess::superviseStream). Applied live by the daemon.
 			'supervise'             => (bool) ($rSettings['fanout_supervise'] ?? true),
-		);
+		];
 	}
 
 	/**
@@ -151,7 +151,7 @@ class FanoutConfig {
 	 * the file we write honest rather than relying on that.
 	 */
 	private static function backend(string $rValue): string {
-		return in_array($rValue, array('auto', 'ffmpeg', 'native'), true) ? $rValue : 'auto';
+		return in_array($rValue, ['auto', 'ffmpeg', 'native'], true) ? $rValue : 'auto';
 	}
 
 	/** Clamp an int into [lo, hi]. */
diff --git a/src/Streaming/Fanout/IngestFeeder.php b/src/Streaming/Fanout/IngestFeeder.php
index 62e623a0..d6eff28d 100644
--- a/src/Streaming/Fanout/IngestFeeder.php
+++ b/src/Streaming/Fanout/IngestFeeder.php
@@ -32,21 +32,30 @@ final class IngestFeeder {
 	private const RETRY_SEC = 2.0;
 
 	private int $streamID;
+
 	private ?string $keyHex;
+
 	private ?string $ivHex;
+
 	/** @var callable|null fn(string $message): void */
 	private $logger;
+
 	/** @var callable fn(int $id, ?string $key, ?string $iv): ?string */
 	private $register;
+
 	/** @var callable fn(string $socket): resource|false */
 	private $dial;
 
 	/** @var resource|null */
 	private $conn = null;
+
 	private string $pending = '';
+
 	/** Bytes of the backlog's head packet already written to the current connection. */
 	private int $headSent = 0;
+
 	private float $retryAt = 0.0;
+
 	private int $droppedPackets = 0;
 
 	/**
@@ -82,7 +91,7 @@ final class IngestFeeder {
 	 * @return self
 	 */
 	public static function forStream(int $rStreamID, bool $rEncrypt, ?callable $rLogger = null): self {
-		[$rKey, $rIV] = $rEncrypt ? self::streamKey($rStreamID) : array(null, null);
+		[$rKey, $rIV] = $rEncrypt ? self::streamKey($rStreamID) : [null, null];
 		return new self($rStreamID, $rKey, $rIV, $rLogger);
 	}
 
@@ -95,14 +104,14 @@ final class IngestFeeder {
 	 */
 	public static function streamKey(int $rStreamID): array {
 		if (!defined('STREAMS_PATH')) {
-			return array(null, null);
+			return [null, null];
 		}
 		$rKey = @file_get_contents(STREAMS_PATH . $rStreamID . '_.key');
 		$rIV = @file_get_contents(STREAMS_PATH . $rStreamID . '_.iv');
 		if (!is_string($rKey) || strlen($rKey) !== 16 || !is_string($rIV) || strlen($rIV) !== 16) {
-			return array(null, null);
+			return [null, null];
 		}
-		return array(bin2hex($rKey), bin2hex($rIV));
+		return [bin2hex($rKey), bin2hex($rIV)];
 	}
 
 	/**
diff --git a/src/Streaming/Health/ProcessChecker.php b/src/Streaming/Health/ProcessChecker.php
index ce984646..379b56b7 100644
--- a/src/Streaming/Health/ProcessChecker.php
+++ b/src/Streaming/Health/ProcessChecker.php
@@ -15,7 +15,7 @@ namespace XcVm\Streaming\Health;
 class ProcessChecker {
 	public static function checkPID($rPID, $rSearch) {
 		if (!is_array($rSearch)) {
-			$rSearch = array($rSearch);
+			$rSearch = [$rSearch];
 		}
 		if (file_exists('/proc/' . $rPID)) {
 			$rCommand = trim(file_get_contents('/proc/' . $rPID . '/cmdline'));
@@ -30,7 +30,7 @@ class ProcessChecker {
 
 	public static function getWatchdog($rID, $rLimit = 86400) {
 		global $db;
-		$rReturn = array();
+		$rReturn = [];
 		$db->query('SELECT * FROM `servers_stats` WHERE `server_id` = ? AND UNIX_TIMESTAMP() - `time` <= ? ORDER BY `time` DESC;', $rID, $rLimit);
 		if (0 < $db->num_rows()) {
 			foreach ($db->get_rows() as $rRow) {
diff --git a/src/Streaming/Lifecycle/ShutdownHandler.php b/src/Streaming/Lifecycle/ShutdownHandler.php
index d9b91e1e..3913b395 100644
--- a/src/Streaming/Lifecycle/ShutdownHandler.php
+++ b/src/Streaming/Lifecycle/ShutdownHandler.php
@@ -24,57 +24,56 @@ use XcVm\Infrastructure\Redis\RedisManager;
  */
 
 class ShutdownHandler {
+	/**
+	 * @param string $rContext  'live' | 'vod' | 'timeshift'
+	 */
+	public static function handle(string $rContext = 'live') {
+		global $rCloseCon, $rTokenData, $rPID, $rChannelInfo, $rStreamID, $rServers, $db;
+		$rSettings = CacheReader::get('settings');
 
-    /**
-     * @param string $rContext  'live' | 'vod' | 'timeshift'
-     */
-    public static function handle($rContext = 'live') {
-        global $rCloseCon, $rTokenData, $rPID, $rChannelInfo, $rStreamID, $rServers, $db;
-        $rSettings = CacheReader::get('settings');
+		if ($rCloseCon) {
+			if (!empty($rSettings['redis_handler'])) {
+				if (!RedisManager::isConnected()) {
+					RedisManager::ensureConnected();
+				}
 
-        if ($rCloseCon) {
-            if (!empty($rSettings['redis_handler'])) {
-                if (!RedisManager::isConnected()) {
-                    RedisManager::ensureConnected();
-                }
+				$rConnection = ConnectionTracker::getConnection($rTokenData['uuid']);
 
-                $rConnection = ConnectionTracker::getConnection($rTokenData['uuid']);
+				if ($rConnection && $rConnection['pid'] == $rPID) {
+					$rChanges = ['hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset'])];
+					ConnectionTracker::updateConnection($rConnection, $rChanges, 'close');
+				}
+			} else {
+				if (!is_object($db)) {
+					DatabaseFactory::connect();
+				}
 
-                if ($rConnection && $rConnection['pid'] == $rPID) {
-                    $rChanges = array('hls_last_read' => time() - intval($rServers[SERVER_ID]['time_offset']));
-                    ConnectionTracker::updateConnection($rConnection, $rChanges, 'close');
-                }
-            } else {
-                if (!is_object($db)) {
-                    DatabaseFactory::connect();
-                }
+				$db->query(
+					'UPDATE `lines_live` SET `hls_end` = 1, `hls_last_read` = ? WHERE `uuid` = ? AND `pid` = ?;',
+					time() - intval($rServers[SERVER_ID]['time_offset']),
+					$rTokenData['uuid'],
+					$rPID
+				);
+			}
 
-                $db->query(
-                    'UPDATE `lines_live` SET `hls_end` = 1, `hls_last_read` = ? WHERE `uuid` = ? AND `pid` = ?;',
-                    time() - intval($rServers[SERVER_ID]['time_offset']),
-                    $rTokenData['uuid'],
-                    $rPID
-                );
-            }
+			// live: clean up both connection tmp files
+			// vod/timeshift: clean up the token touch file so it can't be reused after expiry
+			@unlink(CONS_TMP_PATH . $rTokenData['uuid']);
+			if ($rContext === 'live') {
+				@unlink(CONS_TMP_PATH . $rStreamID . '/' . $rTokenData['uuid']);
+			}
+		}
 
-            // live: clean up both connection tmp files
-            // vod/timeshift: clean up the token touch file so it can't be reused after expiry
-            @unlink(CONS_TMP_PATH . $rTokenData['uuid']);
-            if ($rContext === 'live') {
-                @unlink(CONS_TMP_PATH . $rStreamID . '/' . $rTokenData['uuid']);
-            }
-        }
+		// Только live: on-demand instant off
+		if ($rContext === 'live' && !empty($rSettings['on_demand_instant_off']) && !empty($rChannelInfo['on_demand'])) {
+			ConnectionTracker::removeFromQueue($rStreamID, $rPID);
+		}
 
-        // Только live: on-demand instant off
-        if ($rContext === 'live' && !empty($rSettings['on_demand_instant_off']) && !empty($rChannelInfo['on_demand'])) {
-            ConnectionTracker::removeFromQueue($rStreamID, $rPID);
-        }
-
-        // Закрытие ресурсов
-        if (empty($rSettings['redis_handler']) && is_object($db)) {
-            DatabaseFactory::close();
-        } elseif (!empty($rSettings['redis_handler']) && RedisManager::isConnected()) {
-            RedisManager::closeInstance();
-        }
-    }
+		// Закрытие ресурсов
+		if (empty($rSettings['redis_handler']) && is_object($db)) {
+			DatabaseFactory::close();
+		} elseif (!empty($rSettings['redis_handler']) && RedisManager::isConnected()) {
+			RedisManager::closeInstance();
+		}
+	}
 }
diff --git a/src/Streaming/Protection/ConnectionLimiter.php b/src/Streaming/Protection/ConnectionLimiter.php
index 9c101dfd..8f74d480 100644
--- a/src/Streaming/Protection/ConnectionLimiter.php
+++ b/src/Streaming/Protection/ConnectionLimiter.php
@@ -38,19 +38,19 @@ class ConnectionLimiter {
 	 *                                    pid 0, so the new viewer could evict itself.
 	 * @return int|null Connections closed, or null when within the limit.
 	 */
-	public static function closeConnections($rUserID, $rMaxConnections, $rIsHMAC = null, $rIdentifier = '', $rIP = null, $rUserAgent = null, $rCurrentUUID = null) {
+	public static function closeConnections(?int $rUserID, int $rMaxConnections, ?int $rIsHMAC = null, string $rIdentifier = '', ?string $rIP = null, ?string $rUserAgent = null, ?string $rCurrentUUID = null) {
 		global $rSettings, $rServers, $db;
 		$redis = RedisManager::instance();
 		if ($rSettings['redis_handler']) {
 			if (!$redis) {
 				return null;
 			}
-			$rConnections = array();
+			$rConnections = [];
 			// An HMAC identity's connections are keyed by "<hmac_id>_<identifier>",
 			// not a line id (which is null for it).
 			$rIdentity = $rIsHMAC ? $rIsHMAC . '_' . $rIdentifier : intval($rUserID);
 			$rKeys = $redis->zRangeByScore('LINE#' . $rIdentity, '-inf', '+inf');
-			$rKeys = is_array($rKeys) ? $rKeys : array();
+			$rKeys = is_array($rKeys) ? $rKeys : [];
 			$rToKill = count($rKeys) - $rMaxConnections;
 			if ($rToKill > 0) {
 				foreach (array_map('igbinary_unserialize', $redis->mGet($rKeys)) as $rConnection) {
@@ -81,14 +81,14 @@ class ConnectionLimiter {
 
 		$rIP = $_SERVER['REMOTE_ADDR'];
 		$rKilled = 0;
-		$rDelSID = $rDelUUID = $rIDs = array();
+		$rDelSID = $rDelUUID = $rIDs = [];
 		if ($rIP && $rUserAgent) {
-			$rKillTypes = array(2, 1, 0);
+			$rKillTypes = [2, 1, 0];
 		} else {
 			if ($rIP) {
-				$rKillTypes = array(1, 0);
+				$rKillTypes = [1, 0];
 			} else {
-				$rKillTypes = array(0);
+				$rKillTypes = [0];
 			}
 		}
 
@@ -125,7 +125,7 @@ class ConnectionLimiter {
 
 		if (!empty($rIDs)) {
 			if ($rSettings['redis_handler']) {
-				$rUUIDs = array();
+				$rUUIDs = [];
 				$rRedis = $redis->multi();
 				foreach ($rIDs as $rConnection) {
 					$rRedis->zRem('LINE#' . $rConnection['identity'], $rConnection['uuid']);
@@ -200,7 +200,7 @@ class ConnectionLimiter {
 		} else {
 			if ($rActivityInfo['container'] == 'hls' || $rActivityInfo['container'] == 'm3u8') {
 				if ($rSettings['redis_handler']) {
-					ConnectionTracker::updateConnection($rActivityInfo, array(), 'close');
+					ConnectionTracker::updateConnection($rActivityInfo, [], 'close');
 				} else {
 					$db->query('UPDATE `lines_live` SET `hls_end` = 1 WHERE `activity_id` = ?', $rActivityInfo['activity_id']);
 				}
@@ -210,7 +210,7 @@ class ConnectionLimiter {
 				if ($rActivityInfo['server_id'] == SERVER_ID && !empty($rActivityInfo['uuid'])) {
 					@unlink(CONS_TMP_PATH . $rActivityInfo['uuid']);
 				}
-			} else if (intval($rActivityInfo['pid']) === 0) {
+			} elseif (intval($rActivityInfo['pid']) === 0) {
 				// Daemon-served live TS (ADR 0003): no worker to kill — the daemon
 				// serving it drops the uuid (directly, or via its node's signals).
 				ConnectionTracker::dropDaemonViewer($rActivityInfo);
diff --git a/src/Streaming/StreamingBootstrap.php b/src/Streaming/StreamingBootstrap.php
index 82de3c05..e7e9c502 100644
--- a/src/Streaming/StreamingBootstrap.php
+++ b/src/Streaming/StreamingBootstrap.php
@@ -16,9 +16,9 @@ use XcVm\Core\Init\LegacyInitializer;
 
 class StreamingBootstrap {
 	public static function bootstrap($rFilename, $rSettings) {
-		$rProbeEndpoints = array('probe', 'player_api');
-		$rDefaultEndpoints = array('live', 'thumb', 'subtitle', 'timeshift', 'vod', 'status');
-		$rPrivilegedEndpoints = array('rtmp', 'portal');
+		$rProbeEndpoints = ['probe', 'player_api'];
+		$rDefaultEndpoints = ['live', 'thumb', 'subtitle', 'timeshift', 'vod', 'status'];
+		$rPrivilegedEndpoints = ['rtmp', 'portal'];
 
 		if (!in_array($rFilename, array_merge($rProbeEndpoints, $rDefaultEndpoints, $rPrivilegedEndpoints), true)) {
 			return null;
diff --git a/src/bootstrap.php b/src/bootstrap.php
index f7cd9ad3..df1ec0ee 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -53,7 +53,6 @@
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
 
-declare(strict_types=0);
 
 use XcVm\Core\Config\ConfigReader;
 use XcVm\Core\Config\SettingsManager;
@@ -82,7 +81,7 @@ use XcVm\Infrastructure\Redis\RedisManager;
 // require_once paths below. Defined here now that the legacy autoload.php (which
 // used to define it) has been removed.
 if (!defined('MAIN_HOME')) {
-    define('MAIN_HOME', __DIR__ . '/');
+	define('MAIN_HOME', __DIR__ . '/');
 }
 
 // Composer PSR-4 autoloader — resolves every XcVm\* class; modules load via
@@ -96,21 +95,21 @@ require_once __DIR__ . '/vendor/autoload.php';
 // ─────────────────────────────────────────────────────────────────
 
 if (!function_exists('getallheaders')) {
-    /**
-     * Polyfill for getallheaders(): reconstruct request headers from $_SERVER.
-     *
-     * @return array<string,string> Header name => value.
-     */
-    function getallheaders() {
-        $headers = [];
-        foreach ($_SERVER as $name => $value) {
-            if (substr($name, 0, 5) === 'HTTP_') {
-                $key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
-                $headers[$key] = $value;
-            }
-        }
-        return $headers;
-    }
+	/**
+	 * Polyfill for getallheaders(): reconstruct request headers from $_SERVER.
+	 *
+	 * @return array<string,string> Header name => value.
+	 */
+	function getallheaders() {
+		$headers = [];
+		foreach ($_SERVER as $name => $value) {
+			if (substr($name, 0, 5) === 'HTTP_') {
+				$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
+				$headers[$key] = $value;
+			}
+		}
+		return $headers;
+	}
 }
 
 
@@ -119,708 +118,715 @@ if (!function_exists('getallheaders')) {
 // ─────────────────────────────────────────────────────────────────
 
 class XC_Bootstrap {
+	// ── Contexts (kept for backward compatibility — prefer BootContext enum) ──
+	/** @deprecated Use BootContext::Minimal */
+	const CONTEXT_MINIMAL  = 'minimal';
+	/** @deprecated Use BootContext::Cli */
+	const CONTEXT_CLI      = 'cli';
+	/** @deprecated Use BootContext::Stream */
+	const CONTEXT_STREAM   = 'stream';
+	/** @deprecated Use BootContext::Admin */
+	const CONTEXT_ADMIN    = 'admin';
 
-    // ── Contexts (kept for backward compatibility — prefer BootContext enum) ──
-    /** @deprecated Use BootContext::Minimal */
-    const CONTEXT_MINIMAL  = 'minimal';
-    /** @deprecated Use BootContext::Cli */
-    const CONTEXT_CLI      = 'cli';
-    /** @deprecated Use BootContext::Stream */
-    const CONTEXT_STREAM   = 'stream';
-    /** @deprecated Use BootContext::Admin */
-    const CONTEXT_ADMIN    = 'admin';
-
-    // ── Internal state ───────────────────────────────────────
-    private static bool    $booted  = false;
-    private static ?string $context = null;
-    private static array   $options = [];
-    private static bool    $devMode = false;
-
-    // ── Subsystem initialization flags ────────────────────────
-    private static bool $constantsLoaded = false;
-    private static bool $configLoaded    = false;
-    private static bool $loggerStarted   = false;
-    private static bool $databaseReady   = false;
-    private static bool $coreReady       = false;
-    private static bool $adminReady      = false;
-    private static bool $sessionStarted  = false;
-    private static bool $redisReady      = false;
-
-    /**
-     * Main entry point.
-     *
-     * @param string|BootContext $context  Boot context. Accepts BootContext enum or legacy string constant.
-     * @param array              $options  Additional options:
-     *   'cached'      => bool   Use settings cache (for stream/cli, default: false)
-     *   'redis'       => bool   Connect Redis (default: true for admin, false for others)
-     *   'process'     => string Process name for cli_set_process_title()
-     *   'shutdown'    => callable Shutdown callback (replaces register_shutdown_function)
-     */
-    public static function boot(string|BootContext $context = BootContext::Cli, array $options = []): void {
-        if (self::$booted) {
-            return;
-        }
-
-        $ctx = $context instanceof BootContext ? $context : BootContext::from($context);
-
-        self::$context = $ctx->value;
-        self::$options = array_merge(self::defaults($ctx), $options);
-
-        // ── Create container ────────────────────────────────────
-        $container = ServiceContainer::getInstance();
-        $container->set('context', $ctx->value);
-        $container->set('options', self::$options);
-
-        // ── Common for all contexts ────────────────────────────
-
-        self::loadConstants();
-
-        $container->set('config', ConfigReader::getAll());
-
-        // ── Flood-protection (HTTP only) ───────────────────────
-        if (!self::isCli()) {
-            self::floodProtection();
-            self::hostVerification();
-        }
-
-        // ── Context-dependent initialization ───────────────────
-
-        match ($ctx) {
-            BootContext::Minimal => null,
-            BootContext::Cli     => self::bootCli(),
-            BootContext::Stream  => self::bootStream(),
-            BootContext::Admin   => self::bootAdmin(),
-        };
-
-        // ── Register services in the container ──────────────────
-        self::populateContainer($container);
-
-        // ── Verify that expected services were registered ────────
-        if ($ctx !== BootContext::Minimal) {
-            self::assertContainerHealth($container);
-        }
-
-        self::$booted = true;
-    }
-
-    // ─────────────────────────────────────────────────────────
-    //  Public getters
-    // ─────────────────────────────────────────────────────────
-
-    /**
-     * Current boot context.
-     */
-    public static function getContext(): ?string {
-        return self::$context;
-    }
-
-    /**
-     * Whether bootstrap has been executed.
-     */
-    public static function isBooted(): bool {
-        return self::$booted;
-    }
-
-    /**
-     * Whether dev mode is active (DEV_MODE constant in AppConfig.php is true).
-     * When true, PHP errors are displayed on-screen regardless of DB settings.
-     */
-    public static function isDevMode(): bool {
-        return self::$devMode;
-    }
-
-    /**
-     * Database reference (backward compatibility).
-     */
-    public static function getDatabase(): ?Database {
-        global $db;
-        return $db;
-    }
-
-    /**
-     * Get the ServiceContainer.
-     *
-     * @return ServiceContainer
-     */
-    public static function getContainer(): ServiceContainer {
-        return ServiceContainer::getInstance();
-    }
-
-    /**
-     * Check whether running in CLI mode.
-     */
-    public static function isCli(): bool {
-        return php_sapi_name() === 'cli' || defined('STDIN');
-    }
-
-    /**
-     * Force reset (for testing).
-     */
-    public static function reset(): void {
-        self::$booted          = false;
-        self::$context         = null;
-        self::$options         = [];
-        self::$constantsLoaded = false;
-        self::$configLoaded    = false;
-        self::$loggerStarted   = false;
-        self::$databaseReady   = false;
-        self::$coreReady       = false;
-        self::$adminReady      = false;
-        self::$sessionStarted  = false;
-        self::$redisReady      = false;
-
-        ServiceContainer::resetInstance();
-    }
-
-    // ─────────────────────────────────────────────────────────
-    //  Context boot sequences
-    // ─────────────────────────────────────────────────────────
-
-    /**
-     * Boot sequence for the CLI context: database, legacy core, optional redis
-     * and process title.
-     *
-     * @return void
-     */
-    private static function bootCli(): void {
-        self::initDatabase(self::$options['cached']);
-        self::initLegacyCore(self::$options['cached']);
-        if (self::$options['redis']) {
-            self::initRedis();
-        }
-        if (!empty(self::$options['process'])) {
-            cli_set_process_title(self::$options['process']);
-        }
-    }
-
-    /**
-     * Boot sequence for the streaming context: cached database connection only.
-     *
-     * @return void
-     */
-    private static function bootStream(): void {
-        self::initDatabase(true);
-    }
-
-    /**
-     * Boot sequence for the admin context: session, database, legacy core, redis,
-     * admin API, translator, shutdown handler and status constants.
-     *
-     * @return void
-     */
-    private static function bootAdmin(): void {
-        self::initSession();
-        self::initDatabase(false);
-        self::initLegacyCore(false);
-        self::initRedis();
-        self::initAdminAPI();
-        self::initTranslator();
-        self::registerAdminShutdown();
-        self::defineStatusConstants();
-        self::initAdminGlobals();
-    }
-
-    // ─────────────────────────────────────────────────────────
-    //  Subsystem initialization (each called at most once)
-    // ─────────────────────────────────────────────────────────
-
-    /**
-     * Load constants, paths, Logger, error functions.
-     *
-     * Loads core configuration directly (without www/constants.php):
-     *   core/Error/ErrorCodes.php  — $rErrorCodes
-     *   core/Error/ErrorHandler.php — generateError(), generate404()
-     *   core/Config/Paths.php      — *_PATH constants
-     *   core/Config/AppConfig.php  — version, Git, flags
-     *   core/Config/Binaries.php   — FFMPEG, FFPROBE, GeoIP
-     */
-    private static function loadConstants(): void {
-        if (self::$constantsLoaded) {
-            return;
-        }
-
-        require_once MAIN_HOME . 'Core/Error/ErrorCodes.php';
-        require_once MAIN_HOME . 'Core/Error/ErrorHandler.php';
-        require_once MAIN_HOME . 'Core/Config/Paths.php';
-        require_once MAIN_HOME . 'Core/Config/AppConfig.php';
-        require_once MAIN_HOME . 'Core/Config/Binaries.php';
-
-        self::$devMode = DEV_MODE;
-
-        if (!defined('PHP_ERRORS')) {
-            define('PHP_ERRORS', self::$devMode);
-        }
-
-        Logger::init(
-            self::$devMode || PHP_ERRORS,
-            LOGS_TMP_PATH . 'error_log.log'
-        );
-
-        self::$constantsLoaded = true;
-        self::$configLoaded    = true;
-        self::$loggerStarted   = true;
-    }
-
-    /**
-     * Flood-protection: block banned IPs.
-     *
-     * Called for HTTP contexts only.
-     */
-    private static function floodProtection(): void {
-        if (self::isCli()) {
-            return;
-        }
-
-        $rIP = $_SERVER['REMOTE_ADDR'] ?? '';
-        if (!empty($rIP) && file_exists(FLOOD_TMP_PATH . 'block_' . $rIP)) {
-            http_response_code(403);
-            exit();
-        }
-    }
-
-    /**
-     * Host verification: ensure request comes from an allowed domain.
-     */
-    private static function hostVerification(): void {
-        if (self::isCli()) {
-            return;
-        }
-
-        if (!defined('HOST')) {
-            $host = trim(explode(':', $_SERVER['HTTP_HOST'] ?? '')[0]);
-            define('HOST', $host);
-        }
-
-        // Domain check via settings cache
-        if (file_exists(CACHE_TMP_PATH . 'settings')) {
-            $rData = @file_get_contents(CACHE_TMP_PATH . 'settings');
-            if ($rData !== false) {
-                $rSettings = @igbinary_unserialize($rData);
-                if (is_array($rSettings) && !empty($rSettings['verify_host'])) {
-                    if (file_exists(CACHE_TMP_PATH . 'allowed_domains')) {
-                        $rDomains = @igbinary_unserialize(@file_get_contents(CACHE_TMP_PATH . 'allowed_domains'));
-                        if (
-                            is_array($rDomains) && count($rDomains) > 0
-                            && !in_array(HOST, $rDomains) && HOST !== 'xc_vm'
-                            && !filter_var(HOST, FILTER_VALIDATE_IP)
-                        ) {
-                            generateError('INVALID_HOST');
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Start PHP session with secure parameters.
-     *
-     * HTTP contexts only (admin/reseller).
-     */
-    private static function initSession(): void {
-        if (self::$sessionStarted || self::isCli()) {
-            return;
-        }
-
-        if (session_status() === PHP_SESSION_NONE) {
-            $rParams = session_get_cookie_params() ?: [];
-            $rParams['samesite'] = 'Strict';
-            // The panel's scripts never read the session cookie, so an XSS must
-            // not be able to either.
-            $rParams['httponly'] = true;
-            session_set_cookie_params($rParams);
-            // Refuse session ids this server never issued, so a visitor cannot
-            // arrive carrying one an attacker chose.
-            ini_set('session.use_strict_mode', '1');
-            session_start();
-        }
-
-        self::$sessionStarted = true;
-    }
-
-    /**
-     * Connect to MySQL/MariaDB.
-     *
-     * Creates the global $db variable (backward compatibility).
-     *
-     * @param bool $cached If true, LegacyInitializer will use
-     *                     file cache instead of SQL queries for settings.
-     */
-    private static function initDatabase(bool $cached = false): void {
-        if (self::$databaseReady) {
-            return;
-        }
-
-        global $db;
-
-        $db = new DatabaseHandler();
-
-        self::$databaseReady = true;
-    }
-
-    /**
-     * Initialize legacy core subsystems.
-     *
-     * Sanitizes globals ($_GET, $_POST, $_SESSION, $_COOKIE),
-     * parses config, defines SERVER_ID, selects FFmpeg binaries,
-     * loads settings (from DB or cache).
-     *
-     * @param bool $cached Use cache for settings (for high-load paths)
-     */
-    private static function initLegacyCore(bool $cached = false): void {
-        if (self::$coreReady) {
-            return;
-        }
-
-        global $db;
-
-        DatabaseFactory::set($db);
-
-        // Wire $db into the domain service classes before initCore() runs,
-        // since initCore() calls ServerRepository::getAll() which requires it.
-        self::wireDomainDatabase($db);
-
-        LegacyInitializer::initCore($cached);
-
-        // If cache was used and is incomplete — reconnect to DB
-        if ($cached && !SettingsManager::get('enable_cache')) {
-            $db = new DatabaseHandler();
-            DatabaseFactory::set($db);
-            self::wireDomainDatabase($db);
-        }
-
-        self::$coreReady = true;
-    }
-
-    /**
-     * Connect to Redis.
-     */
-    private static function initRedis(): void {
-        if (self::$redisReady) {
-            return;
-        }
-
-        // $redisReady means "connected", not "attempted": assertContainerHealth()
-        // requires the 'redis' service only when this flag is set, so a failed
-        // connection must leave it false — the panel degrades instead of 500ing.
-        self::$redisReady = RedisManager::ensureConnected();
-    }
-
-    /**
-     * Initialize Admin API + Reseller API.
-     *
-     * Initializes ResellerAPI class and admin user info.
-     */
-    private static function initAdminAPI(): void {
-        if (self::$adminReady) {
-            return;
-        }
-
-        global $db;
-
-
-        // Admin user info
-        if (isset($_SESSION['hash'])) {
-            $GLOBALS['rAdminUserInfo'] = UserRepository::getRegisteredUserById($_SESSION['hash']);
-        }
-
-        ResellerAPI::init();
-
-        self::$adminReady = true;
-    }
-
-    /**
-     * Initialize Translator (i18n).
-     */
-    private static function initTranslator(): void {
-        Translator::init();
-    }
-
-    /**
-     * Register shutdown function for admin context.
-     *
-     * Closes the MySQL connection on script termination.
-     */
-    private static function registerAdminShutdown(): void {
-        register_shutdown_function(function () {
-            global $db;
-            if (is_object($db)) {
-                $db->close_mysql();
-            }
-        });
-    }
-
-    /**
-     * Populate the container with initialized services.
-     *
-     * Called at the end of boot() — all subsystems are already running,
-     * so it is safe to reference $db, SettingsManager, etc.
-     *
-     * Container stores:
-     *   'db'           => Database       — PDO wrapper
-     *   'config'       => array          — $_INFO from config.ini
-     *   'settings'     => array          — panel settings
-     *   'redis'        => Redis|null     — Redis connection
-     *   'servers'      => array          — server list
-     *   'bouquets'     => array          — bouquets
-     *   'categories'   => array          — categories
-     *   'translator'   => string         — Translator class
-     *   'events'       => string         — EventDispatcher class
-     *
-     * @param ServiceContainer $container
-     */
-    private static function populateContainer(ServiceContainer $container): void {
-        // Database
-        if (self::$databaseReady) {
-            global $db;
-            $container->set('db', $db);
-            self::wireDomainDatabase($db);
-        }
-
-        // Settings and core data
-        if (self::$coreReady) {
-            $container->set('settings',   SettingsManager::getAll());
-            $container->set('servers',    ServerRepository::getAll());
-            $container->set('bouquets',   BouquetService::getAll());
-            $container->set('categories', CategoryService::getFromDatabase());
-
-            if (self::$redisReady && RedisManager::isConnected()) {
-                $container->set('redis', RedisManager::instance());
-            }
-        }
-
-        // Translator
-        if (class_exists(Translator::class, false) && Translator::available()) {
-            $container->set('translator', Translator::class);
-        }
-
-        // Events — create an instance, wire it as the static singleton bridge,
-        // and register it in the container so it can be injected via DI.
-        $dispatcher = new EventDispatcher();
-        EventDispatcher::setInstance($dispatcher);
-        $container->set('events', $dispatcher);
-    }
-
-    /**
-     * Wire the injected $db instance into every domain service class.
-     *
-     * Domain classes use the static setDb() / db() pattern: setDb() stores
-     * the injected instance; db() returns it. Calling this method removes the
-     * need for the global $db fallback inside each db() helper.
-     *
-     * @param DatabaseHandler $db DatabaseHandler instance
-     */
-    private static function wireDomainDatabase(object $db): void {
-        DomainDatabaseWiring::wire($db);
-    }
-
-    /**
-     * Verify that services which should have been registered actually are.
-     *
-     * Called after populateContainer() for every context except CONTEXT_MINIMAL.
-     * Throws RuntimeException on the first missing service so the application
-     * fails loudly instead of silently degrading.
-     *
-     * @param ServiceContainer $container
-     * @throws RuntimeException
-     */
-    private static function assertContainerHealth(ServiceContainer $container): void {
-        $required = ['events'];
-
-        if (self::$databaseReady) {
-            $required[] = 'db';
-        }
-
-        if (self::$redisReady) {
-            $required[] = 'redis';
-        }
-
-        $missing = [];
-        foreach ($required as $service) {
-            if (!$container->has($service)) {
-                $missing[] = $service;
-            }
-        }
-
-        if ($missing !== []) {
-            throw new RuntimeException(
-                'ServiceContainer health check failed — missing required services: '
-                    . implode(', ', $missing)
-            );
-        }
-    }
-
-    /**
-     * Default boot options for a context.
-     *
-     * @param BootContext $ctx Boot context.
-     * @return array Options: cached, redis, process, shutdown.
-     */
-    private static function defaults(BootContext $ctx): array {
-        return match ($ctx) {
-            BootContext::Admin   => ['cached' => false, 'redis' => true,  'process' => '', 'shutdown' => null],
-            BootContext::Stream  => ['cached' => true,  'redis' => false, 'process' => '', 'shutdown' => null],
-            BootContext::Cli     => ['cached' => false, 'redis' => false, 'process' => '', 'shutdown' => null],
-            BootContext::Minimal => ['cached' => false, 'redis' => false, 'process' => '', 'shutdown' => null],
-        };
-    }
-
-    /**
-     * Initialize admin globals: MobileDetect, timeouts, servers, protocol.
-     */
-    private static function initAdminGlobals(): void {
-        global $rDetect, $rMobile, $rTimeout, $rSQLTimeout, $rProtocol,
-            $allServers, $rServers, $rSettings, $rProxyServers,
-            $rPermissions, $allowedLangs;
-
-        if (!defined('SERVER_ID')) {
-            define('SERVER_ID', intval(ConfigReader::get('server_id')));
-        }
-
-        $rDetect = new \Detection\MobileDetect();
-        $rMobile = $rDetect->isMobile();
-
-        $rTimeout    = 15;
-        $rSQLTimeout = 10;
-        set_time_limit($rTimeout);
-        ini_set('mysql.connect_timeout', (string) $rSQLTimeout);
-        ini_set('max_execution_time', (string) $rTimeout);
-        ini_set('default_socket_timeout', (string) $rTimeout);
-
-        $rProtocol    = self::detectProtocol();
-        $allServers   = ServerRepository::getAllSimple();
-        $rServers     = ServerRepository::getStreamingSimple($rPermissions);
-        $rSettings    = SettingsManager::getAll();
-        if (self::$devMode) {
-            $rSettings['debug_show_errors'] = true;
-        }
-        $rProxyServers = ServerRepository::getProxySimple($rPermissions);
-
-        $allowedLangs = Translator::available();
-
-        // Sort servers by order
-        if (is_array($rServers)) {
-            uasort(
-                $rServers,
-                function ($a, $b) {
-                    return $a['order'] - $b['order'];
-                }
-            );
-        }
-
-        // Ensure the legacy 'reseller' assets alias (Public/assets/reseller → admin).
-        self::ensureResellerAssetsSymlink();
-    }
-
-    /**
-     * Ensure the legacy 'reseller' assets alias exists (Public/assets/reseller → admin).
-     *
-     * Reseller pages reuse the admin asset bundle, and some nginx configs / legacy
-     * routes expect Public/assets/reseller to resolve to Public/assets/admin. The
-     * link is not stored in git (an absolute-path symlink broke the build), so the
-     * panel recreates it here. Idempotent, and repairs a stale/broken link.
-     */
-    private static function ensureResellerAssetsSymlink(): void {
-        $assetsBase   = MAIN_HOME . 'Public/assets/';
-        $resellerLink = $assetsBase . 'reseller';
-
-        // Nothing to point at yet — skip.
-        if (!is_dir($assetsBase . 'admin')) {
-            return;
-        }
-
-        if (is_link($resellerLink)) {
-            // Correct, resolvable link → nothing to do.
-            if (readlink($resellerLink) === 'admin' && is_dir($resellerLink)) {
-                return;
-            }
-            @unlink($resellerLink); // stale/broken link — recreate below
-        } elseif (file_exists($resellerLink)) {
-            return; // a real directory/file lives here — leave it alone
-        }
-
-        // Relative link so it is independent of MAIN_HOME and path case.
-        if (!@symlink('admin', $resellerLink)) {
-            // Without the link every reseller access code serves pages with no
-            // CSS/JS (nginx aliases /CODE/assets/ to Public/assets/reseller/).
-            error_log('XC_Bootstrap: failed to create Public/assets/reseller -> admin symlink — check ownership of Public/assets/ (expected xc_vm).');
-        }
-    }
-
-    /**
-     * Detect HTTP protocol (http/https).
-     */
-    private static function detectProtocol(): string {
-        $https  = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
-        $port443 = isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443;
-        return ($https || $port443) ? 'https' : 'http';
-    }
-
-    // ─────────────────────────────────────────────────────────
-    //  Status constants (from admin.php)
-    // ─────────────────────────────────────────────────────────
-
-    /**
-     * Define status constants (STATUS_FAILURE, STATUS_SUCCESS, ...).
-     *
-     * Used throughout admin and reseller API handlers.
-     * Called automatically in CONTEXT_ADMIN.
-     * Can be called manually when needed.
-     */
-    public static function defineStatusConstants(): void {
-        // Guard against duplicate definition
-        if (defined('STATUS_FAILURE')) {
-            return;
-        }
-
-        define('STATUS_FAILURE', 0);
-        define('STATUS_SUCCESS', 1);
-        define('STATUS_SUCCESS_MULTI', 2);
-        define('STATUS_CODE_LENGTH', 3);
-        define('STATUS_NO_SOURCES', 4);
-        define('STATUS_DISABLED', 5);
-        define('STATUS_NOT_ADMIN', 6);
-        define('STATUS_INVALID_EMAIL', 7);
-        define('STATUS_INVALID_PASSWORD', 8);
-        define('STATUS_INVALID_IP', 9);
-        define('STATUS_INVALID_PLAYLIST', 10);
-        define('STATUS_INVALID_NAME', 11);
-        define('STATUS_INVALID_CAPTCHA', 12);
-        define('STATUS_INVALID_CODE', 13);
-        define('STATUS_INVALID_DATE', 14);
-        define('STATUS_INVALID_FILE', 15);
-        define('STATUS_INVALID_GROUP', 16);
-        define('STATUS_INVALID_DATA', 17);
-        define('STATUS_INVALID_DIR', 18);
-        define('STATUS_INVALID_MAC', 19);
-        define('STATUS_EXISTS_CODE', 20);
-        define('STATUS_EXISTS_NAME', 21);
-        define('STATUS_EXISTS_USERNAME', 22);
-        define('STATUS_EXISTS_MAC', 23);
-        define('STATUS_EXISTS_SOURCE', 24);
-        define('STATUS_EXISTS_IP', 25);
-        define('STATUS_EXISTS_DIR', 26);
-        define('STATUS_SUCCESS_REPLACE', 27);
-        define('STATUS_FLUSH', 28);
-        define('STATUS_TOO_MANY_RESULTS', 29);
-        define('STATUS_SPACE_ISSUE', 30);
-        define('STATUS_INVALID_USER', 31);
-        define('STATUS_CERTBOT', 32);
-        define('STATUS_CERTBOT_INVALID', 33);
-        define('STATUS_INVALID_INPUT', 34);
-        define('STATUS_NOT_RESELLER', 35);
-        define('STATUS_NO_TRIALS', 36);
-        define('STATUS_INSUFFICIENT_CREDITS', 37);
-        define('STATUS_INVALID_PACKAGE', 38);
-        define('STATUS_INVALID_TYPE', 39);
-        define('STATUS_INVALID_USERNAME', 40);
-        define('STATUS_INVALID_SUBRESELLER', 41);
-        define('STATUS_NO_DESCRIPTION', 42);
-        define('STATUS_NO_KEY', 43);
-        define('STATUS_EXISTS_HMAC', 44);
-        define('STATUS_CERTBOT_RUNNING', 45);
-        define('STATUS_RESERVED_CODE', 46);
-        define('STATUS_NO_TITLE', 47);
-        define('STATUS_NO_SOURCE', 48);
-    }
+	// ── Internal state ───────────────────────────────────────
+	private static bool $booted  = false;
+
+	private static ?string $context = null;
+
+	private static array $options = [];
+
+	private static bool $devMode = false;
+
+	// ── Subsystem initialization flags ────────────────────────
+	private static bool $constantsLoaded = false;
+
+	private static bool $configLoaded    = false;
+
+	private static bool $loggerStarted   = false;
+
+	private static bool $databaseReady   = false;
+
+	private static bool $coreReady       = false;
+
+	private static bool $adminReady      = false;
+
+	private static bool $sessionStarted  = false;
+
+	private static bool $redisReady      = false;
+
+	/**
+	 * Main entry point.
+	 *
+	 * @param string|BootContext $context  Boot context. Accepts BootContext enum or legacy string constant.
+	 * @param array              $options  Additional options:
+	 *   'cached'      => bool   Use settings cache (for stream/cli, default: false)
+	 *   'redis'       => bool   Connect Redis (default: true for admin, false for others)
+	 *   'process'     => string Process name for cli_set_process_title()
+	 *   'shutdown'    => callable Shutdown callback (replaces register_shutdown_function)
+	 */
+	public static function boot(string|BootContext $context = BootContext::Cli, array $options = []): void {
+		if (self::$booted) {
+			return;
+		}
+
+		$ctx = $context instanceof BootContext ? $context : BootContext::from($context);
+
+		self::$context = $ctx->value;
+		self::$options = array_merge(self::defaults($ctx), $options);
+
+		// ── Create container ────────────────────────────────────
+		$container = ServiceContainer::getInstance();
+		$container->set('context', $ctx->value);
+		$container->set('options', self::$options);
+
+		// ── Common for all contexts ────────────────────────────
+
+		self::loadConstants();
+
+		$container->set('config', ConfigReader::getAll());
+
+		// ── Flood-protection (HTTP only) ───────────────────────
+		if (!self::isCli()) {
+			self::floodProtection();
+			self::hostVerification();
+		}
+
+		// ── Context-dependent initialization ───────────────────
+
+		match ($ctx) {
+			BootContext::Minimal => null,
+			BootContext::Cli     => self::bootCli(),
+			BootContext::Stream  => self::bootStream(),
+			BootContext::Admin   => self::bootAdmin(),
+		};
+
+		// ── Register services in the container ──────────────────
+		self::populateContainer($container);
+
+		// ── Verify that expected services were registered ────────
+		if ($ctx !== BootContext::Minimal) {
+			self::assertContainerHealth($container);
+		}
+
+		self::$booted = true;
+	}
+
+	// ─────────────────────────────────────────────────────────
+	//  Public getters
+	// ─────────────────────────────────────────────────────────
+
+	/**
+	 * Current boot context.
+	 */
+	public static function getContext(): ?string {
+		return self::$context;
+	}
+
+	/**
+	 * Whether bootstrap has been executed.
+	 */
+	public static function isBooted(): bool {
+		return self::$booted;
+	}
+
+	/**
+	 * Whether dev mode is active (DEV_MODE constant in AppConfig.php is true).
+	 * When true, PHP errors are displayed on-screen regardless of DB settings.
+	 */
+	public static function isDevMode(): bool {
+		return self::$devMode;
+	}
+
+	/**
+	 * Database reference (backward compatibility).
+	 */
+	public static function getDatabase(): ?Database {
+		global $db;
+		return $db;
+	}
+
+	/**
+	 * Get the ServiceContainer.
+	 *
+	 * @return ServiceContainer
+	 */
+	public static function getContainer(): ServiceContainer {
+		return ServiceContainer::getInstance();
+	}
+
+	/**
+	 * Check whether running in CLI mode.
+	 */
+	public static function isCli(): bool {
+		return php_sapi_name() === 'cli' || defined('STDIN');
+	}
+
+	/**
+	 * Force reset (for testing).
+	 */
+	public static function reset(): void {
+		self::$booted          = false;
+		self::$context         = null;
+		self::$options         = [];
+		self::$constantsLoaded = false;
+		self::$configLoaded    = false;
+		self::$loggerStarted   = false;
+		self::$databaseReady   = false;
+		self::$coreReady       = false;
+		self::$adminReady      = false;
+		self::$sessionStarted  = false;
+		self::$redisReady      = false;
+
+		ServiceContainer::resetInstance();
+	}
+
+	// ─────────────────────────────────────────────────────────
+	//  Context boot sequences
+	// ─────────────────────────────────────────────────────────
+
+	/**
+	 * Boot sequence for the CLI context: database, legacy core, optional redis
+	 * and process title.
+	 *
+	 * @return void
+	 */
+	private static function bootCli(): void {
+		self::initDatabase(self::$options['cached']);
+		self::initLegacyCore(self::$options['cached']);
+		if (self::$options['redis']) {
+			self::initRedis();
+		}
+		if (!empty(self::$options['process'])) {
+			cli_set_process_title(self::$options['process']);
+		}
+	}
+
+	/**
+	 * Boot sequence for the streaming context: cached database connection only.
+	 *
+	 * @return void
+	 */
+	private static function bootStream(): void {
+		self::initDatabase(true);
+	}
+
+	/**
+	 * Boot sequence for the admin context: session, database, legacy core, redis,
+	 * admin API, translator, shutdown handler and status constants.
+	 *
+	 * @return void
+	 */
+	private static function bootAdmin(): void {
+		self::initSession();
+		self::initDatabase(false);
+		self::initLegacyCore(false);
+		self::initRedis();
+		self::initAdminAPI();
+		self::initTranslator();
+		self::registerAdminShutdown();
+		self::defineStatusConstants();
+		self::initAdminGlobals();
+	}
+
+	// ─────────────────────────────────────────────────────────
+	//  Subsystem initialization (each called at most once)
+	// ─────────────────────────────────────────────────────────
+
+	/**
+	 * Load constants, paths, Logger, error functions.
+	 *
+	 * Loads core configuration directly (without www/constants.php):
+	 *   core/Error/ErrorCodes.php  — $rErrorCodes
+	 *   core/Error/ErrorHandler.php — generateError(), generate404()
+	 *   core/Config/Paths.php      — *_PATH constants
+	 *   core/Config/AppConfig.php  — version, Git, flags
+	 *   core/Config/Binaries.php   — FFMPEG, FFPROBE, GeoIP
+	 */
+	private static function loadConstants(): void {
+		if (self::$constantsLoaded) {
+			return;
+		}
+
+		require_once MAIN_HOME . 'Core/Error/ErrorCodes.php';
+		require_once MAIN_HOME . 'Core/Error/ErrorHandler.php';
+		require_once MAIN_HOME . 'Core/Config/Paths.php';
+		require_once MAIN_HOME . 'Core/Config/AppConfig.php';
+		require_once MAIN_HOME . 'Core/Config/Binaries.php';
+
+		self::$devMode = DEV_MODE;
+
+		if (!defined('PHP_ERRORS')) {
+			define('PHP_ERRORS', self::$devMode);
+		}
+
+		Logger::init(
+			self::$devMode || PHP_ERRORS,
+			LOGS_TMP_PATH . 'error_log.log'
+		);
+
+		self::$constantsLoaded = true;
+		self::$configLoaded    = true;
+		self::$loggerStarted   = true;
+	}
+
+	/**
+	 * Flood-protection: block banned IPs.
+	 *
+	 * Called for HTTP contexts only.
+	 */
+	private static function floodProtection(): void {
+		if (self::isCli()) {
+			return;
+		}
+
+		$rIP = $_SERVER['REMOTE_ADDR'] ?? '';
+		if (!empty($rIP) && file_exists(FLOOD_TMP_PATH . 'block_' . $rIP)) {
+			http_response_code(403);
+			exit();
+		}
+	}
+
+	/**
+	 * Host verification: ensure request comes from an allowed domain.
+	 */
+	private static function hostVerification(): void {
+		if (self::isCli()) {
+			return;
+		}
+
+		if (!defined('HOST')) {
+			$host = trim(explode(':', $_SERVER['HTTP_HOST'] ?? '')[0]);
+			define('HOST', $host);
+		}
+
+		// Domain check via settings cache
+		if (file_exists(CACHE_TMP_PATH . 'settings')) {
+			$rData = @file_get_contents(CACHE_TMP_PATH . 'settings');
+			if ($rData !== false) {
+				$rSettings = @igbinary_unserialize($rData);
+				if (is_array($rSettings) && !empty($rSettings['verify_host'])) {
+					if (file_exists(CACHE_TMP_PATH . 'allowed_domains')) {
+						$rDomains = @igbinary_unserialize(@file_get_contents(CACHE_TMP_PATH . 'allowed_domains'));
+						if (
+							is_array($rDomains) && count($rDomains) > 0
+							&& !in_array(HOST, $rDomains) && HOST !== 'xc_vm'
+							&& !filter_var(HOST, FILTER_VALIDATE_IP)
+						) {
+							generateError('INVALID_HOST');
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Start PHP session with secure parameters.
+	 *
+	 * HTTP contexts only (admin/reseller).
+	 */
+	private static function initSession(): void {
+		if (self::$sessionStarted || self::isCli()) {
+			return;
+		}
+
+		if (session_status() === PHP_SESSION_NONE) {
+			$rParams = session_get_cookie_params() ?: [];
+			$rParams['samesite'] = 'Strict';
+			// The panel's scripts never read the session cookie, so an XSS must
+			// not be able to either.
+			$rParams['httponly'] = true;
+			session_set_cookie_params($rParams);
+			// Refuse session ids this server never issued, so a visitor cannot
+			// arrive carrying one an attacker chose.
+			ini_set('session.use_strict_mode', '1');
+			session_start();
+		}
+
+		self::$sessionStarted = true;
+	}
+
+	/**
+	 * Connect to MySQL/MariaDB.
+	 *
+	 * Creates the global $db variable (backward compatibility).
+	 *
+	 * @param bool $cached If true, LegacyInitializer will use
+	 *                     file cache instead of SQL queries for settings.
+	 */
+	private static function initDatabase(bool $cached = false): void {
+		if (self::$databaseReady) {
+			return;
+		}
+
+		global $db;
+
+		$db = new DatabaseHandler();
+
+		self::$databaseReady = true;
+	}
+
+	/**
+	 * Initialize legacy core subsystems.
+	 *
+	 * Sanitizes globals ($_GET, $_POST, $_SESSION, $_COOKIE),
+	 * parses config, defines SERVER_ID, selects FFmpeg binaries,
+	 * loads settings (from DB or cache).
+	 *
+	 * @param bool $cached Use cache for settings (for high-load paths)
+	 */
+	private static function initLegacyCore(bool $cached = false): void {
+		if (self::$coreReady) {
+			return;
+		}
+
+		global $db;
+
+		DatabaseFactory::set($db);
+
+		// Wire $db into the domain service classes before initCore() runs,
+		// since initCore() calls ServerRepository::getAll() which requires it.
+		self::wireDomainDatabase($db);
+
+		LegacyInitializer::initCore($cached);
+
+		// If cache was used and is incomplete — reconnect to DB
+		if ($cached && !SettingsManager::get('enable_cache')) {
+			$db = new DatabaseHandler();
+			DatabaseFactory::set($db);
+			self::wireDomainDatabase($db);
+		}
+
+		self::$coreReady = true;
+	}
+
+	/**
+	 * Connect to Redis.
+	 */
+	private static function initRedis(): void {
+		if (self::$redisReady) {
+			return;
+		}
+
+		// $redisReady means "connected", not "attempted": assertContainerHealth()
+		// requires the 'redis' service only when this flag is set, so a failed
+		// connection must leave it false — the panel degrades instead of 500ing.
+		self::$redisReady = RedisManager::ensureConnected();
+	}
+
+	/**
+	 * Initialize Admin API + Reseller API.
+	 *
+	 * Initializes ResellerAPI class and admin user info.
+	 */
+	private static function initAdminAPI(): void {
+		if (self::$adminReady) {
+			return;
+		}
+
+		global $db;
+
+
+		// Admin user info
+		if (isset($_SESSION['hash'])) {
+			$GLOBALS['rAdminUserInfo'] = UserRepository::getRegisteredUserById($_SESSION['hash']);
+		}
+
+		ResellerAPI::init();
+
+		self::$adminReady = true;
+	}
+
+	/**
+	 * Initialize Translator (i18n).
+	 */
+	private static function initTranslator(): void {
+		Translator::init();
+	}
+
+	/**
+	 * Register shutdown function for admin context.
+	 *
+	 * Closes the MySQL connection on script termination.
+	 */
+	private static function registerAdminShutdown(): void {
+		register_shutdown_function(function () {
+			global $db;
+			if (is_object($db)) {
+				$db->close_mysql();
+			}
+		});
+	}
+
+	/**
+	 * Populate the container with initialized services.
+	 *
+	 * Called at the end of boot() — all subsystems are already running,
+	 * so it is safe to reference $db, SettingsManager, etc.
+	 *
+	 * Container stores:
+	 *   'db'           => Database       — PDO wrapper
+	 *   'config'       => array          — $_INFO from config.ini
+	 *   'settings'     => array          — panel settings
+	 *   'redis'        => Redis|null     — Redis connection
+	 *   'servers'      => array          — server list
+	 *   'bouquets'     => array          — bouquets
+	 *   'categories'   => array          — categories
+	 *   'translator'   => string         — Translator class
+	 *   'events'       => string         — EventDispatcher class
+	 *
+	 */
+	private static function populateContainer(ServiceContainer $container): void {
+		// Database
+		if (self::$databaseReady) {
+			global $db;
+			$container->set('db', $db);
+			self::wireDomainDatabase($db);
+		}
+
+		// Settings and core data
+		if (self::$coreReady) {
+			$container->set('settings', SettingsManager::getAll());
+			$container->set('servers', ServerRepository::getAll());
+			$container->set('bouquets', BouquetService::getAll());
+			$container->set('categories', CategoryService::getFromDatabase());
+
+			if (self::$redisReady && RedisManager::isConnected()) {
+				$container->set('redis', RedisManager::instance());
+			}
+		}
+
+		// Translator
+		if (class_exists(Translator::class, false) && Translator::available()) {
+			$container->set('translator', Translator::class);
+		}
+
+		// Events — create an instance, wire it as the static singleton bridge,
+		// and register it in the container so it can be injected via DI.
+		$dispatcher = new EventDispatcher();
+		EventDispatcher::setInstance($dispatcher);
+		$container->set('events', $dispatcher);
+	}
+
+	/**
+	 * Wire the injected $db instance into every domain service class.
+	 *
+	 * Domain classes use the static setDb() / db() pattern: setDb() stores
+	 * the injected instance; db() returns it. Calling this method removes the
+	 * need for the global $db fallback inside each db() helper.
+	 *
+	 * @param DatabaseHandler $db DatabaseHandler instance
+	 */
+	private static function wireDomainDatabase(object $db): void {
+		DomainDatabaseWiring::wire($db);
+	}
+
+	/**
+	 * Verify that services which should have been registered actually are.
+	 *
+	 * Called after populateContainer() for every context except CONTEXT_MINIMAL.
+	 * Throws RuntimeException on the first missing service so the application
+	 * fails loudly instead of silently degrading.
+	 *
+	 * @throws RuntimeException
+	 */
+	private static function assertContainerHealth(ServiceContainer $container): void {
+		$required = ['events'];
+
+		if (self::$databaseReady) {
+			$required[] = 'db';
+		}
+
+		if (self::$redisReady) {
+			$required[] = 'redis';
+		}
+
+		$missing = [];
+		foreach ($required as $service) {
+			if (!$container->has($service)) {
+				$missing[] = $service;
+			}
+		}
+
+		if ($missing !== []) {
+			throw new RuntimeException(
+				'ServiceContainer health check failed — missing required services: '
+					. implode(', ', $missing)
+			);
+		}
+	}
+
+	/**
+	 * Default boot options for a context.
+	 *
+	 * @param BootContext $ctx Boot context.
+	 * @return array Options: cached, redis, process, shutdown.
+	 */
+	private static function defaults(BootContext $ctx): array {
+		return match ($ctx) {
+			BootContext::Admin   => ['cached' => false, 'redis' => true,  'process' => '', 'shutdown' => null],
+			BootContext::Stream  => ['cached' => true,  'redis' => false, 'process' => '', 'shutdown' => null],
+			BootContext::Cli     => ['cached' => false, 'redis' => false, 'process' => '', 'shutdown' => null],
+			BootContext::Minimal => ['cached' => false, 'redis' => false, 'process' => '', 'shutdown' => null],
+		};
+	}
+
+	/**
+	 * Initialize admin globals: MobileDetect, timeouts, servers, protocol.
+	 */
+	private static function initAdminGlobals(): void {
+		global $rDetect, $rMobile, $rTimeout, $rSQLTimeout, $rProtocol,
+			$allServers, $rServers, $rSettings, $rProxyServers,
+			$rPermissions, $allowedLangs;
+
+		if (!defined('SERVER_ID')) {
+			define('SERVER_ID', intval(ConfigReader::get('server_id')));
+		}
+
+		$rDetect = new \Detection\MobileDetect();
+		$rMobile = $rDetect->isMobile();
+
+		$rTimeout    = 15;
+		$rSQLTimeout = 10;
+		set_time_limit($rTimeout);
+		ini_set('mysql.connect_timeout', (string) $rSQLTimeout);
+		ini_set('max_execution_time', (string) $rTimeout);
+		ini_set('default_socket_timeout', (string) $rTimeout);
+
+		$rProtocol    = self::detectProtocol();
+		$allServers   = ServerRepository::getAllSimple();
+		$rServers     = ServerRepository::getStreamingSimple($rPermissions);
+		$rSettings    = SettingsManager::getAll();
+		if (self::$devMode) {
+			$rSettings['debug_show_errors'] = true;
+		}
+		$rProxyServers = ServerRepository::getProxySimple($rPermissions);
+
+		$allowedLangs = Translator::available();
+
+		// Sort servers by order
+		if (is_array($rServers)) {
+			uasort(
+				$rServers,
+				function ($a, $b) {
+					return $a['order'] - $b['order'];
+				}
+			);
+		}
+
+		// Ensure the legacy 'reseller' assets alias (Public/assets/reseller → admin).
+		self::ensureResellerAssetsSymlink();
+	}
+
+	/**
+	 * Ensure the legacy 'reseller' assets alias exists (Public/assets/reseller → admin).
+	 *
+	 * Reseller pages reuse the admin asset bundle, and some nginx configs / legacy
+	 * routes expect Public/assets/reseller to resolve to Public/assets/admin. The
+	 * link is not stored in git (an absolute-path symlink broke the build), so the
+	 * panel recreates it here. Idempotent, and repairs a stale/broken link.
+	 */
+	private static function ensureResellerAssetsSymlink(): void {
+		$assetsBase   = MAIN_HOME . 'Public/assets/';
+		$resellerLink = $assetsBase . 'reseller';
+
+		// Nothing to point at yet — skip.
+		if (!is_dir($assetsBase . 'admin')) {
+			return;
+		}
+
+		if (is_link($resellerLink)) {
+			// Correct, resolvable link → nothing to do.
+			if (readlink($resellerLink) === 'admin' && is_dir($resellerLink)) {
+				return;
+			}
+			@unlink($resellerLink); // stale/broken link — recreate below
+		} elseif (file_exists($resellerLink)) {
+			return; // a real directory/file lives here — leave it alone
+		}
+
+		// Relative link so it is independent of MAIN_HOME and path case.
+		if (!@symlink('admin', $resellerLink)) {
+			// Without the link every reseller access code serves pages with no
+			// CSS/JS (nginx aliases /CODE/assets/ to Public/assets/reseller/).
+			error_log('XC_Bootstrap: failed to create Public/assets/reseller -> admin symlink — check ownership of Public/assets/ (expected xc_vm).');
+		}
+	}
+
+	/**
+	 * Detect HTTP protocol (http/https).
+	 */
+	private static function detectProtocol(): string {
+		$https  = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
+		$port443 = isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443;
+		return ($https || $port443) ? 'https' : 'http';
+	}
+
+	// ─────────────────────────────────────────────────────────
+	//  Status constants (from admin.php)
+	// ─────────────────────────────────────────────────────────
+
+	/**
+	 * Define status constants (STATUS_FAILURE, STATUS_SUCCESS, ...).
+	 *
+	 * Used throughout admin and reseller API handlers.
+	 * Called automatically in CONTEXT_ADMIN.
+	 * Can be called manually when needed.
+	 */
+	public static function defineStatusConstants(): void {
+		// Guard against duplicate definition
+		if (defined('STATUS_FAILURE')) {
+			return;
+		}
+
+		define('STATUS_FAILURE', 0);
+		define('STATUS_SUCCESS', 1);
+		define('STATUS_SUCCESS_MULTI', 2);
+		define('STATUS_CODE_LENGTH', 3);
+		define('STATUS_NO_SOURCES', 4);
+		define('STATUS_DISABLED', 5);
+		define('STATUS_NOT_ADMIN', 6);
+		define('STATUS_INVALID_EMAIL', 7);
+		define('STATUS_INVALID_PASSWORD', 8);
+		define('STATUS_INVALID_IP', 9);
+		define('STATUS_INVALID_PLAYLIST', 10);
+		define('STATUS_INVALID_NAME', 11);
+		define('STATUS_INVALID_CAPTCHA', 12);
+		define('STATUS_INVALID_CODE', 13);
+		define('STATUS_INVALID_DATE', 14);
+		define('STATUS_INVALID_FILE', 15);
+		define('STATUS_INVALID_GROUP', 16);
+		define('STATUS_INVALID_DATA', 17);
+		define('STATUS_INVALID_DIR', 18);
+		define('STATUS_INVALID_MAC', 19);
+		define('STATUS_EXISTS_CODE', 20);
+		define('STATUS_EXISTS_NAME', 21);
+		define('STATUS_EXISTS_USERNAME', 22);
+		define('STATUS_EXISTS_MAC', 23);
+		define('STATUS_EXISTS_SOURCE', 24);
+		define('STATUS_EXISTS_IP', 25);
+		define('STATUS_EXISTS_DIR', 26);
+		define('STATUS_SUCCESS_REPLACE', 27);
+		define('STATUS_FLUSH', 28);
+		define('STATUS_TOO_MANY_RESULTS', 29);
+		define('STATUS_SPACE_ISSUE', 30);
+		define('STATUS_INVALID_USER', 31);
+		define('STATUS_CERTBOT', 32);
+		define('STATUS_CERTBOT_INVALID', 33);
+		define('STATUS_INVALID_INPUT', 34);
+		define('STATUS_NOT_RESELLER', 35);
+		define('STATUS_NO_TRIALS', 36);
+		define('STATUS_INSUFFICIENT_CREDITS', 37);
+		define('STATUS_INVALID_PACKAGE', 38);
+		define('STATUS_INVALID_TYPE', 39);
+		define('STATUS_INVALID_USERNAME', 40);
+		define('STATUS_INVALID_SUBRESELLER', 41);
+		define('STATUS_NO_DESCRIPTION', 42);
+		define('STATUS_NO_KEY', 43);
+		define('STATUS_EXISTS_HMAC', 44);
+		define('STATUS_CERTBOT_RUNNING', 45);
+		define('STATUS_RESERVED_CODE', 46);
+		define('STATUS_NO_TITLE', 47);
+		define('STATUS_NO_SOURCE', 48);
+	}
 }
diff --git a/src/config/bundled_modules.php b/src/config/bundled_modules.php
index 4a178839..cad1f85f 100644
--- a/src/config/bundled_modules.php
+++ b/src/config/bundled_modules.php
@@ -29,20 +29,20 @@
  */
 
 return [
-    // ministra is no longer a module — the Stalker portal moved into core at
-    // src/Ministra/ (served via /home/xc_vm/Ministra). No entry needed here.
-    [
-        'hash_id'    => '2541abe329f151202d7a3c4ecfb17db4',
-        'name'       => 'watch',
-        'source'     => 'git',
-        'repository' => 'https://github.com/Vateron-Media/Module_Watch',
-        'channel'    => 'stable',
-    ],
-    [
-        'hash_id'    => '20cd9576a466f5c1d60cc32c971a571b',
-        'name'       => 'plex',
-        'source'     => 'git',
-        'repository' => 'https://github.com/Vateron-Media/Module_Plex',
-        'channel'    => 'stable',
-    ],
+	// ministra is no longer a module — the Stalker portal moved into core at
+	// src/Ministra/ (served via /home/xc_vm/Ministra). No entry needed here.
+	[
+		'hash_id'    => '2541abe329f151202d7a3c4ecfb17db4',
+		'name'       => 'watch',
+		'source'     => 'git',
+		'repository' => 'https://github.com/Vateron-Media/Module_Watch',
+		'channel'    => 'stable',
+	],
+	[
+		'hash_id'    => '20cd9576a466f5c1d60cc32c971a571b',
+		'name'       => 'plex',
+		'source'     => 'git',
+		'repository' => 'https://github.com/Vateron-Media/Module_Plex',
+		'channel'    => 'stable',
+	],
 ];
diff --git a/src/config/modules.php b/src/config/modules.php
index ab695981..ee970a02 100644
--- a/src/config/modules.php
+++ b/src/config/modules.php
@@ -32,6 +32,6 @@ use XcVm\Core\Module\ModuleLoader;
  */
 
 return [
-    // Пример отключения модуля:
-    // 'example-module' => ['enabled' => false],
+	// Пример отключения модуля:
+	// 'example-module' => ['enabled' => false],
 ];
diff --git a/tests/Unit/ExceptionHierarchyTest.php b/tests/Unit/ExceptionHierarchyTest.php
index ed895fcb..1a9e9ea2 100644
--- a/tests/Unit/ExceptionHierarchyTest.php
+++ b/tests/Unit/ExceptionHierarchyTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 use XcVm\Core\Exception\Module\ModuleNotFoundException;
 use XcVm\Core\Exception\Module\ModuleManifestException;
 use XcVm\Core\Exception\Module\ModuleLoadException;
@@ -22,8 +21,7 @@ use PHPUnit\Framework\TestCase;
  * These tests act as a regression guard: if any class is renamed,
  * moved, or changes its parent, the test suite catches it immediately.
  */
-class ExceptionHierarchyTest extends TestCase
-{
+class ExceptionHierarchyTest extends TestCase {
     // ── Base ──────────────────────────────────────────────────
 
     public function testXcVmExceptionExtendsRuntimeException(): void {
diff --git a/tests/Unit/M3uParser/ExceptionTest.php b/tests/Unit/M3uParser/ExceptionTest.php
index 424c173d..bf023881 100644
--- a/tests/Unit/M3uParser/ExceptionTest.php
+++ b/tests/Unit/M3uParser/ExceptionTest.php
@@ -1,16 +1,13 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests;
 
 use M3uParser\Exception;
 use PHPUnit\Framework\TestCase;
 
-class ExceptionTest extends TestCase
-{
-    public function test(): void
-    {
+class ExceptionTest extends TestCase {
+    public function test(): void {
         self::assertInstanceOf('Exception', new Exception());
     }
 }
diff --git a/tests/Unit/M3uParser/ExtCustomTag.php b/tests/Unit/M3uParser/ExtCustomTag.php
index 33ee4851..9469caaa 100644
--- a/tests/Unit/M3uParser/ExtCustomTag.php
+++ b/tests/Unit/M3uParser/ExtCustomTag.php
@@ -1,49 +1,41 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests;
 
 use M3uParser\Tag\ExtTagInterface;
 
-class ExtCustomTag implements ExtTagInterface
-{
+class ExtCustomTag implements ExtTagInterface {
     private string $data = '';
 
     /**
      * #EXTCUSTOMTAG:data.
      */
-    public function __construct(?string $lineStr = null)
-    {
+    public function __construct(?string $lineStr = null) {
         if (null !== $lineStr) {
             $this->makeData($lineStr);
         }
     }
 
-    public function __toString(): string
-    {
-        return '#EXTCUSTOMTAG: '.$this->getData();
+    public function __toString(): string {
+        return '#EXTCUSTOMTAG: ' . $this->getData();
     }
 
-    public function getData(): string
-    {
+    public function getData(): string {
         return $this->data;
     }
 
-    public function setData(string $data): self
-    {
+    public function setData(string $data): self {
         $this->data = $data;
 
         return $this;
     }
 
-    public static function isMatch(string $lineStr): bool
-    {
+    public static function isMatch(string $lineStr): bool {
         return 0 === \stripos($lineStr, '#EXTCUSTOMTAG:');
     }
 
-    protected function makeData(string $lineStr): void
-    {
+    protected function makeData(string $lineStr): void {
         /*
 EXTCUSTOMTAG format:
 #EXTCUSTOMTAG:data
diff --git a/tests/Unit/M3uParser/M3uDataTest.php b/tests/Unit/M3uParser/M3uDataTest.php
index 006b6c9a..02ad3463 100644
--- a/tests/Unit/M3uParser/M3uDataTest.php
+++ b/tests/Unit/M3uParser/M3uDataTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests;
 
@@ -11,14 +10,12 @@ use M3uParser\Tag\ExtLogo;
 use M3uParser\Tag\ExtTv;
 use PHPUnit\Framework\TestCase;
 
-class M3uDataTest extends TestCase
-{
-    public function testComplexDefaultEntryToString(): void
-    {
-        $expectedString = '#EXTM3U test-name="test-value"'."\n";
-        $expectedString .= '#EXTINF:123 test-attr="test-attrname",extinf-title'."\n";
-        $expectedString .= '#EXTTV:hd,sd;ru;xml-tv-id;https://example.org/icon.png'."\n";
-        $expectedString .= '#EXTLOGO:https://example.org/logo.png'."\n";
+class M3uDataTest extends TestCase {
+    public function testComplexDefaultEntryToString(): void {
+        $expectedString = '#EXTM3U test-name="test-value"' . "\n";
+        $expectedString .= '#EXTINF:123 test-attr="test-attrname",extinf-title' . "\n";
+        $expectedString .= '#EXTTV:hd,sd;ru;xml-tv-id;https://example.org/icon.png' . "\n";
+        $expectedString .= '#EXTLOGO:https://example.org/logo.png' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
@@ -51,16 +48,15 @@ class M3uDataTest extends TestCase
     /**
      * @see https://github.com/Gemorroj/M3uParser/pull/14
      */
-    public function testComplexDefaultEntriesToString(): void
-    {
-        $expectedString = '#EXTM3U test-name="test-value"'."\n";
-        $expectedString .= '#EXTINF:123 test-attr="test-attrname1",extinf-title1'."\n";
-        $expectedString .= '#EXTTV:hd,sd;ru;xml-tv-id;https://example.org/icon.png'."\n";
-        $expectedString .= '#EXTLOGO:https://example.org/logo.png'."\n";
-        $expectedString .= 'test-path1'."\n";
-        $expectedString .= '#EXTINF:123 test-attr="test-attrname2",extinf-title2'."\n";
-        $expectedString .= '#EXTTV:hd,sd;ru;xml-tv-id;https://example.org/icon.png'."\n";
-        $expectedString .= '#EXTLOGO:https://example.org/logo.png'."\n";
+    public function testComplexDefaultEntriesToString(): void {
+        $expectedString = '#EXTM3U test-name="test-value"' . "\n";
+        $expectedString .= '#EXTINF:123 test-attr="test-attrname1",extinf-title1' . "\n";
+        $expectedString .= '#EXTTV:hd,sd;ru;xml-tv-id;https://example.org/icon.png' . "\n";
+        $expectedString .= '#EXTLOGO:https://example.org/logo.png' . "\n";
+        $expectedString .= 'test-path1' . "\n";
+        $expectedString .= '#EXTINF:123 test-attr="test-attrname2",extinf-title2' . "\n";
+        $expectedString .= '#EXTTV:hd,sd;ru;xml-tv-id;https://example.org/icon.png' . "\n";
+        $expectedString .= '#EXTLOGO:https://example.org/logo.png' . "\n";
         $expectedString .= 'test-path2';
 
         $entry1 = new M3uEntry();
diff --git a/tests/Unit/M3uParser/M3uParserTest.php b/tests/Unit/M3uParser/M3uParserTest.php
index 8c3f105a..ac716851 100644
--- a/tests/Unit/M3uParser/M3uParserTest.php
+++ b/tests/Unit/M3uParser/M3uParserTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests;
 
@@ -10,10 +9,8 @@ use M3uParser\M3uParser;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class M3uParserTest extends TestCase
-{
-    public function testParseFileFail(): void
-    {
+class M3uParserTest extends TestCase {
+    public function testParseFileFail(): void {
         $this->expectException(M3uParserException::class);
 
         $m3uParser = new M3uParser();
@@ -21,11 +18,10 @@ class M3uParserTest extends TestCase
         $m3uParser->parseFile('fake_file');
     }
 
-    public function testParseFileExtM3u(): void
-    {
+    public function testParseFileExtM3u(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/fixtures/extm3u.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/fixtures/extm3u.m3u');
 
         self::assertEquals([
             'url-tvg' => 'http://www.teleguide.info/download/new3/jtv.zip',
@@ -36,11 +32,10 @@ class M3uParserTest extends TestCase
         self::assertEquals('http://www.teleguide.info/download/new3/jtv.zip', $data->getAttribute('url-tvg'));
     }
 
-    public function testParseFileComment(): void
-    {
+    public function testParseFileComment(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/fixtures/comment.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/fixtures/comment.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -49,11 +44,10 @@ class M3uParserTest extends TestCase
         self::assertEmpty($entry->getExtTags());
     }
 
-    public function testParseFileNoTags(): void
-    {
+    public function testParseFileNoTags(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/fixtures/notags.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/fixtures/notags.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -62,11 +56,10 @@ class M3uParserTest extends TestCase
         self::assertEmpty($entry->getExtTags());
     }
 
-    public function testParseFileCombinedExtTags(): void
-    {
+    public function testParseFileCombinedExtTags(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/fixtures/combined.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/fixtures/combined.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -80,11 +73,10 @@ class M3uParserTest extends TestCase
         self::assertContainsOnlyInstancesOf(ExtTagInterface::class, $extTags);
     }
 
-    public function testParseFileExtCustomTag(): void
-    {
+    public function testParseFileExtCustomTag(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addTag(ExtCustomTag::class);
-        $data = $m3uParser->parseFile(__DIR__.'/fixtures/customtag.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/fixtures/customtag.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
diff --git a/tests/Unit/M3uParser/Tag/ExtAlbTest.php b/tests/Unit/M3uParser/Tag/ExtAlbTest.php
index 77fb7bb4..17638865 100644
--- a/tests/Unit/M3uParser/Tag/ExtAlbTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtAlbTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtAlb;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class ExtAlbTest extends TestCase
-{
-    public function testParseExtAlb(): void
-    {
+class ExtAlbTest extends TestCase {
+    public function testParseExtAlb(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extalb.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extalb.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class ExtAlbTest extends TestCase
         self::assertEquals('some album', $extAlb->getValue());
     }
 
-    public function testGenerateExtAlb(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTALB:some album'."\n";
+    public function testGenerateExtAlb(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTALB:some album' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtAlbumArtUrlTest.php b/tests/Unit/M3uParser/Tag/ExtAlbumArtUrlTest.php
index f6c1610f..7ccd049e 100644
--- a/tests/Unit/M3uParser/Tag/ExtAlbumArtUrlTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtAlbumArtUrlTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtAlbumArtUrl;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class ExtAlbumArtUrlTest extends TestCase
-{
-    public function testParseExtAlbumArtUrl(): void
-    {
+class ExtAlbumArtUrlTest extends TestCase {
+    public function testParseExtAlbumArtUrl(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extalbumarturl.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extalbumarturl.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class ExtAlbumArtUrlTest extends TestCase
         self::assertEquals('https://store.example.com/download/A32X5yz-1.jpg', $extAlbumArtUrl->getValue());
     }
 
-    public function testGenerateExtAlbumArtUrl(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTALBUMARTURL:https://store.example.com/download/A32X5yz-1.jpg'."\n";
+    public function testGenerateExtAlbumArtUrl(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTALBUMARTURL:https://store.example.com/download/A32X5yz-1.jpg' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtArtTest.php b/tests/Unit/M3uParser/Tag/ExtArtTest.php
index faa07d22..f0068cc3 100644
--- a/tests/Unit/M3uParser/Tag/ExtArtTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtArtTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtArt;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class ExtArtTest extends TestCase
-{
-    public function testParseExtArt(): void
-    {
+class ExtArtTest extends TestCase {
+    public function testParseExtArt(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extart.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extart.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class ExtArtTest extends TestCase
         self::assertEquals('some artist', $extArt->getValue());
     }
 
-    public function testGenerateExtArt(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTART:some artist'."\n";
+    public function testGenerateExtArt(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTART:some artist' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtGenreTest.php b/tests/Unit/M3uParser/Tag/ExtGenreTest.php
index bf4281da..e1699ba2 100644
--- a/tests/Unit/M3uParser/Tag/ExtGenreTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtGenreTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtGenre;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class ExtGenreTest extends TestCase
-{
-    public function testParseExtGenre(): void
-    {
+class ExtGenreTest extends TestCase {
+    public function testParseExtGenre(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extgenre.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extgenre.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class ExtGenreTest extends TestCase
         self::assertEquals('Rock', $extGenre->getValue());
     }
 
-    public function testGenerateExtGenre(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTGENRE:Rock'."\n";
+    public function testGenerateExtGenre(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTGENRE:Rock' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtGrpTest.php b/tests/Unit/M3uParser/Tag/ExtGrpTest.php
index 54aa2e32..4934dd5b 100644
--- a/tests/Unit/M3uParser/Tag/ExtGrpTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtGrpTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtGrp;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class ExtGrpTest extends TestCase
-{
-    public function testParseExtGrp(): void
-    {
+class ExtGrpTest extends TestCase {
+    public function testParseExtGrp(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extgrp.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extgrp.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class ExtGrpTest extends TestCase
         self::assertEquals('Rock', $extGrp->getValue());
     }
 
-    public function testGenerateExtGrp(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTGRP:Rock'."\n";
+    public function testGenerateExtGrp(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTGRP:Rock' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtImgTest.php b/tests/Unit/M3uParser/Tag/ExtImgTest.php
index 60830cfe..6a516f68 100644
--- a/tests/Unit/M3uParser/Tag/ExtImgTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtImgTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtImg;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class ExtImgTest extends TestCase
-{
-    public function testParseExtImg(): void
-    {
+class ExtImgTest extends TestCase {
+    public function testParseExtImg(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extimg.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extimg.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class ExtImgTest extends TestCase
         self::assertEquals('http://example.org/logo.png', $extImg->getValue());
     }
 
-    public function testGenerateExtImg(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTIMG:http://example.org/logo.png'."\n";
+    public function testGenerateExtImg(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTIMG:http://example.org/logo.png' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtInfTest.php b/tests/Unit/M3uParser/Tag/ExtInfTest.php
index a66cf6a0..a1e19888 100644
--- a/tests/Unit/M3uParser/Tag/ExtInfTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtInfTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtInf;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class ExtInfTest extends TestCase
-{
-    public function testParseIssue23(): void
-    {
+class ExtInfTest extends TestCase {
+    public function testParseIssue23(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/issue23.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/issue23.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -27,11 +24,10 @@ class ExtInfTest extends TestCase
         self::assertSame(5.279, $extInf->getDuration());
     }
 
-    public function testParseExtInf(): void
-    {
+    public function testParseExtInf(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extinf.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extinf.m3u');
 
         self::assertCount(6, $data);
 
@@ -165,10 +161,9 @@ class ExtInfTest extends TestCase
         ], $extInf->getAttributes());
     }
 
-    public function testGenerateExtInf(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTINF:123 test-attr="test-attrname",extinf-title'."\n";
+    public function testGenerateExtInf(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTINF:123 test-attr="test-attrname",extinf-title' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
@@ -186,8 +181,7 @@ class ExtInfTest extends TestCase
         self::assertEquals($expectedString, (string) $data);
     }
 
-    public function testAttributeQuotes(): void
-    {
+    public function testAttributeQuotes(): void {
         $testString = '#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" tvg-chno="7529" channel-id="7529" group-title="S: (HULU) The Handmaid\'s Tale",The Handmaid\'s Tale S01 E01';
 
         $extInf = new ExtInf($testString);
diff --git a/tests/Unit/M3uParser/Tag/ExtLogoTest.php b/tests/Unit/M3uParser/Tag/ExtLogoTest.php
index 65ca2f26..09aef274 100644
--- a/tests/Unit/M3uParser/Tag/ExtLogoTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtLogoTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtLogo;
 use M3uParser\Tag\ExtTagInterface;
 use PHPUnit\Framework\TestCase;
 
-class ExtLogoTest extends TestCase
-{
-    public function testParseExtLogo(): void
-    {
+class ExtLogoTest extends TestCase {
+    public function testParseExtLogo(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extlogo.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extlogo.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class ExtLogoTest extends TestCase
         self::assertEquals('http://example.org/logo.png', $extLogo->getValue());
     }
 
-    public function testGenerateExtLogo(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTLOGO:http://example.org/logo.png'."\n";
+    public function testGenerateExtLogo(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTLOGO:http://example.org/logo.png' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtTitleTest.php b/tests/Unit/M3uParser/Tag/ExtTitleTest.php
index a4cfa790..f4b08552 100644
--- a/tests/Unit/M3uParser/Tag/ExtTitleTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtTitleTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtTagInterface;
 use M3uParser\Tag\ExtTitle;
 use PHPUnit\Framework\TestCase;
 
-class ExtTitleTest extends TestCase
-{
-    public function testParseExtTitle(): void
-    {
+class ExtTitleTest extends TestCase {
+    public function testParseExtTitle(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/exttitle.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/exttitle.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class ExtTitleTest extends TestCase
         self::assertEquals('Rock music', $extTitle->getValue());
     }
 
-    public function testGenerateExtTitle(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTTITLE:Rock music'."\n";
+    public function testGenerateExtTitle(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTTITLE:Rock music' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtTvTest.php b/tests/Unit/M3uParser/Tag/ExtTvTest.php
index f96efc0d..0b2c2dd9 100644
--- a/tests/Unit/M3uParser/Tag/ExtTvTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtTvTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtTagInterface;
 use M3uParser\Tag\ExtTv;
 use PHPUnit\Framework\TestCase;
 
-class ExtTvTest extends TestCase
-{
-    public function testParseExtTv(): void
-    {
+class ExtTvTest extends TestCase {
+    public function testParseExtTv(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/exttv.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/exttv.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -38,10 +35,9 @@ class ExtTvTest extends TestCase
         self::assertNull($extTv->getIconUrl());
     }
 
-    public function testGenerateExtTv(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTTV:hd,sd;ru;xml-tv-id;https://example.org/icon.png'."\n";
+    public function testGenerateExtTv(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTTV:hd,sd;ru;xml-tv-id;https://example.org/icon.png' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/ExtVlcOptTest.php b/tests/Unit/M3uParser/Tag/ExtVlcOptTest.php
index 49b10d44..31d71857 100644
--- a/tests/Unit/M3uParser/Tag/ExtVlcOptTest.php
+++ b/tests/Unit/M3uParser/Tag/ExtVlcOptTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtTagInterface;
 use M3uParser\Tag\ExtVlcOpt;
 use PHPUnit\Framework\TestCase;
 
-class ExtVlcOptTest extends TestCase
-{
-    public function testParseExtVlcOpt(): void
-    {
+class ExtVlcOptTest extends TestCase {
+    public function testParseExtVlcOpt(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/extvlcopt.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/extvlcopt.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -36,10 +33,9 @@ class ExtVlcOptTest extends TestCase
         self::assertEquals('Lavf53.32.100', $extVlcOpt->getValue());
     }
 
-    public function testGenerateExtVlcOpt(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#EXTVLCOPT:some-key=some-value'."\n";
+    public function testGenerateExtVlcOpt(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#EXTVLCOPT:some-key=some-value' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/Tag/PlaylistTest.php b/tests/Unit/M3uParser/Tag/PlaylistTest.php
index 730af2be..c10a3db0 100644
--- a/tests/Unit/M3uParser/Tag/PlaylistTest.php
+++ b/tests/Unit/M3uParser/Tag/PlaylistTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests\Tag;
 
@@ -11,13 +10,11 @@ use M3uParser\Tag\ExtTagInterface;
 use M3uParser\Tag\Playlist;
 use PHPUnit\Framework\TestCase;
 
-class PlaylistTest extends TestCase
-{
-    public function testParsePlaylist(): void
-    {
+class PlaylistTest extends TestCase {
+    public function testParsePlaylist(): void {
         $m3uParser = new M3uParser();
         $m3uParser->addDefaultTags();
-        $data = $m3uParser->parseFile(__DIR__.'/../fixtures/playlist.m3u');
+        $data = $m3uParser->parseFile(__DIR__ . '/../fixtures/playlist.m3u');
 
         /** @var M3uEntry $entry */
         $entry = $data[0];
@@ -35,10 +32,9 @@ class PlaylistTest extends TestCase
         self::assertEquals('My favorite playlist', $playlist->getValue());
     }
 
-    public function testGeneratePlaylist(): void
-    {
-        $expectedString = '#EXTM3U'."\n";
-        $expectedString .= '#PLAYLIST:My favorite playlist'."\n";
+    public function testGeneratePlaylist(): void {
+        $expectedString = '#EXTM3U' . "\n";
+        $expectedString .= '#PLAYLIST:My favorite playlist' . "\n";
         $expectedString .= 'test-path';
 
         $entry = new M3uEntry();
diff --git a/tests/Unit/M3uParser/TagAttributesTraitTest.php b/tests/Unit/M3uParser/TagAttributesTraitTest.php
index 16a6049b..cbbd54c5 100644
--- a/tests/Unit/M3uParser/TagAttributesTraitTest.php
+++ b/tests/Unit/M3uParser/TagAttributesTraitTest.php
@@ -1,18 +1,15 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests;
 
 use M3uParser\TagAttributesTrait;
 use PHPUnit\Framework\TestCase;
 
-class TagAttributesTraitTest extends TestCase
-{
+class TagAttributesTraitTest extends TestCase {
     use TagAttributesTrait;
 
-    public function testParseAttributes(): void
-    {
+    public function testParseAttributes(): void {
         $this->initAttributes('tvg-ID="" tvg-name="MEDI 1 SAT" group-title="ARABIC" tvg-name-custom=Первый_HD ext-tag="some\"quoted"');
 
         $result = $this->getAttributes();
@@ -30,8 +27,7 @@ class TagAttributesTraitTest extends TestCase
         self::assertNull($this->getAttribute('fake-attribute'));
     }
 
-    public function testMakeAttributes(): void
-    {
+    public function testMakeAttributes(): void {
         $this->setAttribute('tvg-ID', '');
         $this->setAttribute('ext-tag', 'some"quoted');
         $this->setAttribute('tvg-name-custom', 'Первый HD');
diff --git a/tests/Unit/M3uParser/TagsManagerTraitTest.php b/tests/Unit/M3uParser/TagsManagerTraitTest.php
index cb291cec..aa26b583 100644
--- a/tests/Unit/M3uParser/TagsManagerTraitTest.php
+++ b/tests/Unit/M3uParser/TagsManagerTraitTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace M3uParser\Tests;
 
@@ -9,12 +8,10 @@ use M3uParser\Tag\ExtInf;
 use M3uParser\TagsManagerTrait;
 use PHPUnit\Framework\TestCase;
 
-class TagsManagerTraitTest extends TestCase
-{
+class TagsManagerTraitTest extends TestCase {
     use TagsManagerTrait;
 
-    public function testTags(): void
-    {
+    public function testTags(): void {
         $this->addTag(ExtInf::class);
 
         $result = $this->getTags();
@@ -23,8 +20,7 @@ class TagsManagerTraitTest extends TestCase
         self::assertEquals([ExtInf::class], $result);
     }
 
-    public function testClearTags(): void
-    {
+    public function testClearTags(): void {
         $this->addTag(ExtInf::class);
         $this->clearTags();
 
@@ -34,8 +30,7 @@ class TagsManagerTraitTest extends TestCase
         self::assertEquals([], $result);
     }
 
-    public function testErrorTags(): void
-    {
+    public function testErrorTags(): void {
         $this->expectException(Exception::class);
         $this->addTag(self::class); // @phpstan-ignore-line
     }
diff --git a/tests/Unit/PhpM3u8/Data/Transformer/AttributeStringToArrayTest.php b/tests/Unit/PhpM3u8/Data/Transformer/AttributeStringToArrayTest.php
index b40a5ef9..8b1dfd11 100644
--- a/tests/Unit/PhpM3u8/Data/Transformer/AttributeStringToArrayTest.php
+++ b/tests/Unit/PhpM3u8/Data/Transformer/AttributeStringToArrayTest.php
@@ -1,16 +1,13 @@
 <?php
 
-declare(strict_types=1);
 
 namespace Chrisyue\PhpM3u8\Test\Data\Transformer;
 
 use Chrisyue\PhpM3u8\Data\Transformer\AttributeStringToArray;
 use PHPUnit\Framework\TestCase;
 
-class AttributeStringToArrayTest extends TestCase
-{
-    public function testInvoke(): void
-    {
+class AttributeStringToArrayTest extends TestCase {
+    public function testInvoke(): void {
         $attr2Array = new AttributeStringToArray();
 
         $string = 'FOO=BAR,URI="http://example.com/?p=1"';
diff --git a/tests/Unit/PhpM3u8/Data/Transformer/Iso8601TransformerTest.php b/tests/Unit/PhpM3u8/Data/Transformer/Iso8601TransformerTest.php
index 790bf090..b5b820b5 100644
--- a/tests/Unit/PhpM3u8/Data/Transformer/Iso8601TransformerTest.php
+++ b/tests/Unit/PhpM3u8/Data/Transformer/Iso8601TransformerTest.php
@@ -1,23 +1,19 @@
 <?php
 
-declare(strict_types=1);
 
 namespace Chrisyue\PhpM3u8\Test\Data\Transformer;
 
 use Chrisyue\PhpM3u8\Data\Transformer\Iso8601Transformer;
 use PHPUnit\Framework\TestCase;
 
-class Iso8601TransformerTest extends TestCase
-{
-    public function testFromString(): void
-    {
+class Iso8601TransformerTest extends TestCase {
+    public function testFromString(): void {
         $string = '2018-01-01T01:02:03.002+08:00';
 
         $this->assertEquals(new \DateTime($string), Iso8601Transformer::fromString($string));
     }
 
-    public function testToString(): void
-    {
+    public function testToString(): void {
         $string = '2018-01-01T01:02:03.002+08:00';
         $datetime = new \DateTime($string);
 
diff --git a/tests/Unit/PhpM3u8/Data/Value/Attribute/ResolutionTest.php b/tests/Unit/PhpM3u8/Data/Value/Attribute/ResolutionTest.php
index 3d9aa49b..5c4671d9 100644
--- a/tests/Unit/PhpM3u8/Data/Value/Attribute/ResolutionTest.php
+++ b/tests/Unit/PhpM3u8/Data/Value/Attribute/ResolutionTest.php
@@ -1,32 +1,27 @@
 <?php
 
-declare(strict_types=1);
 
 namespace Chrisyue\PhpM3u8\Test\Data\Value\Attribute;
 
 use Chrisyue\PhpM3u8\Data\Value\Attribute\Resolution;
 use PHPUnit\Framework\TestCase;
 
-class ResolutionTest extends TestCase
-{
+class ResolutionTest extends TestCase {
     /**
      * @dataProvider dataProvider
      */
-    public function testFromString($string, Resolution $resolution): void
-    {
+    public function testFromString($string, Resolution $resolution): void {
         $this->assertEquals($resolution, Resolution::fromString($string));
     }
 
     /**
      * @dataProvider dataProvider
      */
-    public function testToString($string, Resolution $resolution): void
-    {
+    public function testToString($string, Resolution $resolution): void {
         $this->assertEquals($string, (string) $resolution);
     }
 
-    public static function dataProvider(): array
-    {
+    public static function dataProvider(): array {
         return [
             ['800x600', new Resolution(800, 600)],
         ];
diff --git a/tests/Unit/PhpM3u8/Data/Value/ByterangeTest.php b/tests/Unit/PhpM3u8/Data/Value/ByterangeTest.php
index 15694155..976212a9 100644
--- a/tests/Unit/PhpM3u8/Data/Value/ByterangeTest.php
+++ b/tests/Unit/PhpM3u8/Data/Value/ByterangeTest.php
@@ -1,32 +1,27 @@
 <?php
 
-declare(strict_types=1);
 
 namespace Chrisyue\PhpM3u8\Test\Data\Value;
 
 use Chrisyue\PhpM3u8\Data\Value\Byterange;
 use PHPUnit\Framework\TestCase;
 
-class ByterangeTest extends TestCase
-{
+class ByterangeTest extends TestCase {
     /**
      * @dataProvider dataProvider
      */
-    public function testFromString($string, Byterange $byterange): void
-    {
+    public function testFromString($string, Byterange $byterange): void {
         $this->assertEquals($byterange, Byterange::fromString($string));
     }
 
     /**
      * @dataProvider dataProvider
      */
-    public function testToString($string, Byterange $byterange): void
-    {
+    public function testToString($string, Byterange $byterange): void {
         $this->assertEquals($string, (string) $byterange);
     }
 
-    public static function dataProvider(): array
-    {
+    public static function dataProvider(): array {
         return [
             ['2000', new Byterange(2000)],
             ['2000@1000', new Byterange(2000, 1000)],
diff --git a/tests/Unit/PhpM3u8/Data/Value/Tag/InfTest.php b/tests/Unit/PhpM3u8/Data/Value/Tag/InfTest.php
index 3f42e631..8a99f327 100644
--- a/tests/Unit/PhpM3u8/Data/Value/Tag/InfTest.php
+++ b/tests/Unit/PhpM3u8/Data/Value/Tag/InfTest.php
@@ -1,32 +1,27 @@
 <?php
 
-declare(strict_types=1);
 
 namespace Chrisyue\PhpM3u8\Test\Data\Value\Tag;
 
 use Chrisyue\PhpM3u8\Data\Value\Tag\Inf;
 use PHPUnit\Framework\TestCase;
 
-class InfTest extends TestCase
-{
+class InfTest extends TestCase {
     /**
      * @dataProvider dataProvider
      */
-    public function testFromString($string, Inf $inf): void
-    {
+    public function testFromString($string, Inf $inf): void {
         $this->assertEquals($inf, Inf::fromString($string));
     }
 
     /**
      * @dataProvider dataProvider
      */
-    public function testToString($string, Inf $inf): void
-    {
+    public function testToString($string, Inf $inf): void {
         $this->assertEquals($string, (string) $inf);
     }
 
-    public static function dataProvider(): array
-    {
+    public static function dataProvider(): array {
         return [
             ['0.000,', new Inf(0)],
             ['10.001,', new Inf(10.001)],
diff --git a/tests/Unit/PhpM3u8/Line/LineTest.php b/tests/Unit/PhpM3u8/Line/LineTest.php
index df1844ef..bfbd5a1a 100644
--- a/tests/Unit/PhpM3u8/Line/LineTest.php
+++ b/tests/Unit/PhpM3u8/Line/LineTest.php
@@ -1,19 +1,16 @@
 <?php
 
-declare(strict_types=1);
 
 namespace Chrisyue\PhpM3u8\Test\Line;
 
 use Chrisyue\PhpM3u8\Line\Line;
 use PHPUnit\Framework\TestCase;
 
-class LineTest extends TestCase
-{
+class LineTest extends TestCase {
     /**
      * @dataProvider stringTransformationSamples
      */
-    public function testFromString($string, $expected): void
-    {
+    public function testFromString($string, $expected): void {
         $line = Line::fromString($string);
 
         $this->assertEquals($expected, $line);
@@ -22,8 +19,7 @@ class LineTest extends TestCase
     /**
      * @dataProvider stringTransformationSamples
      */
-    public function testToString($string, Line $line = null): void
-    {
+    public function testToString($string, Line $line = null): void {
         if (null === $line) {
             $this->expectNotToPerformAssertions();
 
@@ -33,8 +29,7 @@ class LineTest extends TestCase
         $this->assertEquals($string, (string) $line);
     }
 
-    public static function stringTransformationSamples(): array
-    {
+    public static function stringTransformationSamples(): array {
         return [
             ['#foo:bar', null],
             ['#EXT-FOO', new Line('EXT-FOO', true)],
@@ -47,13 +42,11 @@ class LineTest extends TestCase
     /**
      * @dataProvider typeSamples
      */
-    public function testIsType(Line $line, $type): void
-    {
+    public function testIsType(Line $line, $type): void {
         $this->assertTrue($line->isType($type));
     }
 
-    public static function typeSamples(): array
-    {
+    public static function typeSamples(): array {
         return [
             [new Line('foo', 'bar'), Line::TYPE_TAG],
             [new Line(null, 'foobar'), Line::TYPE_URI],
diff --git a/tests/Unit/PhpM3u8/Line/LinesTest.php b/tests/Unit/PhpM3u8/Line/LinesTest.php
index 779fe51c..e35133ba 100644
--- a/tests/Unit/PhpM3u8/Line/LinesTest.php
+++ b/tests/Unit/PhpM3u8/Line/LinesTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 
 namespace Chrisyue\PhpM3u8\Test\Line;
 
@@ -9,48 +8,39 @@ use Chrisyue\PhpM3u8\Line\Lines;
 use Chrisyue\PhpM3u8\Stream\StreamInterface;
 use PHPUnit\Framework\TestCase;
 
-class LinesTest extends TestCase
-{
-    public function testValid(): void
-    {
+class LinesTest extends TestCase {
+    public function testValid(): void {
         $stream = new class([false], [null]) implements StreamInterface {
             private array $validSequence;
             private array $currentSequence;
             private int $position = 0;
 
-            public function __construct(array $validSequence, array $currentSequence)
-            {
+            public function __construct(array $validSequence, array $currentSequence) {
                 $this->validSequence = $validSequence;
                 $this->currentSequence = $currentSequence;
             }
 
-            public function current(): mixed
-            {
+            public function current(): mixed {
                 return $this->currentSequence[$this->position] ?? null;
             }
 
-            public function next(): void
-            {
+            public function next(): void {
                 ++$this->position;
             }
 
-            public function key(): mixed
-            {
+            public function key(): mixed {
                 return $this->position;
             }
 
-            public function valid(): bool
-            {
+            public function valid(): bool {
                 return $this->validSequence[$this->position] ?? false;
             }
 
-            public function rewind(): void
-            {
+            public function rewind(): void {
                 $this->position = 0;
             }
 
-            public function add($line): void
-            {
+            public function add($line): void {
                 $this->currentSequence[] = $line;
             }
         };
@@ -64,39 +54,32 @@ class LinesTest extends TestCase
             private array $currentSequence;
             private int $position = 0;
 
-            public function __construct(array $validSequence, array $currentSequence)
-            {
+            public function __construct(array $validSequence, array $currentSequence) {
                 $this->validSequence = $validSequence;
                 $this->currentSequence = $currentSequence;
             }
 
-            public function current(): mixed
-            {
+            public function current(): mixed {
                 return $this->currentSequence[$this->position] ?? null;
             }
 
-            public function next(): void
-            {
+            public function next(): void {
                 ++$this->position;
             }
 
-            public function key(): mixed
-            {
+            public function key(): mixed {
                 return $this->position;
             }
 
-            public function valid(): bool
-            {
+            public function valid(): bool {
                 return $this->validSequence[$this->position] ?? false;
             }
 
-            public function rewind(): void
-            {
+            public function rewind(): void {
                 $this->position = 0;
             }
 
-            public function add($line): void
-            {
+            public function add($line): void {
                 $this->currentSequence[] = $line;
             }
         };
diff --git a/tests/Unit/PhpM3u8/Stream/TextStreamTest.php b/tests/Unit/PhpM3u8/Stream/TextStreamTest.php
index 3f99210f..86e5e775 100644
--- a/tests/Unit/PhpM3u8/Stream/TextStreamTest.php
+++ b/tests/Unit/PhpM3u8/Stream/TextStreamTest.php
@@ -1,18 +1,14 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Chrisyue\PhpM3u8\Test\Stream;
 
 use Chrisyue\PhpM3u8\Stream\TextStream;
 use PHPUnit\Framework\TestCase;
 
-class TextStreamTest extends TestCase
-{
-    public function testToString(): void
-    {
+class TextStreamTest extends TestCase {
+    public function testToString(): void {
         $text = "first\nsecond";
-        $this->assertSame($text."\n", (string) new TextStream($text));
+        $this->assertSame($text . "\n", (string) new TextStream($text));
 
         $text = "first\nsecond\n";
         $this->assertSame($text, (string) new TextStream($text));