GSP/Panel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #88 from GameServerPanel/copilot/move-update-ui-to-update-module

Browse source
This commit is contained in:
Frank Harris 2026-05-01 14:37:09 -07:00 • committed by GitHub
commit b99cd45db9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 164 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/administration/administration.php
View file

@ -181,11 +181,6 @@ function exec_ogp_module()
"</table>\n"; "</table>\n";
### END ICONS TO FRAMES ### END ICONS TO FRAMES
### PANEL UPDATES
require_once(dirname(__FILE__) . '/panel_update.php');
gsp_panel_update_section();
### END PANEL UPDATES
### CHANGE MENU ORDER ### CHANGE MENU ORDER
if ( isset( $_POST['changeOrder'] ) ) if ( isset( $_POST['changeOrder'] ) )

143
modules/administration/panel_update.php
View file

@ -16,11 +16,11 @@
*/ */
// Panel root is two directories up from this file (modules/administration/panel_update.php) // Panel root is two directories up from this file (modules/administration/panel_update.php)
define('GSP_PANEL_DIR', realpath(dirname(__FILE__) . '/../../')); defined('GSP_PANEL_DIR') || define('GSP_PANEL_DIR', realpath(dirname(__FILE__) . '/../../'));
define('GSP_BACKUP_BASE', GSP_PANEL_DIR . '/backups'); defined('GSP_BACKUP_BASE') || define('GSP_BACKUP_BASE', GSP_PANEL_DIR . '/backups');
define('GSP_UPDATE_LOG', GSP_PANEL_DIR . '/logs/panel_updates.log'); defined('GSP_UPDATE_LOG') || define('GSP_UPDATE_LOG', GSP_PANEL_DIR . '/logs/panel_updates.log');
define('GSP_VERSION_FILE', GSP_PANEL_DIR . '/includes/panel_version.php'); defined('GSP_VERSION_FILE') || define('GSP_VERSION_FILE', GSP_PANEL_DIR . '/includes/panel_version.php');
define('GSP_VERSION_JSON', GSP_PANEL_DIR . '/version.json'); defined('GSP_VERSION_JSON') || define('GSP_VERSION_JSON', GSP_PANEL_DIR . '/version.json');
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Helper: write a line to the panel update log // Helper: write a line to the panel update log
@ -35,6 +35,35 @@ function gsp_update_log($message)
@file_put_contents(GSP_UPDATE_LOG, $line, FILE_APPEND | LOCK_EX); @file_put_contents(GSP_UPDATE_LOG, $line, FILE_APPEND | LOCK_EX);
} }
// ---------------------------------------------------------------------------
// Helper: insert a row into gsp_panel_update_log (silently skips on failure)
// ---------------------------------------------------------------------------
function gsp_log_update_to_db($channel, $branch, $status, $message, $backup_path = null, $db_backup_path = null, $file_backup_path = null, $started_at = null, $finished_at = null)
{
global $db;
if (!isset($db) || !is_object($db)) {
return;
}
if ($started_at === null) {
$started_at = date('Y-m-d H:i:s');
}
$channel = $db->real_escape_string((string) $channel);
$branch = $branch !== null ? "'" . $db->real_escape_string((string) $branch) . "'" : 'NULL';
$status = $db->real_escape_string((string) $status);
$message_esc = $message !== null ? "'" . $db->real_escape_string((string) $message) . "'" : 'NULL';
$backup_path_esc = $backup_path !== null ? "'" . $db->real_escape_string((string) $backup_path) . "'" : 'NULL';
$db_backup_esc = $db_backup_path !== null ? "'" . $db->real_escape_string((string) $db_backup_path) . "'" : 'NULL';
$file_backup_esc = $file_backup_path !== null ? "'" . $db->real_escape_string((string) $file_backup_path) . "'" : 'NULL';
$started_esc = "'" . $db->real_escape_string($started_at) . "'";
$finished_esc = $finished_at !== null ? "'" . $db->real_escape_string((string) $finished_at) . "'" : 'NULL';
$db->query(
"INSERT INTO OGP_DB_PREFIXpanel_update_log"
. " (channel, branch, status, message, backup_path, db_backup_path, file_backup_path, started_at, finished_at)"
. " VALUES ('{$channel}', {$branch}, '{$status}', {$message_esc},"
. " {$backup_path_esc}, {$db_backup_esc}, {$file_backup_esc}, {$started_esc}, {$finished_esc})"
);
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Helper: read the installed version / branch from panel_version.php // Helper: read the installed version / branch from panel_version.php
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -836,7 +865,7 @@ function gsp_do_update($repo_owner, $repo_name, $ref, $update_type)
} }
gsp_update_log("Update to {$ref} (type={$update_type}) complete"); gsp_update_log("Update to {$ref} (type={$update_type}) complete");
return ['success' => true, 'files_copied' => $files_copied]; return ['success' => true, 'files_copied' => $files_copied, 'backup_dir' => $backup['backup_dir']];
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -1004,26 +1033,69 @@ function gsp_panel_update_section()
$user_label = htmlspecialchars($_SESSION['users_login']) $user_label = htmlspecialchars($_SESSION['users_login'])
. ' (IP: ' . htmlspecialchars($_SERVER['REMOTE_ADDR']) . ')'; . ' (IP: ' . htmlspecialchars($_SERVER['REMOTE_ADDR']) . ')';
if ($action === 'update_release') { if ($action === 'backup_only') {
$started_at = date('Y-m-d H:i:s');
$result = gsp_create_full_backup('backup-only', 'manual');
$finished_at = date('Y-m-d H:i:s');
if ($result['success']) {
$bk_dir = htmlspecialchars($result['backup_dir']);
print_success('Backup created successfully at <code>' . $bk_dir . '</code>.');
gsp_update_log("Admin {$user_label} created manual backup at {$result['backup_dir']}");
gsp_log_update_to_db(
'backup-only', null, 'success',
'Manual backup by ' . $_SESSION['users_login'],
$result['backup_dir'],
$result['backup_dir'] . '/database.sql',
$result['backup_dir'] . '/panel-files.tar.gz',
$started_at, $finished_at
);
} else {
print_failure('Backup failed: ' . htmlspecialchars($result['error']));
gsp_update_log("Admin {$user_label} manual backup FAILED: {$result['error']}");
gsp_log_update_to_db(
'backup-only', null, 'failed',
'Manual backup failed: ' . $result['error'],
null, null, null, $started_at, $finished_at
);
}
} elseif ($action === 'update_release') {
$version = isset($_POST['gsp_release_version']) ? trim($_POST['gsp_release_version']) : ''; $version = isset($_POST['gsp_release_version']) ? trim($_POST['gsp_release_version']) : '';
if (!preg_match('/^[a-zA-Z0-9._\-]+$/', $version) || strlen($version) > 80) { if (!preg_match('/^[a-zA-Z0-9._\-]+$/', $version) || strlen($version) > 80) {
print_failure('Invalid release tag selected.'); print_failure('Invalid release tag selected.');
} else { } else {
$started_at = date('Y-m-d H:i:s');
$result = gsp_do_update($repo_owner, $repo_name, $version, 'release'); $result = gsp_do_update($repo_owner, $repo_name, $version, 'release');
$finished_at = date('Y-m-d H:i:s');
if ($result['success']) { if ($result['success']) {
print_success( print_success(
'Panel updated to release <strong>' . htmlspecialchars($version) . '</strong>. ' 'Panel updated to release <strong>' . htmlspecialchars($version) . '</strong>. '
. intval($result['files_copied']) . ' file(s) updated. Source: <strong>GitHub Releases</strong>' . intval($result['files_copied']) . ' file(s) updated. Source: <strong>GitHub Releases</strong>'
); );
gsp_update_log("Admin {$user_label} updated panel to release {$version}"); gsp_update_log("Admin {$user_label} updated panel to release {$version}");
gsp_log_update_to_db(
'release', $version, 'success',
'Updated to release ' . $version . ' by ' . $_SESSION['users_login'],
$result['backup_dir'] ?? null,
isset($result['backup_dir']) ? $result['backup_dir'] . '/database.sql' : null,
isset($result['backup_dir']) ? $result['backup_dir'] . '/panel-files.tar.gz': null,
$started_at, $finished_at
);
} else { } else {
print_failure('Update failed: ' . htmlspecialchars($result['error'])); print_failure('Update failed: ' . htmlspecialchars($result['error']));
gsp_update_log("Admin {$user_label} update to release {$version} FAILED: {$result['error']}"); gsp_update_log("Admin {$user_label} update to release {$version} FAILED: {$result['error']}");
gsp_log_update_to_db(
'release', $version, 'failed',
'Update to release ' . $version . ' failed: ' . $result['error'],
null, null, null, $started_at, $finished_at
);
} }
} }
} elseif ($action === 'update_stable') { } elseif ($action === 'update_stable') {
$started_at = date('Y-m-d H:i:s');
$result = gsp_do_update($repo_owner, $repo_name, $stable_branch, 'development'); $result = gsp_do_update($repo_owner, $repo_name, $stable_branch, 'development');
$finished_at = date('Y-m-d H:i:s');
if ($result['success']) { if ($result['success']) {
print_success( print_success(
'Panel updated to development version (<strong>' . htmlspecialchars($stable_branch) . '</strong>). ' 'Panel updated to development version (<strong>' . htmlspecialchars($stable_branch) . '</strong>). '
@ -1031,13 +1103,28 @@ function gsp_panel_update_section()
. htmlspecialchars($stable_branch) . '</strong>' . htmlspecialchars($stable_branch) . '</strong>'
); );
gsp_update_log("Admin {$user_label} updated panel to stable branch {$stable_branch}"); gsp_update_log("Admin {$user_label} updated panel to stable branch {$stable_branch}");
gsp_log_update_to_db(
'development', $stable_branch, 'success',
'Updated to stable branch ' . $stable_branch . ' by ' . $_SESSION['users_login'],
$result['backup_dir'] ?? null,
isset($result['backup_dir']) ? $result['backup_dir'] . '/database.sql' : null,
isset($result['backup_dir']) ? $result['backup_dir'] . '/panel-files.tar.gz': null,
$started_at, $finished_at
);
} else { } else {
print_failure('Update failed: ' . htmlspecialchars($result['error'])); print_failure('Update failed: ' . htmlspecialchars($result['error']));
gsp_update_log("Admin {$user_label} update to stable branch {$stable_branch} FAILED: {$result['error']}"); gsp_update_log("Admin {$user_label} update to stable branch {$stable_branch} FAILED: {$result['error']}");
gsp_log_update_to_db(
'development', $stable_branch, 'failed',
'Update to stable branch ' . $stable_branch . ' failed: ' . $result['error'],
null, null, null, $started_at, $finished_at
);
} }
} elseif ($action === 'update_unstable') { } elseif ($action === 'update_unstable') {
$started_at = date('Y-m-d H:i:s');
$result = gsp_do_update($repo_owner, $repo_name, $unstable_branch, 'cutting-edge'); $result = gsp_do_update($repo_owner, $repo_name, $unstable_branch, 'cutting-edge');
$finished_at = date('Y-m-d H:i:s');
if ($result['success']) { if ($result['success']) {
print_success( print_success(
'Panel updated to cutting edge version (<strong>' . htmlspecialchars($unstable_branch) . '</strong>). ' 'Panel updated to cutting edge version (<strong>' . htmlspecialchars($unstable_branch) . '</strong>). '
@ -1045,9 +1132,22 @@ function gsp_panel_update_section()
. htmlspecialchars($unstable_branch) . '</strong>' . htmlspecialchars($unstable_branch) . '</strong>'
); );
gsp_update_log("Admin {$user_label} updated panel to unstable branch {$unstable_branch}"); gsp_update_log("Admin {$user_label} updated panel to unstable branch {$unstable_branch}");
gsp_log_update_to_db(
'cutting-edge', $unstable_branch, 'success',
'Updated to cutting-edge branch ' . $unstable_branch . ' by ' . $_SESSION['users_login'],
$result['backup_dir'] ?? null,
isset($result['backup_dir']) ? $result['backup_dir'] . '/database.sql' : null,
isset($result['backup_dir']) ? $result['backup_dir'] . '/panel-files.tar.gz': null,
$started_at, $finished_at
);
} else { } else {
print_failure('Update failed: ' . htmlspecialchars($result['error'])); print_failure('Update failed: ' . htmlspecialchars($result['error']));
gsp_update_log("Admin {$user_label} update to unstable branch {$unstable_branch} FAILED: {$result['error']}"); gsp_update_log("Admin {$user_label} update to unstable branch {$unstable_branch} FAILED: {$result['error']}");
gsp_log_update_to_db(
'cutting-edge', $unstable_branch, 'failed',
'Update to cutting-edge branch ' . $unstable_branch . ' failed: ' . $result['error'],
null, null, null, $started_at, $finished_at
);
} }
} elseif ($action === 'revert') { } elseif ($action === 'revert') {
@ -1055,16 +1155,31 @@ function gsp_panel_update_section()
if (!preg_match('/^\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}$/', $backup_ts)) { if (!preg_match('/^\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}$/', $backup_ts)) {
print_failure('Invalid backup timestamp selected.'); print_failure('Invalid backup timestamp selected.');
} else { } else {
$started_at = date('Y-m-d H:i:s');
$result = gsp_do_revert($backup_ts); $result = gsp_do_revert($backup_ts);
$finished_at = date('Y-m-d H:i:s');
if ($result['success']) { if ($result['success']) {
print_success( print_success(
'Panel reverted to backup from <strong>' . htmlspecialchars($backup_ts) . '</strong>. ' 'Panel reverted to backup from <strong>' . htmlspecialchars($backup_ts) . '</strong>. '
. intval($result['files_restored']) . ' file(s) restored.' . intval($result['files_restored']) . ' file(s) restored.'
); );
gsp_update_log("Admin {$user_label} reverted panel to backup {$backup_ts}"); gsp_update_log("Admin {$user_label} reverted panel to backup {$backup_ts}");
gsp_log_update_to_db(
'revert', $backup_ts, 'success',
'Reverted to backup ' . $backup_ts . ' by ' . $_SESSION['users_login'],
GSP_BACKUP_BASE . '/' . $backup_ts,
GSP_BACKUP_BASE . '/' . $backup_ts . '/database.sql',
GSP_BACKUP_BASE . '/' . $backup_ts . '/panel-files.tar.gz',
$started_at, $finished_at
);
} else { } else {
print_failure('Revert failed: ' . htmlspecialchars($result['error'])); print_failure('Revert failed: ' . htmlspecialchars($result['error']));
gsp_update_log("Admin {$user_label} revert to backup {$backup_ts} FAILED: {$result['error']}"); gsp_update_log("Admin {$user_label} revert to backup {$backup_ts} FAILED: {$result['error']}");
gsp_log_update_to_db(
'revert', $backup_ts, 'failed',
'Revert to backup ' . $backup_ts . ' failed: ' . $result['error'],
null, null, null, $started_at, $finished_at
);
} }
} }
} }
@ -1130,6 +1245,20 @@ function gsp_panel_update_section()
} }
echo "</table>\n<br>\n"; echo "</table>\n<br>\n";
// ---- Backup Only --------------------------------------------------------
echo "<h3>Create Backup</h3>\n";
echo "<form method='POST'>\n";
echo "<input type='hidden' name='gsp_update_action' value='backup_only'>\n";
echo "<input type='hidden' name='gsp_update_csrf' value='" . htmlspecialchars($csrf_token) . "'>\n";
echo "<button type='submit'"
. " onclick='return confirm(\"Create a backup of panel files and the database now (no update). Continue?\");'>"
. "Create Backup Now</button>\n";
echo "<span style='margin-left:10px;color:#666;'>Saves to: <code>"
. htmlspecialchars(GSP_BACKUP_BASE) . "</code></span>\n";
echo "</form>\n";
echo "<br>\n";
// ---- Numbered Releases -------------------------------------------------- // ---- Numbered Releases --------------------------------------------------
echo "<h3>Numbered Releases</h3>\n"; echo "<h3>Numbered Releases</h3>\n";
if (is_array($releases) && !empty($releases)) { if (is_array($releases) && !empty($releases)) {

23
modules/update/module.php
View file

@ -24,8 +24,8 @@
// Module general information // Module general information
$module_title = "Update"; $module_title = "Update";
$module_version = "1.1"; $module_version = "1.2";
$db_version = 2; // avoid 'duplicate table' error message. $db_version = 3; // avoid 'duplicate table' error message.
$module_required = TRUE; $module_required = TRUE;
$module_menus = array( $module_menus = array(
array( 'subpage' => '', 'name'=>'Update', 'group'=>'admin' ) array( 'subpage' => '', 'name'=>'Update', 'group'=>'admin' )
@ -38,13 +38,28 @@ $install_queries[1] = array(
`file_path` VARCHAR(1000) UNIQUE NOT NULL `file_path` VARCHAR(1000) UNIQUE NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;"); ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
$install_queries[2] = array( $install_queries[2] = array(
"DELETE FROM ".OGP_DB_PREFIX."update_blacklist "DELETE FROM ".OGP_DB_PREFIX."update_blacklist
WHERE file_path IN (SELECT * WHERE file_path IN (SELECT *
FROM (SELECT file_path FROM ".OGP_DB_PREFIX."update_blacklist FROM (SELECT file_path FROM ".OGP_DB_PREFIX."update_blacklist
GROUP BY file_path HAVING (COUNT(*) > 1) GROUP BY file_path HAVING (COUNT(*) > 1)
) AS A ) AS A
);", );",
"ALTER TABLE ".OGP_DB_PREFIX."update_blacklist MODIFY file_path VARCHAR(1000);", "ALTER TABLE ".OGP_DB_PREFIX."update_blacklist MODIFY file_path VARCHAR(1000);",
"ALTER TABLE ".OGP_DB_PREFIX."update_blacklist ADD UNIQUE (file_path);" "ALTER TABLE ".OGP_DB_PREFIX."update_blacklist ADD UNIQUE (file_path);"
);
$install_queries[3] = array(
"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."panel_update_log` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`channel` varchar(64) NOT NULL,
`branch` varchar(128) DEFAULT NULL,
`status` varchar(32) NOT NULL,
`message` text DEFAULT NULL,
`backup_path` varchar(255) DEFAULT NULL,
`db_backup_path` varchar(255) DEFAULT NULL,
`file_backup_path` varchar(255) DEFAULT NULL,
`started_at` datetime NOT NULL,
`finished_at` datetime DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"
); );
?> ?>

18
modules/update/update.php
View file

@ -22,18 +22,14 @@
* *
*/ */
// todo, make checking and updating functions for updateing on the background.
// todo, more specified updates in smaller packages
function exec_ogp_module() function exec_ogp_module()
{ {
global $db, $settings; if ($_SESSION['users_group'] !== 'admin') {
define('REPONAME', 'OGP-Website'); print_failure(get_lang('no_access'));
return;
if ($_SESSION['users_group'] != "admin") }
{
print_failure(get_lang('no_access'));
return;
}
echo "To update the panel, visit our git at http://git.iaregamer.com:3000, download the panel and replace your files.";
require_once(dirname(__FILE__) . '/../administration/panel_update.php');
gsp_panel_update_section();
} }
?>

4
modules/user_games/edit_home.php
View file

@ -715,7 +715,7 @@ function exec_ogp_module()
echo "<tr><td class='right'>". get_lang("game_control_password") .":</td><td class='left'>"; echo "<tr><td class='right'>". get_lang("game_control_password") .":</td><td class='left'>";
echo "<form action='?m=user_games&p=edit&home_id=".$home_id."' method='post'>"; echo "<form action='?m=user_games&p=edit&home_id=".$home_id."' method='post'>";
echo "<input type='hidden' name='home_id' value=\"$home_id\" />\n"; echo "<input type='hidden' name='home_id' value=\"$home_id\" />\n";
echo "<input type='text' size='30' name='control_password' value=\"".str_replace('"', "&quot;", $home_info['control_password'])."\" />"; echo "<input type='password' size='30' name='control_password' value=\"".str_replace('"', "&quot;", $home_info['control_password'])."\" />";
echo "<input type='submit' name='change_control_password' value='". get_lang("change_control_password") ."' />"; echo "<input type='submit' name='change_control_password' value='". get_lang("change_control_password") ."' />";
echo "</form></td></tr>"; echo "</form></td></tr>";
echo "<tr><td colspan='2' class='info'>". get_lang("change_control_password_info") ."</td></tr>"; echo "<tr><td colspan='2' class='info'>". get_lang("change_control_password_info") ."</td></tr>";
@ -754,7 +754,7 @@ function exec_ogp_module()
// Form to edit control ftp password // Form to edit control ftp password
echo "<tr><td class='right'>". get_lang("server_ftp_password") .":</td><td class='left'>"; echo "<tr><td class='right'>". get_lang("server_ftp_password") .":</td><td class='left'>";
echo "<form action='?m=user_games&p=edit&home_id=".$home_id."' method='post'>"; echo "<form action='?m=user_games&p=edit&home_id=".$home_id."' method='post'>";
echo "<input type='text' size='30' name='ftp_password' value=\"".str_replace('"', "&quot;", $home_info['ftp_password'])."\" />"; echo "<input type='password' size='30' name='ftp_password' value=\"".str_replace('"', "&quot;", $home_info['ftp_password'])."\" />";
echo "<input type='submit' name='change_ftp_password' value='". get_lang("change_ftp_password") ."' />"; echo "<input type='submit' name='change_ftp_password' value='". get_lang("change_ftp_password") ."' />";
echo "</form></td></tr>"; echo "</form></td></tr>";
echo "<tr><td colspan='2' class='info'>". get_lang("change_ftp_password_info") ."</td></tr>"; echo "<tr><td colspan='2' class='info'>". get_lang("change_ftp_password_info") ."</td></tr>";