diff --git a/home.php b/home.php index 31be3f63..3ccb3519 100644 --- a/home.php +++ b/home.php @@ -187,6 +187,12 @@ function ogpHome() foreach ((array)$servers_by_game_name as $game_name => $server_homes ) { $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$server_homes[0]['home_cfg_file']); + if ($server_xml === FALSE) + { + // Bad XML – skip this game from the navigation list; error is + // already collected and will be shown to admins below. + continue; + } $mod = $server_homes[0]['mod_key']; // If query name does not exist use mod key instead. if ($server_xml->protocol == "gameq") @@ -223,6 +229,26 @@ function ogpHome() } else $game_homes_list = ""; + + // Show admin-only warning for any game config XMLs that failed to parse. + if ($isAdmin) { + $xml_errors = function_exists('gsp_get_xml_errors') ? gsp_get_xml_errors() : array(); + if (!empty($xml_errors)) { + echo "
"; + echo "⚠ One or more game config XML files failed to load and have been skipped:"; + echo "

Use Game/Mod Config to edit and fix the broken file(s).

"; + echo "
"; + } + } ?>
diff --git a/modules/billing/module.php b/modules/billing/module.php index 3c369079..c7e456a8 100644 --- a/modules/billing/module.php +++ b/modules/billing/module.php @@ -30,12 +30,9 @@ $module_required = FALSE; // Module description $module_description = "Billing storefront / provisioning integration. Public ordering runs as a standalone site; panel pages provide provisioning and admin order management."; -// Register module menus so panel can show links (user and admin views) -$module_menus = array( - array('subpage' => 'my_orders', 'name' => 'My Orders', 'group' => 'user'), - array('subpage' => 'provision_servers', 'name' => 'Provision Servers', 'group' => 'user'), - array('subpage' => 'admin_orders', 'name' => 'Manage Orders', 'group' => 'admin') -); +// No panel menu entries – billing runs as a standalone website, not panel pages. +// Install/uninstall/update DB logic below is still active. +$module_menus = array(); $install_queries = array(); diff --git a/modules/config_games/server_config_parser.php b/modules/config_games/server_config_parser.php index 6419c8b5..b3f59133 100644 --- a/modules/config_games/server_config_parser.php +++ b/modules/config_games/server_config_parser.php @@ -52,6 +52,40 @@ if (!function_exists('ogp_render_config_error')) { } } +/** + * Collect a non-fatal XML parse/validation error for a game config file. + * Errors are stored in a static array and can be retrieved via + * gsp_get_xml_errors(). Does NOT stop page execution. + */ +if (!function_exists('gsp_collect_xml_error')) { + function gsp_collect_xml_error(string $file, string $title, string $details = ''): void + { + $log_message = "[GSP] $title" . (empty($details) ? '' : ' Details: ' . $details); + error_log($log_message); + + static $errors = []; + $errors[] = array( + 'file' => $file, + 'title' => $title, + 'details' => $details, + ); + // Store in a predictable global so callers (e.g. home.php) can read it + // even across include boundaries without having to call the function. + $GLOBALS['_gsp_xml_errors'][] = array( + 'file' => $file, + 'title' => $title, + 'details' => $details, + ); + } +} + +if (!function_exists('gsp_get_xml_errors')) { + function gsp_get_xml_errors(): array + { + return isset($GLOBALS['_gsp_xml_errors']) ? $GLOBALS['_gsp_xml_errors'] : array(); + } +} + if (!function_exists('ogp_render_missing_xml_extensions')) { function ogp_render_missing_xml_extensions($missing_extensions) { @@ -114,36 +148,47 @@ function read_server_config( $filename ) ogp_ensure_xml_support(); if (!is_readable($filename)) { - ogp_render_config_error( + gsp_collect_xml_error( + $filename, "Game configuration file is missing or unreadable.", "Expected at: {$filename}" ); + return FALSE; } $previous_error_state = libxml_use_internal_errors(true); $dom = new DOMDocument(); if ($dom->load($filename) === FALSE) { - ogp_render_config_error( + gsp_collect_xml_error( + $filename, "Unable to load XML configuration.", "File: {$filename}\n".ogp_format_libxml_errors() ); + libxml_use_internal_errors($previous_error_state); + return FALSE; } if ( $dom->schemaValidate(XML_SCHEMA) !== TRUE ) { - ogp_render_config_error( + gsp_collect_xml_error( + $filename, "XML configuration failed schema validation.", "File: {$filename}\nSchema: ".XML_SCHEMA."\n".ogp_format_libxml_errors() ); + libxml_use_internal_errors($previous_error_state); + return FALSE; } $xml = simplexml_import_dom($dom); if($xml === false){ - ogp_render_config_error( + gsp_collect_xml_error( + $filename, "Failed to parse XML configuration.", "File: {$filename}\n".ogp_format_libxml_errors() ); + libxml_use_internal_errors($previous_error_state); + return FALSE; } $xml->addChild('home_cfg_file',basename($filename)); diff --git a/modules/faq/rss_php.php b/modules/faq/rss_php.php index d509e377..328d5537 100644 --- a/modules/faq/rss_php.php +++ b/modules/faq/rss_php.php @@ -70,12 +70,28 @@ class rss_php { ***/ private function loadParser($rss=false) { if($rss) { + // Strip a leading UTF-8 BOM and any whitespace before the XML declaration + // to prevent "Extra content at the end of the document" and related errors. + $rss = preg_replace('/^\xEF\xBB\xBF/', '', (string)$rss); + $rss = ltrim($rss); + + // Reject obviously non-XML content early to avoid noisy libxml warnings. + if(strlen($rss) < 5 || $rss[0] !== '<') { + return; + } + $this->document = array(); $this->channel = array(); $this->items = array(); $DOMDocument = new DOMDocument; $DOMDocument->strictErrorChecking = false; - $DOMDocument->loadXML($rss); + $prevErrors = libxml_use_internal_errors(true); + $loaded = $DOMDocument->loadXML($rss); + libxml_clear_errors(); + libxml_use_internal_errors($prevErrors); + if($loaded === false) { + return; + } $this->document = $this->extractDOM($DOMDocument->childNodes); } } @@ -99,6 +115,7 @@ class rss_php { private function extractDOM($nodeList,$parentNodeName=false) { $itemCounter = 0; + $tempNode = array(); foreach ((array)$nodeList as $values) { if(substr($values->nodeName,0,1) != '#') { if($values->nodeName == 'item') { diff --git a/modules/steam_workshop/module.php b/modules/steam_workshop/module.php index f60cab13..1a0aaeed 100644 --- a/modules/steam_workshop/module.php +++ b/modules/steam_workshop/module.php @@ -27,11 +27,6 @@ $module_version = "2.1"; $db_version = 1; $module_required = TRUE; $module_menus = array( - array( - 'subpage' => 'main', - 'name' => 'Steam Workshop', - 'group' => 'user' - ), array( 'subpage' => 'workshop_admin', 'name' => 'Steam Workshop', diff --git a/modules/steam_workshop/navigation.xml b/modules/steam_workshop/navigation.xml index a82623fb..c35e2855 100644 --- a/modules/steam_workshop/navigation.xml +++ b/modules/steam_workshop/navigation.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file