";
$actionId = 'node_action_' . substr(md5($safePath . $index), 0, 8);
- $html .= "";
+ $html .= "";
$html .= "";
@@ -201,25 +294,59 @@ function config_games_render_node(SimpleXMLElement $node, array $ancestors, arra
function config_games_render_editor(SimpleXMLElement $xml)
{
config_games_print_editor_css();
+ $schemaOrder = config_games_schema_order();
$rootName = $xml->getName();
$html = "
"; $xml = @simplexml_load_file($config_file); + // Also show any schema validation errors on the current file (informational, before editing) + $existingErrors = config_games_validate_xml_file($config_file); + if (!empty($existingErrors)) { + echo "
+
+{$safeLabel}
{$displayPath}
{$safeLabel}{$badge}
{$displayPath}
";
$html .= "";
$html .= "
";
$counters = [];
- foreach ($xml->children() as $child) {
- $html .= config_games_render_node($child, [$rootName], $counters);
+
+ // Sort top-level children by schema order; unknown elements follow at the end.
+ $children = iterator_to_array($xml->children(), false);
+ usort($children, function ($a, $b) use ($schemaOrder) {
+ $nameA = $a->getName();
+ $nameB = $b->getName();
+ $orderKeys = array_keys($schemaOrder);
+ $posA = ($idx = array_search($nameA, $orderKeys)) !== false ? $idx : PHP_INT_MAX;
+ $posB = ($idx = array_search($nameB, $orderKeys)) !== false ? $idx : PHP_INT_MAX;
+ return $posA <=> $posB;
+ });
+
+ $lastSection = null;
+ foreach ($children as $child) {
+ $cName = $child->getName();
+ $isRequired = $schemaOrder[$cName] ?? null;
+ // Print section dividers between required and optional groups
+ $section = ($isRequired === true) ? 'required' : (($isRequired === false) ? 'optional' : 'custom');
+ if ($section !== $lastSection) {
+ if ($section === 'required') {
+ $html .= "
";
return $html;
}
+/**
+ * Save XML from structured form nodes payload.
+ * Validates against the schema before writing.
+ * Returns true on success, or an array of error strings on failure.
+ */
function config_games_save_xml($db, $home_cfg_id, array $nodesPayload)
{
$cfg_info = $db->getGameCfg($home_cfg_id);
if ($cfg_info === FALSE) {
- return false;
+ return ['Configuration record not found in database.'];
}
$config_file = SERVER_CONFIG_LOCATION . $cfg_info['home_cfg_file'];
if (!file_exists($config_file) || !is_readable($config_file)) {
- return false;
+ return ['Configuration file not found or not readable: ' . htmlspecialchars($config_file, ENT_QUOTES, 'UTF-8')];
}
$nodes = [];
foreach ((array)$nodesPayload as $key => $data) {
@@ -232,14 +359,16 @@ function config_games_save_xml($db, $home_cfg_id, array $nodesPayload)
$nodes[$cleanPath] = $data;
}
if (empty($nodes)) {
- return false;
+ return ['No node data was submitted.'];
}
$dom = new DOMDocument();
$dom->preserveWhiteSpace = false;
$dom->formatOutput = true;
if (@$dom->load($config_file) === false) {
- return false;
+ return ['The configuration file could not be parsed as XML. It may be malformed.'];
}
+ // Keep a backup of the original content so we can restore on validation failure.
+ $backup = file_get_contents($config_file);
$xpath = new DOMXPath($dom);
uksort($nodes, function ($a, $b) {
return substr_count($b, '/') <=> substr_count($a, '/');
@@ -295,7 +424,20 @@ function config_games_save_xml($db, $home_cfg_id, array $nodesPayload)
}
}
if ($dom->save($config_file) === false) {
- return false;
+ // Restore backup on write failure
+ if (isset($backup)) {
+ file_put_contents($config_file, $backup);
+ }
+ return ['Failed to write the configuration file. Check file permissions.'];
+ }
+ // Validate the saved file against the schema.
+ $errors = config_games_validate_xml_file($config_file);
+ if (!empty($errors)) {
+ // Restore original on schema failure
+ if (isset($backup)) {
+ file_put_contents($config_file, $backup);
+ }
+ return $errors;
}
$savedContents = @file_get_contents($config_file);
if ($savedContents !== false) {
@@ -381,11 +523,51 @@ function exec_ogp_module() {
if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['save_xml']) && isset($_POST['home_cfg_id'])) {
$edit_id = (int)$_POST['home_cfg_id'];
- $nodesPayload = isset($_POST['nodes']) && is_array($_POST['nodes']) ? $_POST['nodes'] : [];
- if (config_games_save_xml($db, $edit_id, $nodesPayload)) {
- print_success(get_lang('configs_updated_ok'));
+
+ // Raw XML save path
+ if (isset($_POST['raw_xml_content'])) {
+ $cfg_info = $db->getGameCfg($edit_id);
+ if ($cfg_info !== FALSE) {
+ $config_file = SERVER_CONFIG_LOCATION . $cfg_info['home_cfg_file'];
+ $raw_content = $_POST['raw_xml_content'];
+ // Write to a temp file for validation
+ $tmp = tempnam(sys_get_temp_dir(), 'gsp_xml_');
+ file_put_contents($tmp, $raw_content);
+ $xmlErrors = config_games_validate_xml_file($tmp);
+ @unlink($tmp);
+ if (!empty($xmlErrors)) {
+ echo "★ Required Fields
";
+ } elseif ($section === 'optional') {
+ $html .= "Optional Fields
";
+ } else {
+ $html .= "Custom / Unknown Fields
";
+ }
+ $lastSection = $section;
+ }
+ $html .= config_games_render_node($child, [$rootName], $counters, 0, $isRequired);
}
+
$html .= "⚠ XML validation failed — file was NOT saved:
";
+ } else {
+ if (file_put_contents($config_file, $raw_content) !== false) {
+ print_success(get_lang('configs_updated_ok'));
+ $config = read_server_config($config_file);
+ if ($config !== FALSE) {
+ $db->addGameCfg($config);
+ }
+ } else {
+ print_failure('Failed to write configuration file. Check permissions.');
+ }
+ }
+ } else {
+ print_failure('Configuration record not found.');
+ }
} else {
- print_failure('Failed to save XML configuration.');
+ $nodesPayload = isset($_POST['nodes']) && is_array($_POST['nodes']) ? $_POST['nodes'] : [];
+ $result = config_games_save_xml($db, $edit_id, $nodesPayload);
+ if ($result === true) {
+ print_success(get_lang('configs_updated_ok'));
+ } else {
+ $errors = is_array($result) ? $result : ['Failed to save XML configuration.'];
+ echo "- ";
+ foreach ($xmlErrors as $err) {
+ echo "
- " . htmlspecialchars($err, ENT_QUOTES, 'UTF-8') . " "; + } + echo "
⚠ XML validation failed — file was NOT saved:
";
+ }
}
$_GET['home_cfg_id'] = $edit_id;
}
@@ -464,17 +646,36 @@ function exec_ogp_module() {
echo "".get_lang_f('delete_game_config_for',$cfg_info['game_name']." $os $arch")."- ";
+ foreach ($errors as $err) {
+ echo "
- " . htmlspecialchars($err, ENT_QUOTES, 'UTF-8') . " "; + } + echo "
"; $xml = @simplexml_load_file($config_file); + // Also show any schema validation errors on the current file (informational, before editing) + $existingErrors = config_games_validate_xml_file($config_file); + if (!empty($existingErrors)) { + echo "
⚠ This file currently fails schema validation:
";
+ }
if ($xml === false) {
print_failure(get_lang_f("error_when_handling_file",$config_file));
} else {
+ $raw_xml_content = htmlspecialchars(file_get_contents($config_file), ENT_QUOTES, 'UTF-8');
echo "";
- echo "- ";
+ foreach ($existingErrors as $err) {
+ echo "
- " . htmlspecialchars($err, ENT_QUOTES, 'UTF-8') . " "; + } + echo "
Use the action dropdown to remove entire sections. Attribute values left blank will be removed. Script sections such as post_install are fully editable.
"; } } } diff --git a/modules/editconfigfiles/module.php b/modules/editconfigfiles/module.php index 89f6f1fa..d1eb60d5 100644 --- a/modules/editconfigfiles/module.php +++ b/modules/editconfigfiles/module.php @@ -24,6 +24,6 @@ // Module general information $module_title = "Edit Config Files"; -$module_version = "0.2"; +$module_version = "1.0"; $db_version = 0; $module_required = false; \ No newline at end of file diff --git a/modules/faq/faq.php b/modules/faq/faq.php index 9ed9d102..794acaa8 100644 --- a/modules/faq/faq.php +++ b/modules/faq/faq.php @@ -36,11 +36,11 @@ function exec_ogp_module() require 'modules/faq/rss_php.php'; $url = 'https://opengamepanel.org/faq/rss.php'; - $local_copy = 'modules/faq/faq.rss'; ## Relative path - $save_as = realpath('modules' . DIRECTORY_SEPARATOR . 'faq') . DIRECTORY_SEPARATOR . 'faq.rss'; + $local_copy = 'modules/faq/ogpfaq.rss'; ## Relative path + $save_as = realpath('modules' . DIRECTORY_SEPARATOR . 'faq') . DIRECTORY_SEPARATOR . 'ogpfaq.rss'; ## Full path (adding the filename to realpath would fail if the file does not exists yet) $online = false; - $local = true; + $local = false; $updated = false; $s = (isset($_SERVER['HTTPS'])) ? "s" : ""; $p = (isset($_SERVER['SERVER_PORT']) and $_SERVER['SERVER_PORT'] != "80") ? ":".$_SERVER['SERVER_PORT'] : ""; @@ -57,8 +57,7 @@ function exec_ogp_module() $items = $rss->getItems(); #returns all rss items $local = true; } - /* - echo ""; + echo ""; if( ($local AND ( strtotime("+1 day", filemtime($save_as)) <= strtotime("now") )) OR !$local) # Check the file is older than 1 day to avoid spamming the server { stream_context_set_default(array('ssl' => array( @@ -66,13 +65,13 @@ function exec_ogp_module() 'verify_peer_name' => false ) )); - - $headers = get_headers( $url, 1 ); + + $headers = @get_headers( $url, 1 ); touch( $save_as ); # Connection done, so we reset the file modification time even if the server is down (avoid server spamming) echo ""; - if( $headers[0] == 'HTTP/1.1 200 OK') + if( is_array($headers) && isset($headers[0]) && $headers[0] == 'HTTP/1.1 200 OK') { - $online = false; + $online = true; $rss_online = new rss_php; $rss_online->load($url); # SERVER USAGE WARNING : using 32kb of server bandwidth each time each person loads this function $items_online = $rss_online->getItems(); @@ -111,7 +110,6 @@ function exec_ogp_module() $rss->load($local_url); $items = $rss->getItems(); #returns all rss items } - */ if(!file_exists($save_as)) { @@ -147,11 +145,15 @@ function exec_ogp_module() echo "".
"
-
diff --git a/modules/ftp/module.php b/modules/ftp/module.php
index 808ff01e..3b9f6adc 100644
--- a/modules/ftp/module.php
+++ b/modules/ftp/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "ftp";
-$module_version = "1.41";
+$module_version = "1.0";
$db_version = 1;
$module_required = TRUE;
$module_menus = array( array( 'subpage' => 'ftp_admin', 'name'=>'FTP Admin', 'group'=>'admin' ) );
diff --git a/modules/litefm/module.php b/modules/litefm/module.php
index 3651d544..cb181284 100644
--- a/modules/litefm/module.php
+++ b/modules/litefm/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "Lite File Manager";
-$module_version = "1.11";
+$module_version = "1.0";
$db_version = 1;
$module_required = TRUE;
$module_menus = array( array( 'subpage' => 'litefm_settings', 'name'=>'LiteFM Settings', 'group'=>'admin' ) );
diff --git a/modules/modulemanager/module.php b/modules/modulemanager/module.php
index e2ab9ac7..bf942b8b 100644
--- a/modules/modulemanager/module.php
+++ b/modules/modulemanager/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "Module manager";
-$module_version = "1.1";
+$module_version = "1.0";
$db_version = 1;
$module_required = TRUE;
$module_menus = array(
diff --git a/modules/news/module.php b/modules/news/module.php
index a2de5e1c..e6de072b 100644
--- a/modules/news/module.php
+++ b/modules/news/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "NewsLister";
-$module_version = "0.9";
+$module_version = "1.0";
$db_version = 0;
$module_required = FALSE;
$module_menus = array( array( 'subpage' => 'news', 'name'=>'News', 'group'=>'user' ),
diff --git a/modules/register/module.php b/modules/register/module.php
index 42e86eb4..2eab95d0 100644
--- a/modules/register/module.php
+++ b/modules/register/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "register";
-$module_version = "1.2";
+$module_version = "1.0";
$db_version = 0;
$module_required = TRUE;
$module_menus = array( array( 'subpage' => 'form', 'name'=>'Register', 'group'=>'guest' ) );
diff --git a/modules/server/module.php b/modules/server/module.php
index 8b56e570..50bee31c 100644
--- a/modules/server/module.php
+++ b/modules/server/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "Server manager";
-$module_version = "1.6.1";
+$module_version = "1.0";
$db_version = 1;
$module_required = TRUE;
$module_menus = array(
diff --git a/modules/settings/module.php b/modules/settings/module.php
index acf1d588..2f9b4849 100644
--- a/modules/settings/module.php
+++ b/modules/settings/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "Settings";
-$module_version = "1.1";
+$module_version = "1.0";
$db_version = 1;
$module_required = TRUE;
$module_menus = array(
diff --git a/modules/update/module.php b/modules/update/module.php
index 392833e1..c303fa51 100644
--- a/modules/update/module.php
+++ b/modules/update/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "Update";
-$module_version = "1.2";
+$module_version = "1.0";
$db_version = 3; // avoid 'duplicate table' error message.
$module_required = TRUE;
$module_menus = array(
diff --git a/modules/user_admin/module.php b/modules/user_admin/module.php
index 37b2faf0..8c2a1032 100644
--- a/modules/user_admin/module.php
+++ b/modules/user_admin/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "User admin";
-$module_version = "1.1";
+$module_version = "1.0";
$db_version = 7;
$module_required = TRUE;
$module_menus = array(
diff --git a/modules/user_games/module.php b/modules/user_games/module.php
index 2a6cedab..e1fcce88 100644
--- a/modules/user_games/module.php
+++ b/modules/user_games/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "User games";
-$module_version = "1.3";
+$module_version = "1.0";
$db_version = 3;
$module_required = TRUE;
$module_menus = array(
diff --git a/modules/util/module.php b/modules/util/module.php
index 389a7383..e0327edb 100644
--- a/modules/util/module.php
+++ b/modules/util/module.php
@@ -24,7 +24,7 @@
// Module general information
$module_title = "Utilities";
-$module_version = "2.0";
+$module_version = "1.0";
$db_version = 0;
$module_required = TRUE;
$module_menus = array( array( 'subpage' => '', 'name'=>'Utilities', 'group'=>'user' ) );
diff --git a/themes/Obsidian/botbody.html b/themes/Obsidian/botbody.html
new file mode 100644
index 00000000..302cfa1a
--- /dev/null
+++ b/themes/Obsidian/botbody.html
@@ -0,0 +1,4 @@
+
+ ".
- "
". + "Powered by:
". + "
".
"
".
"". + "Powered by:
". + "
".
"".
"Credits:
". - "
". + "".
"
";
}
diff --git a/modules/faq/navigation.xml b/modules/faq/navigation.xml
index 735a9413..01c7c0c5 100644
--- a/modules/faq/navigation.xml
+++ b/modules/faq/navigation.xml
@@ -1,3 +1,3 @@
". - "
". + "
Original Idea | Chief Content Maintainer : omano at opengamepanel.org
". + "Front End Developer | james30263 at opengamepanel.org
". + "Back End Developer | DieFeM at opengamepanel.org
". + "Beta Tester | Content Maintainer : rocco at opengamepanel.org
".
"". + "Front End Developer | james30263 at opengamepanel.org
". + "Back End Developer | DieFeM at opengamepanel.org
". + "Beta Tester | Content Maintainer : rocco at opengamepanel.org