diff --git a/modules/gamemanager/server_monitor.php b/modules/gamemanager/server_monitor.php index 9d14dfdd..0369906b 100644 --- a/modules/gamemanager/server_monitor.php +++ b/modules/gamemanager/server_monitor.php @@ -594,7 +594,6 @@ echo "put the log file here\n"; */ -echo "
Put the log file here
"; //include("log.php"); ?> diff --git a/modules/steam_workshop/controllers/AdminWorkshopController.php b/modules/steam_workshop/controllers/AdminWorkshopController.php index d4110602..f66ebb44 100644 --- a/modules/steam_workshop/controllers/AdminWorkshopController.php +++ b/modules/steam_workshop/controllers/AdminWorkshopController.php @@ -148,8 +148,8 @@ class AdminWorkshopController { $rows = []; foreach ($this->gameGroups as $group) { - $primaryKey = $group['primary_game_key']; - $override = ($this->adapterFormGameKey === $primaryKey) ? $this->adapterFormOverride : null; + $primaryKey = isset($group['primary_game_key']) ? (string)$group['primary_game_key'] : ''; + $override = ($primaryKey !== '' && $this->adapterFormGameKey === $primaryKey) ? $this->adapterFormOverride : null; $mappingValues = []; foreach ((array)$group['game_keys'] as $gameKey) { @@ -159,16 +159,16 @@ class AdminWorkshopController } $rows[] = [ - 'group_key' => $group['group_key'], - 'app_id' => $group['app_id'], - 'game_name' => $group['game_name'], - 'game_keys' => $group['game_keys'], + 'group_key' => $group['group_key'] ?? '', + 'app_id' => $group['app_id'] ?? '', + 'game_name' => $group['game_name'] ?? '', + 'game_keys' => $group['game_keys'] ?? [], 'primary_game_key' => $primaryKey, 'mixed_mapping' => count((array)$mappingValues) > 1, 'selected_adapter' => count((array)$mappingValues) === 1 ? array_key_first($mappingValues) : '', - 'exists' => $this->service->gameAdapterExists($primaryKey), - 'adapter' => $this->service->getGameAdapter($primaryKey), - 'updated_at' => $this->service->getGameAdapterUpdatedAt($primaryKey), + 'exists' => $primaryKey !== '' && $this->service->gameAdapterExists($primaryKey), + 'adapter' => $primaryKey !== '' ? $this->service->getGameAdapter($primaryKey) : null, + 'updated_at' => $primaryKey !== '' ? $this->service->getGameAdapterUpdatedAt($primaryKey) : null, 'form' => $this->service->getAdapterFormData($primaryKey, $override), ]; } diff --git a/modules/steam_workshop/module.php b/modules/steam_workshop/module.php index 1a0aaeed..715a5cec 100644 --- a/modules/steam_workshop/module.php +++ b/modules/steam_workshop/module.php @@ -26,13 +26,7 @@ $module_title = "Steam Workshop"; $module_version = "2.1"; $db_version = 1; $module_required = TRUE; -$module_menus = array( - array( - 'subpage' => 'workshop_admin', - 'name' => 'Steam Workshop', - 'group' => 'admin' - ) -); +$module_menus = array(); // Database schema migration: create the three Workshop tables when not present. // Called by the panel module installer when db_version increments.