mirror of
https://github.com/Vateron-Media/XC_VM.git
synced 2026-10-12 20:02:49 +02:00
style: apply K&R + tab formatting across the codebase (make cs-fix)
Mechanical, behaviour-preserving reformat produced by 'make cs-fix' under the new build/phpcs.xml.dist ruleset: K&R braces, tab indentation, and the other whitespace normalisations. No logic changes.
This commit is contained in:
Divarion_D
@@ -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';
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user