From 251af10faf0a8ec07e205b834c76d707c80d3d3f Mon Sep 17 00:00:00 2001 From: Frank Harris Date: Thu, 2 Jul 2026 18:11:32 -0500 Subject: [PATCH] cleanup --- .github/agent.md | 12 +- .github/copilot-instructions.md | 12 +- .github/module-map.md | 16 +- LAST_UPDATE.txt | 2 +- Panel/APACHE_SETUP.md | 8 +- Panel/CHANGELOG.md | 6 +- Panel/IMPLEMENTATION_COMPLETE.md | 28 +- Panel/IMPLEMENTATION_NOTES.md | 38 +- Panel/IMPLEMENTATION_SUMMARY.md | 4 +- Panel/INSTALL.BAT | 24 +- Panel/INSTALL_README.md | 10 +- Panel/README.txt | 4 +- Panel/agent_event_receiver.php | 2 +- Panel/all_hostable_games_union.csv | 14 +- Panel/check.php | 6 +- Panel/css/global.css | 8 +- Panel/docs/GSP_INSTALLER.md | 34 +- Panel/documentation/admin-guide.md | 24 +- Panel/documentation/agent-guide.md | 26 +- Panel/documentation/xml-notes.md | 28 +- Panel/game_titles.txt | 4 +- Panel/{ogp_api.php => gsp_api.php} | 524 +++---- Panel/home.php | 68 +- Panel/includes/api_functions.php | 82 +- Panel/includes/database.php | 68 +- Panel/includes/database_mysqli.php | 728 +++++----- Panel/includes/form_table_class.php | 6 +- Panel/includes/functions.php | 190 +-- Panel/includes/helpers.php | 124 +- Panel/includes/html_functions.php | 14 +- Panel/includes/lang.php | 46 +- Panel/includes/lib_remote.php | 140 +- Panel/includes/navig.php | 16 +- Panel/includes/refreshed.php | 34 +- Panel/includes/view.php | 112 +- Panel/index.orig.php | 96 +- Panel/index.php | 118 +- Panel/install.php | 40 +- Panel/js/global.js | 60 +- Panel/js/modules/gamemanager.js | 28 +- Panel/js/modules/litefm.js | 96 +- Panel/js/modules/user_games-assign.js | 14 +- Panel/lang/Arabic/global.php | 6 +- Panel/lang/Arabic/install.php | 14 +- Panel/lang/Arabic/modules/TS3Admin.php | 6 +- Panel/lang/Arabic/modules/addonsmanager.php | 6 +- Panel/lang/Arabic/modules/administration.php | 6 +- Panel/lang/Arabic/modules/config_games.php | 6 +- Panel/lang/Arabic/modules/dashboard.php | 12 +- Panel/lang/Arabic/modules/dsi.php | 6 +- Panel/lang/Arabic/modules/extras.php | 6 +- Panel/lang/Arabic/modules/fast_download.php | 8 +- Panel/lang/Arabic/modules/ftp.php | 6 +- Panel/lang/Arabic/modules/gamemanager.php | 14 +- Panel/lang/Arabic/modules/litefm.php | 6 +- Panel/lang/Arabic/modules/lostpwd.php | 8 +- Panel/lang/Arabic/modules/modulemanager.php | 6 +- Panel/lang/Arabic/modules/mysql.php | 20 +- Panel/lang/Arabic/modules/news.php | 6 +- Panel/lang/Arabic/modules/rcon.php | 6 +- Panel/lang/Arabic/modules/register.php | 8 +- Panel/lang/Arabic/modules/server.php | 16 +- Panel/lang/Arabic/modules/settings.php | 10 +- Panel/lang/Arabic/modules/status.php | 6 +- Panel/lang/Arabic/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Arabic/modules/subusers.php | 8 +- Panel/lang/Arabic/modules/support.php | 6 +- Panel/lang/Arabic/modules/tickets.php | 6 +- Panel/lang/Arabic/modules/update.php | 6 +- Panel/lang/Arabic/modules/user_admin.php | 6 +- Panel/lang/Arabic/modules/user_games.php | 10 +- Panel/lang/Arabic/modules/util.php | 6 +- .../Chinese(China)/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Croatian(Croatia)/global.php | 6 +- Panel/lang/Croatian(Croatia)/install.php | 18 +- .../Croatian(Croatia)/modules/TS3Admin.php | 6 +- .../modules/addonsmanager.php | 6 +- .../modules/administration.php | 6 +- .../modules/config_games.php | 6 +- .../Croatian(Croatia)/modules/dashboard.php | 12 +- Panel/lang/Croatian(Croatia)/modules/dsi.php | 6 +- .../lang/Croatian(Croatia)/modules/extras.php | 6 +- .../modules/fast_download.php | 8 +- Panel/lang/Croatian(Croatia)/modules/ftp.php | 6 +- .../Croatian(Croatia)/modules/gamemanager.php | 16 +- .../lang/Croatian(Croatia)/modules/litefm.php | 6 +- .../Croatian(Croatia)/modules/lostpwd.php | 8 +- .../modules/modulemanager.php | 8 +- .../lang/Croatian(Croatia)/modules/mysql.php | 20 +- Panel/lang/Croatian(Croatia)/modules/news.php | 6 +- Panel/lang/Croatian(Croatia)/modules/rcon.php | 6 +- .../Croatian(Croatia)/modules/register.php | 8 +- .../lang/Croatian(Croatia)/modules/server.php | 16 +- .../Croatian(Croatia)/modules/settings.php | 10 +- .../lang/Croatian(Croatia)/modules/status.php | 6 +- .../modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- .../Croatian(Croatia)/modules/subusers.php | 8 +- .../Croatian(Croatia)/modules/support.php | 6 +- .../Croatian(Croatia)/modules/tickets.php | 6 +- .../lang/Croatian(Croatia)/modules/update.php | 6 +- .../Croatian(Croatia)/modules/user_admin.php | 6 +- .../Croatian(Croatia)/modules/user_games.php | 12 +- Panel/lang/Croatian(Croatia)/modules/util.php | 6 +- Panel/lang/Czech(CzechRepublic)/global.php | 6 +- Panel/lang/Czech(CzechRepublic)/install.php | 18 +- .../Czech(CzechRepublic)/modules/TS3Admin.php | 6 +- .../modules/addonsmanager.php | 6 +- .../modules/administration.php | 6 +- .../modules/config_games.php | 6 +- .../modules/dashboard.php | 12 +- .../lang/Czech(CzechRepublic)/modules/dsi.php | 6 +- .../Czech(CzechRepublic)/modules/extras.php | 6 +- .../modules/fast_download.php | 8 +- .../lang/Czech(CzechRepublic)/modules/ftp.php | 6 +- .../modules/gamemanager.php | 16 +- .../Czech(CzechRepublic)/modules/litefm.php | 6 +- .../Czech(CzechRepublic)/modules/lostpwd.php | 8 +- .../modules/modulemanager.php | 8 +- .../Czech(CzechRepublic)/modules/mysql.php | 20 +- .../Czech(CzechRepublic)/modules/news.php | 6 +- .../Czech(CzechRepublic)/modules/rcon.php | 6 +- .../Czech(CzechRepublic)/modules/register.php | 8 +- .../Czech(CzechRepublic)/modules/server.php | 16 +- .../Czech(CzechRepublic)/modules/settings.php | 10 +- .../Czech(CzechRepublic)/modules/status.php | 6 +- .../modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- .../Czech(CzechRepublic)/modules/subusers.php | 8 +- .../Czech(CzechRepublic)/modules/support.php | 6 +- .../Czech(CzechRepublic)/modules/tickets.php | 6 +- .../Czech(CzechRepublic)/modules/update.php | 6 +- .../modules/user_admin.php | 6 +- .../modules/user_games.php | 12 +- .../Czech(CzechRepublic)/modules/util.php | 6 +- Panel/lang/Danish/global.php | 6 +- Panel/lang/Danish/install.php | 18 +- Panel/lang/Danish/modules/TS3Admin.php | 6 +- Panel/lang/Danish/modules/addonsmanager.php | 6 +- Panel/lang/Danish/modules/administration.php | 6 +- Panel/lang/Danish/modules/config_games.php | 6 +- Panel/lang/Danish/modules/dashboard.php | 12 +- Panel/lang/Danish/modules/dsi.php | 6 +- Panel/lang/Danish/modules/extras.php | 6 +- Panel/lang/Danish/modules/fast_download.php | 8 +- Panel/lang/Danish/modules/ftp.php | 6 +- Panel/lang/Danish/modules/gamemanager.php | 16 +- Panel/lang/Danish/modules/litefm.php | 6 +- Panel/lang/Danish/modules/lostpwd.php | 8 +- Panel/lang/Danish/modules/modulemanager.php | 8 +- Panel/lang/Danish/modules/mysql.php | 20 +- Panel/lang/Danish/modules/news.php | 6 +- Panel/lang/Danish/modules/rcon.php | 6 +- Panel/lang/Danish/modules/register.php | 8 +- Panel/lang/Danish/modules/server.php | 16 +- Panel/lang/Danish/modules/settings.php | 10 +- Panel/lang/Danish/modules/status.php | 6 +- Panel/lang/Danish/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Danish/modules/subusers.php | 6 +- Panel/lang/Danish/modules/support.php | 6 +- Panel/lang/Danish/modules/tickets.php | 6 +- Panel/lang/Danish/modules/update.php | 6 +- Panel/lang/Danish/modules/user_admin.php | 6 +- Panel/lang/Danish/modules/user_games.php | 12 +- Panel/lang/Danish/modules/util.php | 6 +- Panel/lang/English/fast_download_global.php | 8 +- Panel/lang/English/global.php | 6 +- Panel/lang/English/install.php | 18 +- Panel/lang/English/modules/TS3Admin.php | 6 +- Panel/lang/English/modules/addonsmanager.php | 6 +- Panel/lang/English/modules/administration.php | 6 +- Panel/lang/English/modules/billing.php | 6 +- Panel/lang/English/modules/circular.php | 6 +- Panel/lang/English/modules/config_games.php | 6 +- Panel/lang/English/modules/cron.php | 8 +- Panel/lang/English/modules/dashboard.php | 12 +- Panel/lang/English/modules/dsi.php | 6 +- Panel/lang/English/modules/extras.php | 6 +- Panel/lang/English/modules/fast_download.php | 8 +- Panel/lang/English/modules/ftp.php | 6 +- Panel/lang/English/modules/gamemanager.php | 14 +- Panel/lang/English/modules/litefm.php | 6 +- Panel/lang/English/modules/lostpwd.php | 8 +- Panel/lang/English/modules/modulemanager.php | 8 +- Panel/lang/English/modules/mysql.php | 20 +- Panel/lang/English/modules/news.php | 6 +- Panel/lang/English/modules/rcon.php | 6 +- Panel/lang/English/modules/register.php | 8 +- Panel/lang/English/modules/reseller.php | 6 +- Panel/lang/English/modules/server.php | 16 +- Panel/lang/English/modules/settings.php | 10 +- Panel/lang/English/modules/status.php | 6 +- Panel/lang/English/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/English/modules/subusers.php | 8 +- Panel/lang/English/modules/support.php | 6 +- Panel/lang/English/modules/tickets.php | 6 +- Panel/lang/English/modules/update.php | 6 +- Panel/lang/English/modules/user_admin.php | 6 +- Panel/lang/English/modules/user_games.php | 12 +- Panel/lang/English/modules/util.php | 6 +- Panel/lang/Finnish(Finland)/modules/dsi.php | 6 +- .../modules/fast_download.php | 8 +- Panel/lang/Finnish(Finland)/modules/news.php | 6 +- Panel/lang/Finnish(Finland)/modules/rcon.php | 6 +- .../modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- .../lang/Finnish(Finland)/modules/support.php | 6 +- .../lang/Finnish(Finland)/modules/tickets.php | 6 +- Panel/lang/Finnish(Finland)/modules/util.php | 6 +- Panel/lang/French/global.php | 6 +- Panel/lang/French/install.php | 18 +- Panel/lang/French/modules/TS3Admin.php | 6 +- Panel/lang/French/modules/addonsmanager.php | 6 +- Panel/lang/French/modules/administration.php | 6 +- Panel/lang/French/modules/config_games.php | 6 +- Panel/lang/French/modules/dashboard.php | 12 +- Panel/lang/French/modules/dsi.php | 6 +- Panel/lang/French/modules/extras.php | 6 +- Panel/lang/French/modules/fast_download.php | 6 +- Panel/lang/French/modules/ftp.php | 6 +- Panel/lang/French/modules/gamemanager.php | 12 +- Panel/lang/French/modules/litefm.php | 6 +- Panel/lang/French/modules/lostpwd.php | 8 +- Panel/lang/French/modules/modulemanager.php | 8 +- Panel/lang/French/modules/mysql.php | 20 +- Panel/lang/French/modules/news.php | 6 +- Panel/lang/French/modules/rcon.php | 6 +- Panel/lang/French/modules/register.php | 6 +- Panel/lang/French/modules/server.php | 18 +- Panel/lang/French/modules/settings.php | 10 +- Panel/lang/French/modules/status.php | 6 +- Panel/lang/French/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/French/modules/subusers.php | 6 +- Panel/lang/French/modules/support.php | 6 +- Panel/lang/French/modules/tickets.php | 6 +- Panel/lang/French/modules/update.php | 6 +- Panel/lang/French/modules/user_admin.php | 6 +- Panel/lang/French/modules/user_games.php | 12 +- Panel/lang/French/modules/util.php | 6 +- Panel/lang/German/global.php | 6 +- Panel/lang/German/install.php | 18 +- Panel/lang/German/modules/TS3Admin.php | 6 +- Panel/lang/German/modules/addonsmanager.php | 6 +- Panel/lang/German/modules/administration.php | 6 +- Panel/lang/German/modules/config_games.php | 6 +- Panel/lang/German/modules/dashboard.php | 12 +- Panel/lang/German/modules/dsi.php | 6 +- Panel/lang/German/modules/extras.php | 6 +- Panel/lang/German/modules/fast_download.php | 8 +- Panel/lang/German/modules/ftp.php | 6 +- Panel/lang/German/modules/gamemanager.php | 16 +- Panel/lang/German/modules/litefm.php | 6 +- Panel/lang/German/modules/lostpwd.php | 6 +- Panel/lang/German/modules/modulemanager.php | 8 +- Panel/lang/German/modules/mysql.php | 20 +- Panel/lang/German/modules/news.php | 6 +- Panel/lang/German/modules/rcon.php | 6 +- Panel/lang/German/modules/register.php | 8 +- Panel/lang/German/modules/server.php | 16 +- Panel/lang/German/modules/settings.php | 10 +- Panel/lang/German/modules/status.php | 6 +- Panel/lang/German/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/German/modules/subusers.php | 8 +- Panel/lang/German/modules/support.php | 6 +- Panel/lang/German/modules/tickets.php | 6 +- Panel/lang/German/modules/update.php | 6 +- Panel/lang/German/modules/user_admin.php | 6 +- Panel/lang/German/modules/user_games.php | 12 +- Panel/lang/German/modules/util.php | 6 +- Panel/lang/Greek(Greece)/global.php | 6 +- Panel/lang/Greek(Greece)/install.php | 18 +- Panel/lang/Greek(Greece)/modules/TS3Admin.php | 6 +- .../Greek(Greece)/modules/addonsmanager.php | 6 +- .../Greek(Greece)/modules/administration.php | 6 +- .../Greek(Greece)/modules/config_games.php | 6 +- .../lang/Greek(Greece)/modules/dashboard.php | 12 +- Panel/lang/Greek(Greece)/modules/dsi.php | 6 +- Panel/lang/Greek(Greece)/modules/extras.php | 6 +- .../Greek(Greece)/modules/fast_download.php | 8 +- Panel/lang/Greek(Greece)/modules/ftp.php | 6 +- .../Greek(Greece)/modules/gamemanager.php | 16 +- Panel/lang/Greek(Greece)/modules/litefm.php | 6 +- Panel/lang/Greek(Greece)/modules/lostpwd.php | 8 +- .../Greek(Greece)/modules/modulemanager.php | 8 +- Panel/lang/Greek(Greece)/modules/mysql.php | 20 +- Panel/lang/Greek(Greece)/modules/news.php | 6 +- Panel/lang/Greek(Greece)/modules/rcon.php | 6 +- Panel/lang/Greek(Greece)/modules/register.php | 8 +- Panel/lang/Greek(Greece)/modules/server.php | 16 +- Panel/lang/Greek(Greece)/modules/settings.php | 10 +- Panel/lang/Greek(Greece)/modules/status.php | 6 +- .../Greek(Greece)/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Greek(Greece)/modules/subusers.php | 8 +- Panel/lang/Greek(Greece)/modules/support.php | 6 +- Panel/lang/Greek(Greece)/modules/tickets.php | 6 +- Panel/lang/Greek(Greece)/modules/update.php | 6 +- .../lang/Greek(Greece)/modules/user_admin.php | 6 +- .../lang/Greek(Greece)/modules/user_games.php | 12 +- Panel/lang/Greek(Greece)/modules/util.php | 6 +- Panel/lang/Hebrew(Israel)/modules/dsi.php | 6 +- .../Hebrew(Israel)/modules/fast_download.php | 6 +- Panel/lang/Hebrew(Israel)/modules/news.php | 6 +- Panel/lang/Hebrew(Israel)/modules/rcon.php | 6 +- .../Hebrew(Israel)/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Hebrew(Israel)/modules/support.php | 6 +- Panel/lang/Hebrew(Israel)/modules/tickets.php | 6 +- Panel/lang/Hebrew(Israel)/modules/util.php | 6 +- Panel/lang/Hungarian/global.php | 6 +- Panel/lang/Hungarian/install.php | 18 +- Panel/lang/Hungarian/modules/TS3Admin.php | 6 +- .../lang/Hungarian/modules/addonsmanager.php | 6 +- .../lang/Hungarian/modules/administration.php | 6 +- Panel/lang/Hungarian/modules/config_games.php | 6 +- Panel/lang/Hungarian/modules/dashboard.php | 12 +- Panel/lang/Hungarian/modules/dsi.php | 6 +- Panel/lang/Hungarian/modules/extras.php | 6 +- .../lang/Hungarian/modules/fast_download.php | 8 +- Panel/lang/Hungarian/modules/ftp.php | 6 +- Panel/lang/Hungarian/modules/gamemanager.php | 14 +- Panel/lang/Hungarian/modules/litefm.php | 6 +- Panel/lang/Hungarian/modules/lostpwd.php | 10 +- .../lang/Hungarian/modules/modulemanager.php | 8 +- Panel/lang/Hungarian/modules/mysql.php | 20 +- Panel/lang/Hungarian/modules/news.php | 6 +- Panel/lang/Hungarian/modules/rcon.php | 6 +- Panel/lang/Hungarian/modules/register.php | 8 +- Panel/lang/Hungarian/modules/server.php | 16 +- Panel/lang/Hungarian/modules/settings.php | 10 +- Panel/lang/Hungarian/modules/status.php | 6 +- .../lang/Hungarian/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Hungarian/modules/subusers.php | 8 +- Panel/lang/Hungarian/modules/support.php | 6 +- Panel/lang/Hungarian/modules/tickets.php | 6 +- Panel/lang/Hungarian/modules/update.php | 6 +- Panel/lang/Hungarian/modules/user_admin.php | 6 +- Panel/lang/Hungarian/modules/user_games.php | 12 +- Panel/lang/Hungarian/modules/util.php | 6 +- Panel/lang/Italian/global.php | 6 +- Panel/lang/Italian/install.php | 16 +- Panel/lang/Italian/modules/TS3Admin.php | 6 +- Panel/lang/Italian/modules/addonsmanager.php | 6 +- Panel/lang/Italian/modules/administration.php | 6 +- Panel/lang/Italian/modules/config_games.php | 6 +- Panel/lang/Italian/modules/dashboard.php | 12 +- Panel/lang/Italian/modules/dsi.php | 6 +- Panel/lang/Italian/modules/extras.php | 6 +- Panel/lang/Italian/modules/fast_download.php | 8 +- Panel/lang/Italian/modules/ftp.php | 6 +- Panel/lang/Italian/modules/gamemanager.php | 16 +- Panel/lang/Italian/modules/litefm.php | 6 +- Panel/lang/Italian/modules/lostpwd.php | 8 +- Panel/lang/Italian/modules/modulemanager.php | 8 +- Panel/lang/Italian/modules/mysql.php | 20 +- Panel/lang/Italian/modules/news.php | 6 +- Panel/lang/Italian/modules/rcon.php | 6 +- Panel/lang/Italian/modules/register.php | 8 +- Panel/lang/Italian/modules/server.php | 16 +- Panel/lang/Italian/modules/settings.php | 10 +- Panel/lang/Italian/modules/status.php | 6 +- Panel/lang/Italian/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Italian/modules/subusers.php | 8 +- Panel/lang/Italian/modules/support.php | 6 +- Panel/lang/Italian/modules/tickets.php | 6 +- Panel/lang/Italian/modules/update.php | 6 +- Panel/lang/Italian/modules/user_admin.php | 6 +- Panel/lang/Italian/modules/user_games.php | 12 +- Panel/lang/Italian/modules/util.php | 6 +- Panel/lang/Persian/global.php | 6 +- Panel/lang/Persian/install.php | 18 +- Panel/lang/Persian/modules/TS3Admin.php | 6 +- Panel/lang/Persian/modules/addonsmanager.php | 6 +- Panel/lang/Persian/modules/administration.php | 6 +- Panel/lang/Persian/modules/config_games.php | 6 +- Panel/lang/Persian/modules/dashboard.php | 12 +- Panel/lang/Persian/modules/dsi.php | 6 +- Panel/lang/Persian/modules/extras.php | 6 +- Panel/lang/Persian/modules/fast_download.php | 8 +- Panel/lang/Persian/modules/ftp.php | 6 +- Panel/lang/Persian/modules/gamemanager.php | 16 +- Panel/lang/Persian/modules/litefm.php | 6 +- Panel/lang/Persian/modules/lostpwd.php | 10 +- Panel/lang/Persian/modules/modulemanager.php | 8 +- Panel/lang/Persian/modules/mysql.php | 20 +- Panel/lang/Persian/modules/news.php | 6 +- Panel/lang/Persian/modules/rcon.php | 6 +- Panel/lang/Persian/modules/register.php | 8 +- Panel/lang/Persian/modules/server.php | 16 +- Panel/lang/Persian/modules/settings.php | 10 +- Panel/lang/Persian/modules/status.php | 6 +- Panel/lang/Persian/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Persian/modules/subusers.php | 8 +- Panel/lang/Persian/modules/support.php | 6 +- Panel/lang/Persian/modules/tickets.php | 6 +- Panel/lang/Persian/modules/update.php | 6 +- Panel/lang/Persian/modules/user_admin.php | 6 +- Panel/lang/Persian/modules/user_games.php | 12 +- Panel/lang/Persian/modules/util.php | 6 +- Panel/lang/Polish/global.php | 6 +- Panel/lang/Polish/install.php | 18 +- Panel/lang/Polish/modules/TS3Admin.php | 6 +- Panel/lang/Polish/modules/addonsmanager.php | 6 +- Panel/lang/Polish/modules/administration.php | 6 +- Panel/lang/Polish/modules/config_games.php | 6 +- Panel/lang/Polish/modules/dashboard.php | 12 +- Panel/lang/Polish/modules/dsi.php | 6 +- Panel/lang/Polish/modules/extras.php | 6 +- Panel/lang/Polish/modules/fast_download.php | 8 +- Panel/lang/Polish/modules/ftp.php | 6 +- Panel/lang/Polish/modules/gamemanager.php | 16 +- Panel/lang/Polish/modules/litefm.php | 6 +- Panel/lang/Polish/modules/lostpwd.php | 8 +- Panel/lang/Polish/modules/modulemanager.php | 8 +- Panel/lang/Polish/modules/mysql.php | 20 +- Panel/lang/Polish/modules/news.php | 6 +- Panel/lang/Polish/modules/rcon.php | 6 +- Panel/lang/Polish/modules/register.php | 8 +- Panel/lang/Polish/modules/server.php | 14 +- Panel/lang/Polish/modules/settings.php | 10 +- Panel/lang/Polish/modules/status.php | 6 +- Panel/lang/Polish/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Polish/modules/subusers.php | 6 +- Panel/lang/Polish/modules/support.php | 6 +- Panel/lang/Polish/modules/tickets.php | 6 +- Panel/lang/Polish/modules/update.php | 6 +- Panel/lang/Polish/modules/user_admin.php | 6 +- Panel/lang/Polish/modules/user_games.php | 12 +- Panel/lang/Polish/modules/util.php | 6 +- Panel/lang/Portuguese(Brazil)/global.php | 6 +- Panel/lang/Portuguese(Brazil)/install.php | 16 +- .../Portuguese(Brazil)/modules/TS3Admin.php | 6 +- .../modules/addonsmanager.php | 6 +- .../modules/administration.php | 6 +- .../modules/config_games.php | 6 +- .../Portuguese(Brazil)/modules/dashboard.php | 8 +- Panel/lang/Portuguese(Brazil)/modules/dsi.php | 6 +- .../Portuguese(Brazil)/modules/extras.php | 6 +- .../modules/fast_download.php | 8 +- Panel/lang/Portuguese(Brazil)/modules/ftp.php | 6 +- .../modules/gamemanager.php | 12 +- .../Portuguese(Brazil)/modules/litefm.php | 6 +- .../Portuguese(Brazil)/modules/lostpwd.php | 8 +- .../modules/modulemanager.php | 6 +- .../lang/Portuguese(Brazil)/modules/mysql.php | 20 +- .../lang/Portuguese(Brazil)/modules/news.php | 6 +- .../lang/Portuguese(Brazil)/modules/rcon.php | 6 +- .../Portuguese(Brazil)/modules/register.php | 8 +- .../Portuguese(Brazil)/modules/server.php | 10 +- .../Portuguese(Brazil)/modules/settings.php | 6 +- .../Portuguese(Brazil)/modules/status.php | 6 +- .../modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- .../Portuguese(Brazil)/modules/subusers.php | 6 +- .../Portuguese(Brazil)/modules/support.php | 6 +- .../Portuguese(Brazil)/modules/tickets.php | 6 +- .../Portuguese(Brazil)/modules/update.php | 6 +- .../Portuguese(Brazil)/modules/user_admin.php | 6 +- .../Portuguese(Brazil)/modules/user_games.php | 8 +- .../lang/Portuguese(Brazil)/modules/util.php | 6 +- Panel/lang/Portuguese/global.php | 6 +- Panel/lang/Portuguese/install.php | 8 +- Panel/lang/Portuguese/modules/TS3Admin.php | 6 +- .../lang/Portuguese/modules/addonsmanager.php | 6 +- .../Portuguese/modules/administration.php | 6 +- .../lang/Portuguese/modules/config_games.php | 6 +- Panel/lang/Portuguese/modules/dashboard.php | 6 +- Panel/lang/Portuguese/modules/dsi.php | 6 +- Panel/lang/Portuguese/modules/extras.php | 6 +- .../lang/Portuguese/modules/fast_download.php | 6 +- Panel/lang/Portuguese/modules/ftp.php | 6 +- Panel/lang/Portuguese/modules/gamemanager.php | 10 +- Panel/lang/Portuguese/modules/litefm.php | 6 +- Panel/lang/Portuguese/modules/lostpwd.php | 6 +- .../lang/Portuguese/modules/modulemanager.php | 6 +- Panel/lang/Portuguese/modules/mysql.php | 20 +- Panel/lang/Portuguese/modules/news.php | 6 +- Panel/lang/Portuguese/modules/rcon.php | 6 +- Panel/lang/Portuguese/modules/register.php | 6 +- Panel/lang/Portuguese/modules/server.php | 10 +- Panel/lang/Portuguese/modules/settings.php | 8 +- Panel/lang/Portuguese/modules/status.php | 6 +- .../Portuguese/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Portuguese/modules/subusers.php | 6 +- Panel/lang/Portuguese/modules/support.php | 6 +- Panel/lang/Portuguese/modules/tickets.php | 6 +- Panel/lang/Portuguese/modules/update.php | 6 +- Panel/lang/Portuguese/modules/user_admin.php | 6 +- Panel/lang/Portuguese/modules/user_games.php | 6 +- Panel/lang/Portuguese/modules/util.php | 6 +- Panel/lang/README.lang | 8 +- Panel/lang/Romanian(Romania)/global.php | 6 +- Panel/lang/Romanian(Romania)/install.php | 18 +- .../Romanian(Romania)/modules/TS3Admin.php | 6 +- .../modules/addonsmanager.php | 6 +- .../modules/administration.php | 6 +- .../modules/config_games.php | 6 +- .../Romanian(Romania)/modules/dashboard.php | 12 +- Panel/lang/Romanian(Romania)/modules/dsi.php | 6 +- .../lang/Romanian(Romania)/modules/extras.php | 6 +- .../modules/fast_download.php | 8 +- Panel/lang/Romanian(Romania)/modules/ftp.php | 6 +- .../Romanian(Romania)/modules/gamemanager.php | 16 +- .../lang/Romanian(Romania)/modules/litefm.php | 6 +- .../Romanian(Romania)/modules/lostpwd.php | 8 +- .../modules/modulemanager.php | 8 +- .../lang/Romanian(Romania)/modules/mysql.php | 20 +- Panel/lang/Romanian(Romania)/modules/news.php | 6 +- Panel/lang/Romanian(Romania)/modules/rcon.php | 6 +- .../Romanian(Romania)/modules/register.php | 8 +- .../lang/Romanian(Romania)/modules/server.php | 16 +- .../Romanian(Romania)/modules/settings.php | 10 +- .../lang/Romanian(Romania)/modules/status.php | 6 +- .../modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- .../Romanian(Romania)/modules/subusers.php | 8 +- .../Romanian(Romania)/modules/support.php | 6 +- .../Romanian(Romania)/modules/tickets.php | 6 +- .../lang/Romanian(Romania)/modules/update.php | 6 +- .../Romanian(Romania)/modules/user_admin.php | 6 +- .../Romanian(Romania)/modules/user_games.php | 12 +- Panel/lang/Romanian(Romania)/modules/util.php | 6 +- Panel/lang/Russian/global.php | 6 +- Panel/lang/Russian/install.php | 14 +- Panel/lang/Russian/modules/TS3Admin.php | 6 +- Panel/lang/Russian/modules/addonsmanager.php | 6 +- Panel/lang/Russian/modules/administration.php | 6 +- Panel/lang/Russian/modules/config_games.php | 6 +- Panel/lang/Russian/modules/dashboard.php | 12 +- Panel/lang/Russian/modules/dsi.php | 6 +- Panel/lang/Russian/modules/extras.php | 6 +- Panel/lang/Russian/modules/fast_download.php | 8 +- Panel/lang/Russian/modules/ftp.php | 6 +- Panel/lang/Russian/modules/gamemanager.php | 14 +- Panel/lang/Russian/modules/litefm.php | 6 +- Panel/lang/Russian/modules/lostpwd.php | 8 +- Panel/lang/Russian/modules/modulemanager.php | 6 +- Panel/lang/Russian/modules/mysql.php | 20 +- Panel/lang/Russian/modules/news.php | 6 +- Panel/lang/Russian/modules/rcon.php | 6 +- Panel/lang/Russian/modules/register.php | 8 +- Panel/lang/Russian/modules/server.php | 16 +- Panel/lang/Russian/modules/settings.php | 14 +- Panel/lang/Russian/modules/status.php | 6 +- Panel/lang/Russian/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Russian/modules/subusers.php | 6 +- Panel/lang/Russian/modules/support.php | 6 +- Panel/lang/Russian/modules/tickets.php | 6 +- Panel/lang/Russian/modules/update.php | 6 +- Panel/lang/Russian/modules/user_admin.php | 6 +- Panel/lang/Russian/modules/user_games.php | 10 +- Panel/lang/Russian/modules/util.php | 6 +- Panel/lang/Serbian(Serbia)/global.php | 6 +- Panel/lang/Serbian(Serbia)/install.php | 18 +- .../lang/Serbian(Serbia)/modules/TS3Admin.php | 6 +- .../Serbian(Serbia)/modules/addonsmanager.php | 6 +- .../modules/administration.php | 6 +- .../Serbian(Serbia)/modules/config_games.php | 6 +- .../Serbian(Serbia)/modules/dashboard.php | 12 +- Panel/lang/Serbian(Serbia)/modules/dsi.php | 6 +- Panel/lang/Serbian(Serbia)/modules/extras.php | 6 +- .../Serbian(Serbia)/modules/fast_download.php | 6 +- Panel/lang/Serbian(Serbia)/modules/ftp.php | 6 +- .../Serbian(Serbia)/modules/gamemanager.php | 14 +- Panel/lang/Serbian(Serbia)/modules/litefm.php | 6 +- .../lang/Serbian(Serbia)/modules/lostpwd.php | 8 +- .../Serbian(Serbia)/modules/modulemanager.php | 8 +- Panel/lang/Serbian(Serbia)/modules/mysql.php | 20 +- Panel/lang/Serbian(Serbia)/modules/news.php | 6 +- Panel/lang/Serbian(Serbia)/modules/rcon.php | 6 +- .../lang/Serbian(Serbia)/modules/register.php | 8 +- Panel/lang/Serbian(Serbia)/modules/server.php | 16 +- .../lang/Serbian(Serbia)/modules/settings.php | 10 +- Panel/lang/Serbian(Serbia)/modules/status.php | 6 +- .../modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- .../lang/Serbian(Serbia)/modules/subusers.php | 8 +- .../lang/Serbian(Serbia)/modules/support.php | 6 +- .../lang/Serbian(Serbia)/modules/tickets.php | 6 +- Panel/lang/Serbian(Serbia)/modules/update.php | 6 +- .../Serbian(Serbia)/modules/user_admin.php | 6 +- .../Serbian(Serbia)/modules/user_games.php | 12 +- Panel/lang/Serbian(Serbia)/modules/util.php | 6 +- Panel/lang/Spanish/global.php | 8 +- Panel/lang/Spanish/install.php | 16 +- Panel/lang/Spanish/modules/TS3Admin.php | 6 +- Panel/lang/Spanish/modules/addonsmanager.php | 6 +- Panel/lang/Spanish/modules/administration.php | 6 +- Panel/lang/Spanish/modules/config_games.php | 6 +- Panel/lang/Spanish/modules/dashboard.php | 12 +- Panel/lang/Spanish/modules/dsi.php | 6 +- Panel/lang/Spanish/modules/extras.php | 6 +- Panel/lang/Spanish/modules/fast_download.php | 8 +- Panel/lang/Spanish/modules/ftp.php | 6 +- Panel/lang/Spanish/modules/gamemanager.php | 14 +- Panel/lang/Spanish/modules/litefm.php | 6 +- Panel/lang/Spanish/modules/lostpwd.php | 6 +- Panel/lang/Spanish/modules/modulemanager.php | 6 +- Panel/lang/Spanish/modules/mysql.php | 20 +- Panel/lang/Spanish/modules/news.php | 6 +- Panel/lang/Spanish/modules/rcon.php | 6 +- Panel/lang/Spanish/modules/register.php | 8 +- Panel/lang/Spanish/modules/server.php | 12 +- Panel/lang/Spanish/modules/settings.php | 28 +- Panel/lang/Spanish/modules/status.php | 6 +- Panel/lang/Spanish/modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- Panel/lang/Spanish/modules/subusers.php | 6 +- Panel/lang/Spanish/modules/support.php | 6 +- Panel/lang/Spanish/modules/tickets.php | 6 +- Panel/lang/Spanish/modules/update.php | 6 +- Panel/lang/Spanish/modules/user_admin.php | 6 +- Panel/lang/Spanish/modules/user_games.php | 10 +- Panel/lang/Spanish/modules/util.php | 6 +- Panel/lang/Swedish(Sweden)/global.php | 6 +- Panel/lang/Swedish(Sweden)/install.php | 18 +- .../lang/Swedish(Sweden)/modules/TS3Admin.php | 6 +- .../Swedish(Sweden)/modules/addonsmanager.php | 6 +- .../modules/administration.php | 6 +- .../Swedish(Sweden)/modules/config_games.php | 6 +- .../Swedish(Sweden)/modules/dashboard.php | 12 +- Panel/lang/Swedish(Sweden)/modules/dsi.php | 6 +- Panel/lang/Swedish(Sweden)/modules/extras.php | 6 +- .../Swedish(Sweden)/modules/fast_download.php | 8 +- Panel/lang/Swedish(Sweden)/modules/ftp.php | 6 +- .../Swedish(Sweden)/modules/gamemanager.php | 16 +- Panel/lang/Swedish(Sweden)/modules/litefm.php | 6 +- .../lang/Swedish(Sweden)/modules/lostpwd.php | 8 +- .../Swedish(Sweden)/modules/modulemanager.php | 8 +- Panel/lang/Swedish(Sweden)/modules/mysql.php | 20 +- Panel/lang/Swedish(Sweden)/modules/news.php | 6 +- Panel/lang/Swedish(Sweden)/modules/rcon.php | 6 +- .../lang/Swedish(Sweden)/modules/register.php | 8 +- Panel/lang/Swedish(Sweden)/modules/server.php | 16 +- .../lang/Swedish(Sweden)/modules/settings.php | 10 +- Panel/lang/Swedish(Sweden)/modules/status.php | 6 +- .../modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- .../lang/Swedish(Sweden)/modules/subusers.php | 8 +- .../lang/Swedish(Sweden)/modules/support.php | 6 +- .../lang/Swedish(Sweden)/modules/tickets.php | 6 +- Panel/lang/Swedish(Sweden)/modules/update.php | 6 +- .../Swedish(Sweden)/modules/user_admin.php | 6 +- .../Swedish(Sweden)/modules/user_games.php | 12 +- Panel/lang/Swedish(Sweden)/modules/util.php | 6 +- Panel/lang/Turkish(Turkey)/global.php | 6 +- Panel/lang/Turkish(Turkey)/install.php | 18 +- .../lang/Turkish(Turkey)/modules/TS3Admin.php | 6 +- .../Turkish(Turkey)/modules/addonsmanager.php | 6 +- .../modules/administration.php | 6 +- .../Turkish(Turkey)/modules/config_games.php | 6 +- .../Turkish(Turkey)/modules/dashboard.php | 12 +- Panel/lang/Turkish(Turkey)/modules/dsi.php | 6 +- Panel/lang/Turkish(Turkey)/modules/extras.php | 6 +- .../Turkish(Turkey)/modules/fast_download.php | 8 +- Panel/lang/Turkish(Turkey)/modules/ftp.php | 6 +- .../Turkish(Turkey)/modules/gamemanager.php | 16 +- Panel/lang/Turkish(Turkey)/modules/litefm.php | 6 +- .../lang/Turkish(Turkey)/modules/lostpwd.php | 12 +- .../Turkish(Turkey)/modules/modulemanager.php | 8 +- Panel/lang/Turkish(Turkey)/modules/mysql.php | 20 +- Panel/lang/Turkish(Turkey)/modules/news.php | 6 +- Panel/lang/Turkish(Turkey)/modules/rcon.php | 6 +- .../lang/Turkish(Turkey)/modules/register.php | 8 +- Panel/lang/Turkish(Turkey)/modules/server.php | 16 +- .../lang/Turkish(Turkey)/modules/settings.php | 10 +- Panel/lang/Turkish(Turkey)/modules/status.php | 6 +- .../modules/steam_workshop.php | 6 +- .../steam_workshop.php.bak.20260609-112432 | 106 +- .../lang/Turkish(Turkey)/modules/subusers.php | 8 +- .../lang/Turkish(Turkey)/modules/support.php | 6 +- .../lang/Turkish(Turkey)/modules/tickets.php | 6 +- Panel/lang/Turkish(Turkey)/modules/update.php | 6 +- .../Turkish(Turkey)/modules/user_admin.php | 6 +- .../Turkish(Turkey)/modules/user_games.php | 12 +- Panel/lang/Turkish(Turkey)/modules/util.php | 6 +- Panel/lang/lang-check2.php | 18 +- Panel/modules/SERVER_IMAGE_MODULE_REVIEW.md | 4 +- Panel/modules/TS3Admin/TS3Admin.php | 16 +- Panel/modules/TS3Admin/module.php | 8 +- .../TS3Admin/ts3webinterface.class.php | 338 ++--- .../addonsmanager/SERVER_CONTENT_ROADMAP.md | 20 +- .../SERVER_CONTENT_WORKSHOP_PHASE1.md | 4 +- .../addonsmanager/addons_installer.php | 48 +- .../addons_installer.php.bak.20260609-111046 | 48 +- .../modules/addonsmanager/addons_manager.php | 56 +- .../addons_manager.php.bak.20260609-111046 | 56 +- Panel/modules/addonsmanager/module.php | 16 +- .../module.php.bak.20260609-111046 | 16 +- .../modules/addonsmanager/monitor_buttons.php | 6 +- ...generated_steamcmd_job.bak.20260609-093249 | 2 +- ...generated_steamcmd_job.bak.20260609-101329 | 2 +- ...generated_steamcmd_job.bak.20260609-101812 | 2 +- .../addonsmanager/server_content_actions.php | 10 +- .../server_content_categories.php | 4 +- .../addonsmanager/server_content_helpers.php | 38 +- ...er_content_helpers.php.bak.20260609-083408 | 38 +- ...er_content_helpers.php.bak.20260609-083446 | 38 +- ...er_content_helpers.php.bak.20260609-111046 | 38 +- .../tests/workshop_helpers_test.php | 4 +- Panel/modules/addonsmanager/user_addons.php | 10 +- .../workshop_action.php.bak.20260609-070033 | 16 +- .../workshop_action.php.bak.20260609-070146 | 16 +- .../workshop_action.php.bak.20260609-071012 | 14 +- .../workshop_action.php.bak.20260609-083408 | 16 +- .../workshop_action.php.bak.20260609-083446 | 18 +- .../workshop_action.php.bak.20260609-093249 | 18 +- .../workshop_content.php.bak.20260609-070033 | 4 +- .../workshop_content.php.bak.20260609-070146 | 4 +- .../workshop_content.php.bak.20260609-071012 | 4 +- .../workshop_content.php.bak.20260609-083408 | 4 +- .../workshop_content.php.bak.20260609-083446 | 4 +- .../modules/administration/administration.php | 52 +- Panel/modules/administration/backupdwl.php | 8 +- Panel/modules/administration/banlist.php | 14 +- Panel/modules/administration/iframe.php | 22 +- Panel/modules/administration/module.php | 18 +- Panel/modules/administration/panel_update.php | 8 +- Panel/modules/administration/watch_logger.php | 40 +- .../Old Stuff/old.backup-restore.php.old | 4 +- .../backup-restore/Old Stuff/servers2.xml | 4 +- .../modules/backup-restore/backup-restore.php | 4 +- Panel/modules/backup-restore/function.php | 14 +- .../backup-restore/monitor_buttons.php | 8 +- Panel/modules/backup-restore/test.sh | 4 +- Panel/modules/billing/BILLING_FIX_SUMMARY.md | 6 +- .../modules/billing/COLUMN_RENAME_SUMMARY.md | 6 +- Panel/modules/billing/COUPON_SYSTEM.md | 24 +- Panel/modules/billing/FIXES_APPLIED.md | 14 +- Panel/modules/billing/INVOICE_FIRST_FLOW.md | 36 +- Panel/modules/billing/INVOICE_SYSTEM.md | 12 +- Panel/modules/billing/MIGRATION_SUMMARY.md | 36 +- Panel/modules/billing/PANEL_INTEGRATION.md | 28 +- .../billing/PAYMENT_IMPLEMENTATION_SUMMARY.md | 34 +- .../modules/billing/PAYPAL_DEBUGGING_GUIDE.md | 10 +- .../modules/billing/QUICK_DEBUG_REFERENCE.md | 8 +- Panel/modules/billing/QUICK_START.md | 56 +- Panel/modules/billing/README.md | 4 +- Panel/modules/billing/README_COUPON_UPDATE.md | 16 +- Panel/modules/billing/RECENT_FIXES_SUMMARY.md | 8 +- Panel/modules/billing/STATUS_REPORT.md | 10 +- Panel/modules/billing/TESTING_CHECKLIST.md | 62 +- .../billing/_archived/CONFIGURATION.md | 2 +- Panel/modules/billing/_archived/FEATURES.md | 34 +- .../_archived/IMPLEMENTATION_SUMMARY.md | 44 +- .../modules/billing/_archived/README_LOGIN.md | 26 +- .../add_remote_server_enabled_column.sql | 2 +- Panel/modules/billing/add_to_cart.php | 4 +- Panel/modules/billing/admin_config.php | 2 +- Panel/modules/billing/admin_invoices.php | 2 +- Panel/modules/billing/admin_orders.php | 82 +- Panel/modules/billing/admin_payments.php | 2 +- Panel/modules/billing/adminserverlist.php | 2 +- Panel/modules/billing/api/capture_order.php | 2 +- Panel/modules/billing/cart.php | 36 +- Panel/modules/billing/checkout_free.php | 2 +- Panel/modules/billing/create_servers.php | 66 +- Panel/modules/billing/cron-shop.php | 10 +- Panel/modules/billing/diag_remote.php | 2 +- Panel/modules/billing/docs.php | 106 +- .../docs/DOCUMENTATION_ENHANCEMENT_SUMMARY.md | 8 +- Panel/modules/billing/docs/XML-Notes.md | 28 +- .../billing/docs/brainbread2/index.php | 4 +- Panel/modules/billing/docs/csgo/index.php | 4 +- Panel/modules/billing/docs/czero/index.php | 4 +- Panel/modules/billing/docs/dmc/index.php | 4 +- Panel/modules/billing/docs/dod/index.php | 4 +- .../docs/gameserver_catalog_all_sources.yaml | 50 +- Panel/modules/billing/docs/hldm/index.php | 4 +- .../billing/docs/nmrih_steam/index.php | 4 +- .../billing/docs/nucleardawn/index.php | 4 +- Panel/modules/billing/docs/ricochet/index.php | 4 +- Panel/modules/billing/docs/xml_notes.php | 4 +- Panel/modules/billing/docs/zps/index.php | 4 +- Panel/modules/billing/forgot_password.php | 82 +- Panel/modules/billing/includes/README.md | 2 +- .../modules/billing/includes/panel_bridge.php | 10 +- .../billing/includes/session_bridge.php | 2 +- Panel/modules/billing/login.php | 44 +- Panel/modules/billing/logout.php | 2 +- .../modules/billing/migration_to_invoices.sql | 44 +- Panel/modules/billing/module.php | 92 +- Panel/modules/billing/my_account.php | 30 +- Panel/modules/billing/my_orders_panel.php | 32 +- .../normalize_billing_order_status.sql | 2 +- Panel/modules/billing/payment_success.php | 12 +- Panel/modules/billing/register.php | 2 +- Panel/modules/billing/renew_server.php | 28 +- Panel/modules/billing/reset_password.php | 76 +- .../sql/002_billing_checkout_fixes.sql | 2 +- Panel/modules/billing/test_db_connection.php | 8 +- Panel/modules/billing/test_integration.php | 42 +- Panel/modules/billing/tools/check_db_user.php | 2 +- Panel/modules/circular/circular.php | 28 +- Panel/modules/circular/functions.php | 34 +- Panel/modules/circular/lang/circular.php | 6 +- Panel/modules/circular/module.php | 16 +- Panel/modules/circular/show_circular.php | 8 +- Panel/modules/config_games/cli-params.php | 10 +- Panel/modules/config_games/config_servers.php | 38 +- Panel/modules/config_games/create.php | 10 +- Panel/modules/config_games/module.php | 14 +- .../config_games/server_config_parser.php | 34 +- .../backup/7daystodie_linux32.xml | 2 +- .../backup/brainbread2_win32.xml | 2 +- .../backup/counterstrike_source.xml | 2 +- .../server_configs/backup/csgo128_linux.xml | 2 +- .../server_configs/backup/cstrike.xml | 2 +- .../server_configs/backup/czero_linux.xml | 2 +- .../server_configs/backup/dmc.xml | 2 +- .../server_configs/backup/dod.xml | 2 +- .../server_configs/backup/doi.xml | 2 +- .../server_configs/backup/doi_win.xml | 2 +- .../backup/dontstarvetogether_linux32.xml | 4 +- .../server_configs/backup/ets2_linux64.xml | 4 +- .../server_configs/backup/garrysmod.xml | 2 +- .../server_configs/backup/hldm_linux32.xml | 2 +- .../backup/insurgency_linux.xml | 2 +- .../backup/insurgency_linux32.xml | 2 +- .../backup/left4dead2_linux32.xml | 2 +- .../server_configs/backup/nmrih_linux32.xml | 2 +- .../server_configs/backup/nuclear_dawn.xml | 2 +- .../server_configs/backup/ricochet.xml | 2 +- .../server_configs/backup/rust_linux64.xml | 2 +- .../backup/sinusbot_linux64.xml | 14 +- .../backup/teamspeak3_linux32.xml | 2 +- .../backup/teamspeak3_win32.xml | 2 +- .../backup/teamspeak3_win64.xml | 2 +- .../server_configs/backup/tfc.xml | 2 +- .../backup/unturned_linux32.xml | 2 +- .../backup/unturned_linux64.xml | 2 +- .../server_configs/backup/vbox_linux32.xml | 2 +- .../server_configs/backup/zps_linux32.xml | 2 +- .../server_configs/brainbread2_win32.xml | 2 +- .../server_configs/counterstrike_source.xml | 2 +- .../server_configs/csgo128_linux.xml | 2 +- .../config_games/server_configs/cstrike.xml | 2 +- .../server_configs/czero_linux.xml | 2 +- .../config_games/server_configs/database.sh | 4 +- .../config_games/server_configs/dmc.xml | 2 +- .../config_games/server_configs/dod.xml | 2 +- .../config_games/server_configs/doi.xml | 2 +- .../config_games/server_configs/doi_win.xml | 2 +- .../dontstarvetogether_linux32.xml | 4 +- .../server_configs/ets2_linux64.xml | 4 +- .../config_games/server_configs/garrysmod.xml | 2 +- .../server_configs/hldm_linux32.xml | 2 +- .../server_configs/insurgency_linux.xml | 2 +- .../server_configs/left4dead2_linux32.xml | 2 +- .../server_configs/nmrih_linux32.xml | 2 +- .../server_configs/nuclear_dawn.xml | 2 +- .../config_games/server_configs/ricochet.xml | 2 +- .../server_configs/rust_linux64.xml | 2 +- .../server_configs/sinusbot_linux64.xml | 14 +- .../server_configs/teamspeak3_win64.xml | 2 +- .../config_games/server_configs/tfc.xml | 2 +- .../server_configs/unturned_linux64.xml | 2 +- .../server_configs/vbox_linux32.xml | 2 +- .../server_configs/zps_linux32.xml | 2 +- Panel/modules/config_games/set_mods.php | 18 +- Panel/modules/config_games/set_params.php | 28 +- .../config_games/xml_config_creator.php | 8 +- .../config_games/xml_tag_descriptions.php | 4 +- Panel/modules/cron/cron.php | 66 +- Panel/modules/cron/events.php | 28 +- Panel/modules/cron/module.php | 6 +- Panel/modules/cron/shared_cron_functions.php | 90 +- Panel/modules/cron/thetime.php | 12 +- Panel/modules/cron/user_cron.php | 60 +- Panel/modules/dashboard/dashboard.php | 70 +- Panel/modules/dashboard/module.php | 34 +- Panel/modules/dashboard/query_ref.php | 24 +- Panel/modules/dashboard/updateWidgets.php | 34 +- Panel/modules/dsi/dsi_admin.php | 36 +- Panel/modules/dsi/dsi_list.php | 56 +- Panel/modules/dsi/dsi_user.php | 18 +- Panel/modules/dsi/image.php | 56 +- Panel/modules/dsi/includes/functions.php | 32 +- Panel/modules/dsi/includes/functions_ui.php | 16 +- Panel/modules/dsi/module.php | 8 +- Panel/modules/dsi/monitor_buttons.php | 8 +- .../editconfigfiles/configFileList.php | 28 +- Panel/modules/editconfigfiles/modify.php | 46 +- Panel/modules/editconfigfiles/module.php | 6 +- .../editconfigfiles/monitor_buttons.php | 6 +- Panel/modules/faq/faq.php | 32 +- Panel/modules/faq/faq.php.save | 26 +- Panel/modules/faq/faq.rss | 6 +- Panel/modules/faq/{ogpfaq.rss => gspfaq.rss} | 1268 ++++++++--------- Panel/modules/fast_download/admin_fastdl.php | 48 +- Panel/modules/fast_download/functions.php | 22 +- Panel/modules/fast_download/module.php | 14 +- .../modules/fast_download/monitor_buttons.php | 6 +- Panel/modules/fast_download/user_fastd.php | 42 +- Panel/modules/ftp/ftp.php | 18 +- Panel/modules/ftp/ftp_admin.php | 70 +- .../ftp/includes/registerglobals.inc.php | 60 +- Panel/modules/ftp/index.php | 26 +- Panel/modules/ftp/module.php | 6 +- Panel/modules/ftp/monitor_buttons.php | 10 +- Panel/modules/ftp/settings.inc.php | 16 +- .../modules/ftp/skins/blue/login.template.php | 6 +- .../gamemanager/MinecraftRcon.class.php | 58 +- .../modules/gamemanager/cfg_text_replace.php | 38 +- Panel/modules/gamemanager/get_server_log.php | 8 +- .../gamemanager/home_handling_functions.php | 104 +- Panel/modules/gamemanager/log.php | 8 +- Panel/modules/gamemanager/mini_start.php | 127 +- Panel/modules/gamemanager/module.php | 34 +- Panel/modules/gamemanager/monitor_buttons.php | 12 +- Panel/modules/gamemanager/rcon.php | 22 +- Panel/modules/gamemanager/rcon_presets.php | 34 +- .../modules/gamemanager/ref_servermonitor.php | 22 +- Panel/modules/gamemanager/restart_server.php | 60 +- Panel/modules/gamemanager/server_monitor.php | 164 +-- Panel/modules/gamemanager/start_server.php | 82 +- Panel/modules/gamemanager/stop_server.php | 28 +- Panel/modules/gamemanager/update_actions.php | 6 +- Panel/modules/gamemanager/update_server.php | 22 +- .../modules/gamemanager/upload_map_image.php | 40 +- Panel/modules/gamemanager/view_server_log.php | 16 +- Panel/modules/lgsl_with_img_mod/feed.php | 2 +- Panel/modules/lgsl_with_img_mod/image.php | 80 +- Panel/modules/lgsl_with_img_mod/lgsl.php | 8 +- .../modules/lgsl_with_img_mod/lgsl_admin.php | 8 +- .../lgsl_files/lgsl_admin.php | 12 +- .../lgsl_files/lgsl_class.php | 30 +- Panel/modules/lgsl_with_img_mod/module.php | 8 +- Panel/modules/litefm/SessionCheck.php | 8 +- Panel/modules/litefm/fm_dir.php | 62 +- Panel/modules/litefm/fm_read.php | 38 +- Panel/modules/litefm/fm_write.php | 18 +- Panel/modules/litefm/get_file.php | 32 +- Panel/modules/litefm/litefm.php | 16 +- Panel/modules/litefm/module.php | 6 +- Panel/modules/litefm/monitor_buttons.php | 8 +- Panel/modules/litefm/settings.php | 14 +- Panel/modules/lostpwd/lostpwd.php | 48 +- Panel/modules/lostpwd/module.php | 6 +- Panel/modules/modulemanager/add_module.php | 8 +- Panel/modules/modulemanager/delete_module.php | 8 +- Panel/modules/modulemanager/module.php | 8 +- .../modules/modulemanager/module_handling.php | 40 +- Panel/modules/modulemanager/modulemanager.php | 26 +- .../modules/modulemanager/update_modules.php | 10 +- Panel/modules/mysql/edit_server.php | 112 +- Panel/modules/mysql/get_dump.php | 22 +- Panel/modules/mysql/module.php | 14 +- .../modules/mysql/monitor_buttons.PHPMYADMIN | 8 +- Panel/modules/mysql/monitor_buttons.php | 12 +- Panel/modules/mysql/mysql_database.php | 48 +- Panel/modules/mysql/mysqli_database.php | 48 +- Panel/modules/mysql/servers.php | 90 +- Panel/modules/mysql/user_db.php | 54 +- Panel/modules/news/README.md | 2 +- Panel/modules/news/admin.php | 2 +- Panel/modules/news/index.php | 2 +- Panel/modules/news/module.php | 6 +- Panel/modules/news/upload.php | 8 +- Panel/modules/rcon/module.php | 6 +- Panel/modules/rcon/rcon.php | 26 +- Panel/modules/register/captchakeys.php | 6 +- Panel/modules/register/module.php | 6 +- Panel/modules/register/register-exec.php | 50 +- Panel/modules/register/register.php | 28 +- Panel/modules/register/register_helpers.php | 6 +- Panel/modules/reseller/account_details.php | 56 +- Panel/modules/reseller/accounts.php | 54 +- Panel/modules/reseller/add_to_cart.php | 34 +- Panel/modules/reseller/assign_server.php | 134 +- Panel/modules/reseller/bill.php | 42 +- Panel/modules/reseller/cart.php | 118 +- Panel/modules/reseller/cron-shop.php | 46 +- Panel/modules/reseller/module.php | 36 +- Panel/modules/reseller/paid-ipn.php | 42 +- Panel/modules/reseller/paid.php | 4 +- Panel/modules/reseller/paypal.php | 34 +- Panel/modules/reseller/services.php | 104 +- Panel/modules/reseller/settings.php | 14 +- Panel/modules/reseller/shop.php | 44 +- Panel/modules/server/add_server.php | 18 +- Panel/modules/server/arrange_ports.php | 48 +- Panel/modules/server/edit_server.php | 38 +- Panel/modules/server/firewall.php | 20 +- Panel/modules/server/module.php | 14 +- Panel/modules/server/mon_stats.php | 22 +- Panel/modules/server/reboot.php | 18 +- Panel/modules/server/restart.php | 24 +- Panel/modules/server/servers.php | 42 +- Panel/modules/server/view_log.php | 14 +- Panel/modules/settings/api_hosts.php | 40 +- Panel/modules/settings/functions.php | 6 +- Panel/modules/settings/module.php | 12 +- Panel/modules/settings/settings.php | 44 +- Panel/modules/settings/themes.php | 10 +- Panel/modules/status/config.php | 6 +- Panel/modules/status/include/bar.php | 6 +- Panel/modules/status/include/cpu.php | 38 +- Panel/modules/status/include/hdd.php | 8 +- Panel/modules/status/include/os.php | 14 +- Panel/modules/status/include/ram.php | 26 +- Panel/modules/status/include/task.php | 8 +- Panel/modules/status/include/uptime.php | 8 +- Panel/modules/status/module.php | 6 +- Panel/modules/status/status.php | 28 +- .../functions.php | 44 +- .../main.php | 80 +- .../module.php | 6 +- .../monitor_buttons.php | 6 +- .../uninstall.php | 54 +- .../workshop_admin.php | 62 +- Panel/modules/steam_workshop/functions.php | 22 +- Panel/modules/steam_workshop/main.php | 64 +- Panel/modules/steam_workshop/module.php | 6 +- .../steam_workshop/monitor_buttons.php | 6 +- Panel/modules/steam_workshop/uninstall.php | 54 +- .../modules/steam_workshop/workshop_admin.php | 42 +- .../workshop_admin.php.bak.20260609-151211 | 62 +- Panel/modules/subusers/add_subuser-exec.php | 28 +- Panel/modules/subusers/add_subuser.php | 18 +- Panel/modules/subusers/del_subuser.php | 38 +- Panel/modules/subusers/module.php | 6 +- Panel/modules/subusers/submanage.php | 18 +- Panel/modules/support/module.php | 6 +- Panel/modules/support/support.php | 20 +- Panel/modules/teamspeak3/module.php | 6 +- Panel/modules/tickets/downloadAttachment.php | 4 +- Panel/modules/tickets/include/Attachments.php | 4 +- .../tickets/include/TicketSettings.php | 8 +- Panel/modules/tickets/include/ticket.php | 54 +- Panel/modules/tickets/module.php | 42 +- Panel/modules/tickets/notificationCount.php | 4 +- Panel/modules/tickets/rating.php | 4 +- Panel/modules/tickets/submitTicket.php | 8 +- Panel/modules/tickets/supportTickets.php | 4 +- Panel/modules/tickets/ticketSettings.php | 6 +- Panel/modules/tickets/viewTicket.php | 6 +- Panel/modules/tshock/bans.php | 20 +- Panel/modules/tshock/create_token.php | 10 +- Panel/modules/tshock/module.php | 10 +- Panel/modules/tshock/server.php | 26 +- Panel/modules/tshock/users.php | 24 +- Panel/modules/update/blacklist.php | 58 +- Panel/modules/update/module.php | 22 +- Panel/modules/update/patch_manager.php | 8 +- Panel/modules/update/post_update.php | 8 +- Panel/modules/update/unzip.php | 6 +- Panel/modules/update/update.php | 8 +- Panel/modules/update/updating.php | 80 +- Panel/modules/user_admin/add_group.php | 8 +- Panel/modules/user_admin/add_to_group.php | 16 +- Panel/modules/user_admin/add_user.php | 14 +- Panel/modules/user_admin/del_from_group.php | 18 +- Panel/modules/user_admin/del_group.php | 18 +- Panel/modules/user_admin/del_user.php | 8 +- Panel/modules/user_admin/edit_user.php | 36 +- Panel/modules/user_admin/module.php | 46 +- Panel/modules/user_admin/show_groups.php | 26 +- Panel/modules/user_admin/show_users.php | 20 +- Panel/modules/user_games/add_home.php | 50 +- Panel/modules/user_games/add_home.php.org | 46 +- Panel/modules/user_games/assign_home.php | 42 +- .../user_games/billing_integration.php | 8 +- Panel/modules/user_games/browser.php | 26 +- Panel/modules/user_games/check_expire.php | 16 +- Panel/modules/user_games/clone_home.php | 44 +- Panel/modules/user_games/custom_fields.php | 48 +- Panel/modules/user_games/del_home.php | 50 +- Panel/modules/user_games/edit_home.php | 120 +- Panel/modules/user_games/get_size.php | 8 +- Panel/modules/user_games/home_mods.php | 40 +- Panel/modules/user_games/install_cmds.php | 32 +- Panel/modules/user_games/migrate_home.php | 20 +- Panel/modules/user_games/module.php | 28 +- Panel/modules/user_games/monitor_buttons.php | 8 +- Panel/modules/user_games/show_homes.php | 24 +- Panel/modules/util/addadmin_helper.php | 36 +- Panel/modules/util/agents.php | 14 +- Panel/modules/util/amx_addadmin_helper.php | 36 +- Panel/modules/util/functions.php | 22 +- Panel/modules/util/module.php | 6 +- Panel/modules/util/network_tools.php | 22 +- Panel/modules/util/steamid_converter.php | 8 +- Panel/modules/util/util.php | 92 +- Panel/modules/util/util_config.php | 16 +- Panel/panel.conf | 30 +- Panel/panel.sql | 598 ++++---- Panel/protocol/PROTOCOL_UPGRADE_REVIEW.md | 2 +- Panel/protocol/TeamSpeak3/TS3Monitor.php | 14 +- Panel/protocol/TeamSpeak3/functions.php | 36 +- Panel/protocol/lgsl/lgsl_protocol.php | 66 +- Panel/protocol/lgsl/lgsl_protocol.php.080723 | 66 +- Panel/protocol/lgsl/lgsl_protocol.php.save.1 | 66 +- Panel/protocol/lgsl/lgsl_protocol.php.save.2 | 66 +- Panel/protocol/lgsl/lgsl_protocol.save | 12 +- Panel/scripts/build_pdfs.py | 146 +- Panel/scripts/quality_control.py | 116 +- Panel/server_status.php | 36 +- Panel/status_api.php | 18 +- Panel/status_api_local.php.example | 2 +- .../AdminLTE-2/dist/img/gsp_logo_light.svg | 4 + .../AdminLTE-2/dist/img/ogp_logo_light.svg | 1 - Panel/themes/AdminLTE-2/dist/js/main.js | 34 +- Panel/themes/AdminLTE-2/dist/php/settings.php | 76 +- .../AdminLTE-2/dist/php/theme.class.php | 220 +-- Panel/themes/AdminLTE-2/layout.html | 8 +- .../AdminLTE-2/modules/administration/main.js | 20 +- .../AdminLTE-2/modules/dashboard/dashboard.js | 138 +- .../modules/gamemanager/game_monitor.js | 40 +- .../AdminLTE-2/modules/litefm/litefm.js | 8 +- .../AdminLTE-2/modules/mysql/mysql_admin.js | 12 +- Panel/themes/AdminLTE-2/modules/server/add.js | 2 +- .../AdminLTE-2/modules/settings/themes.js | 108 +- .../modules/simple-billing/services.js | 2 +- .../AdminLTE-2/modules/simple-billing/shop.js | 14 +- .../modules/simple-billing/shop_guest.js | 18 +- .../modules/steam_workshop/steam_workshop.js | 8 +- .../AdminLTE-2/modules/update/blacklist.js | 8 +- .../modules/user_admin/user_admin.js | 26 +- .../AdminLTE/dist/img/gsp_logo_light.svg | 4 + .../AdminLTE/dist/img/ogp_logo_light.svg | 1 - Panel/themes/AdminLTE/dist/js/main.js | 34 +- Panel/themes/AdminLTE/dist/php/settings.php | 76 +- .../themes/AdminLTE/dist/php/theme.class.php | 222 +-- Panel/themes/AdminLTE/layout.html | 8 +- .../AdminLTE/modules/administration/main.js | 20 +- .../AdminLTE/modules/dashboard/dashboard.js | 138 +- .../modules/gamemanager/game_monitor.js | 40 +- .../themes/AdminLTE/modules/litefm/litefm.js | 8 +- .../AdminLTE/modules/mysql/mysql_admin.js | 12 +- Panel/themes/AdminLTE/modules/server/add.js | 2 +- .../AdminLTE/modules/settings/themes.js | 108 +- .../modules/simple-billing/services.js | 2 +- .../AdminLTE/modules/simple-billing/shop.js | 14 +- .../modules/simple-billing/shop_guest.js | 18 +- .../modules/steam_workshop/steam_workshop.js | 8 +- .../AdminLTE/modules/update/blacklist.js | 8 +- .../AdminLTE/modules/user_admin/user_admin.js | 26 +- .../Evolution/modules/evolution/evolution.css | 322 ++--- Panel/themes/MasterControlProgram/README.md | 10 +- Panel/themes/MasterControlProgram/bottom.html | 2 +- .../themes/MasterControlProgram/css/main.css | 26 +- Panel/themes/Obsidian/config/config.php | 22 +- Panel/themes/Obsidian/upload/get.php | 2 +- Panel/themes/Obsidian/upload/remove.php | 2 +- Panel/themes/Obsidian/upload/upload.php | 16 +- Panel/themes/Revolution-Light/bottom.html | 54 +- Panel/themes/SimpleBootstrap/css/main.css | 6 +- Panel/tools/generate_server_guides.py | 162 +-- README.md | 4 +- docs/AGENT_COMMUNICATION.md | 4 +- docs/ARCHITECTURE.md | 2 +- docs/COMMAND_FLOW.md | 2 +- docs/agents/LINUX_AGENT.md | 18 +- docs/agents/WINDOWS_AGENT.md | 73 +- docs/architecture/API_REFERENCE.md | 28 +- docs/architecture/LIBRARY_REFERENCE.md | 8 +- docs/architecture/MODULE_DEPENDENCIES.md | 14 +- docs/architecture/PANEL_AGENT_COMMANDS.md | 14 +- docs/architecture/PANEL_AGENT_FLOW.md | 4 +- docs/architecture/REPOSITORY_OVERVIEW.md | 6 +- docs/architecture/RPC_STATUS_REPAIR_REPORT.md | 12 +- .../2026-07-02-1631-lifecycle-hardening.md | 134 ++ docs/decisions/COMPANION_PROGRAMS_DESIGN.md | 26 +- docs/decisions/SCHEDULER_ACTIONS_DESIGN.md | 10 +- docs/decisions/STEAM_WORKSHOP_DESIGN.md | 12 +- docs/development/CODEX_GUIDE.md | 18 +- .../GSP_PLATFORM_IMPROVEMENT_REPORT.md | 8 +- docs/features/COMPANION_PROGRAMS.md | 12 +- docs/features/COMPETITOR_COMPARISON.md | 2 +- docs/features/INSTALLERS.md | 22 +- docs/features/LOGGING_SYSTEM.md | 4 +- docs/features/SCHEDULER_ACTIONS.md | 22 +- docs/features/SCHEDULER_SYSTEM.md | 4 +- docs/features/STATUS_SYSTEM.md | 6 +- docs/features/USER_API.md | 22 +- docs/modules/GAMEMANAGER.md | 2 +- docs/modules/SCHEDULER.md | 8 +- 1190 files changed, 12636 insertions(+), 12476 deletions(-) rename Panel/{ogp_api.php => gsp_api.php} (92%) rename Panel/modules/faq/{ogpfaq.rss => gspfaq.rss} (55%) create mode 100644 Panel/themes/AdminLTE-2/dist/img/gsp_logo_light.svg delete mode 100644 Panel/themes/AdminLTE-2/dist/img/ogp_logo_light.svg create mode 100644 Panel/themes/AdminLTE/dist/img/gsp_logo_light.svg delete mode 100644 Panel/themes/AdminLTE/dist/img/ogp_logo_light.svg create mode 100644 docs/codex-history/2026/2026-07-02-1631-lifecycle-hardening.md diff --git a/.github/agent.md b/.github/agent.md index cbd80475..51e90a11 100644 --- a/.github/agent.md +++ b/.github/agent.md @@ -4,7 +4,7 @@ **Prime directive:** Read this document first. Keep `.github/agent.md` identical to this file—any edit here must be mirrored there in the same commit. ## Workspace deliverables (WDS 2025 refresh) -- Use the GSP/WDS/GSW branding across UI, docs, and comments; when heritage context matters add: “GSP is a heavily customized fork of OGP maintained by WDS.” +- Use the GSP/WDS/GSW branding across UI, docs, and comments; when heritage context matters add: “GSP is a heavily customized fork of GSP maintained by WDS.” - Keep `bootstrap/` current: Ubuntu 24.04 panel + agent installers, Windows Server 2019 (Cygwin) agent installer + service wrapper, and the optional `docker/compose.yml` dev stack. All scripts must be idempotent, echo next steps, and document verify/rollback procedures in their README files. - Author and maintain admin-only docs in `WDS_Website/content/projects/gsp.md` and `content/docs/gsp/*` (front-matter + the **Admin Documentation** banner). Cross-link these guides from panel features that need deep dives. - Refresh user-facing help in `Panel/modules/faq/` (RSS + UI) so the seven core topics—panel basics, file browser, Adminer/MySQL, FTP/SFTP, task scheduler, sub-users, and support—link to the latest WDS admin docs. @@ -48,7 +48,7 @@ header('Location: /modules/billing/cart.php'); - `Website/` – storefront runtime, payment handlers, provisioning bridge. - `Panel/modules/config_games/server_configs/` – authoritative XML metadata for every supported game. - `Panel/modules/` – control-panel modules. -- `Panel/includes/` & `Panel/ogp_api.php` – database layer, shared helpers, remote agent operations. +- `Panel/includes/` & `Panel/gsp_api.php` – database layer, shared helpers, remote agent operations. ## 2) Planning mode (default) While scoping multi-file work, do **not** emit PHP/SQL/XML or run shell commands unless a maintainer explicitly says “Generate code now.” Plans should cover: @@ -57,14 +57,14 @@ While scoping multi-file work, do **not** emit PHP/SQL/XML or run shell commands - Risks, rollback notes, validation/tests. ## 3) Scope & principles -- **Single session across panel + storefront.** Every billing page must call `session_name('opengamepanel_web')` before `session_start()`. Always keep `$_SESSION['user_id']`, `$_SESSION['users_login']`, `$_SESSION['users_group']`, and `$_SESSION['website_user_id']` in sync so that logging into either surface signs the visitor into both. +- **Single session across panel + storefront.** Every billing page must call `session_name('gameserverpanel_web')` before `session_start()`. Always keep `$_SESSION['user_id']`, `$_SESSION['users_login']`, `$_SESSION['users_group']`, and `$_SESSION['website_user_id']` in sync so that logging into either surface signs the visitor into both. - **Auth reuse.** Preferred order when verifying credentials: `users_pass_hash` (modern hash) → legacy `users_passwd` (MD5). Upgrading to a modern hash is allowed so long as panel logins keep working. -- **Bridge for panel helpers.** Use `Website/includes/panel_bridge.php` to load panel classes (`OGPDatabase`, `OGPRemoteLibrary`, XML parsers) when the storefront needs to provision servers or read panel-only metadata. Do not reinvent ad-hoc copies of panel logic. -- **Storefront runtime.** Public pages continue to use mysqli with credentials from `Website/includes/config.inc.php`. Provisioning steps may request an `OGPDatabase` handle from the bridge. +- **Bridge for panel helpers.** Use `Website/includes/panel_bridge.php` to load panel classes (`GSPDatabase`, `GSPRemoteLibrary`, XML parsers) when the storefront needs to provision servers or read panel-only metadata. Do not reinvent ad-hoc copies of panel logic. +- **Storefront runtime.** Public pages continue to use mysqli with credentials from `Website/includes/config.inc.php`. Provisioning steps may request an `GSPDatabase` handle from the bridge. - **Provisioning pipeline.** Always funnel server creation or renewals through the shared provisioner (`Website/includes/provisioner.php`). This helper wraps the old `create_servers.php` logic and ensures PayPal captures, cron jobs, and panel clicks all follow the same code path. - **Catalog = XML.** Never hardcode game metadata. Parse `Panel/modules/config_games/server_configs/*.xml` at runtime; new XMLs must show up automatically. - **Regions/Nodes = live DB.** Pull nodes/locations from the panel DB (`gsp_remote_servers`, etc.). Respect admin enable/disable flags and never mirror node lists into flat files. -- **Game XML wiki parity.** We ship a PHP-rendered version of https://github.com/OpenGamePanel/OGP-Website/wiki/XML-Notes inside `Website/` (linked from the storefront admin area). Keep it updated so maintainers can edit XMLs without leaving the repo. +- **Game XML wiki parity.** We ship a PHP-rendered version of https://github.com/GameServerPanel/GSP-Panel/wiki/XML-Notes inside `Website/` (linked from the storefront admin area). Keep it updated so maintainers can edit XMLs without leaving the repo. ## 4) Functional requirements ### 4.1 Catalog (from XML) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index cbd80475..51e90a11 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -4,7 +4,7 @@ **Prime directive:** Read this document first. Keep `.github/agent.md` identical to this file—any edit here must be mirrored there in the same commit. ## Workspace deliverables (WDS 2025 refresh) -- Use the GSP/WDS/GSW branding across UI, docs, and comments; when heritage context matters add: “GSP is a heavily customized fork of OGP maintained by WDS.” +- Use the GSP/WDS/GSW branding across UI, docs, and comments; when heritage context matters add: “GSP is a heavily customized fork of GSP maintained by WDS.” - Keep `bootstrap/` current: Ubuntu 24.04 panel + agent installers, Windows Server 2019 (Cygwin) agent installer + service wrapper, and the optional `docker/compose.yml` dev stack. All scripts must be idempotent, echo next steps, and document verify/rollback procedures in their README files. - Author and maintain admin-only docs in `WDS_Website/content/projects/gsp.md` and `content/docs/gsp/*` (front-matter + the **Admin Documentation** banner). Cross-link these guides from panel features that need deep dives. - Refresh user-facing help in `Panel/modules/faq/` (RSS + UI) so the seven core topics—panel basics, file browser, Adminer/MySQL, FTP/SFTP, task scheduler, sub-users, and support—link to the latest WDS admin docs. @@ -48,7 +48,7 @@ header('Location: /modules/billing/cart.php'); - `Website/` – storefront runtime, payment handlers, provisioning bridge. - `Panel/modules/config_games/server_configs/` – authoritative XML metadata for every supported game. - `Panel/modules/` – control-panel modules. -- `Panel/includes/` & `Panel/ogp_api.php` – database layer, shared helpers, remote agent operations. +- `Panel/includes/` & `Panel/gsp_api.php` – database layer, shared helpers, remote agent operations. ## 2) Planning mode (default) While scoping multi-file work, do **not** emit PHP/SQL/XML or run shell commands unless a maintainer explicitly says “Generate code now.” Plans should cover: @@ -57,14 +57,14 @@ While scoping multi-file work, do **not** emit PHP/SQL/XML or run shell commands - Risks, rollback notes, validation/tests. ## 3) Scope & principles -- **Single session across panel + storefront.** Every billing page must call `session_name('opengamepanel_web')` before `session_start()`. Always keep `$_SESSION['user_id']`, `$_SESSION['users_login']`, `$_SESSION['users_group']`, and `$_SESSION['website_user_id']` in sync so that logging into either surface signs the visitor into both. +- **Single session across panel + storefront.** Every billing page must call `session_name('gameserverpanel_web')` before `session_start()`. Always keep `$_SESSION['user_id']`, `$_SESSION['users_login']`, `$_SESSION['users_group']`, and `$_SESSION['website_user_id']` in sync so that logging into either surface signs the visitor into both. - **Auth reuse.** Preferred order when verifying credentials: `users_pass_hash` (modern hash) → legacy `users_passwd` (MD5). Upgrading to a modern hash is allowed so long as panel logins keep working. -- **Bridge for panel helpers.** Use `Website/includes/panel_bridge.php` to load panel classes (`OGPDatabase`, `OGPRemoteLibrary`, XML parsers) when the storefront needs to provision servers or read panel-only metadata. Do not reinvent ad-hoc copies of panel logic. -- **Storefront runtime.** Public pages continue to use mysqli with credentials from `Website/includes/config.inc.php`. Provisioning steps may request an `OGPDatabase` handle from the bridge. +- **Bridge for panel helpers.** Use `Website/includes/panel_bridge.php` to load panel classes (`GSPDatabase`, `GSPRemoteLibrary`, XML parsers) when the storefront needs to provision servers or read panel-only metadata. Do not reinvent ad-hoc copies of panel logic. +- **Storefront runtime.** Public pages continue to use mysqli with credentials from `Website/includes/config.inc.php`. Provisioning steps may request an `GSPDatabase` handle from the bridge. - **Provisioning pipeline.** Always funnel server creation or renewals through the shared provisioner (`Website/includes/provisioner.php`). This helper wraps the old `create_servers.php` logic and ensures PayPal captures, cron jobs, and panel clicks all follow the same code path. - **Catalog = XML.** Never hardcode game metadata. Parse `Panel/modules/config_games/server_configs/*.xml` at runtime; new XMLs must show up automatically. - **Regions/Nodes = live DB.** Pull nodes/locations from the panel DB (`gsp_remote_servers`, etc.). Respect admin enable/disable flags and never mirror node lists into flat files. -- **Game XML wiki parity.** We ship a PHP-rendered version of https://github.com/OpenGamePanel/OGP-Website/wiki/XML-Notes inside `Website/` (linked from the storefront admin area). Keep it updated so maintainers can edit XMLs without leaving the repo. +- **Game XML wiki parity.** We ship a PHP-rendered version of https://github.com/GameServerPanel/GSP-Panel/wiki/XML-Notes inside `Website/` (linked from the storefront admin area). Keep it updated so maintainers can edit XMLs without leaving the repo. ## 4) Functional requirements ### 4.1 Catalog (from XML) diff --git a/.github/module-map.md b/.github/module-map.md index f5fa0d71..1785be60 100644 --- a/.github/module-map.md +++ b/.github/module-map.md @@ -6,16 +6,16 @@ This file captures how the control panel, storefront, agents, and helper scripts | Area | Key files | Responsibilities | Downstream callers | | --- | --- | --- | --- | -| Database bootstrap | `Panel/includes/functions.php`, `Panel/includes/database_mysqli.php` | Creates the `OGPDatabase` instance and exposes helpers such as `resultQuery()`, `addGameHome()`, and logging. | Every panel page, `Website/Website/includes/panel_bridge.php`, cron jobs. | -| Session helpers | `includes/helpers.php` (`startSession()`) | Sets `session_name('opengamepanel_web')`, sanitizes request vars, loads locales. | `index.php`, `home.php`, provisioning pages, storefront session bridge. | +| Database bootstrap | `Panel/includes/functions.php`, `Panel/includes/database_mysqli.php` | Creates the `GSPDatabase` instance and exposes helpers such as `resultQuery()`, `addGameHome()`, and logging. | Every panel page, `Website/Website/includes/panel_bridge.php`, cron jobs. | +| Session helpers | `includes/helpers.php` (`startSession()`) | Sets `session_name('gameserverpanel_web')`, sanitizes request vars, loads locales. | `index.php`, `home.php`, provisioning pages, storefront session bridge. | | Remote control | `Panel/includes/lib_remote.php` | Wraps agent RPC (install/update, FTP user management, rsync, SteamCMD). | `Panel/modules/gamemanager/*`, `Website/create_servers.php`, cron jobs. | | XML parser | `Panel/modules/config_games/server_config_parser.php` | Converts `Panel/modules/config_games/server_configs/*.xml` into PHP arrays used for provisioning and pricing metadata. | `Panel/modules/gamemanager`, `Website/` (catalog + provisioner), cron installers. | -| API surface | `ogp_api.php`, `includes/api_functions.php` | HTTP API for third-party tooling. Exposes operations such as starting/stopping homes, querying stats. | Mobile apps, automated provisioning, selected billing workflows. | +| API surface | `gsp_api.php`, `includes/api_functions.php` | HTTP API for third-party tooling. Exposes operations such as starting/stopping homes, querying stats. | Mobile apps, automated provisioning, selected billing workflows. | | Cron/automation | `scripts/` (`cron-shop.php`, `status/*`, etc.) | Suspends/unsuspends services, refreshes status caches, runs backups. | Triggered via system cron or panel scheduler. | ## High-level flows -1. **Auth/session** – Driven by `index.php` (panel) and `Website/login.php` (storefront). Both set `$_SESSION['user_id']`, `users_login`, `users_group`, and `website_user_id`. The shared session cookie `opengamepanel_web` means logging into either surface immediately authenticates the other. +1. **Auth/session** – Driven by `index.php` (panel) and `Website/login.php` (storefront). Both set `$_SESSION['user_id']`, `users_login`, `users_group`, and `website_user_id`. The shared session cookie `gameserverpanel_web` means logging into either surface immediately authenticates the other. 2. **Catalog** – `modules/config_games` hosts XML definitions. Panel modules (`gamemanager`, `config_games`) and storefront pages (`serverlist.php`, `order.php`, documentation pages, and the XML-notes mirror) parse these files for display and provisioning metadata. 3. **Provisioning** – Orders land in `gsp_billing_orders`. `Website/create_servers.php` allocates homes, assigns nodes/IPs, configures mods, kicks off SteamCMD/rsync/manual installers, and then syncs the resulting `home_id` back into `billing_orders`, `billing_invoices`, and `billing_transactions` so paid services never stay orphaned. The same provisioner is invoked by: - PayPal capture endpoint (`Website/api/capture_order.php`). @@ -40,14 +40,14 @@ This file captures how the control panel, storefront, agents, and helper scripts | `extras`, `addonsmanager` | Workshop/add-on management. Server Content workshop installs now share validation/runtime helpers across admin, user, and API flows, and sync bundled workshop scripts into each home’s `gsp_server_content/scripts/workshop/` directory before execution. | Hooks into game homes after provisioning and uses agent-side SteamCMD copy/install workflows. | | `litefm`, `ftp`, `TS3Admin` | File managers and TeamSpeak controllers. | Depend on homes and remote server credentials set during provisioning. | | `news`, `circular`, `faq` | Content modules for panel UI. | Use standard MVC wrappers, share session/auth. | -| `cron` | Scheduler UI feeding `scripts/` commands. | Maintains job metadata that OS cron reads, including scheduler-triggered Server Content actions via `ogp_api.php?server_content/run_scheduled_action` and `modules/addonsmanager/server_content_actions.php`. | +| `cron` | Scheduler UI feeding `scripts/` commands. | Maintains job metadata that OS cron reads, including scheduler-triggered Server Content actions via `gsp_api.php?server_content/run_scheduled_action` and `modules/addonsmanager/server_content_actions.php`. | ## Storefront (`Panel/modules/billing` runtime + `Website/` compatibility wrappers) | Area | Key files | Notes | | --- | --- | --- | | Public pages | `Panel/modules/billing/index.php`, `serverlist.php`, `order.php`, `cart.php`, `payment_success.php`, `docs.php` | Runtime now lives under `Panel/modules/billing`. `Website/*.php` wrappers proxy legacy paths to these files. | -| Auth | `Panel/modules/billing/login.php`, `register.php`, `reset_password.php`, `forgot_password.php`, `includes/login_required.php`, `includes/admin_auth.php` | Share `opengamepanel_web` session, call into panel DB to validate roles. | +| Auth | `Panel/modules/billing/login.php`, `register.php`, `reset_password.php`, `forgot_password.php`, `includes/login_required.php`, `includes/admin_auth.php` | Share `gameserverpanel_web` session, call into panel DB to validate roles. | | Admin | `Panel/modules/billing/admin.php`, `adminserverlist.php`, `admin_orders.php`, `admin_coupons.php`, `admin_config.php`, `my_orders_panel.php` | Manage services, coupons, prices, and provisioning. `adminserverlist.php` controls service availability per node. | | PayPal API | `Panel/modules/billing/api/create_order.php`, `api/capture_order.php`, `paypal/webhook.php`, `logs/payment_capture.log` | Implements REST checkout. Legacy `Website/api/*` and `Website/paypal/webhook.php` wrappers proxy to module runtime. | | Provisioning bridge | `Panel/modules/billing/create_servers.php`, `includes/provisioner.php`, `includes/panel_bridge.php` | Shared between panel module and storefront backend. Encapsulates whole server creation/renewal pipeline. | @@ -67,11 +67,11 @@ This file captures how the control panel, storefront, agents, and helper scripts - **Users** – `gsp_users` table is shared. Registration uses `Website/register.php`, admin pages use `Panel/modules/user_admin`. Password upgrades must not break panel logins. - **Billing tables** – `gsp_billing_services`, `gsp_billing_orders`, `gsp_billing_invoices`, `gsp_billing_coupons`. Admin edits (pricing, enable/disable, locations) are done via `adminserverlist.php`; automation uses `cron-shop.php`. - **Homes/Mods/IPs** – Stored in `gsp_game_homes`, `gsp_game_mods`, `gsp_remote_server_ips`. Provisioner writes to these tables; `gamemanager`, `litefm`, `ftp`, and `user_games` read them. -- **Logging** – `$db->logger()` writes to `ogp_logs`. Storefront-specific logs live in `Website/logs/` for quick inspection (payment capture, provisioning outcomes, coupon usage). +- **Logging** – `$db->logger()` writes to `gsp_logs`. Storefront-specific logs live in `Website/logs/` for quick inspection (payment capture, provisioning outcomes, coupon usage). ## Usage tips -1. **Need a DB object inside `Website/`?** Include `Website/includes/panel_bridge.php` and call `billing_get_panel_db()`. It sets up constants, loads helpers, and caches the `OGPDatabase` instance so multi-call flows (e.g., capture → provision → email) reuse it. +1. **Need a DB object inside `Website/`?** Include `Website/includes/panel_bridge.php` and call `billing_get_panel_db()`. It sets up constants, loads helpers, and caches the `GSPDatabase` instance so multi-call flows (e.g., capture → provision → email) reuse it. 2. **Want to change provisioning?** Update `Website/includes/provisioner.php` once. `create_servers.php`, PayPal webhooks, cron jobs, and admin repair flows all use it. 3. **Working on XML or documentation?** Update the XML file under `Panel/modules/config_games/server_configs/`, regenerate docs if needed, and keep the PHP XML-notes mirror (`Website/docs/xml_notes.php`) accurate so the admin link stays trustworthy. 4. **Need to know who uses a table?** Search `.github/module-map.md` first; the table above lists the canonical readers/writers for each major schema. diff --git a/LAST_UPDATE.txt b/LAST_UPDATE.txt index bed3d4c1..457ac84a 100644 --- a/LAST_UPDATE.txt +++ b/LAST_UPDATE.txt @@ -12,7 +12,7 @@ Updated files: - Panel/modules/addonsmanager/server_content_categories.php - Panel/modules/addonsmanager/server_content_helpers.php - Panel/modules/addonsmanager/workshop_action.php -- Panel/ogp_api.php +- Panel/gsp_api.php - Panel/CHANGELOG.md - Panel/docs/COPILOT_TODO.md - .github/module-map.md diff --git a/Panel/APACHE_SETUP.md b/Panel/APACHE_SETUP.md index f392531b..568afe3d 100644 --- a/Panel/APACHE_SETUP.md +++ b/Panel/APACHE_SETUP.md @@ -5,7 +5,7 @@ This directory contains Apache virtual host configuration files for deploying th ## Configuration Files ### 1. panel.conf -Configuration for the main Open Game Panel dashboard. +Configuration for the main GameServer Panel dashboard. - **Domain**: panel.yourdomain.com - **Document Root**: /var/www/GSP - **Purpose**: Main panel interface for server management @@ -15,7 +15,7 @@ Configuration for the GameServers.World storefront website. - **Domain**: gameservers.world - **Document Root**: /var/www/GSP/_website - **Purpose**: Customer-facing storefront for ordering game servers -- **Features**: +- **Features**: - Separate session handling - Protected includes and data directories - Static asset caching @@ -190,7 +190,7 @@ sudo tail -f /var/log/apache2/error.log # Ubuntu/Debian sudo tail -f /var/log/httpd/error_log # CentOS/RHEL # Site-specific logs -sudo tail -f /var/log/apache2/ogp-panel-error.log +sudo tail -f /var/log/apache2/gsp-panel-error.log sudo tail -f /var/log/apache2/gameservers-website-error.log sudo tail -f /var/log/apache2/fileserver-error.log ``` @@ -227,4 +227,4 @@ For issues specific to: ## License -These configuration files are part of the Open Game Panel project and follow the same license as the main project. +These configuration files are part of the GameServer Panel project and follow the same license as the main project. diff --git a/Panel/CHANGELOG.md b/Panel/CHANGELOG.md index e472e15b..e9ef554e 100644 --- a/Panel/CHANGELOG.md +++ b/Panel/CHANGELOG.md @@ -33,7 +33,7 @@ - **Auto-install trigger + monthly-only billing pricing:** Refactored Game Monitor update/install into a shared callable (`modules/gamemanager/update_actions.php`) reused by billing provisioning so new paid/free/admin-created homes auto-trigger the same install/update path used by `m=gamemanager&p=update&update=refresh` without manual clicks. Billing now treats monthly pricing (`price_monthly`) as canonical across admin service config, add-to-cart, free checkout, PayPal capture, and provisioning end-date math (31-day months), while preserving legacy daily/yearly columns for backward compatibility. - **LiteFM PHP 8.3 compatibility and install-pending UX:** Removed deprecated `${var}` interpolation usage, guarded missing `fm_cwd_*` session keys and `dirname()` null paths, and replaced directory-not-found warning output with a clear message when server files are not installed yet. - **Provisioning + billing admin UX reliability pass:** Hardened automatic server provisioning to reserve ports from `arrange_ports` (exact `home_cfg_id`, then `home_cfg_id=0` fallback), prevent duplicate `home_ip_ports` assignment, keep order/invoice/home linkage intact even when install is pending, and apply safe default mod resolution so base installs are not blocked by missing explicit mod choices. Refreshed billing admin service management with row-level save actions, sortable columns (including Game Name enabled-first toggle), clearer save feedback, cleaner unstable-update caution styling, login theme polish, and updated storefront timestamp footer metadata. -- **Steam Workshop reliability + UI simplification:** Removed customer CLI/update scripting instructions from Workshop user flow, reduced per-server behavior options to supported modes only, switched remaining Steam Workshop SQL references to prefix helpers (no `OGP_DB_PREFIX` strings), hardened queued-update agent processing (`queued → updating → installed/failed`) with clearer error persistence, and refreshed monitor/support documentation links to open game-specific docs (fallback to docs index) in a new tab. +- **Steam Workshop reliability + UI simplification:** Removed customer CLI/update scripting instructions from Workshop user flow, reduced per-server behavior options to supported modes only, switched remaining Steam Workshop SQL references to prefix helpers (no `GSP_DB_PREFIX` strings), hardened queued-update agent processing (`queued → updating → installed/failed`) with clearer error persistence, and refreshed monitor/support documentation links to open game-specific docs (fallback to docs index) in a new tab. - **Billing docs routing refresh:** Updated docs browser links/icons to root-relative storefront paths (`/docs.php`, `/docs/...`) and removed stale hardcoded panel host guidance from getting-started documentation. ## 2026-05-07 @@ -57,11 +57,11 @@ - **Billing checkout — SQL migration:** Added `sql/002_billing_checkout_fixes.sql` — idempotent migration that adds `coupon_id`, `discount_amount`, `payment_status`, `subtotal`, and `total_due` columns to `gsp_billing_invoices`, and `coupon_id`/`discount_amount` to `gsp_billing_orders` for older installations missing these columns. - **Billing order status standardization:** Canonical `billing_orders.status` values are now `Active`, `Invoiced`, and `Expired` only. All old writes of `installed`, `paid` (as order status), and `suspended` have been replaced. A SQL migration script `modules/billing/sql/normalize_billing_order_status.sql` converts any existing legacy rows. Backward-compatibility read paths (e.g. renewable-status checks in `my_account.php`) are preserved until the migration runs. - **Expiration display date-only:** The billing expiration shown on the game server monitor (`server_monitor.php`) now displays as `YYYY-MM-DD` only instead of `YYYY-MM-DD HH:MM`. -- **Full-day expiration grace rule:** A server whose `end_date` falls on today is treated as active for the entire calendar day. Expiration is only processed starting the next calendar day. This rule is applied consistently in: billing cron (`cron-shop.php` Steps B and C), the server monitor expiration helper (`home_handling_functions.php::get_server_billing_expiration_html`), and the OGP user/group assignment expiration processor (`user_games/check_expire.php`). All comparisons now use `DATE(end_date) < CURDATE()` (SQL) or `< strtotime(date('Y-m-d'))` (PHP) — never `<= NOW()` or `<= time()`. +- **Full-day expiration grace rule:** A server whose `end_date` falls on today is treated as active for the entire calendar day. Expiration is only processed starting the next calendar day. This rule is applied consistently in: billing cron (`cron-shop.php` Steps B and C), the server monitor expiration helper (`home_handling_functions.php::get_server_billing_expiration_html`), and the GSP user/group assignment expiration processor (`user_games/check_expire.php`). All comparisons now use `DATE(end_date) < CURDATE()` (SQL) or `< strtotime(date('Y-m-d'))` (PHP) — never `<= NOW()` or `<= time()`. - **GSP 1.0 baseline:** Reset all bundled/core module versions to `1.0`. DB schema versions (`$db_version`) are unchanged. -- **FAQ module refresh:** Restored online RSS update code from upstream (opengamepanel.org), fixed `$local = false` initialization bug, switched local cache to `ogpfaq.rss`, added PHP 8.3-compatible `(array)` casts, restored upstream credits footer, and opened `navigation.xml` access to `user,admin,subuser`. +- **FAQ module refresh:** Restored online RSS update code from upstream (gameserverpanel.org), fixed `$local = false` initialization bug, switched local cache to `gspfaq.rss`, added PHP 8.3-compatible `(array)` casts, restored upstream credits footer, and opened `navigation.xml` access to `user,admin,subuser`. - **Config XML editor improvements:** Added schema validation before save (both structured editor and raw XML path); invalid XML is rejected with line-level error messages instead of being written to disk. Added auto-restore from backup on validation failure. Fields are now displayed in schema-defined order with required/optional badges. Added a raw XML editing panel with validation warning. Unknown/custom XML fields are preserved when only specific nodes are modified. - **Obsidian theme:** Added `themes/Obsidian/` from `hmrserver/Obsidian`. The theme is immediately selectable in the panel theme settings. diff --git a/Panel/IMPLEMENTATION_COMPLETE.md b/Panel/IMPLEMENTATION_COMPLETE.md index d799a379..0a9e1b7f 100644 --- a/Panel/IMPLEMENTATION_COMPLETE.md +++ b/Panel/IMPLEMENTATION_COMPLETE.md @@ -2,8 +2,8 @@ ## Task: Fix PayPal Order Error & Implement Coupon System -**Date**: October 29, 2025 -**Status**: ✅ COMPLETE +**Date**: October 29, 2025 +**Status**: ✅ COMPLETE **Branch**: `copilot/fix-paypal-order-error` ## Problems Solved @@ -14,13 +14,13 @@ ``` Error: Unexpected end of JSON input -[29-Oct-2025 10:30:12 UTC] PHP Fatal error: Failed opening required +[29-Oct-2025 10:30:12 UTC] PHP Fatal error: Failed opening required '/home/domainpl/gameservers.world/api/../../../includes/database_mysqli.php' ``` **Root Cause**: The billing module was trying to use panel database helper functions that don't exist when deployed on a separate web server. -**Solution**: +**Solution**: - Removed all `require_once` statements referencing panel files - Replaced `createDatabaseConnection()` with native `mysqli_connect()` - Created standalone `config.inc.php` for database credentials @@ -35,7 +35,7 @@ Error: Unexpected end of JSON input The billing module can now operate completely independently: - ✅ Can be deployed on same server as panel -- ✅ Can be deployed on external web host +- ✅ Can be deployed on external web host - ✅ Only requires MySQL connection credentials - ✅ No dependencies on panel PHP files - ✅ Uses `gameservers_website` session namespace (separate from panel) @@ -59,7 +59,7 @@ Implemented full-featured discount coupon system: **Example Use Cases**: -1. **New Customer Welcome**: +1. **New Customer Welcome**: - Code: `WELCOME10` - Type: One-time - Discount: 10% @@ -93,13 +93,13 @@ Implemented full-featured discount coupon system: ### Database Changes -**New Table**: `ogp_billing_coupons` +**New Table**: `gsp_billing_coupons` - 14 columns including coupon_id, code, discount_percent, usage_type, game_filter_list, etc. - Indexes on code (unique), active status, expiration **Modified Tables**: -- `ogp_billing_invoices`: Added `coupon_id`, `discount_amount` -- `ogp_billing_orders`: Added `coupon_id`, `discount_amount` +- `gsp_billing_invoices`: Added `coupon_id`, `discount_amount` +- `gsp_billing_orders`: Added `coupon_id`, `discount_amount` ## Quality Assurance @@ -210,7 +210,7 @@ If issues occur: Suggested features for future development: - Fixed-amount coupons -- Minimum purchase requirements +- Minimum purchase requirements - User-specific or group-specific coupons - Referral system integration - Coupon analytics dashboard @@ -249,7 +249,7 @@ Suggested features for future development: 1. ✅ Fixed PayPal "Unexpected end of JSON input" error 2. ✅ Made billing module truly standalone 3. ✅ Implemented comprehensive coupon system -4. ✅ Admin interface for coupon management +4. ✅ Admin interface for coupon management 5. ✅ Cart integration with real-time updates 6. ✅ One-time and permanent discount types 7. ✅ Game-specific filtering @@ -261,7 +261,7 @@ The implementation is production-ready, well-documented, and security-validated. --- -**Completed By**: GitHub Copilot Agent -**Review Status**: Code review passed, no issues -**Security Status**: CodeQL scan passed, no vulnerabilities +**Completed By**: GitHub Copilot Agent +**Review Status**: Code review passed, no issues +**Security Status**: CodeQL scan passed, no vulnerabilities **Ready for Merge**: ✅ YES diff --git a/Panel/IMPLEMENTATION_NOTES.md b/Panel/IMPLEMENTATION_NOTES.md index febb2156..f99b36c2 100644 --- a/Panel/IMPLEMENTATION_NOTES.md +++ b/Panel/IMPLEMENTATION_NOTES.md @@ -65,11 +65,11 @@ This implementation adds password reset functionality, user server management, i ## Database Tables Created -### ogp_password_reset_tokens +### gsp_password_reset_tokens Stores password reset tokens with expiration and usage tracking. ```sql -CREATE TABLE ogp_password_reset_tokens ( +CREATE TABLE gsp_password_reset_tokens ( id INT AUTO_INCREMENT PRIMARY KEY, user_id INT NOT NULL, token VARCHAR(64) NOT NULL, @@ -81,11 +81,11 @@ CREATE TABLE ogp_password_reset_tokens ( ) ``` -### ogp_server_status +### gsp_server_status Stores server infrastructure status and metrics. ```sql -CREATE TABLE ogp_server_status ( +CREATE TABLE gsp_server_status ( status_id INT AUTO_INCREMENT PRIMARY KEY, remote_server_id INT NOT NULL, server_name VARCHAR(255) NOT NULL, @@ -257,17 +257,17 @@ Before deploying to production: All requirements from the problem statement have been addressed: -✅ **Password reset on login page** - Added "Forgot Password?" link and complete workflow -✅ **Password reset via username or email** - Both methods supported -✅ **Email password reset link** - Implemented with email sending -✅ **Reset password page** - Created with token validation -✅ **Fix order page images** - Changed to use ../ prefix -✅ **Server list "Order Now" as button** - Styled as gradient button -✅ **My servers page** - Shows active servers with expiration and renewal -✅ **Server status page** - Created with database table -✅ **Server status link in footer** - Added -✅ **Apache configs** - All three created (panel, website, fileserver) -✅ **Documentation** - APACHE_SETUP.md and FEATURES.md created +✅ **Password reset on login page** - Added "Forgot Password?" link and complete workflow +✅ **Password reset via username or email** - Both methods supported +✅ **Email password reset link** - Implemented with email sending +✅ **Reset password page** - Created with token validation +✅ **Fix order page images** - Changed to use ../ prefix +✅ **Server list "Order Now" as button** - Styled as gradient button +✅ **My servers page** - Shows active servers with expiration and renewal +✅ **Server status page** - Created with database table +✅ **Server status link in footer** - Added +✅ **Apache configs** - All three created (panel, website, fileserver) +✅ **Documentation** - APACHE_SETUP.md and FEATURES.md created ## Next Steps @@ -282,13 +282,13 @@ All requirements from the problem statement have been addressed: ## Support - Main documentation: See FEATURES.md -- Apache setup: See APACHE_SETUP.md +- Apache setup: See APACHE_SETUP.md - Issues: Check PHP error logs and database connectivity - Questions: Review existing GSP documentation --- -**Implementation Date**: 2025-10-22 -**Repository**: GameServerPanel/GSP -**Branch**: copilot/add-password-reset-feature +**Implementation Date**: 2025-10-22 +**Repository**: GameServerPanel/GSP +**Branch**: copilot/add-password-reset-feature **Status**: Ready for review and testing diff --git a/Panel/IMPLEMENTATION_SUMMARY.md b/Panel/IMPLEMENTATION_SUMMARY.md index 7f1b0d82..46278e92 100644 --- a/Panel/IMPLEMENTATION_SUMMARY.md +++ b/Panel/IMPLEMENTATION_SUMMARY.md @@ -9,12 +9,12 @@ This PR successfully addresses all three main issues from the problem statement: ## 1. Login White Screen Fix ### Issue -Users were experiencing a white screen after login due to hardcoded table name `ogp_users` in the menu.php file. +Users were experiencing a white screen after login due to hardcoded table name `gsp_users` in the menu.php file. ### Solution - Changed `modules/billing/includes/menu.php` line 46 from: ```php - $res = mysqli_query($menu_db, "SELECT users_role FROM ogp_users WHERE user_id = $uid LIMIT 1"); + $res = mysqli_query($menu_db, "SELECT users_role FROM gsp_users WHERE user_id = $uid LIMIT 1"); ``` To: ```php diff --git a/Panel/INSTALL.BAT b/Panel/INSTALL.BAT index a0cf3c8e..c93625ff 100644 --- a/Panel/INSTALL.BAT +++ b/Panel/INSTALL.BAT @@ -61,7 +61,7 @@ REM cls REM ===== Create/update 'gameserver' and make admin (PowerShell handles special chars) ===== -set /p PASS=Enter password for 'gameserver' (visible): +set /p PASS=Enter password for 'gameserver' (visible): set "GSU=gameserver" powershell -NoProfile -ExecutionPolicy Bypass -Command ^ @@ -82,24 +82,24 @@ cls REM ===== Fetch agent files (curl instead of wget) ===== REM (Old SVN example left as comment) REM curl -L "http://master.dl.sourceforge.net/project/ogpextras/Installer-Snapshot/latest_win_agent_files.zip" -o "agent_files.zip" -curl -L "https://github.com/OpenGamePanel/OGP-Agent-Windows/archive/master.zip" -o "agent_files.zip" +curl -L "https://github.com/GameServerPanel/GSP-Agent-Windows/archive/master.zip" -o "agent_files.zip" unzip -q agent_files_old.zip unzip -q -o agent_files.zip -IF NOT EXIST "OGP-Agent-Windows-master" unzip -q agent_files_local_copy.zip -cd "OGP-Agent-Windows-master" -IF EXIST OGP/COPYING xcopy /Y /E * ..\ -IF EXIST OGP/COPYING cd .. -rm -rf "OGP-Agent-Windows-master" +IF NOT EXIST "GSP-Agent-Windows-master" unzip -q agent_files_local_copy.zip +cd "GSP-Agent-Windows-master" +IF EXIST GSP/COPYING xcopy /Y /E * ..\ +IF EXIST GSP/COPYING cd .. +rm -rf "GSP-Agent-Windows-master" rm -f agent_files.zip rm -f agent_files_old.zip rm -f agent_files_local_copy.zip -chmod +x /OGP/agent_conf.sh -chmod +x /bin/ogp_agent +chmod +x /GSP/agent_conf.sh +chmod +x /bin/gsp_agent REM ===== Configure agent (pass password safely) ===== powershell -NoProfile -ExecutionPolicy Bypass -Command ^ - "Start-Process -FilePath bash -NoNewWindow -Wait -ArgumentList @('/OGP/agent_conf.sh','-p',$env:PASS)" + "Start-Process -FilePath bash -NoNewWindow -Wait -ArgumentList @('/GSP/agent_conf.sh','-p',$env:PASS)" REM ===== Create scheduled task (password via PowerShell to avoid metachar issues) ===== tools\fart.exe "%WD%\service_settings.xml" "{COMMAND}" "%WD%\agent_start.bat" @@ -107,12 +107,12 @@ tools\fart.exe "%WD%\service_settings.xml" "{COMMAND_WORK_DIR}" "%WD%" powershell -NoProfile -ExecutionPolicy Bypass -Command ^ "$xml = Join-Path $env:WD 'service_settings.xml'; " ^ - "Start-Process -FilePath schtasks -NoNewWindow -Wait -ArgumentList @('/create','/tn','OGP agent start on boot','/XML',$xml,'/ru','gameserver','/rp',$env:PASS)" + "Start-Process -FilePath schtasks -NoNewWindow -Wait -ArgumentList @('/create','/tn','GSP agent start on boot','/XML',$xml,'/ru','gameserver','/rp',$env:PASS)" REM ===== Rebase & start agent ===== call "%WD%\rebase_post_ins.bat" echo. -schtasks /Run /tn "OGP agent start on boot" +schtasks /Run /tn "GSP agent start on boot" REM ===== Grant logon as a service ===== tools\ntrights.exe +r SeServiceLogonRight -u gameserver -m \\%COMPUTERNAME% diff --git a/Panel/INSTALL_README.md b/Panel/INSTALL_README.md index 6e1c17cb..1d2b9205 100644 --- a/Panel/INSTALL_README.md +++ b/Panel/INSTALL_README.md @@ -1,6 +1,6 @@ # GSP / WDS Panel — Installer Guide -> **GSP is a heavily customized fork of OGP maintained by WDS.** +> **GSP is a heavily customized fork of GSP maintained by WDS.** --- @@ -147,15 +147,15 @@ After installation completes: --- -## 7. Table Prefix Migration (ogp_ → gsp_) +## 7. Table Prefix Migration (gsp_ → gsp_) -If you are migrating from an older OGP installation: +If you are migrating from an older GSP installation: -- The installer automatically renames `ogp_*` tables to `gsp_*` (or your chosen prefix) when they don't already exist. +- The installer automatically renames `gsp_*` tables to `gsp_*` (or your chosen prefix) when they don't already exist. - Tables that already exist under the new prefix are skipped safely. - You can choose a custom prefix (e.g. `mypanel_`) in the installer form. -**Module SQL files** containing `ogp_` references are dynamically converted to the chosen prefix at import time. +**Module SQL files** containing `gsp_` references are dynamically converted to the chosen prefix at import time. --- diff --git a/Panel/README.txt b/Panel/README.txt index f71174a8..57887539 100644 --- a/Panel/README.txt +++ b/Panel/README.txt @@ -14,12 +14,12 @@ crontab -e and copy this line at the end of the file and save it (WARNING:modify it with the correct path): -*/1 * * * * php /var/www/html/ogp/modules/billing/cron-shop.php +*/1 * * * * php /var/www/html/gsp/modules/billing/cron-shop.php Now this script searches for expired game homes every minute, and wil stop and remove them if they are expired. If you would like to do this at midnight every day instead of every minute you should use -0 0 * * * php /var/www/html/ogp/modules/billing/cron-shop.php +0 0 * * * php /var/www/html/gsp/modules/billing/cron-shop.php TIP: Searching in google, for example, "cron every month" you will find the correct code to search expired homes and remove them every month. diff --git a/Panel/agent_event_receiver.php b/Panel/agent_event_receiver.php index bf83cf4d..036a8526 100644 --- a/Panel/agent_event_receiver.php +++ b/Panel/agent_event_receiver.php @@ -11,7 +11,7 @@ if ($_SERVER['REQUEST_METHOD'] !== 'POST') { } $db = createDatabaseConnection($db_type, $db_host, $db_user, $db_pass, $db_name, $table_prefix, isset($db_port) ? $db_port : NULL); -if (!$db instanceof OGPDatabase) { +if (!$db instanceof GSPDatabase) { gsp_agent_event_fail(503, 'database_unavailable', 'Could not connect to database.'); } diff --git a/Panel/all_hostable_games_union.csv b/Panel/all_hostable_games_union.csv index 6edf1829..8e0cf925 100644 --- a/Panel/all_hostable_games_union.csv +++ b/Panel/all_hostable_games_union.csv @@ -6,12 +6,12 @@ ARMA 3,LinuxGSM Abiotic Factor,Nitrado Action Half-Life,LinuxGSM Action: Source,LinuxGSM -Aliens vs Predator,OGP +Aliens vs Predator,GSP Aloft,"G-Portal, Nitrado" American Truck Simulator,"LinuxGSM, Nitrado" -Arma 2,OGP -Arma 2 Combined Operations,OGP -Arma 2 Operation Arrowhead,OGP +Arma 2,GSP +Arma 2 Combined Operations,GSP +Arma 2 Operation Arrowhead,GSP Arma 3,G-Portal Arma Reforger,"G-Portal, LinuxGSM" Assetto Corsa,LinuxGSM @@ -54,7 +54,7 @@ Day of Defeat: Source,LinuxGSM Day of Dragons,"G-Portal, LinuxGSM" Day of Infamy,LinuxGSM DayZ,LinuxGSM -DayZ Mod for Arma2CO ,OGP +DayZ Mod for Arma2CO ,GSP Dead Matter,G-Portal Deadside,G-Portal Deadside (Console),G-Portal @@ -191,14 +191,14 @@ Unreal Tournament 2004,LinuxGSM Unreal Tournament 3,LinuxGSM Unreal Tournament 99,LinuxGSM Unturned,"G-Portal, LinuxGSM, Nitrado" -Urban Terror 4,OGP +Urban Terror 4,GSP V Rising,G-Portal Valheim,"G-Portal, GameServers.com, LinuxGSM" Vampire Slayer,LinuxGSM Velocity Proxy,LinuxGSM Vintage Story,"G-Portal, LinuxGSM" Warfork,LinuxGSM -Warsow,OGP +Warsow,GSP WaterfallMC,LinuxGSM Wolfenstein: Enemy Territory,LinuxGSM World Titans War,G-Portal diff --git a/Panel/check.php b/Panel/check.php index 3604f27e..660212d2 100644 --- a/Panel/check.php +++ b/Panel/check.php @@ -1,10 +1,10 @@ $pear_path !== false ? 'ok' : 'warning', 'current' => $pear_path !== false ? $pear_path : 'Not found', 'fix' => $pear_path !== false ? '' : 'sudo apt install php-pear -y', - 'notes' => 'Used by some legacy OGP/GSP modules.', + 'notes' => 'Used by some legacy GSP/GSP modules.', ]; // ── Writable / readable paths ──────────────────────────────────────────────── diff --git a/Panel/css/global.css b/Panel/css/global.css index 0df3fc92..1d936512 100644 --- a/Panel/css/global.css +++ b/Panel/css/global.css @@ -1,5 +1,5 @@ -/* - * These are global CSS styles that should apply to all themes +/* + * These are global CSS styles that should apply to all themes * Overrides go here... some styles may need !important to override inline styles applied by libraries * This CSS file will be loaded last in the chain, so use !important carefully */ @@ -23,7 +23,7 @@ span.versionInfo{ display: inline-block; } -div.OGPVersionArea{ +div.GSPVersionArea{ width: 100%; position: relative; } @@ -48,7 +48,7 @@ span.copyVersionResult{ .progress .progress-bar { width: 1px; height: 15px; - + /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#b4e391+0,61c419+50,b4e391+100;Green+3D */ background: #43DB00; /* Old browsers */ background: -moz-linear-gradient(top, #b4e391 0%, #61c419 50%, #b4e391 100%); /* FF3.6-15 */ diff --git a/Panel/docs/GSP_INSTALLER.md b/Panel/docs/GSP_INSTALLER.md index 2385e26b..0efac087 100644 --- a/Panel/docs/GSP_INSTALLER.md +++ b/Panel/docs/GSP_INSTALLER.md @@ -1,11 +1,11 @@ -# GSP Installer – Differences from Original OGP `install.php` +# GSP Installer – Differences from Original GSP `install.php` ## Overview `install.php` in this repository is a customized installer for the **GSP (Game Server Panel)** maintained by WDS. It is based on the original -OGP installer at - +GSP installer at + but has been adapted for the GSP/WDS environment. --- @@ -14,7 +14,7 @@ but has been adapted for the GSP/WDS environment. ### 1. Default table prefix: `gsp_` -The original OGP installer defaults to `ogp_`. Our installer defaults to +The original GSP installer defaults to `gsp_`. Our installer defaults to `gsp_` (the `$table_prefix` form field pre-fills with `gsp_`). You may change this during installation. @@ -38,7 +38,7 @@ port 3306). ### 3. MySQLi connection uses the port -`includes/database_mysqli.php` – `OGPDatabaseMySQL::connect()` – now +`includes/database_mysqli.php` – `GSPDatabaseMySQL::connect()` – now accepts an optional `$db_port` argument and passes it to `mysqli_connect()`: ```php @@ -48,7 +48,7 @@ $this->link = mysqli_connect($db_host, $db_user, $db_pass, $db_name, $port); `includes/helpers.php` – `createDatabaseConnection()` – likewise accepts and forwards `$db_port`. -All panel entry points (`home.php`, `index.php`, `ogp_api.php`, +All panel entry points (`home.php`, `index.php`, `gsp_api.php`, `server_status.php`, `modules/billing/cron-shop.php`, `modules/billing/includes/panel_bridge.php`) pass `isset($db_port) ? $db_port : NULL` when calling @@ -57,7 +57,7 @@ All panel entry points (`home.php`, `index.php`, `ogp_api.php`, ### 4. Default admin account created automatically After modules are installed, the installer automatically creates an `admin` -account with password `admin` using the existing `OGPDatabaseMySQL::addUser()` +account with password `admin` using the existing `GSPDatabaseMySQL::addUser()` method (which stores passwords as `MD5`). If an admin user already exists it is **not** duplicated. @@ -65,7 +65,7 @@ is **not** duplicated. ### 5. No prerequisite checks -Step 0 shows a welcome screen and language selector only. The original OGP +Step 0 shows a welcome screen and language selector only. The original GSP installer checks for required PHP extensions, Pear, etc. GSP skips those checks because the deployment environment is pre-validated by our bootstrap scripts. @@ -77,21 +77,21 @@ Every directory found under `modules/` is installed via as warnings (not hard failures) so that the overall installation succeeds even if optional dependencies are missing. -### 7. `ogp_` → `gsp_` table migration (optional, safe) +### 7. `gsp_` → `gsp_` table migration (optional, safe) -If the database already contains tables prefixed with `ogp_`: +If the database already contains tables prefixed with `gsp_`: -* For each `ogp_X` table, if the corresponding `gsp_X` table does **not** +* For each `gsp_X` table, if the corresponding `gsp_X` table does **not** exist, it is renamed to `gsp_X`. * If `gsp_X` already exists, the rename is skipped silently. * The installer never aborts due to pre-existing tables. -This allows upgrading an existing OGP installation to GSP without losing data. +This allows upgrading an existing GSP installation to GSP without losing data. ### 8. MD5 password hashing (legacy) -The `OGPDatabaseMySQL::addUser()` method stores passwords using `MD5()`. -This is legacy behaviour inherited from OGP and matches the existing panel +The `GSPDatabaseMySQL::addUser()` method stores passwords using `MD5()`. +This is legacy behaviour inherited from GSP and matches the existing panel login system. MD5 is cryptographically broken for new systems; however, changing the hashing scheme requires coordinated changes to the login code (`index.php`, `modules/register/`, etc.) and is outside the scope of the @@ -101,7 +101,7 @@ scheme in a follow-up change. ### 9. Branding The installer title and default site settings reference **GSP – Game Server -Panel** and **WDS** instead of "Open Game Panel". +Panel** and **WDS** instead of "GameServer Panel". --- @@ -124,5 +124,5 @@ Panel** and **WDS** instead of "Open Game Panel". * To re-run the installer, simply navigate to `install.php` again. * If the wrong prefix was chosen, edit `includes/config.inc.php` manually or re-run `install.php`. -* Renamed (`ogp_` → `gsp_`) tables can be manually renamed back with - `RENAME TABLE gsp_X TO ogp_X` in MySQL. +* Renamed (`gsp_` → `gsp_`) tables can be manually renamed back with + `RENAME TABLE gsp_X TO gsp_X` in MySQL. diff --git a/Panel/documentation/admin-guide.md b/Panel/documentation/admin-guide.md index acb46897..f1066c91 100644 --- a/Panel/documentation/admin-guide.md +++ b/Panel/documentation/admin-guide.md @@ -1,6 +1,6 @@ # GameServer Panel Admin Guide -This document mirrors the internal WDS wiki entry so it can be viewed directly from the repository, packaged with releases, or imported into another wiki. It explains how we deploy, operate, and extend the GameServer Panel (GSP) fork of Open Game Panel. +This document mirrors the internal WDS wiki entry so it can be viewed directly from the repository, packaged with releases, or imported into another wiki. It explains how we deploy, operate, and extend the GameServer Panel (GSP) fork of GameServer Panel. ## Overview @@ -28,10 +28,10 @@ Key behaviors: ## Architecture -GSP is still built around the classic OGP topology: +GSP is still built around the classic GSP topology: 1. **Web Panel** – PHP application with billing, coupons, invoicing, and customer UI enhancements. -2. **Agents** – Lightweight Perl daemons (`ogp_agent.pl`) installed on every game host. Default port 12679/TCP. +2. **Agents** – Lightweight Perl daemons (`gsp_agent.pl`) installed on every game host. Default port 12679/TCP. 3. **Game Servers** – Processes defined in `modules/config_games/server_configs/*.xml`. Agents launch them inside detached GNU screen sessions, capture PIDs, and stream console logs back to the panel. All provisioning logic flows through XML definition files, so keep IDs, attributes, and order compliant with `modules/config_games/schema_server_config.xml`. @@ -46,10 +46,10 @@ All provisioning logic flows through XML definition files, so keep IDs, attribut sudo git clone https://github.com/GameServerPanel/GSP-Agent-Linux.git /opt/gsp-agent cd /opt/gsp-agent sudo bash install.sh - sudo bash agent_conf.sh -s "yourRootPassword" -u ogp_agent + sudo bash agent_conf.sh -s "yourRootPassword" -u gsp_agent ``` -3. Edit `/home/ogp_agent/Cfg/Config.pm` to match the panel entry (listen ip/port, `key`, `web_api_url`). -4. Enable the service: `sudo systemctl enable --now ogp_agent` (installs from `systemd/ogp_agent.service`). +3. Edit `/home/gsp_agent/Cfg/Config.pm` to match the panel entry (listen ip/port, `key`, `web_api_url`). +4. Enable the service: `sudo systemctl enable --now gsp_agent` (installs from `systemd/gsp_agent.service`). 5. Confirm heartbeats from the panel → Administration → Game Servers. ### Windows Agent (Cygwin bundle) @@ -58,11 +58,11 @@ All provisioning logic flows through XML definition files, so keep IDs, attribut 2. Run `Install\onceinstall_agent.bat` as Administrator to install Cygwin, create the `gameserver` service user, and copy files. 3. Launch the bundled Cygwin terminal and execute: ```bash - cd /OGP + cd /GSP bash agent_conf.sh -p "gameserverPassword" ``` -4. Update `C:\\OGP\\Cfg\\Config.pm` (same structure as Linux) with the panel’s key, API URL, and listen port. -5. Ensure the “OGP Agent” Windows service is set to Automatic (Delayed Start) and the firewall allows the agent port plus expected game ports. +4. Update `C:\\GSP\\Cfg\\Config.pm` (same structure as Linux) with the panel’s key, API URL, and listen port. +5. Ensure the “GSP Agent” Windows service is set to Automatic (Delayed Start) and the firewall allows the agent port plus expected game ports. ## XML Deep Dive @@ -111,7 +111,7 @@ Game definitions live under `modules/config_games/server_configs`. They must res - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{OGP_HOME_DIR}/RustDedicated_Data/Plugins/x86_64 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{GSP_HOME_DIR}/RustDedicated_Data/Plugins/x86_64 ``` @@ -138,13 +138,13 @@ The full human-readable version is provided in [`documentation/xml-notes.md`](./ 2. **Copy a template** – Duplicate a similar XML file from `server_configs/` and modify it in-place. 3. **Wire up parameters** – Use `server_params` for every knob you want exposed, and map those IDs inside `cli_params`. 4. **Validate** – Run `xmllint --schema modules/config_games/schema_server_config.xml mygame.xml --noout`. -5. **Test** – Upload through the panel, click “Update Games List,” provision a server, and watch `ogp_agent.log` for errors. +5. **Test** – Upload through the panel, click “Update Games List,” provision a server, and watch `gsp_agent.log` for errors. 6. **Document** – Update this guide or the wiki with any quirks, Steam app IDs, or non-standard install notes. ## Operational Notes - **No panelStart wrapper** – The agent handles PID tracking, console logs, and restart logic. Keep commands clean. -- **Logging** – Agents write `ogp_agent.log`, `ogp_agent.pid`, `ogp_agent_run.pid`, and individual `console.log` files. +- **Logging** – Agents write `gsp_agent.log`, `gsp_agent.pid`, `gsp_agent_run.pid`, and individual `console.log` files. - **Stats database** – Optional MySQL credentials in `Cfg/Config.pm` feed resource monitoring cron jobs. - **Password rotation** – Update credentials in `content/staff-passwords.txt` on the WDS website and regenerate secrets in the panel/agents at the same time. diff --git a/Panel/documentation/agent-guide.md b/Panel/documentation/agent-guide.md index 9a36e9a2..5fc5c142 100644 --- a/Panel/documentation/agent-guide.md +++ b/Panel/documentation/agent-guide.md @@ -4,7 +4,7 @@ Packaged copy of the instructions we keep in the staff wiki so you can view them ## Purpose -The Linux agent (`ogp_agent.pl`) exposes the RPC endpoint that allows the GameServer Panel to install, start, stop, and monitor game servers on Linux hosts. Every host that runs customer games must run this service. +The Linux agent (`gsp_agent.pl`) exposes the RPC endpoint that allows the GameServer Panel to install, start, stop, and monitor game servers on Linux hosts. Every host that runs customer games must run this service. ## Supported platforms @@ -21,48 +21,48 @@ sudo apt install -y git curl rsync screen perl libxml-parser-perl libpath-class- sudo git clone https://github.com/GameServerPanel/GSP-Agent-Linux.git /opt/gsp-agent cd /opt/gsp-agent sudo bash install.sh -sudo bash agent_conf.sh -s "root-password" -u ogp_agent +sudo bash agent_conf.sh -s "root-password" -u gsp_agent ``` -`agent_conf.sh` writes `/home/ogp_agent/Cfg/Config.pm`. Set: +`agent_conf.sh` writes `/home/gsp_agent/Cfg/Config.pm`. Set: | Key | Description | | --- | ----------- | | `listen_ip` | Interface to bind (use `0.0.0.0` unless you want to restrict access). | | `listen_port` | TCP port exposed to the panel. Default is `12679`. | | `key` | Shared secret copied from the panel → Administration → Game Servers. | -| `web_api_url` | HTTPS URL to `ogp_api.php` on the panel. | +| `web_api_url` | HTTPS URL to `gsp_api.php` on the panel. | | `stats_db_*` | Optional MySQL credentials for the resource stats cron. | ## Service management ```bash -sudo cp systemd/ogp_agent.service /etc/systemd/system/ -sudo sed -i "s#{OGP_AGENT_PATH}#/opt/gsp-agent#g" /etc/systemd/system/ogp_agent.service +sudo cp systemd/gsp_agent.service /etc/systemd/system/ +sudo sed -i "s#{GSP_AGENT_PATH}#/opt/gsp-agent#g" /etc/systemd/system/gsp_agent.service sudo systemctl daemon-reload -sudo systemctl enable --now ogp_agent +sudo systemctl enable --now gsp_agent ``` -Logs live next to the binaries (`/opt/gsp-agent/ogp_agent.log`). Individual game servers stream to their own `console.log` files inside each home folder. +Logs live next to the binaries (`/opt/gsp-agent/gsp_agent.log`). Individual game servers stream to their own `console.log` files inside each home folder. ## Firewall checklist 1. Allow inbound TCP on the agent port. 2. Allow inbound/outbound UDP/TCP for the games you host. -3. Allow outbound HTTPS to the panel so the agent can talk to `ogp_api.php`. +3. Allow outbound HTTPS to the panel so the agent can talk to `gsp_api.php`. ## Upgrades 1. `cd /opt/gsp-agent && git pull` -2. Stop the service (`sudo systemctl stop ogp_agent`). +2. Stop the service (`sudo systemctl stop gsp_agent`). 3. Re-run `bash install.sh` if new files were added. -4. Start the service (`sudo systemctl start ogp_agent`). +4. Start the service (`sudo systemctl start gsp_agent`). 5. Verify the panel shows the agent as “online”. ## Troubleshooting -- `tail -f ogp_agent.log` – handshake failures usually mean the encryption key or port mismatches the panel entry. -- `journalctl -u ogp_agent` – capture Perl stack traces and missing dependency errors. +- `tail -f gsp_agent.log` – handshake failures usually mean the encryption key or port mismatches the panel entry. +- `journalctl -u gsp_agent` – capture Perl stack traces and missing dependency errors. - `screen -ls` – confirm customer servers are running in screen sessions. - `nc -vz panel.example.com 12679` from the panel host – ensures the agent port is reachable. diff --git a/Panel/documentation/xml-notes.md b/Panel/documentation/xml-notes.md index 2e32a526..4395e721 100644 --- a/Panel/documentation/xml-notes.md +++ b/Panel/documentation/xml-notes.md @@ -1,6 +1,6 @@ ## GameServer Panel XML Notes / still W.I.P. -_The order of each XML element matters, and this guide presents them in their order of appearance for the GSP (OGP fork)!_ +_The order of each XML element matters, and this guide presents them in their order of appearance for the GSP (GSP fork)!_ ___ ### Linux and Windows: @@ -23,7 +23,7 @@ Comes after `` element (actually within `` element as ``` space_engineers_win64 ``` -This is a unique key used to identify this specific game server in OGP. You should not use spaces, nor any special character in it, only alpha-numeric value and underscores. It should contain a suffix related to the compatible OS. Available suffixes are `_win32`, `_win64`, `_linux32`, `_linux64`, using one of these suffixes in the game_key will let OGP know which OS it is available on, making it visible or not when you install a new game server, depending on your OS architecture. `_win` and `_linux` work too, but we highly recommend to now use the previously listed suffixes. +This is a unique key used to identify this specific game server in GSP. You should not use spaces, nor any special character in it, only alpha-numeric value and underscores. It should contain a suffix related to the compatible OS. Available suffixes are `_win32`, `_win64`, `_linux32`, `_linux64`, using one of these suffixes in the game_key will let GSP know which OS it is available on, making it visible or not when you install a new game server, depending on your OS architecture. `_win` and `_linux` work too, but we highly recommend to now use the previously listed suffixes. @@ -34,7 +34,7 @@ Comes after `` element. There can only be one `` element. ``` lgsl ``` -It defines the query protocol used by OGP. Available protocols are `lgsl`, `gameq`, `rcon` (`rcon2`? `lcon`?) +It defines the query protocol used by GSP. Available protocols are `lgsl`, `gameq`, `rcon` (`rcon2`? `lcon`?) @@ -114,8 +114,8 @@ Comes after `` element. There can only be one ` ``` %MAP%%GAMEMODE%%DIFFICULTY%%GAMELENGTH%%PLAYERS%%MUTATOR% %PORT% %IP% %WEB_ADMIN_PORT% %QUERY_PORT% ``` -This is the template that will generate the start command line placed after the server executable name. -You can use these variables which are known to OGP: +This is the template that will generate the start command line placed after the server executable name. +You can use these variables which are known to GSP: ``` GAME_TYPE HOSTNAME @@ -142,7 +142,7 @@ ___ Comes after `` element. There can only be one `` element. Example: ``` - + @@ -166,7 +166,7 @@ Comes after `` or `` element. There can only be one ` 666 ``` -You can add reserved ports here to use in the generated start command line. These ports will also be managed by OGP if OGP is used to manage the Agent machine firewall. Type can be `add` or `subtract` which is self explanatory. In this example when using the %WEB_ADMIN_PORT% variable in the `` it will generate `-WebAdminPort=XXX`, XXX being 5 subtracted to the Port set for this game server, when using the %STEAM_PORT% variable in the `` it will generate `-SteamPort=XXX` where XXX will be 19238 added to the Port set for this game server. As you can see, the variable %MY_CUSTOM_PORT% have no `cli_string`, this can be used this way to simply open this port (which here would be 666 added to the game server port) in the Agent machine firewall, when OGP is set to control the machine firewall (note: the firewall management may actually not open anything else than the game server port, to be verified). +You can add reserved ports here to use in the generated start command line. These ports will also be managed by GSP if GSP is used to manage the Agent machine firewall. Type can be `add` or `subtract` which is self explanatory. In this example when using the %WEB_ADMIN_PORT% variable in the `` it will generate `-WebAdminPort=XXX`, XXX being 5 subtracted to the Port set for this game server, when using the %STEAM_PORT% variable in the `` it will generate `-SteamPort=XXX` where XXX will be 19238 added to the Port set for this game server. As you can see, the variable %MY_CUSTOM_PORT% have no `cli_string`, this can be used this way to simply open this port (which here would be 666 added to the game server port) in the Agent machine firewall, when GSP is set to control the machine firewall (note: the firewall management may actually not open anything else than the game server port, to be verified). @@ -264,7 +264,7 @@ Comes after `` element. There can only be one `` elemen ``` -Used to define different mods for the game server, in this example there is only one mod available which will be the default installed one (actually the game server itself here). The `` here is the Steam appID that will be used to install and update the game server. (note: case RSync to explain? Case multi mods to explain?) +Used to define different mods for the game server, in this example there is only one mod available which will be the default installed one (actually the game server itself here). The `` here is the Steam appID that will be used to install and update the game server. (note: case RSync to explain? Case multi mods to explain?) @@ -352,7 +352,7 @@ Valid options are for the `` element within the `` element withi ns = no space between key and value q = quotes wrapped around value after key (no space added) s = space added after key before value (no quotes added) - anything else = space after key and quotes around the value + anything else = space after key and quotes around the value ``` @@ -533,7 +533,7 @@ Used for setting environment variables which may be needed by some servers. Thi Special entries: -`{OGP_HOME_DIR}` will be replaced by the home directory for the game server. +`{GSP_HOME_DIR}` will be replaced by the home directory for the game server. ___ ### Linux: @@ -563,19 +563,19 @@ Comes after `` element. There can only be one ` ``` -Used for setting environment variables which may be needed by some servers such as Rust. +Used for setting environment variables which may be needed by some servers such as Rust. Example: ``` -export LD_LIBRARY_PATH="{OGP_HOME_DIR}/RustDedicated_Data/Plugins/x86_64" +export LD_LIBRARY_PATH="{GSP_HOME_DIR}/RustDedicated_Data/Plugins/x86_64" ``` Special entries: -`{OGP_HOME_DIR}` will be replaced by the home directory for the game server. +`{GSP_HOME_DIR}` will be replaced by the home directory for the game server. @@ -603,7 +603,7 @@ The above example adds chattr +i to the bin/AvorionServer executable. This prev Special entries: -`{OGP_HOME_DIR}` will be replaced by the home directory for the game server. However, if you're using this variable, you should just use a local path. +`{GSP_HOME_DIR}` will be replaced by the home directory for the game server. However, if you're using this variable, you should just use a local path. diff --git a/Panel/game_titles.txt b/Panel/game_titles.txt index 22b3b852..a55fd813 100644 --- a/Panel/game_titles.txt +++ b/Panel/game_titles.txt @@ -1,6 +1,6 @@ # Game Titles Reference File # This file contains the complete list of games to generate comprehensive server admin guides for -# Format: Game Title | Engine | AppID | Workshop Support | LinuxGSM Support | OGP Module Support +# Format: Game Title | Engine | AppID | Workshop Support | LinuxGSM Support | GSP Module Support # Existing games from data/games/ (verified) 7 Days to Die | Unity | 294420 | No | Yes | Yes @@ -18,7 +18,7 @@ Terraria | XNA/MonoGame | 105600 | Yes | Yes | Yes Unturned | Unity | 304930 | Yes | Yes | Yes Valheim | Unity | 892970 | Yes | Yes | Yes -# Additional popular games from OGP, LinuxGSM, and top providers +# Additional popular games from GSP, LinuxGSM, and top providers Conan Exiles | Unreal Engine 4 | 440900 | Yes | Yes | Yes Space Engineers | VRAGE 2.0 | 244850 | Yes | Yes | Yes Killing Floor 2 | Unreal Engine 3 | 232090 | Yes | Yes | Yes diff --git a/Panel/ogp_api.php b/Panel/gsp_api.php similarity index 92% rename from Panel/ogp_api.php rename to Panel/gsp_api.php index c0c147c1..32c7e0fb 100644 --- a/Panel/ogp_api.php +++ b/Panel/gsp_api.php @@ -1,62 +1,62 @@ getSettings(); - + if(!is_authorized()) output(array("status" => '401', "message" => 'Unauthorized host'), $function); - + $db->checkApiTable(); $logged_in = false; - + if($function != 'api_token') { if(isset($_POST['token'])) @@ -128,7 +128,7 @@ if(function_exists($function)) output(array("status" => "300", "message" => "No token supplied"), $function); } } - + if($logged_in or $function == 'api_token') { //call the function and output the returned data as json @@ -137,7 +137,7 @@ if(function_exists($function)) output(array("status" => "400", "message" => "BAD REQUEST"), $function); else $function_args = get_function_args("$func_req"); - + if(!$function_args) output(array("status" => "400", "message" => "BAD REQUEST - CANT FIND FUNCTION ARGS"), $function); elseif(!(($func_req == "token/test" and isset($request[1])) OR ($func_req == "token/create" and isset($request[1]) and isset($request[2])))) @@ -175,7 +175,7 @@ function output($result, $function){ } } -function outputJSON($result){ +function outputJSON($result){ // Send JSON output header('Content-Type: application/json'); echo json_encode($result); @@ -223,14 +223,14 @@ function api_token() $message = "Invalid Token"; } } - + if($request[0] == "create") { $user = isset($request[1])?urldecode($request[1]):$_POST['user']; $password = isset($request[2])?urldecode($request[2]):$_POST['password']; - + $userInfo = $db->getUser($user); - + if(isset($userInfo['users_passwd']) && md5($password) == $userInfo['users_passwd']) { $token = bin2hex(openssl_random_pseudo_bytes(32)); @@ -270,35 +270,35 @@ function api_token() function api_server() { global $request, $db, $user_info, $settings; - + if($user_info['users_role'] != "admin") return array("status" => '350', "message" => "This function is restricted to administrator accounts."); - + if($request[0] == "list") { $status = "200"; $message = $db->getRemoteServers(); } - + if($request[0] == "status") { $remote_server_id = $_POST['remote_server_id']; $remote_server = $db->getRemoteServer($remote_server_id); - $remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); + $remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); $status = "200"; $message = $remote->status_chk() == 1?'online':'offline'; } - + if($request[0] == "restart") { $remote_server_id = $_POST['remote_server_id']; $remote_server = $db->getRemoteServer($remote_server_id); - $remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); + $remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); $remote->agent_restart(); $status = "200"; $message = "success"; } - + if($request[0] == "create") { $agent_name = $_POST['agent_name']; @@ -311,20 +311,20 @@ function api_server() $timeout = $_POST['timeout']; $use_nat = $_POST['use_nat']; $display_public_ip = $_POST['display_public_ip']; - + $remote_server_id = $db->addRemoteServer($agent_ip,$agent_name,$agent_user,$agent_port,$ftp_ip,$ftp_port,$encryption_key,$timeout,$use_nat,$display_public_ip); - + $status = "200"; $message = $remote_server_id; } - + if($request[0] == "remove") { $remote_server_id = $_POST['remote_server_id']; $status = "200"; $message = $db->removeRemoteServer($remote_server_id); } - + if($request[0] == "add_ip") { $remote_server_id = $_POST['remote_server_id']; @@ -332,7 +332,7 @@ function api_server() $status = "200"; $message = $db->addRemoteServerIP($remote_server_id, $ip); } - + if($request[0] == "remove_ip") { $remote_server_id = $_POST['remote_server_id']; @@ -348,14 +348,14 @@ function api_server() } $status = "200"; } - + if($request[0] == "list_ips") { $remote_server_id = $_POST['remote_server_id']; $message = $db->getRemoteServerIPs($remote_server_id); $status = "200"; } - + if($request[0] == "edit_ip") { $remote_server_id = $_POST['remote_server_id']; @@ -372,17 +372,17 @@ function api_server() } $status = "200"; } - + return array("status" => $status, "message" => $message); } function api_user_games() { global $request, $db, $user_info, $settings; - + if($user_info['users_role'] != "admin") return array("status" => '350', "message" => "This function is restricted to administrator accounts."); - + if($request[0] == "list_games") { $system = strtolower($_POST['system']); @@ -404,7 +404,7 @@ function api_user_games() { $games[$key]['mods'] = $db->getCfgMods($game['home_cfg_id']); preg_match("/^([a-z0-9_-]+)_(linux|win)(32|64)?$/i",$game['game_key'],$matches); - + if(count((array)$matches) == 4) list($game_key, $game_clean, $os, $arch) = $matches; else @@ -420,13 +420,13 @@ function api_user_games() $status = "200"; $message = $sorted_games[$system][$architecture]; } - + if($request[0] == "list_servers") - { + { $status = "200"; $message = $db->getGameHomes(); } - + if($request[0] == "create") { $remote_server_id = $_POST['remote_server_id']; @@ -441,12 +441,12 @@ function api_user_games() $slots = $_POST['slots']; $affinity = $_POST['affinity']; $nice = $_POST['nice']; - + $homeForUser = $user_info['users_login']; if(array_key_exists('custom_user_login_homepath', (array)$_POST) && !empty($_POST['custom_user_login_homepath'])){ $homeForUser = $_POST['custom_user_login_homepath']; } - + $assignGameServerToUserId = $user_info['user_id']; if(array_key_exists('assign_to_username', (array)$_POST) && !empty($_POST['assign_to_username'])){ $assignToAccountUser = $_POST['assign_to_username']; @@ -455,15 +455,15 @@ function api_user_games() $assignGameServerToUserId = $userInfo['user_id']; } } - + $remote_server = $db->getRemoteServer($remote_server_id); if($remote_server === FALSE) return array("status" => '304', "message" => "Remote Server ID#$remote_server_id does not exists"); - + $game_cfg = $db->getGameCfg($home_cfg_id); if($game_cfg === FALSE) return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . "."); - + $cfg_mods = $db->getCfgMods($home_cfg_id); $mod_key = FALSE; if($cfg_mods === FALSE) @@ -479,24 +479,24 @@ function api_user_games() } } } - + if($mod_key === FALSE) return array("status" => '307', "message" => "The mod_cfg_id #" . $mod_cfg_id . " does not belong to the game configuration for home_cfg_id #" . $home_cfg_id . "."); - - $ip_info = $db->resultQuery( "SELECT ip,ip_id FROM OGP_DB_PREFIXremote_server_ips WHERE ip='".$db->real_escape_string($ip)."' AND remote_server_id=".$db->real_escape_string($remote_server_id)); + + $ip_info = $db->resultQuery( "SELECT ip,ip_id FROM GSP_DB_PREFIXremote_server_ips WHERE ip='".$db->real_escape_string($ip)."' AND remote_server_id=".$db->real_escape_string($remote_server_id)); if($ip_info === FALSE) return array("status" => '308', "message" => "The given IP address does not belongs to the given remote server."); - + $port = (int)(trim($port)); if(!isPortValid($port)) return array("status" => '309', "message" => "The given port is not a valid port."); - - $remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); + + $remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); $host_stat = $remote->status_chk(); if($host_stat !== 1) return array("status" => '310', "message" => "The remote server is offline."); - - // Game path logic + + // Game path logic $skipId = false; if(hasValue($settings["default_game_server_home_path_prefix"])) { @@ -508,51 +508,51 @@ function api_user_games() } $game_path = str_replace("{GAMEKEY}", strtolower(substr($game_cfg['game_key'], 0, stripos($game_cfg['game_key'], "_"))), $game_path); // Make sure the path ends with forward slash - if($game_path[strlen($game_path)-1] != "/"){ + if($game_path[strlen($game_path)-1] != "/"){ $game_path .= "/"; } } else - $game_path = "/home/".$remote_server['ogp_user']."/OGP_User_Files/"; // Default - + $game_path = "/home/".$remote_server['gsp_user']."/GSP_User_Files/"; // Default + $game_path = clean_path($game_path); // Clean it - + $home_id = $db->addGameHome($remote_server_id, $assignGameServerToUserId, $home_cfg_id, $game_path, $server_name, $control_password, $ftp_password, $skipId); if($home_id === FALSE) return array("status" => '311', "message" => "Server could not be added to the database."); - + if($db->addGameIpPort($home_id, $ip_info[0]['ip_id'], $port) === FALSE) { $db->deleteGameHome($home_id); return array("status" => '312', "message" => "The given IP:Port is already in use."); } - + if($db->addModToGameHome($home_id, $mod_cfg_id) === FALSE ) { $db->deleteGameHome($home_id); return array("status" => '313', "message" => "Failed to assing mod."); } - + if($db->updateGameModParams($slots, '', $affinity, $nice, $home_id, $mod_cfg_id) === FALSE) { $db->deleteGameHome($home_id); return array("status" => '314', "message" => "Maxplayers, affinity or nice could not be configured."); } - - // Create new home directory if it doesn't already exist + + // Create new home directory if it doesn't already exist $game_path = $game_path . (!$skipId ? $home_id : ""); $remote->exec("mkdir -p " . $game_path); - + if($enable_ftp == "1") { $remote->ftp_mgr("useradd", $home_id, $ftp_password, $game_path); $db->changeFtpStatus('enabled',$home_id); } - + $status = "200"; $message = $home_id; } - + if($request[0] == "clone") { $home_id = $_POST['origin_home_id']; @@ -565,16 +565,16 @@ function api_user_games() $slots = $_POST['slots']; $affinity = $_POST['affinity']; $nice = $_POST['nice']; - + $homeForUser = $user_info['users_login']; if(array_key_exists('custom_user_login_homepath', (array)$_POST) && !empty($_POST['custom_user_login_homepath'])){ $homeForUser = $_POST['custom_user_login_homepath']; } - + $game_home = $db->getGameHome($home_id); if($game_home === FALSE) return array("status" => '315', "message" => "There is no game home with home_id #" . $home_id . "."); - + $assignGameServerToUserId = $game_home['user_id_main']; if(array_key_exists('assign_to_username', (array)$_POST) && !empty($_POST['assign_to_username'])){ $assignToAccountUser = $_POST['assign_to_username']; @@ -583,20 +583,20 @@ function api_user_games() $assignGameServerToUserId = $userInfo['user_id']; } } - - $remote = new OGPRemoteLibrary($game_home['agent_ip'],$game_home['agent_port'],$game_home['encryption_key'],$game_home['timeout']); + + $remote = new GSPRemoteLibrary($game_home['agent_ip'],$game_home['agent_port'],$game_home['encryption_key'],$game_home['timeout']); $host_stat = $remote->status_chk(); if($host_stat !== 1) return array("status" => '310', "message" => "The remote server is offline."); - - $ip_info = $db->resultQuery("SELECT ip,ip_id FROM OGP_DB_PREFIXremote_server_ips WHERE ip='".$db->real_escape_string($ip)."' AND remote_server_id=".$db->real_escape_string($game_home['remote_server_id'])); + + $ip_info = $db->resultQuery("SELECT ip,ip_id FROM GSP_DB_PREFIXremote_server_ips WHERE ip='".$db->real_escape_string($ip)."' AND remote_server_id=".$db->real_escape_string($game_home['remote_server_id'])); if($ip_info === FALSE) return array("status" => '308', "message" => "The given IP address does not belongs to the given remote server."); - + $port = (int)(trim($port)); if(!isPortValid($port)) return array("status" => '309', "message" => "The given port is not a valid port."); - + // Game path logic $skipId = false; if(hasValue($settings["default_game_server_home_path_prefix"])) @@ -609,52 +609,52 @@ function api_user_games() } $game_path = str_replace("{GAMEKEY}", strtolower(substr($game_home['game_key'], 0, stripos($game_home['game_key'], "_"))), $game_path); // Make sure the path ends with forward slash - if($game_path[strlen($game_path)-1] != "/"){ + if($game_path[strlen($game_path)-1] != "/"){ $game_path .= "/"; } } else - $game_path = "/home/".$game_home['ogp_user']."/OGP_User_Files/"; // Default - + $game_path = "/home/".$game_home['gsp_user']."/GSP_User_Files/"; // Default + $game_path = clean_path($game_path); // Clean it - + $clone_home_id = $db->addGameHome($game_home['remote_server_id'], $assignGameServerToUserId, $game_home['home_cfg_id'], $game_path, $server_name, $control_password, $ftp_password, $skipId); - + if ($clone_home_id === FALSE) return array("status" => '311', "message" => "Server could not be added to the database."); - + if($db->addGameIpPort($clone_home_id, $ip_info[0]['ip_id'], $port) === FALSE) { $db->deleteGameHome($clone_home_id); return array("status" => '312', "message" => "The given IP:Port is already in use."); } - + foreach ((array)$game_home['mods'] as $mod_info) if($db->addModToGameHome($clone_home_id, $mod_info['mod_cfg_id']) !== FALSE) $db->updateGameModParams($slots, $mod_info['extra_params'], $affinity, $nice, $clone_home_id, $mod_info['mod_cfg_id']); - - // Create new home directory if it doesn't already exist + + // Create new home directory if it doesn't already exist $game_path = $game_path . (!$skipId ? $clone_home_id : ""); $remote->exec("mkdir -p " . $game_path); - + if($enable_ftp == "1") { $remote->ftp_mgr("useradd", $clone_home_id, $ftp_password, $game_path); $db->changeFtpStatus('enabled', $clone_home_id); } - - $user_group = get_user_uid_gid_from_passwd(explode("\n", $remote->sudo_exec('cat /etc/passwd')), $game_home['ogp_user']); - + + $user_group = get_user_uid_gid_from_passwd(explode("\n", $remote->sudo_exec('cat /etc/passwd')), $game_home['gsp_user']); + $status = "200"; $message = array("clone_home_id" => $clone_home_id, "cloning_status" => $remote->clone_home($game_home['home_path'], $game_path, $user_group)); } - + if($request[0] == "set_expiration") { $home_id = $_POST['home_id']; $date = date('d/m/Y H:i:s', is_numeric($_POST['timestamp']) ? (int)$_POST['timestamp'] : strtotime($_POST['timestamp'])); - + if($db->updateExpirationDate($home_id, $date, 'server') === TRUE) { $status = "200"; @@ -666,23 +666,23 @@ function api_user_games() $message = "Expiration date could not be changed"; } } - + return array("status" => $status, "message" => $message); } function api_user_admin() { global $request, $db, $user_info, $settings; - + if($user_info['users_role'] != "admin") return array("status" => '350', "message" => "This function is restricted to administrator accounts."); - + if($request[0] == "list") { $status = "200"; $message = $db->getUserList(); } - + if($request[0] == "get") { $email = $_POST['email']; @@ -697,8 +697,8 @@ function api_user_admin() $status = "200"; $message = $account; } - } - + } + if($request[0] == "create") { $name = $_POST['name']; @@ -715,7 +715,7 @@ function api_user_admin() $message = "Account created"; } } - + if($request[0] == "remove") { $email = $_POST['email']; @@ -732,7 +732,7 @@ function api_user_admin() $message = "Account removed successfully"; } } - + if($request[0] == "set_expiration") { $email = $_POST['email']; @@ -745,7 +745,7 @@ function api_user_admin() else { $date = (strtoupper($_POST['timestamp']) == 'X' or $_POST['timestamp'] == '') ? 'X': $date; - + if($date != 'X' and !isValidTimeStamp($_POST['timestamp'])) { $status = "321"; @@ -755,7 +755,7 @@ function api_user_admin() { if($date != 'X') $date = $_POST['timestamp']; - + $account['user_expires'] = $date; if ($db->editUser($account, $account['user_id']) == FALSE) { @@ -770,7 +770,7 @@ function api_user_admin() } } } - + if($request[0] == "list_assigned") { $email = $_POST['email']; @@ -795,21 +795,21 @@ function api_user_admin() $message = $game_homes; } } - } - + } + if($request[0] == "assign") { $email = $_POST['email']; $home_id = $_POST['home_id']; $access_rights = strtolower($_POST['access_rights']); - + $game_home = $db->getGameHome($home_id); if($game_home === FALSE) return array("status" => '315', "message" => "There is no game home with home_id #" . $home_id . "."); - + if(!preg_match("/^u?f?p?e?t?c?$/", $access_rights)) return array("status" => "324", "message" => "Ivalid string for access rights"); - + $account = $db->getUserByEmail($email); if($account === FALSE) { @@ -819,7 +819,7 @@ function api_user_admin() else { $date = (strtoupper($_POST['timestamp']) == 'X' or $_POST['timestamp'] == '') ? 'X': $date; - + if($date != 'X' and !isValidTimeStamp($_POST['timestamp'])) { $status = "321"; @@ -829,7 +829,7 @@ function api_user_admin() { if($date != 'X') $date = date('d/m/Y H:i:s', is_numeric($_POST['timestamp']) ? (int)$_POST['timestamp'] : strtotime($_POST['timestamp'])); - + if ( $db->assignHomeTo('user', $account['user_id'], $home_id, $access_rights) === TRUE ) { $db->updateExpirationDate($game_home['home_id'], $date, 'user', $account['user_id']); @@ -844,16 +844,16 @@ function api_user_admin() } } } - + if($request[0] == "remove_assign") { $email = $_POST['email']; $home_id = $_POST['home_id']; - + $game_home = $db->getGameHome($home_id); if($game_home === FALSE) return array("status" => '315', "message" => "There is no game home with home_id #" . $home_id . "."); - + $account = $db->getUserByEmail($email); if($account === FALSE) { @@ -874,16 +874,16 @@ function api_user_admin() } } } - + return array("status" => $status, "message" => $message); } function api_gamemanager_admin() { global $request, $db, $user_info, $settings; - + $isAdmin = $db->isAdmin($user_info['user_id']); - + if($request[0] == "reorder") { if($isAdmin){ @@ -906,29 +906,29 @@ function api_gamemanager_admin() $message = "Only admin users can save the game server display order."; } } - + return array("status" => $status, "message" => $message); } function api_gamemanager() { global $request, $db, $user_info, $settings; - + $ip = trim($_POST['ip']); $port = (int) trim($_POST['port']); $mod_key = isset($_POST['mod_key'])?trim($_POST['mod_key']):''; - + if(!isPortValid($port)) return array("status" => '309', "message" => "The given port is not a valid port."); if(!preg_match("/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/",$ip)) return array("status" => '327', "message" => "The given IP ($ip) is not a valid IP address."); - + $home_info = $db->getGameHomeByIP($ip, $port); if($home_info === FALSE) return array("status" => '328', "message" => "There is no game server with the given address ($ip:$port)."); - + $mod_id = key($home_info['mods']); - + if($mod_key != '') { foreach ((array)$home_info['mods'] as $home_mod) @@ -940,9 +940,9 @@ function api_gamemanager() } } } - + $isAdmin = $db->isAdmin($user_info['user_id']); - + if($isAdmin) { $access_rights = 'ufpetc'; @@ -954,26 +954,26 @@ function api_gamemanager() return array("status" => '329', "message" => "The given address ($ip:$port) does not belong to your account."); $access_rights = $game_home['access_rights']; } - + $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']); if($server_xml === FALSE) return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . "."); - - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $host_stat = $remote->status_chk(); if($host_stat !== 1) return array("status" => '310', "message" => "The remote server is offline."); - + $os = $remote->what_os(); - + if($request[0] == "start") { $start_cmd = get_start_cmd($user_info,$remote,$server_xml,$home_info,$mod_id,$ip,$port,$db); - + if(isset($server_xml->lgsl_query_name)) require_once('protocol/lgsl/lgsl_protocol.php'); - + // Do text replacements in cfg file if($server_xml->replace_texts) { @@ -984,38 +984,38 @@ function api_gamemanager() $server_home = $home_info; require_once(MODULES."gamemanager/cfg_text_replace.php"); } - + // Run pre-start commands if(isset($server_xml->pre_start) && !empty($server_xml->pre_start)){ $preStart = trim($server_xml->pre_start); }else{ $preStart = ""; } - + // Environment variables if(isset($server_xml->environment_variables) && !empty($server_xml->environment_variables)){ $envVars = trim($server_xml->environment_variables); }else{ $envVars = ""; } - + // Additional files to lock if(isset($server_xml->lock_files) && !empty($server_xml->lock_files)){ $lockFiles = trim($server_xml->lock_files); }else{ $lockFiles = ""; } - + if(!empty($lockFiles)){ // Linux only call if(preg_match("/Linux/", $os)){ $lockedFilesStatus = $remote->lock_additional_home_files($home_info['home_path'], $lockFiles, "lock"); } } - + $start_retval = $remote->universal_start($home_info['home_id'], $home_info['home_path'], - $server_xml->server_exec_name, + $server_xml->server_exec_name, $server_xml->exe_location, $start_cmd, $port, $ip, $home_info['mods'][$mod_id]['cpu_affinity'], @@ -1025,7 +1025,7 @@ function api_gamemanager() $server_xml->game_key, (isset( $server_xml->console_log ) ? $server_xml->console_log : "") ); - + if( $start_retval == AGENT_ERROR_NOT_EXECUTABLE) return array("status" => '330', "message" => "The server executable does not have execution permission."); elseif($start_retval <= 0) @@ -1052,7 +1052,7 @@ function api_gamemanager() if(isset($query_port) and $query_port != "" and $query_port != $port) set_firewall($remote, $firewall_settings, 'allow', $query_port, $ip); } - + $db->delServerStatusCache($home_info['ip_id'],$port); $status = "200"; $message = "The server has been started."; @@ -1064,7 +1064,7 @@ function api_gamemanager() $remote_retval = $remote->remote_stop_server($home_info['home_id'], $ip, $port, $server_xml->control_protocol, $home_info['control_password'],$server_xml->control_protocol_type, $home_info['home_path']); - + if($remote_retval === -1) return array("status" => '332', "message" => "The server could not be stopped."); elseif($remote_retval === -2) @@ -1122,35 +1122,35 @@ function api_gamemanager() require_once('protocol/lgsl/lgsl_protocol.php'); require_once(MODULES."gamemanager/cfg_text_replace.php"); } - + // Run pre-start commands if(isset($server_xml->pre_start) && !empty($server_xml->pre_start)){ $preStart = trim($server_xml->pre_start); }else{ $preStart = ""; } - + // Environment variables if(isset($server_xml->environment_variables) && !empty($server_xml->environment_variables)){ $envVars = trim($server_xml->environment_variables); }else{ $envVars = ""; } - + // Additional files to lock if(isset($server_xml->lock_files) && !empty($server_xml->lock_files)){ $lockFiles = trim($server_xml->lock_files); }else{ $lockFiles = ""; } - + if(!empty($lockFiles)){ // Linux only call if(preg_match("/Linux/", $os)){ $lockedFilesStatus = $remote->lock_additional_home_files($home_info['home_path'], $lockFiles, "lock"); } } - + $remote_retval = $remote->remote_restart_server($home_info['home_id'],$ip,$port,$server_xml->control_protocol, $home_info['control_password'],$server_xml->control_protocol_type,$home_info['home_path'], $server_xml->server_exec_name,$server_xml->exe_location,$start_cmd, @@ -1158,10 +1158,10 @@ function api_gamemanager() $home_info['mods'][$mod_id]['nice'], $preStart, $envVars, - $server_xml->game_key, + $server_xml->game_key, (isset( $server_xml->console_log ) ? $server_xml->console_log : ""), $restart_reason); - + if($remote_retval === -1) return array("status" => '333', "message" => "The server could not be restarted."); elseif($remote_retval === -2) @@ -1190,7 +1190,7 @@ function api_gamemanager() $message = $response; } } - + if($request[0] == "update") { if(!strstr($access_rights,'u')) @@ -1218,16 +1218,16 @@ function api_gamemanager() preg_match("/(win|linux)(32|64)?$/", $server_xml->game_key, $matches); $os = strtolower($matches[1]) == 'linux'? 'linux':'windows'; $arch = isset($matches[2])?$matches[2]:'32'; - + $preInstallCMD = ""; if(isset($server_xml->post_install)) $preInstallCMD .= $server_xml->pre_install; - + $postInstallCMD = ""; if(isset($server_xml->post_install)) $postInstallCMD .= $server_xml->post_install; - $postInstallCMD .= "\n{OGP_LOCK_FILE} " . $home_info['home_path'] . "/" . ($server_xml->exe_location ? $server_xml->exe_location . "/" : "") . $server_xml->server_exec_name; - + $postInstallCMD .= "\n{GSP_LOCK_FILE} " . $home_info['home_path'] . "/" . ($server_xml->exe_location ? $server_xml->exe_location . "/" : "") . $server_xml->server_exec_name; + $remote->steam_cmd($home_info['home_id'],$home_info['home_path'],$installer_name,$modname, $betaname,$betapwd,$login,$pass,$settings['steam_guard'], $exec_folder_path,$exec_path,$preInstallCMD,$postInstallCMD,$os,'',$arch); @@ -1240,7 +1240,7 @@ function api_gamemanager() $message = 'This game is not supported by Steam installation.'; } } - + if($_POST['type'] == "master") { $ms_home_id = $db->getMasterServer($home_info['remote_server_id'], $home_info['home_cfg_id']); @@ -1249,16 +1249,16 @@ function api_gamemanager() $exec_folder_path = clean_path($home_info['home_path'] . "/" . $server_xml->exe_location ); $exec_path = clean_path($exec_folder_path . "/" . $server_xml->server_exec_name ); $ms_info = $db->getGameHome($ms_home_id); - + $preInstallCMD = ""; if(isset($server_xml->post_install)) $preInstallCMD .= $server_xml->pre_install; - + $postInstallCMD = ""; if(isset($server_xml->post_install)) $postInstallCMD .= $server_xml->post_install; - $postInstallCMD .= "\n{OGP_LOCK_FILE} " . $home_info['home_path'] . "/" . ($server_xml->exe_location ? $server_xml->exe_location . "/" : "") . $server_xml->server_exec_name; - + $postInstallCMD .= "\n{GSP_LOCK_FILE} " . $home_info['home_path'] . "/" . ($server_xml->exe_location ? $server_xml->exe_location . "/" : "") . $server_xml->server_exec_name; + $remote->masterServerUpdate($home_id,$home_info['home_path'],$ms_home_id,$ms_info['home_path'],$exec_folder_path,$exec_path,$preInstallCMD,$postInstallCMD); $status = "200"; $message = "Installation from master server ($home_info[home_name]) started"; @@ -1270,24 +1270,24 @@ function api_gamemanager() } } } - + return array("status" => $status, "message" => $message); } function api_litefm() { global $request, $db, $user_info, $settings; - + $ip = $_POST['ip']; $port = $_POST['port']; $relative_path = $_POST['relative_path']; - + $home_info = $db->getGameHomeByIP($ip, $port); if($home_info === FALSE) return array("status" => '328', "message" => "There is no game server with the given address ($ip:$port)."); - + $isAdmin = $db->isAdmin($user_info['user_id']); - + if($isAdmin) { $access_rights = 'ufpetc'; @@ -1301,36 +1301,36 @@ function api_litefm() } if(!strstr($access_rights,'f')) return array("status" => '351', "message" => "You don't have access right for file management in server at $ip:$port."); - + $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']); if($server_xml === FALSE) return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . "."); - - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $host_stat = $remote->status_chk(); if($host_stat !== 1) return array("status" => '310', "message" => "The remote server is offline."); - + $relative_path = preg_replace("/(\.\.)(\\\|\/)+/", '/', $relative_path); $path = clean_path($home_info['home_path'].'/'.$relative_path); - + if($request[0] != "save" and $remote->rfile_exists($path) === 0) return array("status" => '338', "message" => "$path does not exists."); - + if($request[0] == "list") { $status = "200"; $message = $remote->remote_dirlistfm($path); } - + if($request[0] == "get") { $remote->remote_readfile($path, $data); $status = "200"; $message = $data; } - + if($request[0] == "save") { $contents = $_POST['contents']; @@ -1345,7 +1345,7 @@ function api_litefm() $message = "Could not write to the file."; } } - + if($request[0] == "remove") { $remote->shell_action('remove_recursive', $path); @@ -1359,9 +1359,9 @@ function api_litefm() $status = '340'; $message = "$path could not be removed."; } - + } - + return array("status" => $status, "message" => $message); } @@ -1372,45 +1372,45 @@ function api_addonsmanager() require_once(MODULES.'addonsmanager/workshop_action.php'); if (file_exists(MODULES.'steam_workshop/includes/functions.php')) require_once(MODULES.'steam_workshop/includes/functions.php'); - + if($db->isModuleInstalled('addonsmanager') === FALSE) return array("status" => '349', "message" => "This function is not available because the module is not installed."); - + if($request[0] == "list") { - $addons_rows = $db->resultQuery("SELECT * FROM OGP_DB_PREFIXaddons"); + $addons_rows = $db->resultQuery("SELECT * FROM GSP_DB_PREFIXaddons"); $status = "200"; $message = $addons_rows; } - + if($request[0] == "install") { $ip = $_POST['ip']; $port = (int)$_POST['port']; $mod_key = isset($_POST['mod_key'])?trim($_POST['mod_key']):''; $addon_id = (int)$_POST['addon_id']; - + $home_info = $db->getGameHomeByIP($ip, $port); if($home_info === FALSE) return array("status" => '328', "message" => "There is no game server with the given address ($ip:$port)."); - + $isAdmin = $db->isAdmin($user_info['user_id']); - + if(!$isAdmin and $db->getUserGameHome($user_info['user_id'], $home_info['home_id']) === FALSE) return array("status" => '329', "message" => "The given address ($ip:$port) does not belong to your account."); - + $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']); if($server_xml === FALSE) return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . "."); - - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $host_stat = $remote->status_chk(); if($host_stat !== 1) return array("status" => '310', "message" => "The remote server is offline."); - + $mod_id = key($home_info['mods']); - + if($mod_key != '') { foreach ((array)$home_info['mods'] as $home_mod) @@ -1424,7 +1424,7 @@ function api_addonsmanager() } else $mod_key = $home_info['mods'][$mod_id]['mod_key']; - + $query_groups = ""; if(!$isAdmin) { @@ -1435,13 +1435,13 @@ function api_addonsmanager() $query_groups .= "group_id=0 OR group_id IS NULL)"; } - $addons_rows = $db->resultQuery("SELECT * FROM OGP_DB_PREFIXaddons WHERE home_cfg_id=".$home_info['home_cfg_id']." AND addon_id=".$addon_id.$query_groups); + $addons_rows = $db->resultQuery("SELECT * FROM GSP_DB_PREFIXaddons WHERE home_cfg_id=".$home_info['home_cfg_id']." AND addon_id=".$addon_id.$query_groups); if($addons_rows === FALSE) return array("status" => '341', "message" => "Invalid addon id #" . $addon_id . "."); - + $addon_info = $addons_rows[0]; - + $install_method = scm_get_install_method_default(isset($addon_info['install_method']) ? $addon_info['install_method'] : 'download_zip'); $validation_payload = scm_collect_install_payload($addon_info); $validation_message = ''; @@ -1449,12 +1449,12 @@ function api_addonsmanager() return array("status" => '422', "message" => $validation_message); $url = $addon_info['url']; $filename = basename($url); - + $post_script = ''; if($addon_info['post_script'] != "") { $addon_info['post_script'] = strip_real_escape_string($addon_info['post_script']); - + if( isset($server_xml->gameq_query_name) ) { $home_info['query_port'] = get_query_port($server_xml, $home_info['port']); @@ -1469,9 +1469,9 @@ function api_addonsmanager() { $query_port = $port + 24; } - + $home_info["incremental"] = $db->incrementalNumByHomeId($home_info['home_id'], $home_info['mods'][$mod_id]['mod_cfg_id'], $home_info['remote_server_id']); - + $post_script = preg_replace( "/\%home_path\%/i", $home_info['home_path'], $addon_info['post_script']); $post_script = preg_replace( "/\%home_name\%/i", $home_info['home_name'], $post_script); $post_script = preg_replace( "/\%control_password\%/i", $home_info['control_password'], $post_script); @@ -1542,7 +1542,7 @@ function api_addonsmanager() $message = "Addon installation failed, file download could not be started.($retval)"; } } - + return array("status" => $status, "message" => $message); } @@ -1587,44 +1587,44 @@ function api_server_content() function api_steam_workshop() { global $request, $db, $user_info, $settings; - + if($db->isModuleInstalled('steam_workshop') === FALSE) return array("status" => '349', "message" => "This function is not available because the module is not installed."); - + define('CONFIGS', "modules/steam_workshop/game_configs/"); - + if($request[0] == "install") { $ip = $_POST['ip']; $port = (int)$_POST['port']; $mod_key = isset($_POST['mod_key'])?trim($_POST['mod_key']):''; $mods_list = $_POST['mods_list']; - + $home_info = $db->getGameHomeByIP($ip, $port); if($home_info === FALSE) return array("status" => '328', "message" => "There is no game server with the given address ($ip:$port)."); - + $isAdmin = $db->isAdmin($user_info['user_id']); - + if(!$isAdmin and $db->getUserGameHome($user_info['user_id'], $home_info['home_id']) === FALSE) return array("status" => '329', "message" => "The given address ($ip:$port) does not belong to your account."); - + $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']); if($server_xml === FALSE) return array("status" => '305', "message" => "No game configuration found for home_cfg_id #" . $home_cfg_id . "."); - - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $host_stat = $remote->status_chk(); if($host_stat !== 1) return array("status" => '310', "message" => "The remote server is offline."); - + require_once(MODULES.'steam_workshop/functions.php'); - + if(preg_match('/^([0-9]+,?)+$/', $mods_list)) - { + { $mod_id = key($home_info['mods']); - + if($mod_key != '') { foreach ((array)$home_info['mods'] as $home_mod) @@ -1636,30 +1636,30 @@ function api_steam_workshop() } } } - + $mod_xml = xml_get_mod($server_xml, $home_info['mods'][$mod_id]['mod_key']); - + if($mod_xml == FALSE) return array("status" => '344', "message" => "mod_key not found from game xml."); - + preg_match('/(linux|win)(32|64)?/i', $home_info['game_key'], $matches); - + if(strtolower($matches[1]) == 'linux') $os = "Linux"; elseif(strtolower($matches[1]) == 'win') $os = "Windows"; - + $xml_file = CONFIGS.$mod_xml->installer_name."_".$os.".xml"; if(!file_exists($xml_file)) return array("status" => '344', "message" => "No Steam workshop xml file could be found for the game installed in the given ip:port."); - + $dom = new DOMDocument(); - + if ( @$dom->load($xml_file) === FALSE ) return array("status" => '345', "message" => "The Steam workshop xml file for this game has bad format."); - + $xml = simplexml_load_file($xml_file); - + $mod_id_array = explode(',', $mods_list); foreach ((array)$mod_id_array as $workshop_mod_id) @@ -1673,7 +1673,7 @@ function api_steam_workshop() break; } } - + if(belongs_to_workshop($workshop_mod_id, $xml->workshop_id)) { if(!$exist) @@ -1691,17 +1691,17 @@ function api_steam_workshop() $moddom = dom_import_simplexml($mod)->ownerDocument; $moddom->formatOutput = true; $mod_string = $moddom->saveXML($moddom->documentElement); - + $dom = dom_import_simplexml($xml)->ownerDocument; $dom->formatOutput = true; - + $mods = $dom->getElementsByTagName('mods')->item(0); - + $f = $dom->createDocumentFragment(); $f->appendXML($mod_string."\n"); $mods->appendChild($f); - - + + file_put_contents($xml_file, $dom->saveXML()); $xml = simplexml_load_file($xml_file); } @@ -1712,7 +1712,7 @@ function api_steam_workshop() return array("status" => '346', "message" => "Mod $workshop_mod_id does not belong to workshop ".$xml->workshop_id."."); } } - + $config = $xml->config; $anonymous_login = $xml->anonymous_login; $download_method = $xml->download_method; @@ -1729,7 +1729,7 @@ function api_steam_workshop() $mod_names_list = get_mod_names_list($mods_list, $xml->mods->mod); $mods_full_path = clean_path($home_info['home_path'].'/'.$xml->mods_path); $workshop_id = $xml->workshop_id; - + $url_list = ""; $filename_list = ""; if($download_method == "steamapi") @@ -1747,9 +1747,9 @@ function api_steam_workshop() } } } - + if($remote->steam_workshop( $home_info['home_id'],$mods_full_path,$workshop_id,$mods_list,$regex,$mods_backreference_index, - $variable,$place_after,$mod_string,$string_separator,$config_file_path,$post_install, + $variable,$place_after,$mod_string,$string_separator,$config_file_path,$post_install, $mod_names_list,$anonymous_login,$user,$pass,$download_method,$url_list,$filename_list ) == 1) { $status = "200"; @@ -1767,29 +1767,29 @@ function api_steam_workshop() $message = "The mods list has bad format ($mods_list), must be a list of mod ids separated by coma with no spaces, or only one mod id."; } } - + return array("status" => $status, "message" => $message); } function api_setting() { global $request, $db, $user_info, $settings; - + if($user_info['users_role'] != "admin"){ outputPlainText("-1"); } - + if($request[0] == "get") { $setting = $_POST['setting_name']; if(array_key_exists($setting, (array)$settings)){ $status = "200"; $message = $settings[$setting]; - + outputPlainText($message); } } - + outputPlainText("-1"); } ?> diff --git a/Panel/home.php b/Panel/home.php index 369fb9a5..2a4ab048 100644 --- a/Panel/home.php +++ b/Panel/home.php @@ -1,10 +1,10 @@ getSettings(); @$GLOBALS['panel_language'] = $settings['panel_language']; -ogpLang(); +gspLang(); // Apply debug level from panel settings (overrides the DEBUG_LEVEL constant) if (defined('DEBUG_MODE') && DEBUG_MODE && function_exists('gsp_apply_debug_level')) { @@ -65,7 +65,7 @@ if (defined('DEBUG_MODE') && DEBUG_MODE && function_exists('gsp_apply_debug_leve } require_once("includes/view.php"); -$view = new OGPView(); +$view = new GSPView(); $view->setCharset(get_lang('lang_charset')); $view->setTimeZone($settings['time_zone']); if(isset($_GET['type']) && $_GET['type'] == 'cleared') @@ -80,14 +80,14 @@ if(isset($_GET['type']) && $_GET['type'] == 'cleared') } else { - ogpHome(); + gspHome(); $view->printView(); } function heading() { global $db,$view,$settings; - + if ( !file_exists(CONFIG_FILE) ) { print_failure(get_lang('failed_to_read_config')); @@ -101,11 +101,11 @@ function heading() echo "

".get_lang('invalid_redirect')."...

"; $view->refresh("index.php", 2); return; - } + } else { $info = $db->getUserById($_SESSION['user_id']); - + // Use parent expiration date for subusers if(!is_null($info['users_parent']) && is_numeric($info['users_parent'])){ $parentInfo = $db->getUserById($info['users_parent']); @@ -113,11 +113,11 @@ function heading() $info['user_expires'] = $parentInfo['user_expires']; } } - + if($info['user_expires'] != "X") { list($days,$strd,$hours,$strh,$minutes,$strm) = explode(" ", read_expire($info['user_expires'])); - + $minutes2expire = $minutes + intval( $hours * 60 ) + intval( $days * 24 * 60 ); if($minutes2expire <= 0) @@ -128,14 +128,14 @@ function heading() return; } } - + if( isset($settings['maintenance_mode']) && $settings['maintenance_mode'] == "1" ) { if ($_SESSION['users_group'] == "user") { echo "

".$settings['maintenance_title']."

"; echo "

".$settings['maintenance_message']."

"; - $view->setTitle("OGP: Maintenance."); + $view->setTitle("GSP: Maintenance."); echo "

".get_lang('logging_out_10')."...

"; $view->refresh("index.php", 10); session_destroy(); @@ -154,7 +154,7 @@ function heading() if(isset($maintenance))echo $maintenance; } -function ogpHome() +function gspHome() { global $db,$view,$settings; ?> @@ -163,12 +163,12 @@ function ogpHome() if(isset($_SESSION['user_id'])) { $isAdmin = $db->isAdmin($_SESSION['user_id']); - + if ( $isAdmin ) $server_homes = $db->getHomesFor('admin', $_SESSION['user_id']); else $server_homes = $db->getHomesFor('user_and_group', $_SESSION['user_id']); - + if(!empty($server_homes)) { $servers_by_game_name = array(); @@ -203,20 +203,20 @@ function ogpHome() $query_name = 'ts3'; else $query_name = $mod; - + //----------+ getting the lgsl image icon $icon_paths = array("images/icons/$mod.png", "images/icons/$query_name.png", "protocol/lgsl/other/icon_unknown.gif"); $icon_path = get_first_existing_file($icon_paths); - + $game_homes_list .= "
  • \n$game_name\n

    - + - + $token, + $params = array('token' => $token, 'ip' => $_POST['ip'], 'name' => $_POST['name'], 'reason' => $_POST['reason']); @@ -78,7 +78,7 @@ function exec_ogp_module() } } } - + if($_GET['show'] == 'list') //View all bans in the tshock database. { if($token){ @@ -100,7 +100,7 @@ function exec_ogp_module() print_failure("No Token Found!"); } } - + if($_GET['show'] == 'read') //View the details of a specific ban. { ?> diff --git a/Panel/modules/tshock/create_token.php b/Panel/modules/tshock/create_token.php index 68225220..98de41e6 100644 --- a/Panel/modules/tshock/create_token.php +++ b/Panel/modules/tshock/create_token.php @@ -1,10 +1,10 @@ $_POST['username'], 'password' => $_POST['password'])); - + If($response['status'] == '200'){ if(saveToken($ip, $port, $response['token'])) { diff --git a/Panel/modules/tshock/module.php b/Panel/modules/tshock/module.php index 73e92e43..f6afc992 100644 --- a/Panel/modules/tshock/module.php +++ b/Panel/modules/tshock/module.php @@ -1,10 +1,10 @@ '', 'name'=>'tshock', 'group'=>'user' $install_queries = array(); $install_queries[0] = array( - "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."tshock;", - "CREATE TABLE ".OGP_DB_PREFIX."tshock ( + "DROP TABLE IF EXISTS ".GSP_DB_PREFIX."tshock;", + "CREATE TABLE ".GSP_DB_PREFIX."tshock ( `token_id` int(11) NOT NULL auto_increment, `ip` varchar(255) NOT NULL, `port` int(11) NOT NULL, diff --git a/Panel/modules/tshock/server.php b/Panel/modules/tshock/server.php index 060f4170..9952d4bf 100644 --- a/Panel/modules/tshock/server.php +++ b/Panel/modules/tshock/server.php @@ -1,10 +1,10 @@ + ?>

    Username:

    - Group:

    + Group:

    Password:

    @@ -82,7 +82,7 @@ function exec_ogp_module() print_failure("No Token Found!"); } } - + if($_GET['show'] == 'destroy') //Destroy a tshock user account { ?> @@ -116,7 +116,7 @@ function exec_ogp_module() print_failure("No Token Found!"); } } - + if($_GET['show'] == 'activelist') //Returns the list of user accounts that are currently in use on the server. { if($token){ @@ -135,7 +135,7 @@ function exec_ogp_module() else print_failure("No Token Found!"); } - + if($_GET['show'] == 'list') //Lists all user accounts in the tshock database. { if($token){ @@ -155,7 +155,7 @@ function exec_ogp_module() else print_failure("No Token Found!"); } - + if($_GET['show'] == 'read') //List detailed information for a user account. { ?> @@ -189,7 +189,7 @@ function exec_ogp_module() print_failure("No Token Found!"); } } - + if($_GET['show'] == 'update') //Update a users information. { ?> diff --git a/Panel/modules/update/blacklist.php b/Panel/modules/update/blacklist.php index 783f4e3a..9cc1d26b 100644 --- a/Panel/modules/update/blacklist.php +++ b/Panel/modules/update/blacklist.php @@ -2,10 +2,10 @@ resultQuery('SELECT file_path FROM `OGP_DB_PREFIXupdate_blacklist`;'); + + $blacklisted_files = $db->resultQuery('SELECT file_path FROM `GSP_DB_PREFIXupdate_blacklist`;'); if($blacklisted_files !== FALSE) { $current_blacklist = array(); foreach ((array)$blacklisted_files as $blacklisted_file) { $current_blacklist[] = $blacklisted_file['file_path']; - } + } } if( isset( $_POST['save_to_blacklist'] ) ) @@ -83,9 +83,9 @@ function exec_ogp_module() foreach ((array)$_POST['blacklist'] as $file) { $file = $db->real_escape_string($file); - $db->query("INSERT INTO `OGP_DB_PREFIXupdate_blacklist` SET file_path='$file';"); + $db->query("INSERT INTO `GSP_DB_PREFIXupdate_blacklist` SET file_path='$file';"); } - + foreach ((array)$_POST['folder_files'] as $file) { if(in_array($file,$current_blacklist)) @@ -93,26 +93,26 @@ function exec_ogp_module() if(!in_array($file,$_POST['blacklist'])) { $file = $db->real_escape_string($file); - $db->query("DELETE FROM `OGP_DB_PREFIXupdate_blacklist` WHERE file_path='$file';"); + $db->query("DELETE FROM `GSP_DB_PREFIXupdate_blacklist` WHERE file_path='$file';"); } } } - - $blacklisted_files = $db->resultQuery('SELECT file_path FROM `OGP_DB_PREFIXupdate_blacklist`;'); + + $blacklisted_files = $db->resultQuery('SELECT file_path FROM `GSP_DB_PREFIXupdate_blacklist`;'); if($blacklisted_files !== FALSE) { $current_blacklist = array(); foreach ((array)$blacklisted_files as $blacklisted_file) { $current_blacklist[] = $blacklisted_file['file_path']; - } + } } } - + $current_blacklist = array_merge($current_blacklist,$blacklist); - + path_check(); - + echo "

    "; echo get_lang('blacklist_files'); echo "

    "; @@ -137,9 +137,9 @@ function exec_ogp_module() "

    ". get_lang_f('currently_viewing',$path)."

    ". ""; - + $dirlist = scandir($path); - + if (!is_array($dirlist)) { if($dirlist === -1) @@ -163,7 +163,7 @@ function exec_ogp_module() $ePath = explode('\\', $path); $filename = end($ePath); } - + $_SESSION['fm_cwd'] = str_replace( "\\", "", dirname( $_SESSION['fm_cwd'] ) ); $view->refresh('?m='.$_GET['m'].'&p=blacklist'.'&path='.$filename,0); } @@ -180,7 +180,7 @@ function exec_ogp_module() print_lang('empty_directory'); } else - { + { echo "
    ". "\n" .show_back(). @@ -192,7 +192,7 @@ function exec_ogp_module() get_lang('filename'). "\n\n". "\n"; - + $directorys = array(); $files = array(); $x = 0; @@ -205,7 +205,7 @@ function exec_ogp_module() continue; $filename = $item; $filepath = clean_path( $path . "/" . $filename ); - + // Directory if(is_dir($filepath)) { @@ -216,10 +216,10 @@ function exec_ogp_module() { $files[$x]['filename'] = $filename; $files[$x]['filepath'] = preg_replace("/^".$preg_basedir_path."/","",$filepath); - } + } $x++; } - + foreach ((array)$directorys as $directory) { echo "\n". @@ -227,7 +227,7 @@ function exec_ogp_module() "". "\n"; } $i = 0; @@ -246,11 +246,11 @@ function exec_ogp_module() "\n"; $i++; } - + echo "
    ". "\"Directory\" ". - "". + "". $directory['filename'] . "
    \n". "\n". "
    \n"; - + } echo create_back_button($_GET['m']); } diff --git a/Panel/modules/update/module.php b/Panel/modules/update/module.php index 1e889729..7f8e95bb 100644 --- a/Panel/modules/update/module.php +++ b/Panel/modules/update/module.php @@ -1,10 +1,10 @@ 1) ) AS A );", - "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 ".GSP_DB_PREFIX."update_blacklist MODIFY file_path VARCHAR(1000);", +"ALTER TABLE ".GSP_DB_PREFIX."update_blacklist ADD UNIQUE (file_path);" ); $install_queries[3] = array( -"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."panel_update_log` ( +"CREATE TABLE IF NOT EXISTS `".GSP_DB_PREFIX."panel_update_log` ( `id` int(11) NOT NULL AUTO_INCREMENT, `channel` varchar(64) NOT NULL, `branch` varchar(128) DEFAULT NULL, @@ -63,7 +63,7 @@ $install_queries[3] = array( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;" ); $install_queries[4] = array( -"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."update_patches` ( +"CREATE TABLE IF NOT EXISTS `".GSP_DB_PREFIX."update_patches` ( `patch_id` varchar(191) NOT NULL, `status` varchar(32) NOT NULL, `details` text DEFAULT NULL, diff --git a/Panel/modules/update/patch_manager.php b/Panel/modules/update/patch_manager.php index 94368333..033de834 100644 --- a/Panel/modules/update/patch_manager.php +++ b/Panel/modules/update/patch_manager.php @@ -1,8 +1,8 @@ resultQuery("SELECT patch_id, status, details, applied_at FROM `OGP_DB_PREFIXupdate_patches`"); +$rows = $db->resultQuery("SELECT patch_id, status, details, applied_at FROM `GSP_DB_PREFIXupdate_patches`"); if (is_array($rows)) { foreach ($rows as $row) { $map[$row['patch_id']] = [ @@ -104,7 +104,7 @@ $dt = $db->real_escape_string($details); $uv = $db->real_escape_string($updater_version); $at = $db->real_escape_string($applied_at); $db->query( -"INSERT INTO `OGP_DB_PREFIXupdate_patches` (patch_id, status, details, updater_version, applied_at) " +"INSERT INTO `GSP_DB_PREFIXupdate_patches` (patch_id, status, details, updater_version, applied_at) " . "VALUES ('{$pid}','{$st}','{$dt}','{$uv}','{$at}') " . "ON DUPLICATE KEY UPDATE status=VALUES(status), details=VALUES(details), updater_version=VALUES(updater_version), applied_at=VALUES(applied_at)" ); diff --git a/Panel/modules/update/post_update.php b/Panel/modules/update/post_update.php index e4ab0b0b..00a58810 100644 --- a/Panel/modules/update/post_update.php +++ b/Panel/modules/update/post_update.php @@ -1,10 +1,10 @@ " . get_lang("dwl_update") . "\n"; @@ -76,9 +76,9 @@ function exec_ogp_module() return; } } - + $temp = get_temp_dir(dirname(__FILE__)); - + if( is_writable( $temp ) ) { // Download file to temporary folder @@ -87,7 +87,7 @@ function exec_ogp_module() $zip_raw_data = file_get_contents($dwl); if(! $zip_raw_data) { - print_failure( get_lang_f( 'dwl_failed', $url ) ); + print_failure( get_lang_f( 'dwl_failed', $url ) ); return; } @@ -100,22 +100,22 @@ function exec_ogp_module() } else { - print_failure( get_lang_f( 'dwl_failed', $url ) ); + print_failure( get_lang_f( 'dwl_failed', $url ) ); return; } - + if( $stat['size'] > 1500 ) { print_success(get_lang("dwl_complete")); } else { - print_failure( get_lang_f( 'dwl_failed', $url ) ); + print_failure( get_lang_f( 'dwl_failed', $url ) ); return; } - + echo "

    ". get_lang("install_update") . "

    \n"; - + // Set default values for file checkings before installing $not_writable = get_lang("can_not_update_non_writable_files") . " :
    "; $filename = ""; @@ -125,31 +125,31 @@ function exec_ogp_module() $filelist = ""; $overwritten_files = ""; $new_files = ""; - + $unwanted_path = REPONAME . "-" . $_GET['version']; - $extract_path = $temp . DIRECTORY_SEPARATOR . "OGP_update"; + $extract_path = $temp . DIRECTORY_SEPARATOR . "GSP_update"; if( !file_exists($extract_path) ) mkdir($extract_path, 0775); - + $blacklist = array ('/install.php', '/modules/gamemanager/rsync_sites_local.list'); - - $blacklisted_files = $db->resultQuery('SELECT file_path FROM `OGP_DB_PREFIXupdate_blacklist`;'); + + $blacklisted_files = $db->resultQuery('SELECT file_path FROM `GSP_DB_PREFIXupdate_blacklist`;'); if($blacklisted_files !== FALSE) { $current_blacklist = array(); foreach ((array)$blacklisted_files as $blacklisted_file) { $current_blacklist[] = $blacklisted_file['file_path']; - } + } $blacklist = array_merge($current_blacklist,$blacklist); } - + include ( 'unzip.php' ); // array|false extractZip( string $zipFile, string $extract_path [, string $remove_path, array $blacklist, array $whitelist] ) $result = extractZip( $temp_dwl, $extract_path, $unwanted_path, '', '' ); if ( is_array( $result['extracted_files'] ) and count((array)$result['extracted_files']) > 0 ) { - // Check file by file if already exists, if it matches, compares both files + // Check file by file if already exists, if it matches, compares both files // looking for changes determining if the file needs to be updated. // Also determines if the file is writable $filelist = array(); @@ -176,7 +176,7 @@ function exec_ogp_module() { $temp = file_get_contents($temp_file); $web = file_get_contents($web_file); - + if( $temp != $web ) { if( !is_writable( $web_file ) ) @@ -207,7 +207,7 @@ function exec_ogp_module() } } else - { + { $filelist[$i] = $file['filename']; $i++; if( !in_array( $filename, $blacklist ) ) @@ -223,13 +223,13 @@ function exec_ogp_module() echo $result; $all_writable = FALSE; } - + // Once checking is done the temp folder is removed if( file_exists( $extract_path ) ) { rmdir_recurse( $extract_path ); } - + if( $all_writable ) { // Extract the files that are set in $filelist, to the folder at $baseDir and removes 'upload' from the beginning of the path. @@ -246,26 +246,26 @@ function exec_ogp_module() // Updated files if ( $overwritten > 0 ) { - print_success(get_lang_f('files_overwritten',$overwritten)); + print_success(get_lang_f('files_overwritten',$overwritten)); echo get_lang_f( "updated_files", $overwritten_files ); } - + if ( $new > 0 ) { print_success(get_lang_f('new_files',$new)); echo get_lang_f( "updated_files", $new_files ); } - + // update version info in db $version = $db->real_escape_string($_GET['version']); - $db->query("UPDATE OGP_DB_PREFIXsettings SET value = '$version' WHERE setting = 'ogp_version'"); - $db->query("UPDATE OGP_DB_PREFIXsettings SET value = '$vtype' WHERE setting = 'version_type'"); + $db->query("UPDATE GSP_DB_PREFIXsettings SET value = '$version' WHERE setting = 'gsp_version'"); + $db->query("UPDATE GSP_DB_PREFIXsettings SET value = '$vtype' WHERE setting = 'version_type'"); // Remove the downloaded package if( file_exists( $temp_dwl ) ) //unlink( $temp_dwl ); - + // Remove files that are not related to the panel if( file_exists( $baseDir . DIRECTORY_SEPARATOR . $unwanted_path ) ) { @@ -273,7 +273,7 @@ function exec_ogp_module() } echo "
    \n

    " . get_lang("updating_modules") ."

    \n"; - + require_once('modules/modulemanager/module_handling.php'); $modules = $db->getInstalledModules(); @@ -286,20 +286,20 @@ function exec_ogp_module() break; } } - + foreach ((array)$modules as $row) { if($row['folder'] == 'modulemanager')//already updated continue; update_module($db, $row['id'], $row['folder']); } - print_success(get_lang("update_complete")); - + print_success(get_lang("update_complete")); + // Inject AJAX to run post update operations again (which will reload functions and helpers in case there are changes there we need now that aren't available once this script finishes running echo ''; - + // Run post update ops if(function_exists("runPostUpdateOperations")){ runPostUpdateOperations(); diff --git a/Panel/modules/user_admin/add_group.php b/Panel/modules/user_admin/add_group.php index 19d66f06..c453044c 100644 --- a/Panel/modules/user_admin/add_group.php +++ b/Panel/modules/user_admin/add_group.php @@ -1,10 +1,10 @@ isAdmin($_SESSION['user_id']) ) { $result = $db->getUserGroupList($_SESSION['user_id']); @@ -40,13 +40,13 @@ function exec_ogp_module() } } } - - if(!$db->isAdmin($_SESSION['user_id']) && !isset($own_group)) + + if(!$db->isAdmin($_SESSION['user_id']) && !isset($own_group)) { echo "

    ".get_lang('not_available')."

    "; return; } - + if( isset($_POST['add_user_to_group']) ) { $group_id = trim($_POST['group_id']); diff --git a/Panel/modules/user_admin/add_user.php b/Panel/modules/user_admin/add_user.php index 2521c528..af63334a 100644 --- a/Panel/modules/user_admin/add_user.php +++ b/Panel/modules/user_admin/add_user.php @@ -1,10 +1,10 @@ refresh("?m=user_admin"); return; } - + // Check _POST['user_role'] is what we expect it to be: either user or admin. // Without this it can be anything else. It's pointless being anything else - but why allow it to be anything else? if(in_array($_POST['user_role'], array('user', 'admin')) === false){ @@ -47,7 +47,7 @@ function exec_ogp_module() $view->refresh("?m=user_admin"); return; } - + if( empty($password) || empty($password2) ) { print_failure(get_lang('you_need_to_enter_both_passwords')); diff --git a/Panel/modules/user_admin/del_from_group.php b/Panel/modules/user_admin/del_from_group.php index 1a39b3a2..781e2095 100644 --- a/Panel/modules/user_admin/del_from_group.php +++ b/Panel/modules/user_admin/del_from_group.php @@ -1,10 +1,10 @@ isAdmin($_SESSION['user_id']) ) { $result = $db->getUserGroupList($_SESSION['user_id']); @@ -40,13 +40,13 @@ function exec_ogp_module() } } } - - if(!$db->isAdmin($_SESSION['user_id']) && !isset($own_group)) + + if(!$db->isAdmin($_SESSION['user_id']) && !isset($own_group)) { echo "

    ".get_lang('not_available')."

    "; return; } - + // Delete user from group. if( isset($_GET['group_id']) && isset($_GET['user_id']) ) { diff --git a/Panel/modules/user_admin/del_group.php b/Panel/modules/user_admin/del_group.php index 5448bae1..cf8b1822 100644 --- a/Panel/modules/user_admin/del_group.php +++ b/Panel/modules/user_admin/del_group.php @@ -1,10 +1,10 @@ isAdmin($_SESSION['user_id']) ) { $result = $db->getUserGroupList($_SESSION['user_id']); @@ -40,13 +40,13 @@ function exec_ogp_module() } } } - - if(!$db->isAdmin($_SESSION['user_id']) && !isset($own_group)) + + if(!$db->isAdmin($_SESSION['user_id']) && !isset($own_group)) { echo "

    ".get_lang('not_available')."

    "; return; } - + $y = isset($_GET['y']) ? $_GET['y'] : ""; $group = $db->getGroupById($group_id); diff --git a/Panel/modules/user_admin/del_user.php b/Panel/modules/user_admin/del_user.php index 8d13707b..b77fd7c3 100644 --- a/Panel/modules/user_admin/del_user.php +++ b/Panel/modules/user_admin/del_user.php @@ -1,10 +1,10 @@ isAdmin($my_user_id); $mySubUsers = $db->getUsersSubUsersIds($_SESSION['user_id']); - + // Check that the user_id parameter corresponds to a valid user. if(($userInfo = $db->getUserById($user_id)) === null) { print_failure(get_lang('valid_user')); return; } - + // Allow user to modify owned subuser account information else if ( ! $isAdmin && $my_user_id !== $user_id && @!in_array($user_id, $mySubUsers)) { @@ -68,7 +68,7 @@ function exec_ogp_module() { return; } } - + echo "

    ".($my_user_id !== $user_id ? get_lang_f('editing_profile', htmlentities($userInfo['users_login'] ?? '', ENT_QUOTES, 'UTF-8')) : get_lang('your_profile'))."

    "; echo "
    "; require_once("includes/form_table_class.php"); @@ -79,8 +79,8 @@ function exec_ogp_module() { print_failure(get_lang('password_mismatch')); } # If we are editing our own profile we need to enter our current password as well - # elseif (isset($_POST['edit_user']) && - # ($my_user_id === $user_id) && + # elseif (isset($_POST['edit_user']) && + # ($my_user_id === $user_id) && # !$db->is_valid_login($my_user_id,$_REQUEST['current_password'])) #{ # print_failure(get_lang('current_password_mismatch')); @@ -101,13 +101,13 @@ function exec_ogp_module() { $theme = sanitizeInputStr($_POST['theme']); $page_limit = sanitizeInputStr($_POST['page_limit']); - // OGP needs to set the new theme and language in the current session, only if I'm modifying my own user profile. + // GSP needs to set the new theme and language in the current session, only if I'm modifying my own user profile. if ( $my_user_id == $user_id ) { $_SESSION['users_theme'] = $theme; $_SESSION['users_lang'] = $newlang; } - + $fields['users_lang'] = $newlang; $fields['users_fname'] = $firstname; $fields['users_lname'] = $lastname; @@ -115,7 +115,7 @@ function exec_ogp_module() { $fields['users_city'] = $city; $fields['users_province'] = $province; $fields['users_country'] = $country; - + if( isset($settings['editable_email']) ) { if( $settings['editable_email'] == "1" OR ( $settings['editable_email'] == "0" and $isAdmin ) ) @@ -143,7 +143,7 @@ function exec_ogp_module() { $fields['users_comment'] = sanitizeInputStr($_POST['comment']); $fields['user_expires'] = $expire_timestamp; $fields['users_login'] = $login; - + // Handle email preference if(isset($_POST['user_receives_emails']) && is_numeric($_POST['user_receives_emails'])){ $fields['user_receives_emails'] = sanitizeInputStr($_POST['user_receives_emails']); @@ -161,7 +161,7 @@ function exec_ogp_module() { $fields['users_theme'] = NULL; else $fields['users_theme'] = $theme; - + if (empty($page_limit) || !is_numeric($page_limit) || $page_limit < 10){ $fields['users_page_limit'] = 25; }else{ @@ -242,12 +242,12 @@ function exec_ogp_module() { $ft->add_field('string','province',$userInfo['users_province'], 64); $ft->add_field('string','country',$userInfo['users_country'], 64); $ft->add_field('string','api_token',$db->getApiToken($userInfo['user_id']), 64, "readonly"); - + // Receives email notifications (for admins only --- really) if ( $isAdmin ) { $ft->add_field('on_off','user_receives_emails',$userInfo['user_receives_emails']); } - + if ( $isAdmin && $userInfo['users_role'] != "subuser" ) { $ft->add_custom_field('user_role', create_drop_box_from_array(array('user', 'admin','banned'),"newrole", $userInfo['users_role'])); diff --git a/Panel/modules/user_admin/module.php b/Panel/modules/user_admin/module.php index 8c2a1032..e88f2c12 100644 --- a/Panel/modules/user_admin/module.php +++ b/Panel/modules/user_admin/module.php @@ -1,10 +1,10 @@ 1 - ) t2 ON ".OGP_DB_PREFIX."users.users_email = t2.users_email AND ".OGP_DB_PREFIX."users.user_id != t2.minID - SET ".OGP_DB_PREFIX."users.users_email = DEFAULT;", - "ALTER TABLE `".OGP_DB_PREFIX."users` ADD UNIQUE `email` (`users_email`);"); -$install_queries[4] = array("UPDATE ".OGP_DB_PREFIX."users SET users_email = DEFAULT WHERE users_email = '';"); -$install_queries[5] = array("ALTER TABLE `".OGP_DB_PREFIX."user_groups` MODIFY group_id int(11) NOT NULL;"); -$install_queries[6] = array("ALTER TABLE `".OGP_DB_PREFIX."users` ADD `users_page_limit` int(11) NULL DEFAULT 25;"); -$install_queries[7] = array("ALTER TABLE `".OGP_DB_PREFIX."users` ADD `user_receives_emails` tinyint(1) NOT NULL DEFAULT 1;"); + ) t2 ON ".GSP_DB_PREFIX."users.users_email = t2.users_email AND ".GSP_DB_PREFIX."users.user_id != t2.minID + SET ".GSP_DB_PREFIX."users.users_email = DEFAULT;", + "ALTER TABLE `".GSP_DB_PREFIX."users` ADD UNIQUE `email` (`users_email`);"); +$install_queries[4] = array("UPDATE ".GSP_DB_PREFIX."users SET users_email = DEFAULT WHERE users_email = '';"); +$install_queries[5] = array("ALTER TABLE `".GSP_DB_PREFIX."user_groups` MODIFY group_id int(11) NOT NULL;"); +$install_queries[6] = array("ALTER TABLE `".GSP_DB_PREFIX."users` ADD `users_page_limit` int(11) NULL DEFAULT 25;"); +$install_queries[7] = array("ALTER TABLE `".GSP_DB_PREFIX."users` ADD `user_receives_emails` tinyint(1) NOT NULL DEFAULT 1;"); ?> diff --git a/Panel/modules/user_admin/show_groups.php b/Panel/modules/user_admin/show_groups.php index 61a2925d..97ae59d5 100644 --- a/Panel/modules/user_admin/show_groups.php +++ b/Panel/modules/user_admin/show_groups.php @@ -1,10 +1,10 @@ 0) ? (int)$_GET['page'] : 1; $limit_user = (isset($_GET['limit']) && (int)$_GET['limit'] > 0) ? (int)$_GET['limit'] : 10; $search_field = (isset($_GET['search']) && !empty($_GET['search'])) ? $_GET['search'] : false; @@ -32,7 +32,7 @@ function exec_ogp_module() { if(hasValue($loggedInUserInfo) && is_array($loggedInUserInfo) && $loggedInUserInfo["users_page_limit"] && !(isset($_GET['limit']) and !empty($_GET['limit']))){ $limit_user = $loggedInUserInfo["users_page_limit"]; } - + ?>

    @@ -50,7 +50,7 @@ function exec_ogp_module() {
    '.get_lang('available_groups').''; - + echo ' -
    @@ -62,12 +62,12 @@ function exec_ogp_module() {
    '; + '; if ($db->isAdmin($_SESSION['user_id'])) $result = $db->getGroupList_limit($page_user,$limit_user,$search_field); else $result = $db->getUserGroupList_limit($_SESSION['user_id'],$page_user,$limit_user,$search_field); - + if ( $result === FALSE ) { echo "

    ".get_lang('no_groups_available')."

    "; @@ -90,8 +90,8 @@ function exec_ogp_module() { echo "".$row['group_name'].""; echo ""; - - + + $subusersEnabled = $db->isModuleInstalled("subusers"); $subEnabled = false; if(!$subusersEnabled){ @@ -147,7 +147,7 @@ function exec_ogp_module() { echo ""; } echo ""; - + if ($db->isAdmin($_SESSION['user_id'])) $count_groups = $db->get_group_count($search_field); else @@ -159,6 +159,6 @@ function exec_ogp_module() { else{ $uri = '?m=user_admin&p=show_groups&limit='.$limit_user.'&page='; } - echo paginationPages($count_groups[0]['total'], $page_user, $limit_user, $uri, 3, 'userGroups'); + echo paginationPages($count_groups[0]['total'], $page_user, $limit_user, $uri, 3, 'userGroups'); } ?> diff --git a/Panel/modules/user_admin/show_users.php b/Panel/modules/user_admin/show_users.php index d34e2a02..16d3cfe9 100644 --- a/Panel/modules/user_admin/show_users.php +++ b/Panel/modules/user_admin/show_users.php @@ -24,10 +24,10 @@ td.actions{ 0) ? (int)$_GET['page'] : 1; $limit_user = (isset($_GET['limit']) && (int)$_GET['limit'] > 0) ? (int)$_GET['limit'] : 10; $search_field = (isset($_GET['search']) && !empty($_GET['search'])) ? $_GET['search'] : false; - + if(hasValue($loggedInUserInfo) && is_array($loggedInUserInfo) && $loggedInUserInfo["users_page_limit"] && !(isset($_GET['limit']) and !empty($_GET['limit']))){ $limit_user = $loggedInUserInfo["users_page_limit"]; } @@ -101,7 +101,7 @@ function exec_ogp_module() { $row['user_expires'] = $parentInfo['user_expires']; } } - + $user_expires = read_expire($row['user_expires']); print ""; }else{ print "" . get_lang('show_subusers') . " ↓"; - } + } print ""; } echo '
    '; $count_users = $db->get_user_count($search_field); - + if(isset($_GET['search']) && !empty($_GET['search'])){ $uri = '?m=user_admin&search='.$_GET['search'].'&limit='.$limit_user.'&page='; } @@ -140,6 +140,6 @@ function exec_ogp_module() { $uri = '?m=user_admin&limit='.$limit_user.'&page='; } echo paginationPages($count_users[0]['total'], $page_user, $limit_user, $uri, 3, 'userManager'); - + } ?> diff --git a/Panel/modules/user_games/add_home.php b/Panel/modules/user_games/add_home.php index bae8f953..55bc9bf9 100644 --- a/Panel/modules/user_games/add_home.php +++ b/Panel/modules/user_games/add_home.php @@ -1,10 +1,10 @@ ".get_lang($selection.'_info').""; } -function exec_ogp_module() +function exec_gsp_module() { global $db, $settings; global $view; @@ -57,11 +57,11 @@ function exec_ogp_module() } echo "

    ".get_lang('note').": ".get_lang('add_mods_note')."

    "; - + $selections = array(); foreach($db->getModulesAccessRights() as $ar) $selections[$ar['description']] = $ar['flag']; - + if ( isset($_REQUEST['add_game_home']) ) { $rserver_id = $_POST['rserver_id']; @@ -69,7 +69,7 @@ function exec_ogp_module() $web_user_id = trim($_POST['web_user_id']); $control_password = genRandomString(8); $access_rights = ""; - + $ftp = FALSE; foreach ((array)$selections as $selection => $flag) { @@ -82,7 +82,7 @@ function exec_ogp_module() } } } - + if ( empty( $web_user_id ) ) { print_failure(get_lang('game_path_empty')); @@ -100,48 +100,48 @@ function exec_ogp_module() } foreach ((array)$remote_servers as $server) { - if($server['remote_server_id'] == $rserver_id) $ogp_user = $server['ogp_user']; + if($server['remote_server_id'] == $rserver_id) $gsp_user = $server['gsp_user']; } foreach ((array)$users as $user) { if($user['user_id'] == $web_user_id) $web_user = $user['users_login']; } $ftppassword = genRandomString(8); - + // Game path logic - $game_path = "/home/".$ogp_user."/OGP_User_Files/"; // Default - + $game_path = "/home/".$gsp_user."/GSP_User_Files/"; // Default + $skipId = false; if(hasValue($default_home_dir)){ // Replace some user supported variables with actual value. - $game_path = $default_home_dir; - $game_path = str_replace("{USERNAME}", $web_user, $game_path); + $game_path = $default_home_dir; + $game_path = str_replace("{USERNAME}", $web_user, $game_path); if(stripos($game_path, "{SKIPID}") !== false){ $skipId = true; } - $game_path = str_replace("{SKIPID}", "", $game_path); + $game_path = str_replace("{SKIPID}", "", $game_path); $game_path = str_replace("{GAMEKEY}", $readable_game_key, $game_path); } - + if($game_path[strlen($game_path)-1] != "/"){ // Make sure the path ends with forward slash $game_path .= "/"; } - + $game_path = clean_path($game_path); // Clean it // End game path logic - + if ( ( $new_home_id = $db->addGameHome($rserver_id,$web_user_id,$home_cfg_id, clean_path($game_path),$server_name,$control_password,$ftppassword,$skipId) )!== FALSE ) - { + { $success = $db->assignHomeTo("user",$web_user_id,$new_home_id,$access_rights); if($success){ $home_info = $db->getGameHomeWithoutMods($new_home_id); require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); - + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + // Create new home directory if it doesn't already exist $remote->exec("mkdir -p " . clean_path($game_path) . (!$skipId ? $new_home_id : "")); - + if($ftp) { $host_stat = $remote->status_chk(); @@ -213,7 +213,7 @@ function exec_ogp_module() $rhost_id = $_POST['rserver_id']; $remote_server = $db->getRemoteServer($rhost_id); require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); + $remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); $host_stat = $remote->status_chk(); if( $host_stat === 1) $os = $remote->what_os(); @@ -231,7 +231,7 @@ function exec_ogp_module() echo "".get_lang('login').": ".get_lang($selection.'_info').""; } -function exec_ogp_module() +function exec_gsp_module() { global $db, $settings; global $view; @@ -56,11 +56,11 @@ function exec_ogp_module() } echo "

    ".get_lang('note').": ".get_lang('add_mods_note')."

    "; - + $selections = array(); foreach($db->getModulesAccessRights() as $ar) $selections[$ar['description']] = $ar['flag']; - + if ( isset($_REQUEST['add_game_home']) ) { $rserver_id = $_POST['rserver_id']; @@ -68,7 +68,7 @@ function exec_ogp_module() $web_user_id = trim($_POST['web_user_id']); $control_password = genRandomString(8); $access_rights = ""; - + $ftp = FALSE; foreach ($selections as $selection => $flag) { @@ -81,7 +81,7 @@ function exec_ogp_module() } } } - + if ( empty( $web_user_id ) ) { print_failure(get_lang('game_path_empty')); @@ -99,48 +99,48 @@ function exec_ogp_module() } foreach ( $remote_servers as $server ) { - if($server['remote_server_id'] == $rserver_id) $ogp_user = $server['ogp_user']; + if($server['remote_server_id'] == $rserver_id) $gsp_user = $server['gsp_user']; } foreach ( $users as $user ) { if($user['user_id'] == $web_user_id) $web_user = $user['users_login']; } $ftppassword = genRandomString(8); - + // Game path logic - $game_path = "/home/".$ogp_user."/OGP_User_Files/"; // Default - + $game_path = "/home/".$gsp_user."/GSP_User_Files/"; // Default + $skipId = false; if(hasValue($default_home_dir)){ // Replace some user supported variables with actual value. - $game_path = $default_home_dir; - $game_path = str_replace("{USERNAME}", $web_user, $game_path); + $game_path = $default_home_dir; + $game_path = str_replace("{USERNAME}", $web_user, $game_path); if(stripos($game_path, "{SKIPID}") !== false){ $skipId = true; } - $game_path = str_replace("{SKIPID}", "", $game_path); + $game_path = str_replace("{SKIPID}", "", $game_path); $game_path = str_replace("{GAMEKEY}", $readable_game_key, $game_path); } - + if($game_path[strlen($game_path)-1] != "/"){ // Make sure the path ends with forward slash $game_path .= "/"; } - + $game_path = clean_path($game_path); // Clean it // End game path logic - + if ( ( $new_home_id = $db->addGameHome($rserver_id,$web_user_id,$home_cfg_id, clean_path($game_path),$server_name,$control_password,$ftppassword,$skipId) )!== FALSE ) - { + { $success = $db->assignHomeTo("user",$web_user_id,$new_home_id,$access_rights); if($success){ $home_info = $db->getGameHomeWithoutMods($new_home_id); require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); - + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + // Create new home directory if it doesn't already exist $remote->exec("mkdir -p " . clean_path($game_path) . (!$skipId ? $new_home_id : "")); - + if($ftp) { $host_stat = $remote->status_chk(); @@ -184,7 +184,7 @@ function exec_ogp_module() $rhost_id = $_POST['rserver_id']; $remote_server = $db->getRemoteServer($rhost_id); require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); + $remote = new GSPRemoteLibrary($remote_server['agent_ip'],$remote_server['agent_port'],$remote_server['encryption_key'],$remote_server['timeout']); $host_stat = $remote->status_chk(); if( $host_stat === 1) $os = $remote->what_os(); diff --git a/Panel/modules/user_games/assign_home.php b/Panel/modules/user_games/assign_home.php index a455c7c7..8992be88 100644 --- a/Panel/modules/user_games/assign_home.php +++ b/Panel/modules/user_games/assign_home.php @@ -2,10 +2,10 @@ ".get_lang($selection.'_info').""; - + if (preg_match("/$flag/",$access_rights)) return $right; } -function exec_ogp_module() +function exec_gsp_module() { global $db; - + $isAdmin = $db->isAdmin($_SESSION['user_id']); - + if(isset($_REQUEST['user_id'])){ if(empty($_REQUEST['user_id']) || $db->getUserById($_REQUEST['user_id']) == null) { @@ -55,13 +55,13 @@ function exec_ogp_module() print_failure(get_lang("invalid_url")); return; } - + if ( isset( $_REQUEST['user_id'] ) && !$isAdmin ) { echo "

    ".get_lang("not_available")."

    "; return; } - + if ( isset( $_REQUEST['group_id'] ) && !$isAdmin ) { $result = $db->getUserGroupList($_SESSION['user_id']); @@ -73,13 +73,13 @@ function exec_ogp_module() } } } - - if( !$isAdmin && !isset($own_group) ) + + if( !$isAdmin && !isset($own_group) ) { echo "

    ".get_lang("not_available")."

    "; return; } - + $selections = array(); $full_access = ''; foreach($db->getModulesAccessRights() as $ar) @@ -87,14 +87,14 @@ function exec_ogp_module() $selections[$ar['description']] = $ar['flag']; $full_access .= $ar['flag']; } - + if(isset($_POST['change_access_rights'])) - { + { if(is_array($_POST['home_ids'])) { if($isAdmin) $access_right_flags = implode('',$_POST['flags']); - + foreach ((array)$_POST['home_ids'] as $i => $home_id) { if(!$isAdmin) @@ -115,7 +115,7 @@ function exec_ogp_module() } return; } - + if ( isset($_REQUEST['user_id']) ) { $assign_id = $_REQUEST['user_id']; @@ -142,7 +142,7 @@ function exec_ogp_module() if (isset($_REQUEST[$selection])) $access_rights .= $flag; } - + $hacker = FALSE; if( !$isAdmin ) { @@ -163,11 +163,11 @@ function exec_ogp_module() print_failure(get_lang_f("failed_to_assign_game_for",$id_type,"(Hacking attempt)")); $hacker = TRUE; } - } + } } } } - + if (!$hacker) { if ( $db->assignHomeTo($id_type,$assign_id,$_REQUEST['home_id'], $access_rights) === TRUE ) @@ -262,7 +262,7 @@ function exec_ogp_module() else { echo "

    ".get_lang("no_more_homes_available_that_can_be_assigned_for_this_$id_type")."

    "; - + if( $isAdmin ) echo get_lang_f("you_can_add_a_new_game_server_from","".get_lang("game_servers")."")."

    "; } @@ -314,7 +314,7 @@ function exec_ogp_module() if ( $id_type === "group" ) echo create_back_button('user_admin','show_groups'); - else + else echo create_back_button('user_admin'); } ?> diff --git a/Panel/modules/user_games/billing_integration.php b/Panel/modules/user_games/billing_integration.php index a2367d75..b0496fbb 100644 --- a/Panel/modules/user_games/billing_integration.php +++ b/Panel/modules/user_games/billing_integration.php @@ -12,7 +12,7 @@ * entries so admins can track every server in one place and cron-shop.php can * manage renewals/suspensions uniformly. * - * Usage (inside exec_ogp_module after $new_home_id is confirmed): + * Usage (inside exec_gsp_module after $new_home_id is confirmed): * require_once 'billing_integration.php'; * admin_register_server_in_billing($db, $user_id, $home_cfg_id, * $rserver_id, $home_name, $max_players, $access_rights, $ftp, $new_home_id); @@ -24,7 +24,7 @@ if (!function_exists('admin_register_server_in_billing')) { * Create billing_invoice + billing_order entries for an admin-provisioned * game server so it participates in the normal billing lifecycle. * - * @param OGPDatabase $db Panel DB object (OGP_DB_PREFIX substitution works) + * @param GSPDatabase $db Panel DB object (GSP_DB_PREFIX substitution works) * @param int $user_id Owner of the server * @param int $home_cfg_id config_homes primary key (game type) * @param int $rserver_id remote_server id (stored in billing as "ip") @@ -55,7 +55,7 @@ if (!function_exists('admin_register_server_in_billing')) { // ------------------------------------------------------------------ // $service_id = 0; $services = $db->resultQuery( - "SELECT service_id FROM OGP_DB_PREFIXbilling_services + "SELECT service_id FROM GSP_DB_PREFIXbilling_services WHERE home_cfg_id = " . intval($home_cfg_id) . " AND enabled = 1 LIMIT 1" @@ -161,7 +161,7 @@ if (!function_exists('admin_register_server_in_billing')) { // 5. Link the invoice back to the new order. // // ------------------------------------------------------------------ // $db->query( - "UPDATE OGP_DB_PREFIXbilling_invoices + "UPDATE GSP_DB_PREFIXbilling_invoices SET order_id = " . intval($order_id) . " WHERE invoice_id = " . intval($invoice_id) ); diff --git a/Panel/modules/user_games/browser.php b/Panel/modules/user_games/browser.php index c53eb153..c805173a 100644 --- a/Panel/modules/user_games/browser.php +++ b/Panel/modules/user_games/browser.php @@ -2,10 +2,10 @@ isAdmin( $_SESSION['user_id'] ); - if($isAdmin) + if($isAdmin) $home_cfg = $db->getGameHome($home_id); else $home_cfg = $db->getUserGameHome($_SESSION['user_id'],$home_id); - + if ($home_cfg === FALSE) { print_failure(get_lang('no_access_to_home')); return; } - + $home_id = $home_cfg['home_id']; litefm_check($home_id); - - $remote = new OGPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']); + + $remote = new GSPRemoteLibrary($home_cfg['agent_ip'], $home_cfg['agent_port'], $home_cfg['encryption_key'], $home_cfg['timeout']); if($isAdmin and isset($_GET['all_fs'])) $path = clean_path("/".@$_SESSION['browser_cwd_'.$home_id]); @@ -88,7 +88,7 @@ function exec_ogp_module() else $path = clean_path($home_cfg['home_path'].@$_SESSION['browser_cwd_'.$home_id]); } - + if( isset( $_GET['create_folder'] ) ) { $folder_name = stripslashes($_GET['folder_name']); @@ -96,7 +96,7 @@ function exec_ogp_module() $remote->shell_action('create_dir', $folder_path); $db->logger( get_lang("create_folder") . ": " . $folder_path ); } - + $dirlist = $remote->remote_dirlistfm($path); $_SESSION['browser_folders_'.$home_id] = array(); if ( is_array($dirlist) ) @@ -111,7 +111,7 @@ function exec_ogp_module() get_lang('folder')."". "".get_lang('owner'). "".get_lang('group')."\n"; - + if(isset($dirlist['directorys']) and is_array($dirlist['directorys'])) { $dirlist['directorys'] = array_orderby($dirlist['directorys'], 'filename', SORT_ASC); diff --git a/Panel/modules/user_games/check_expire.php b/Panel/modules/user_games/check_expire.php index 4e32ab38..04b9152d 100644 --- a/Panel/modules/user_games/check_expire.php +++ b/Panel/modules/user_games/check_expire.php @@ -1,10 +1,10 @@ resultQuery("SELECT home_name, home_id, server_expiration_date FROM OGP_DB_PREFIXserver_homes WHERE server_expiration_date NOT LIKE 'X' AND server_expiration_date < " . $today_midnight . ";"); + $expired_servers = $db->resultQuery("SELECT home_name, home_id, server_expiration_date FROM GSP_DB_PREFIXserver_homes WHERE server_expiration_date NOT LIKE 'X' AND server_expiration_date < " . $today_midnight . ";"); if($expired_servers) { foreach ((array)$expired_servers as $expired_server) @@ -39,7 +39,7 @@ function exec_ogp_module() } } - $expired_users = $db->resultQuery("SELECT user_id, home_id, user_expiration_date FROM OGP_DB_PREFIXuser_homes WHERE user_expiration_date NOT LIKE 'X' AND user_expiration_date < " . $today_midnight . ";"); + $expired_users = $db->resultQuery("SELECT user_id, home_id, user_expiration_date FROM GSP_DB_PREFIXuser_homes WHERE user_expiration_date NOT LIKE 'X' AND user_expiration_date < " . $today_midnight . ";"); if($expired_users) { foreach ((array)$expired_users as $expired_user) @@ -50,9 +50,9 @@ function exec_ogp_module() } $expired_groups = $db->resultQuery("SELECT g.group_id, g.home_id, g.user_group_expiration_date, ug.user_id - FROM OGP_DB_PREFIXuser_group_homes g + FROM GSP_DB_PREFIXuser_group_homes g INNER JOIN - OGP_DB_PREFIXuser_groups ug + GSP_DB_PREFIXuser_groups ug ON ug.group_id=g.group_id WHERE g.user_group_expiration_date NOT LIKE 'X' AND g.user_group_expiration_date < " . $today_midnight . " GROUP BY g.home_id;"); if($expired_groups) diff --git a/Panel/modules/user_games/clone_home.php b/Panel/modules/user_games/clone_home.php index 42b4eb15..12333fc0 100644 --- a/Panel/modules/user_games/clone_home.php +++ b/Panel/modules/user_games/clone_home.php @@ -1,10 +1,10 @@ getUserById($server_row['user_id_main']); $web_user = $web_user["users_login"]; - + // Game path logic - $game_path = "/home/".$server_row['ogp_user']."/OGP_User_Files/"; // Default - + $game_path = "/home/".$server_row['gsp_user']."/GSP_User_Files/"; // Default + $skipId = false; if(hasValue($default_home_dir)){ - $game_path = $default_home_dir; + $game_path = $default_home_dir; $game_path = str_replace("{USERNAME}", $web_user, $game_path); // Replace some user supported variables with actual value. if(stripos($game_path, "{SKIPID}") !== false){ $skipId = true; } - $game_path = str_replace("{SKIPID}", "", $game_path); + $game_path = str_replace("{SKIPID}", "", $game_path); $game_path = str_replace("{GAMEKEY}", $readable_game_key, $game_path); } - + if($game_path[strlen($game_path)-1] != "/"){ // Make sure the path ends with forward slash $game_path .= "/"; } - + $game_path = clean_path($game_path); // Clean it // End game path logic $clone_home_id = $db->addGameHome($server_row['remote_server_id'], $server_row['user_id_main'], $server_row['home_cfg_id'], $game_path, $server_name, '', genRandomString(8), $skipId); - + $server_path = $game_path; - + if(!$skipId) $server_path .= $clone_home_id; - - // Create new home directory if it doesn't already exist + + // Create new home directory if it doesn't already exist $remote->exec("mkdir -p " . clean_path($server_path)); - - + + if ( $clone_home_id === FALSE ) { print_failure(get_lang_f('cloning_of_home_failed',$home_id)); return; } - + if( isset($_REQUEST['clone_mods']) ) { $enabled_mods = $db->getHomeMods($home_id); @@ -139,7 +139,7 @@ function exec_ogp_module() 0%
    '; - + return; } @@ -123,7 +123,7 @@ function exec_ogp_module() { return; } } - + if($y == 'y') { if($agent_online) @@ -138,17 +138,17 @@ function exec_ogp_module() { require_once("modules/gamemanager/home_handling_functions.php"); require_once("modules/config_games/server_config_parser.php"); exec_operation('stop', $home_id, FALSE, $address['ip'], $address['port']); - + break; } } - + if($logAction && is_numeric($home_id)){ logHandling($home_id, $logAction, $remote); } } } - + // Delete cronjobs if(file_exists('modules/cron/shared_cron_functions.php')){ require_once('modules/cron/shared_cron_functions.php'); @@ -156,7 +156,7 @@ function exec_ogp_module() { deleteJobsByHomeServerID($home_id); } } - + if ( $db->deleteGameHome($home_id) === FALSE ) { print_failure(get_lang("failed_to_remove_gamehome_from_database")); diff --git a/Panel/modules/user_games/edit_home.php b/Panel/modules/user_games/edit_home.php index b50b7a2d..0fe0c437 100644 --- a/Panel/modules/user_games/edit_home.php +++ b/Panel/modules/user_games/edit_home.php @@ -1,10 +1,10 @@ isAdmin( $_SESSION['user_id'] ); $home_id = $_GET['home_id']; - + if( $isAdmin ) $game_home['access_rights'] = "ufpetc"; else $game_home = $db->getUserGameHome($_SESSION['user_id'],$home_id); - + if ( !$game_home and !$isAdmin ) return; $submit = isset($_REQUEST['submit']) ? $_REQUEST['submit'] : ""; $home_info = $db->getGameHomeWithoutMods($home_id); - $servers_with_same_path = $db->getGameServersWithSamePath($home_info['remote_server_id'], $home_info['home_path']); + $servers_with_same_path = $db->getGameServersWithSamePath($home_info['remote_server_id'], $home_info['home_path']); $servers_with_same_path = (is_array($servers_with_same_path) ? count((array)$servers_with_same_path) : 0); - + $home_id = $home_info['home_id']; $enabled_mods = $db->getHomeMods($home_id); @@ -51,7 +51,7 @@ function exec_ogp_module() { if( !empty($enabled_mods) ) { - foreach ((array)$enabled_mods as $enabled_rows) + foreach ((array)$enabled_mods as $enabled_rows) { $db->delGameMod($enabled_rows['mod_id']); } @@ -61,20 +61,20 @@ function exec_ogp_module() if($db->updateHomeCfgId($home_id, $new_home_cfg_id)) { $json_message = array('result' => 'success', 'info' => get_lang("successfully_changed_game_server")); - - echo json_encode($json_message); + + echo json_encode($json_message); $db->logger( get_lang("successfully_changed_game_server") ." HOME ID:$home_id - ". get_lang("change_game_type") .":old home_cfg_id:$home_cfg_id, new home_cfg_id:$new_home_cfg_id"); } else echo json_encode(array('result' => 'failure', 'info' => 'Error while updating game type.')); return; } - + $server_xml = read_server_config(SERVER_CONFIG_LOCATION.$home_info['home_cfg_file']); include_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $ftp_installed = $db->isModuleInstalled('ftp'); - + if( isset($_REQUEST['change_name']) ) { //$server_name = strip_tags(strip_real_escape_string($_POST['server_name'])); @@ -100,9 +100,9 @@ function exec_ogp_module() return; } } - + if ( $db->changeHomeControlPassword($home_id, $control_password) === TRUE ) - { + { echo json_encode(array('result' => 'success', 'info' => get_lang("control_password_updated_successfully"))); $db->logger( get_lang("control_password_updated_successfully") ." HOME ID:$home_id - ". get_lang("game_control_password") .":$control_password"); } @@ -132,27 +132,27 @@ function exec_ogp_module() echo json_encode(array('result' => 'failure', 'info' => 'Empty input not permitted.')); return; } - + // Validation - + // Is the same user old and new? if($old_login == $post_ftp_login) { echo json_encode(array('result' => 'success', 'info' => '')); return; } - + if(strlen($post_ftp_login) > 20){ echo json_encode(array('result' => 'failure', 'info' => get_lang("ftp_account_username_too_long"))); return; } - + $host_stat = $remote->status_chk(); $user_exists = FALSE; $old_login_exists = FALSE; $host_online = FALSE; if( $host_stat === 1 ) - { + { $host_online = TRUE; $ftp_accounts_list = $remote->ftp_mgr("list"); $ftp_accounts = explode("\n",$ftp_accounts_list); @@ -163,7 +163,7 @@ function exec_ogp_module() { list($ftp_login, $ftp_path) = explode("\t",$ftp_account); $ftp_login = trim($ftp_login); - + if ($ftp_login == $old_login) $old_login_exists = TRUE; if ($ftp_login == $post_ftp_login) @@ -177,12 +177,12 @@ function exec_ogp_module() $change_login_delete_old = $remote->ftp_mgr("userdel", $old_login); else $change_login_delete_old = 1; - + if ($change_login_delete_old !== 0) { $change_login_add_new = $remote->ftp_mgr("useradd", $post_ftp_login, $home_info['ftp_password'], $home_info['home_path']); } - + if (isset($change_login_add_new) and $change_login_add_new !== 0) { if ( $db->changeFtpLogin($home_id,$post_ftp_login) === TRUE ) @@ -227,28 +227,28 @@ function exec_ogp_module() echo json_encode(array('result' => 'failure', 'info' => 'Empty input not permitted.')); return; } - + // Validation - + // Is the same password old and new? if($home_info['ftp_password'] == $ftp_password) { echo json_encode(array('result' => 'success', 'info' => '')); return; } - + if(strlen($ftp_password) > 20){ echo json_encode(array('result' => 'failure', 'info' => get_lang("ftp_account_password_too_long"))); return; } - + $host_stat = $remote->status_chk(); $current_login = isset($home_info['ftp_login']) ? $home_info['ftp_login'] : $home_id; $login_exists = FALSE; $host_online = FALSE; - + if( $host_stat === 1 ) - { + { $host_online = TRUE; $ftp_accounts_list = $remote->ftp_mgr("list"); $ftp_accounts = explode("\n",$ftp_accounts_list); @@ -266,7 +266,7 @@ function exec_ogp_module() } } } - + if($host_online) { if(!$login_exists) @@ -312,14 +312,14 @@ function exec_ogp_module() $force_mod_id = $_POST['force_mod_id']; $ip_id = $_POST['ip_id']; $port = $_POST['port']; - + if ( $db->forceModAtAddress($ip_id, $port, $force_mod_id) ) { echo "Assigned MOD to this Server"; //json_encode (array('result' => 'success', 'info' => get_lang("successfully_assigned_mod_to_address"))); $db->logger( get_lang("successfully_assigned_mod_to_address") ); echo" "; - + } else echo json_encode(array('result' => 'failure', 'info' => "Failed to assign mod to address.")); @@ -330,14 +330,14 @@ function exec_ogp_module() if( isset( $_REQUEST['create_ftp']) ) { $login = isset($home_info['ftp_login']) ? $home_info['ftp_login'] : $home_id; - + $success = true; if(strlen($login) > 20){ $result = get_lang("ftp_account_username_too_long"); $type = "failure"; $success = false; } - + if($success){ if ($remote->ftp_mgr("useradd", $login, $home_info['ftp_password'], $home_info['home_path']) === 0) { @@ -370,7 +370,7 @@ function exec_ogp_module() { list($ftp_login, $ftp_path) = explode("\t",$ftp_account); $ftp_login = trim($ftp_login); - + if ($ftp_login == $login) { $user_exists = TRUE; @@ -379,7 +379,7 @@ function exec_ogp_module() } } } - + if($host_online and $ftp_accounts_list !== 0) { if( $user_exists ) @@ -428,11 +428,11 @@ function exec_ogp_module() } } } - + if ( $db->changeUserIdMain($home_id,$user_id_main) == TRUE ) { $db->assignHomeTo("user",$user_id_main,$home_id,$old_home['access_rights']); - $query="UPDATE `ogp_billing_orders` SET `user_id`=".$user_id_main." WHERE `home_id` = ".$home_id.";"; + $query="UPDATE `gsp_billing_orders` SET `user_id`=".$user_id_main." WHERE `home_id` = ".$home_id.";"; $db->query($query); echo json_encode(array('result' => 'success', 'info' => get_lang("successfully_changed_game_server"))); $db->logger( get_lang("successfully_changed_game_server") ." HOME ID:$home_id - ". get_lang("change_user_id_main") .":$user_id_main"); @@ -454,18 +454,18 @@ function exec_ogp_module() if ( $db->changeHomePath($home_id,clean_path($home_path)) === TRUE ) { $home_info = $db->getGameHomeWithoutMods($home_id); - $servers_with_same_path = $db->getGameServersWithSamePath($home_info['remote_server_id'], $home_info['home_path']); + $servers_with_same_path = $db->getGameServersWithSamePath($home_info['remote_server_id'], $home_info['home_path']); $servers_with_same_path = (is_array($servers_with_same_path) ? count((array)$servers_with_same_path) : 0); - + $success_json = array('result' => 'success', 'info' => get_lang("successfully_changed_game_server")); - + if($servers_with_same_path > 1){ $success_json["warning_info"] = get_lang('other_servers_exist_with_path_please_change'); } - + // Create new home directory if it doesn't already exist $remote->exec("mkdir -p " . clean_path($home_path)); - + // If FTP is enabled, update the FTP info. if($ftp_installed){ if ($db->IsFtpEnabled($home_id)) @@ -476,7 +476,7 @@ function exec_ogp_module() { $create_new_ftp_account = $remote->ftp_mgr("useradd", $login, $home_info['ftp_password'], $home_path); } - + if (isset($create_new_ftp_account) and $create_new_ftp_account !== 0) { echo json_encode($success_json); @@ -520,7 +520,7 @@ function exec_ogp_module() $db->logger( get_lang("successfully_changed_game_server") ." HOME ID:$home_id - ". get_lang("set_as_master_server") .":$action"); } } - + if( isset($_REQUEST['add_mod']) ) { $mod_cfg_id = $_POST['mod_cfg_id']; @@ -536,7 +536,7 @@ function exec_ogp_module() $db->logger(get_lang_f('successfully_assigned_mod_to_home',$mod_cfg_id)." [HOME ID:$home_id]"); } } - + else if($submit == "delete_mod") { $mod_id = $_GET['mod_id']; @@ -640,7 +640,7 @@ function exec_ogp_module() echo "<< ". get_lang("back_to_game_servers") .""; } echo "

    "; - echo ""; + echo "
    "; if ( $isAdmin ) { // Form to change game type @@ -679,7 +679,7 @@ function exec_ogp_module() echo ""; echo ""; echo ""; - + // Form to edit game path. echo "". ""; - + //Jquery path browser dialog echo "
    "; - + if ( $isAdmin ) { $master_server_home_id = $db->getMasterServer( $home_info['remote_server_id'], $home_info['home_cfg_id'] ); @@ -809,12 +809,12 @@ document.addEventListener('DOMContentLoaded', function() { $expiration_timestamp = is_numeric($server_expiration_ts) ? (int)$server_expiration_ts : strtotime($server_expiration_ts); $expiration_date = $expiration_timestamp !== FALSE ? date("d/m/Y H:i:s", is_numeric($expiration_timestamp) ? (int)$expiration_timestamp : strtotime($expiration_timestamp)) : ''; } - + if( $master_server_home_id != FALSE AND $master_server_home_id == $home_id ) $checked = 'checked ="checked"'; else $checked = ""; - // Form to enable/disable as master server for local update + // Form to enable/disable as master server for local update echo "
    \n". ""; } - + echo "
    " . get_lang("change_user_id_main_info") ."
    ". get_lang("home_path") .":". "
    ". @@ -693,7 +693,7 @@ function exec_ogp_module() } echo "
    ". get_lang("change_home_info") ."
    ". get_lang("master_server_for_clon_update") .":"; echo ""; echo ""; @@ -833,9 +833,9 @@ document.addEventListener('DOMContentLoaded', function() { "
    ". get_lang("server_expiration_date_info") ."
    "; - + if ( $isAdmin ) { $avail_ips = $db->getRemoteServerIPs($home_info['remote_server_id']); @@ -845,19 +845,19 @@ document.addEventListener('DOMContentLoaded', function() { if ( is_array($avail_ips) && !empty($avail_ips) ) { echo "

    ". get_lang("ips_and_ports") ."

    "; - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if( ! $screen_running ) { if( isset($_REQUEST['set_ip']) ) { $ip_id = $db->real_escape_string($_POST['ip']); - $ip_row = $db->resultQuery( "SELECT ip FROM OGP_DB_PREFIXremote_server_ips WHERE ip_id=".$ip_id ); + $ip_row = $db->resultQuery( "SELECT ip FROM GSP_DB_PREFIXremote_server_ips WHERE ip_id=".$ip_id ); $ip = $ip_row['0']['ip']; $port = $_POST['port']; $port = (int)(trim($port)); $home_id = $_POST['home_id']; - if ( !isPortValid($port) ) + if ( !isPortValid($port) ) { print_failure( get_lang("port_range_error") ); } @@ -873,12 +873,12 @@ document.addEventListener('DOMContentLoaded', function() { } } } - + if (isset($_REQUEST["delete_ip"])) { $del_ip = $_GET['ip']; $del_port = $_GET['port']; - + if ( $db->delGameIpPort($home_id,$del_ip,$del_port) ) { print_success( get_lang("successfully_assigned_ip_port") ); diff --git a/Panel/modules/user_games/get_size.php b/Panel/modules/user_games/get_size.php index 0481dd1a..db33e126 100644 --- a/Panel/modules/user_games/get_size.php +++ b/Panel/modules/user_games/get_size.php @@ -6,7 +6,7 @@ function numbersFormatting($bytes){ return sprintf('%1.2f' , $bytes / pow($base,$class)) . ' ' . $si_prefix[$class]; } -function exec_ogp_module() +function exec_gsp_module() { global $db; $isAdmin = $db->isAdmin( $_SESSION['user_id'] ); @@ -20,7 +20,7 @@ function exec_ogp_module() if ( ! $game_home and ! $isAdmin ) return; - $remote = new OGPRemoteLibrary($game_home['agent_ip'], $game_home['agent_port'], $game_home['encryption_key'], $game_home['timeout']); + $remote = new GSPRemoteLibrary($game_home['agent_ip'], $game_home['agent_port'], $game_home['encryption_key'], $game_home['timeout']); $r = $remote->rfile_exists($game_home['home_path']); if($r == 1) { @@ -42,14 +42,14 @@ function exec_ogp_module() $total_size = 0; foreach ((array)$game_homes as $game_home) { - $remote = new OGPRemoteLibrary($game_home['agent_ip'], $game_home['agent_port'], $game_home['encryption_key'], $game_home['timeout']); + $remote = new GSPRemoteLibrary($game_home['agent_ip'], $game_home['agent_port'], $game_home['encryption_key'], $game_home['timeout']); $r = $remote->rfile_exists($game_home['home_path']); if($r == 1) { $home_path = preg_replace("/('+)/", "'\"$1\"'", $game_home['home_path']); $kilobytes = $remote->shell_action('size', $home_path); $total_size += $kilobytes; - } + } } echo numbersFormatting($total_size); } diff --git a/Panel/modules/user_games/home_mods.php b/Panel/modules/user_games/home_mods.php index 2c0a2d81..08ad097c 100644 --- a/Panel/modules/user_games/home_mods.php +++ b/Panel/modules/user_games/home_mods.php @@ -1,10 +1,10 @@ getHomeMods($home_id); $home_info = $db->getGameHomeWithoutMods($home_id); $server_xml = read_server_config(SERVER_CONFIG_LOCATION.$home_info['home_cfg_file']); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'], $home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'], $home_info['timeout']); if( empty($enabled_mods) ) - { + { $cpu_count = $remote->cpu_count(); if($cpu_count === -1) { @@ -47,7 +47,7 @@ function exec_ogp_module() // cpu numbering starts from 0 so lets remove the last cpu. $cpu_count -= 1; } - + $game_mods = $db->getAvailableModsForGameHome($home_id); foreach ((array)$game_mods as $game_mod) { @@ -57,7 +57,7 @@ function exec_ogp_module() break; } } - + if( isset($mod_cfg_id) ) { if ( $db->addModToGameHome($home_id,$mod_cfg_id) === FALSE ) @@ -90,11 +90,11 @@ function exec_ogp_module() echo ""; } } - + if( !empty($enabled_mods) ) { $cpu_count = $remote->cpu_count(); - + if($cpu_count === -1) { print_failure( get_lang("warning_agent_offline_defaulting_CPU_count_to_1") ); @@ -138,9 +138,9 @@ function exec_ogp_module() "\n"; } - + echo ''; - + $game_mods = $db->getAvailableModsForGameHome($home_id); $mods_available = 0; foreach ((array)$game_mods as $game_mod) @@ -170,13 +170,13 @@ function exec_ogp_module() echo '

    '.get_lang('cpu_affinity').'

    '; echo "

    ". get_lang("cpu_affinity_info") ."

    \n"; echo '
    '; - + $enabledCores = $db->getHomeAffinity($home_id); $cores = array(); - + if ($enabledCores !== 'NA') { - + if (preg_match('/win/', $remote->what_os())) { $coreHex = hexdec($enabledCores); @@ -189,23 +189,23 @@ function exec_ogp_module() { $cores[] = $core; } - + $core++; $coreHex >>= 1; } } else { $cores = explode(',', $enabledCores); } - + } - + $cores = array_filter($cores, 'strlen'); // Don't strip out 0 as a value... default to unchecked - + for($x = 0; $x <= $cpu_count; ++$x) { echo ' '; } - + echo '
    '; } } diff --git a/Panel/modules/user_games/install_cmds.php b/Panel/modules/user_games/install_cmds.php index 004b3ddf..29e49dce 100644 --- a/Panel/modules/user_games/install_cmds.php +++ b/Panel/modules/user_games/install_cmds.php @@ -1,10 +1,10 @@ getGameHome($home_id); - if ( array_key_exists($mod_id, (array)$home_info['mods']) ) + if ( array_key_exists($mod_id, (array)$home_info['mods']) ) { echo "

    ".get_lang('cmds_for')." \"".htmlentities($home_info['home_name'])."\" [Mod:".$home_info['mods'][$mod_id]['mod_name']."]

    "; $server_xml = read_server_config(SERVER_CONFIG_LOCATION.$home_info['home_cfg_file']); @@ -42,12 +42,12 @@ function exec_ogp_module() $precmd = $db->real_escape_string($_POST['edit_preinstall_cmds']); if( isset( $_POST['save_as_default'] ) ) { - $game_mod_query = "UPDATE OGP_DB_PREFIXconfig_mods SET def_precmd='$precmd' WHERE mod_cfg_id='$mod_cfg_id'"; + $game_mod_query = "UPDATE GSP_DB_PREFIXconfig_mods SET def_precmd='$precmd' WHERE mod_cfg_id='$mod_cfg_id'"; $db->query($game_mod_query); } else { - $game_mod_query = "UPDATE OGP_DB_PREFIXgame_mods SET precmd='$precmd' WHERE mod_id='$mod_id'"; + $game_mod_query = "UPDATE GSP_DB_PREFIXgame_mods SET precmd='$precmd' WHERE mod_id='$mod_id'"; $db->query($game_mod_query); } $home_info = $db->getGameHome($home_id); @@ -58,23 +58,23 @@ function exec_ogp_module() $postcmd = $db->real_escape_string($_POST['edit_postinstall_cmds']); if( isset( $_POST['save_as_default'] ) ) { - $game_mod_query = "UPDATE OGP_DB_PREFIXconfig_mods SET def_postcmd='$postcmd' WHERE mod_cfg_id='$mod_cfg_id'"; + $game_mod_query = "UPDATE GSP_DB_PREFIXconfig_mods SET def_postcmd='$postcmd' WHERE mod_cfg_id='$mod_cfg_id'"; $db->query($game_mod_query); } else { - $game_mod_query = "UPDATE OGP_DB_PREFIXgame_mods SET postcmd='$postcmd' WHERE mod_id='$mod_id'"; + $game_mod_query = "UPDATE GSP_DB_PREFIXgame_mods SET postcmd='$postcmd' WHERE mod_id='$mod_id'"; $db->query($game_mod_query); } $home_info = $db->getGameHome($home_id); } - - $precmd = $home_info['mods'][$mod_id]['precmd'] == "" ? - ( $home_info['mods'][$mod_id]['def_precmd'] == "" ? $server_xml->pre_install : + + $precmd = $home_info['mods'][$mod_id]['precmd'] == "" ? + ( $home_info['mods'][$mod_id]['def_precmd'] == "" ? $server_xml->pre_install : $home_info['mods'][$mod_id]['def_precmd'] ) : $home_info['mods'][$mod_id]['precmd']; - + $postcmd = $home_info['mods'][$mod_id]['postcmd'] == "" ? - ( $home_info['mods'][$mod_id]['def_postcmd'] == "" ? $server_xml->post_install : + ( $home_info['mods'][$mod_id]['def_postcmd'] == "" ? $server_xml->post_install : $home_info['mods'][$mod_id]['def_precmd'] ) : $home_info['mods'][$mod_id]['postcmd']; ?>

    - diff --git a/Panel/modules/user_games/migrate_home.php b/Panel/modules/user_games/migrate_home.php index 0900f2b1..4e370ed2 100644 --- a/Panel/modules/user_games/migrate_home.php +++ b/Panel/modules/user_games/migrate_home.php @@ -1,8 +1,8 @@ clone_home($src_path, $dst_path, $owner); if ($rc === 1 || $rc === -1) { diff --git a/Panel/modules/user_games/module.php b/Panel/modules/user_games/module.php index e1fcce88..66eda75a 100644 --- a/Panel/modules/user_games/module.php +++ b/Panel/modules/user_games/module.php @@ -1,10 +1,10 @@ diff --git a/Panel/modules/user_games/monitor_buttons.php b/Panel/modules/user_games/monitor_buttons.php index bb5663f7..59be61c9 100644 --- a/Panel/modules/user_games/monitor_buttons.php +++ b/Panel/modules/user_games/monitor_buttons.php @@ -1,10 +1,10 @@ diff --git a/Panel/modules/user_games/show_homes.php b/Panel/modules/user_games/show_homes.php index 38a87e52..431c0346 100644 --- a/Panel/modules/user_games/show_homes.php +++ b/Panel/modules/user_games/show_homes.php @@ -1,10 +1,10 @@ 0) ? (int)$_GET['page'] : 1; $limit_GameHomes = (isset($_GET['limit']) && (int)$_GET['limit'] > 0) ? (int)$_GET['limit'] : 10; $searchString = (isset($_GET['search']) && !empty($_GET['search'])) ? $_GET['search'] : false; $searchTypes = array('ip_port' => 'IP / Port', 'ownedBy' => 'Server Owner', 'rserver' => 'Remote Server', 'home_name' => 'Server Name'); $searchType = isset($_GET['searchType']) ? $_GET['searchType'] : false; - + if(hasValue($loggedInUserInfo) && is_array($loggedInUserInfo) && $loggedInUserInfo["users_page_limit"] && !(isset($_GET['limit']) and !empty($_GET['limit']))){ $limit_GameHomes = $loggedInUserInfo["users_page_limit"]; } @@ -55,7 +55,7 @@ function exec_ogp_module() '; - + if (empty($game_homes)) { if (!empty($search_field)) { print_failure(get_lang_f('no_results_found', htmlentities($search_field))); @@ -95,20 +95,20 @@ function exec_ogp_module() ".get_lang('migrate')." "; } - + echo "
    ".get_lang('total_size').":
    [".get_lang('get_size')."]
    "; - + echo ""; $count_GameHomes = $db->get_GameHomes_count($searchType, $searchString); - + if (isset($_GET['search']) && !empty($_GET['search'])) { $uri = '?m=user_games&search='.$_GET['search'].'&limit='.$limit_GameHomes.'&page='; } else { $uri = '?m=user_games&limit='.$limit_GameHomes.'&page='; } - + echo paginationPages($count_GameHomes[0]['total'], $page_GameHomes, $limit_GameHomes, $uri, 3, 'userGames'); ?> @@ -120,6 +120,6 @@ function exec_ogp_module() }); }); - diff --git a/Panel/modules/util/addadmin_helper.php b/Panel/modules/util/addadmin_helper.php index 1e10bec5..78cf1765 100644 --- a/Panel/modules/util/addadmin_helper.php +++ b/Panel/modules/util/addadmin_helper.php @@ -1,10 +1,10 @@ getIpPortsForUser($_SESSION['user_id']), $subuserAdminManagement, $supportedGames); - + // If it's a post request and the user is signed in - process it. // Otherwise, remove some sensitive info (such as encryption_key) from $servers - only keeping what the user needs to see and json_encode it for JS to process. if($_SERVER['REQUEST_METHOD'] === 'POST'){ @@ -36,26 +36,26 @@ function exec_ogp_module() $flags = ''; $sourcemodFlags = range('a', 't'); $immunityRange = range(1, 99); - + // Don't use isset here because they're always going to be set if the form is submitted - we only want to process the data if the following isn't empty. if(!empty($_POST['gameserver_id']) && !empty($_POST['remote_server_id']) && !empty($_POST['gameserver_name']) && !empty($_POST['gameserver_ip']) && !empty($_POST['gameserver_port']) && !empty($_POST['addSteamid']) && !empty($_POST['sourcemod_perms'])){ - + foreach ((array)$servers as $server){ // Try to check if hidden form values have been manually edited. If not, process. if($server['remote_server_id'] == $_POST['remote_server_id'] && $server['home_id'] == $_POST['gameserver_id'] - && $server['game_name'] == $_POST['gameserver_name'] && $server['ip'] == $_POST['gameserver_ip'] && $server['port'] == $_POST['gameserver_port']){ + && $server['game_name'] == $_POST['gameserver_name'] && $server['ip'] == $_POST['gameserver_ip'] && $server['port'] == $_POST['gameserver_port']){ $serverInfo = $server; } } - + if(!empty($serverInfo)){ - $remote = new OGPRemoteLibrary($serverInfo['agent_ip'], $serverInfo['agent_port'], $serverInfo['encryption_key'], $serverInfo['timeout']); - + $remote = new GSPRemoteLibrary($serverInfo['agent_ip'], $serverInfo['agent_port'], $serverInfo['encryption_key'], $serverInfo['timeout']); + if($remote->status_chk() === 1){ if(preg_match('/^STEAM_[01]:[01]:\d+$/', $_POST['addSteamid'])){ $immunity = (!empty($_POST['immunity']) && in_array($_POST['immunity'], $immunityRange)) ? $_POST['immunity'] : ''; - + if($_POST['sourcemod_perms'] == 'root'){ $flags = 'z'; }elseif($_POST['sourcemod_perms'] == 'custom'){ @@ -64,27 +64,27 @@ function exec_ogp_module() $flags = implode('', ($x)); } } - + if(!empty($flags)){ $adminFile = $serverInfo['home_path'].'/'.$serverInfo['mod_key'].'/'.$adminFiles['sourcemod']; // Build up what the new line will be. $newLine = "\"{$_POST['addSteamid']}\"\t\"".(!empty($immunity) ? $immunity.':' : '').$flags."\""; - + // Only process if the $adminFile exists; if($remote->rfile_exists($adminFile) === 1){ $remote->remote_readfile($adminFile, $file_content); - + // Decide if it's replacing an existing line or is a new line. if(preg_match('/'.$_POST['addSteamid'].'/i', $file_content)){ $file_content = preg_replace('/.*'.$_POST['addSteamid'].'.*/i', $newLine, $file_content); }else{ $file_content .= $newLine."\r\n"; } - + if($remote->remote_writefile($adminFile, $file_content) === 1){ if(!empty($serverInfo['control_password'])){ $reloadAdmins = $remote->remote_send_rcon_command($serverInfo['home_id'], $serverInfo['ip'], $serverInfo['port'], 'rcon2', $serverInfo['control_password'], '', 'sm_reloadadmins', $return); - + if($reloadAdmins === -1){ echo get_lang('rcon_reload_admins_failed'); }elseif($reloadAdmins === 1){ @@ -139,7 +139,7 @@ function exec_ogp_module() 'game_name' => $servers[$x]['game_name'], ); } - + echo json_encode($return); } } diff --git a/Panel/modules/util/agents.php b/Panel/modules/util/agents.php index d97a1e47..70765e00 100644 --- a/Panel/modules/util/agents.php +++ b/Panel/modules/util/agents.php @@ -1,10 +1,10 @@ getRemoteServers(); $servers = array(); - + if(is_array($remoteServers)){ foreach ((array)$remoteServers as $server){ - $remote = new OGPRemoteLibrary($server['agent_ip'], $server['agent_port'], $server['encryption_key'], 1); + $remote = new GSPRemoteLibrary($server['agent_ip'], $server['agent_port'], $server['encryption_key'], 1); $status = (int)$remote->status_chk(); - + $servers[] = array( 'id' => $server['remote_server_id'], 'name' => $server['remote_server_name'] .' '. (($status) === 0 ? '('.get_lang('offline').')' : '('.get_lang('online').')'), diff --git a/Panel/modules/util/amx_addadmin_helper.php b/Panel/modules/util/amx_addadmin_helper.php index 0c352fd2..cb9225aa 100644 --- a/Panel/modules/util/amx_addadmin_helper.php +++ b/Panel/modules/util/amx_addadmin_helper.php @@ -1,10 +1,10 @@ getIpPortsForUser($_SESSION['user_id']), $subuserAdminManagement, $amx_supportedGames); - + // If it's a post request and the user is signed in - process it. // Otherwise, remove some sensitive info (such as encryption_key) from $servers - only keeping what the user needs to see and json_encode it for JS to process. if($_SERVER['REQUEST_METHOD'] === 'POST'){ $serverInfo = array(); $flags = ''; $amx_modFlags = range('a', 'u'); - + // Don't use isset here because they're always going to be set if the form is submitted - we only want to process the data if the following isn't empty. if(!empty($_POST['amx_gameserver_id']) && !empty($_POST['remote_server_id']) && !empty($_POST['gameserver_name']) && !empty($_POST['gameserver_ip']) && !empty($_POST['gameserver_port']) && !empty($_POST['amx_mod_perms']) && !empty($_POST['amx_login_type']) && (!empty($_POST['amx_Steamid']) || !empty($_POST['amx_Nickname']) && !empty($_POST['amx_Password']))){ - + foreach ((array)$servers as $server){ // Try to check if hidden form values have been manually edited. If not, process. if($server['remote_server_id'] == $_POST['remote_server_id'] && $server['home_id'] == $_POST['amx_gameserver_id'] - && $server['game_name'] == $_POST['gameserver_name'] && $server['ip'] == $_POST['gameserver_ip'] && $server['port'] == $_POST['gameserver_port']){ + && $server['game_name'] == $_POST['gameserver_name'] && $server['ip'] == $_POST['gameserver_ip'] && $server['port'] == $_POST['gameserver_port']){ $serverInfo = $server; break; } } - + if(!empty($serverInfo)){ - $remote = new OGPRemoteLibrary($serverInfo['agent_ip'], $serverInfo['agent_port'], $serverInfo['encryption_key'], $serverInfo['timeout']); - + $remote = new GSPRemoteLibrary($serverInfo['agent_ip'], $serverInfo['agent_port'], $serverInfo['encryption_key'], $serverInfo['timeout']); + if($remote->status_chk() === 1){ if(($_POST['amx_login_type'] == 'amx_login_steamid' && preg_match('/^STEAM_[01]:[01]:\d+$/', $_POST['amx_Steamid'])) || ($_POST['amx_login_type'] == 'amx_login_nick_pass' && preg_match('/^[^\s][A-zÀ-ÿ0-9 !@)(,}\/|\.:?;{#$%&*+=-]{1,28}[^\s]$/', $_POST['amx_Nickname']) && preg_match('/^[^\s][A-zÀ-ÿ0-9 !@)(,}\/|\.:?;{#$%&*+=-]{1,28}[^\s]$/', $_POST['amx_Password']))){ - + if($_POST['amx_mod_perms'] == 'root'){ $flags = 'abcdefghijklmnopqrstu'; }elseif($_POST['amx_mod_perms'] == 'custom'){ @@ -67,7 +67,7 @@ function exec_ogp_module() $flags = implode('', ($x)); } } - + if(!empty($flags)){ $adminFile = $serverInfo['home_path'].'/'.$serverInfo['mod_key'].'/'.$adminFiles['amx_mod']; // Build up what the new line will be. @@ -79,11 +79,11 @@ function exec_ogp_module() { $newLine = "\"{$_POST['amx_Nickname']}\" \"{$_POST['amx_Password']}\" \"${flags}\" \"a\""; } - + // Only process if the $adminFile exists; if($remote->rfile_exists($adminFile) === 1){ $remote->remote_readfile($adminFile, $file_content); - + // Decide if it's replacing an existing line or is a new line. if($_POST['amx_login_type'] == 'amx_login_steamid') { @@ -101,11 +101,11 @@ function exec_ogp_module() $file_content .= $newLine."\r\n"; } } - + if($remote->remote_writefile($adminFile, $file_content) === 1){ if(!empty($serverInfo['control_password'])){ $reloadAdmins = $remote->remote_send_rcon_command($serverInfo['home_id'], $serverInfo['ip'], $serverInfo['port'], 'rcon', $serverInfo['control_password'], '', 'amx_reloadadmins', $return); - + if($reloadAdmins === -1){ echo get_lang('rcon_reload_admins_failed'); }elseif($reloadAdmins === 1){ @@ -156,7 +156,7 @@ function exec_ogp_module() 'game_name' => $servers[$x]['game_name'], ); } - + echo json_encode($return); } } diff --git a/Panel/modules/util/functions.php b/Panel/modules/util/functions.php index 7cdda40a..5a32b175 100644 --- a/Panel/modules/util/functions.php +++ b/Panel/modules/util/functions.php @@ -1,10 +1,10 @@ steamID64; - + if(preg_match('/^765/', $steamId64) === 0){ return false; }else{ @@ -72,17 +72,17 @@ function convert($id){ if(preg_match('/^\[U:1:[0-9]+\]/', $id)){ $id = substr($id, 5, -1); } - + // Check if the input is in legacyId, communityId, or SteamId3 format. // If it's not, assume it's a custom Id and attempt to get the communityId from what the user entered. if(preg_match('/^STEAM_[01]:[01]:\d+$/', $id) === 0 && preg_match('/^[0-9]/', $id) === 0 && preg_match('/^765/', $id) === 0){ if(($steamId = getSteamId($id)) === false){ return json_encode(array()); } - + $id = $steamId; } - + echo json_encode(array( 'communityId' => toCommunityID($id), 'steamId' => toSteamID($id), @@ -97,11 +97,11 @@ function getUserServers($servers, $flags, $supportedGames){ $info = array(); $userInfo = $db->getUserById($_SESSION['user_id']); $userRole = $userInfo['users_role']; - + if(!empty($servers)){ foreach ((array)$servers as $server){ $gamehome = $db->getUserGameHome($_SESSION['user_id'], $server['home_id']); - + if(in_array($gamehome['game_name'], $supportedGames) === true){ if($userRole !== 'admin'){ if(strpbrk($gamehome['access_rights'], $flags) !== false){ @@ -113,7 +113,7 @@ function getUserServers($servers, $flags, $supportedGames){ } } } - + return $info; } ?> \ No newline at end of file diff --git a/Panel/modules/util/module.php b/Panel/modules/util/module.php index e0327edb..146f6e41 100644 --- a/Panel/modules/util/module.php +++ b/Panel/modules/util/module.php @@ -1,10 +1,10 @@ getUserById($_SESSION['user_id']); $userRole = $userInfo['users_role']; - + $command = trim($_POST['command']); $target = trim($_POST['remote_target']); - + // Check if the specified agent exists. If it does, assign it to $servers. Otherwise, return that it's an invalid agent. if(($server = $db->getRemoteServerById($_POST['agent'])) === false){ die(get_lang('agent_invalid')); } - - $remote = new OGPRemoteLibrary($server['agent_ip'], $server['agent_port'], $server['encryption_key'], 60); - + + $remote = new GSPRemoteLibrary($server['agent_ip'], $server['agent_port'], $server['encryption_key'], 60); + if($remote->status_chk() === 0){ echo get_lang('networktools_agent_offline'); }elseif(empty($target)){ @@ -47,7 +47,7 @@ function exec_ogp_module() echo get_lang('command_empty'); }else{ $os = preg_match("/CYGWIN/", $remote->what_os()) ? 'windows' : 'linux'; - + // Loop over $availableCommands from util_config.php // Assign a variable, $allowAccess based on the current user's role and if the config file states the user's role is allowed access to this command. for($x = 0; $x < count((array)$availableCommands); ++$x){ @@ -56,7 +56,7 @@ function exec_ogp_module() $allowAccess = $availableCommands[$x][$userRole]; } } - + if(isset($allowAccess) && $allowAccess === true){ // Check the command is available to us. If it's not, echo command_unavilable $which = $remote->exec('which '.$command); diff --git a/Panel/modules/util/steamid_converter.php b/Panel/modules/util/steamid_converter.php index 5a3e4759..471ffd61 100644 --- a/Panel/modules/util/steamid_converter.php +++ b/Panel/modules/util/steamid_converter.php @@ -1,10 +1,10 @@ '; -function exec_ogp_module() +function exec_gsp_module() { global $db; include 'util_config.php'; - + $userInfo = $db->getUserById($_SESSION['user_id']); $userRole = $userInfo['users_role']; $commands = array(); - + foreach ((array)$availableCommands as $command){ if($userRole == 'admin' && $command['admin'] === true){ $commands[] = ''; } - + if($userRole == 'user' && $command['user'] === true){ $commands[] = ''; } - + if($userRole == 'subuser' && $command['subuser'] === true){ $commands[] = ''; } @@ -53,7 +53,7 @@ function exec_ogp_module()
    • - +
    @@ -61,170 +61,170 @@ function exec_ogp_module()
    - +
    - + - +
    - +
    - +
    - +
    - + - - + + - + - +
    - +
    - +
    - + - +
    - +
    - +
    - +
    - +
    - +
    - + - +
    - +
    - + - +
    - +
    - +
    - + - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -233,7 +233,7 @@ function exec_ogp_module()
    -
    'ping', 'linux' => 'ping -c 4', // By default, ping runs indefinitely on Linux - so set the count to 4; same as Windows default. 'windows' => 'ping', - + // Default: Ping is available to all user roles. 'subuser' => true, 'user' => true, 'admin' => true, ), - + array( 'title' => 'traceroute', 'linux' => 'traceroute', 'windows' => 'tracert', - + // Default: Traceroute is only available to admins. 'subuser' => false, 'user' => false, @@ -61,7 +61,7 @@ $logMaliciousUsage = true; $logAllUsage = false; // Games which Sourcemod supports. -// Needs to be exactly what OGP reports as the game_name. +// Needs to be exactly what GSP reports as the game_name. $supportedGames = array( 'Counter Strike Global Offensive', 'Counter Strike Source', @@ -78,7 +78,7 @@ $supportedGames = array( ); // Games which amx mod supports. -// Needs to be exactly what OGP reports as the game_name. +// Needs to be exactly what GSP reports as the game_name. $amx_supportedGames = array( 'Counter-Strike', 'Counter-Strike Condition Zero', diff --git a/Panel/panel.conf b/Panel/panel.conf index 12ae3b51..7634ba11 100644 --- a/Panel/panel.conf +++ b/Panel/panel.conf @@ -1,17 +1,17 @@ - # Panel domain configuration for Open Game Panel + # Panel domain configuration for GameServer Panel ServerName panel.yourdomain.com ServerAlias panel.* - + # Document root points to the GSP panel installation DocumentRoot /var/www/GSP - + # Directory configuration Options -Indexes +FollowSymLinks AllowOverride All Require all granted - + # PHP configuration php_value upload_max_filesize 100M @@ -20,18 +20,18 @@ php_value max_input_time 300 - + # Error and access logs - ErrorLog ${APACHE_LOG_DIR}/ogp-panel-error.log - CustomLog ${APACHE_LOG_DIR}/ogp-panel-access.log combined - + ErrorLog ${APACHE_LOG_DIR}/gsp-panel-error.log + CustomLog ${APACHE_LOG_DIR}/gsp-panel-access.log combined + # Security headers Header always set X-Content-Type-Options "nosniff" Header always set X-Frame-Options "SAMEORIGIN" Header always set X-XSS-Protection "1; mode=block" - + # Disable directory listing Options -Indexes @@ -42,20 +42,20 @@ # # ServerName panel.yourdomain.com # ServerAlias panel.* -# +# # DocumentRoot /var/www/GSP -# +# # SSLEngine on # SSLCertificateFile /etc/ssl/certs/panel.yourdomain.com.crt # SSLCertificateKeyFile /etc/ssl/private/panel.yourdomain.com.key # SSLCertificateChainFile /etc/ssl/certs/ca-bundle.crt -# +# # # Options -Indexes +FollowSymLinks # AllowOverride All # Require all granted # -# -# ErrorLog ${APACHE_LOG_DIR}/ogp-panel-ssl-error.log -# CustomLog ${APACHE_LOG_DIR}/ogp-panel-ssl-access.log combined +# +# ErrorLog ${APACHE_LOG_DIR}/gsp-panel-ssl-error.log +# CustomLog ${APACHE_LOG_DIR}/gsp-panel-ssl-access.log combined # diff --git a/Panel/panel.sql b/Panel/panel.sql index 6402edce..cdb224da 100644 --- a/Panel/panel.sql +++ b/Panel/panel.sql @@ -106,10 +106,10 @@ CREATE TABLE `gsp_process_samples` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_addons` +-- Table structure for table `gsp_addons` -- -CREATE TABLE `ogp_addons` ( +CREATE TABLE `gsp_addons` ( `addon_id` int(10) UNSIGNED NOT NULL, `name` varchar(80) NOT NULL, `url` varchar(200) NOT NULL, @@ -123,10 +123,10 @@ CREATE TABLE `ogp_addons` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_adminexternallinks` +-- Table structure for table `gsp_adminexternallinks` -- -CREATE TABLE `ogp_adminexternallinks` ( +CREATE TABLE `gsp_adminexternallinks` ( `link_id` int(10) UNSIGNED NOT NULL, `name` varchar(80) NOT NULL, `url` varchar(200) NOT NULL, @@ -136,10 +136,10 @@ CREATE TABLE `ogp_adminexternallinks` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_adminlte_serverstats` +-- Table structure for table `gsp_adminlte_serverstats` -- -CREATE TABLE `ogp_adminlte_serverstats` ( +CREATE TABLE `gsp_adminlte_serverstats` ( `home_id` int(4) NOT NULL, `users_online` int(4) NOT NULL, `current_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP @@ -148,10 +148,10 @@ CREATE TABLE `ogp_adminlte_serverstats` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_adminlte_settings` +-- Table structure for table `gsp_adminlte_settings` -- -CREATE TABLE `ogp_adminlte_settings` ( +CREATE TABLE `gsp_adminlte_settings` ( `id` int(20) NOT NULL, `user` int(4) NOT NULL, `name` varchar(255) NOT NULL, @@ -161,10 +161,10 @@ CREATE TABLE `ogp_adminlte_settings` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_api_tokens` +-- Table structure for table `gsp_api_tokens` -- -CREATE TABLE `ogp_api_tokens` ( +CREATE TABLE `gsp_api_tokens` ( `user_id` int(11) NOT NULL, `token` varchar(64) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -172,10 +172,10 @@ CREATE TABLE `ogp_api_tokens` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_arrange_ports` +-- Table structure for table `gsp_arrange_ports` -- -CREATE TABLE `ogp_arrange_ports` ( +CREATE TABLE `gsp_arrange_ports` ( `range_id` int(11) NOT NULL, `ip_id` int(11) NOT NULL, `home_cfg_id` int(11) NOT NULL, @@ -187,20 +187,20 @@ CREATE TABLE `ogp_arrange_ports` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_backup_restore` +-- Table structure for table `gsp_backup_restore` -- -CREATE TABLE `ogp_backup_restore` ( +CREATE TABLE `gsp_backup_restore` ( `id` int(11) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- -------------------------------------------------------- -- --- Table structure for table `ogp_ban_list` +-- Table structure for table `gsp_ban_list` -- -CREATE TABLE `ogp_ban_list` ( +CREATE TABLE `gsp_ban_list` ( `client_ip` varchar(255) NOT NULL, `logging_attempts` int(11) NOT NULL DEFAULT '0', `banned_until` varchar(16) NOT NULL DEFAULT '0' @@ -209,10 +209,10 @@ CREATE TABLE `ogp_ban_list` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_billing_coupons` +-- Table structure for table `gsp_billing_coupons` -- -CREATE TABLE `ogp_billing_coupons` ( +CREATE TABLE `gsp_billing_coupons` ( `coupon_id` int(11) NOT NULL, `code` varchar(50) NOT NULL, `name` varchar(255) NOT NULL DEFAULT '', @@ -232,10 +232,10 @@ CREATE TABLE `ogp_billing_coupons` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_billing_invoices` +-- Table structure for table `gsp_billing_invoices` -- -CREATE TABLE `ogp_billing_invoices` ( +CREATE TABLE `gsp_billing_invoices` ( `invoice_id` int(11) NOT NULL, `order_id` int(11) NOT NULL DEFAULT '0', `user_id` int(11) NOT NULL, @@ -265,10 +265,10 @@ CREATE TABLE `ogp_billing_invoices` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_billing_orders` +-- Table structure for table `gsp_billing_orders` -- -CREATE TABLE `ogp_billing_orders` ( +CREATE TABLE `gsp_billing_orders` ( `order_id` int(11) NOT NULL, `user_id` int(11) NOT NULL, `service_id` int(11) NOT NULL, @@ -294,10 +294,10 @@ CREATE TABLE `ogp_billing_orders` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_billing_services` +-- Table structure for table `gsp_billing_services` -- -CREATE TABLE `ogp_billing_services` ( +CREATE TABLE `gsp_billing_services` ( `service_id` int(11) NOT NULL, `home_cfg_id` int(11) NOT NULL, `mod_cfg_id` int(11) NOT NULL, @@ -321,10 +321,10 @@ CREATE TABLE `ogp_billing_services` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_circular` +-- Table structure for table `gsp_circular` -- -CREATE TABLE `ogp_circular` ( +CREATE TABLE `gsp_circular` ( `circular_id` int(11) NOT NULL, `subject` text NOT NULL, `message` text NOT NULL, @@ -334,10 +334,10 @@ CREATE TABLE `ogp_circular` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_circular_recipients` +-- Table structure for table `gsp_circular_recipients` -- -CREATE TABLE `ogp_circular_recipients` ( +CREATE TABLE `gsp_circular_recipients` ( `user_id` int(11) NOT NULL, `circular_id` int(11) NOT NULL, `status` tinyint(4) NOT NULL @@ -346,10 +346,10 @@ CREATE TABLE `ogp_circular_recipients` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_config_homes` +-- Table structure for table `gsp_config_homes` -- -CREATE TABLE `ogp_config_homes` ( +CREATE TABLE `gsp_config_homes` ( `home_cfg_id` int(20) NOT NULL, `game_key` varchar(64) NOT NULL, `game_name` varchar(255) NOT NULL, @@ -359,10 +359,10 @@ CREATE TABLE `ogp_config_homes` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_config_mods` +-- Table structure for table `gsp_config_mods` -- -CREATE TABLE `ogp_config_mods` ( +CREATE TABLE `gsp_config_mods` ( `mod_cfg_id` int(50) NOT NULL, `home_cfg_id` varchar(50) NOT NULL, `mod_key` varchar(100) NOT NULL COMMENT 'mod short name - used by the game server for startup commands - ex cstrike', @@ -374,10 +374,10 @@ CREATE TABLE `ogp_config_mods` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_game_mods` +-- Table structure for table `gsp_game_mods` -- -CREATE TABLE `ogp_game_mods` ( +CREATE TABLE `gsp_game_mods` ( `mod_id` int(50) NOT NULL, `home_id` int(255) NOT NULL, `mod_cfg_id` int(11) NOT NULL, @@ -392,10 +392,10 @@ CREATE TABLE `ogp_game_mods` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_home_ip_ports` +-- Table structure for table `gsp_home_ip_ports` -- -CREATE TABLE `ogp_home_ip_ports` ( +CREATE TABLE `gsp_home_ip_ports` ( `ip_id` int(11) NOT NULL, `port` int(11) NOT NULL, `home_id` int(11) NOT NULL, @@ -405,10 +405,10 @@ CREATE TABLE `ogp_home_ip_ports` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_lgsl` +-- Table structure for table `gsp_lgsl` -- -CREATE TABLE `ogp_lgsl` ( +CREATE TABLE `gsp_lgsl` ( `id` int(11) NOT NULL, `type` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', `ip` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', @@ -426,10 +426,10 @@ CREATE TABLE `ogp_lgsl` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_logger` +-- Table structure for table `gsp_logger` -- -CREATE TABLE `ogp_logger` ( +CREATE TABLE `gsp_logger` ( `log_id` int(10) UNSIGNED NOT NULL, `date` varchar(20) NOT NULL, `user_id` int(11) NOT NULL, @@ -440,10 +440,10 @@ CREATE TABLE `ogp_logger` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_master_server_homes` +-- Table structure for table `gsp_master_server_homes` -- -CREATE TABLE `ogp_master_server_homes` ( +CREATE TABLE `gsp_master_server_homes` ( `home_id` int(11) NOT NULL, `home_cfg_id` int(11) NOT NULL, `remote_server_id` int(11) NOT NULL @@ -452,10 +452,10 @@ CREATE TABLE `ogp_master_server_homes` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_modules` +-- Table structure for table `gsp_modules` -- -CREATE TABLE `ogp_modules` ( +CREATE TABLE `gsp_modules` ( `id` smallint(5) UNSIGNED NOT NULL, `title` varchar(100) NOT NULL DEFAULT '', `folder` varchar(100) NOT NULL DEFAULT '', @@ -466,10 +466,10 @@ CREATE TABLE `ogp_modules` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_module_access_rights` +-- Table structure for table `gsp_module_access_rights` -- -CREATE TABLE `ogp_module_access_rights` ( +CREATE TABLE `gsp_module_access_rights` ( `module_id` int(11) NOT NULL COMMENT 'This references to modules.id', `flag` char(1) NOT NULL, `description` varchar(64) NOT NULL @@ -478,10 +478,10 @@ CREATE TABLE `ogp_module_access_rights` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_module_menus` +-- Table structure for table `gsp_module_menus` -- -CREATE TABLE `ogp_module_menus` ( +CREATE TABLE `gsp_module_menus` ( `module_id` int(11) NOT NULL COMMENT 'This references to modules.id', `subpage` varchar(64) NOT NULL DEFAULT '', `group` varchar(32) NOT NULL, @@ -492,10 +492,10 @@ CREATE TABLE `ogp_module_menus` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_mysql_databases` +-- Table structure for table `gsp_mysql_databases` -- -CREATE TABLE `ogp_mysql_databases` ( +CREATE TABLE `gsp_mysql_databases` ( `db_id` int(11) NOT NULL, `mysql_server_id` int(11) NOT NULL, `home_id` int(11) NOT NULL, @@ -508,10 +508,10 @@ CREATE TABLE `ogp_mysql_databases` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_mysql_servers` +-- Table structure for table `gsp_mysql_servers` -- -CREATE TABLE `ogp_mysql_servers` ( +CREATE TABLE `gsp_mysql_servers` ( `mysql_server_id` int(11) NOT NULL, `remote_server_id` int(11) NOT NULL, `mysql_name` varchar(100) NOT NULL, @@ -524,10 +524,10 @@ CREATE TABLE `ogp_mysql_servers` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_notification` +-- Table structure for table `gsp_notification` -- -CREATE TABLE `ogp_notification` ( +CREATE TABLE `gsp_notification` ( `notification_id` int(11) NOT NULL, `subject` text NOT NULL, `message` text NOT NULL, @@ -537,10 +537,10 @@ CREATE TABLE `ogp_notification` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_notification_recipients` +-- Table structure for table `gsp_notification_recipients` -- -CREATE TABLE `ogp_notification_recipients` ( +CREATE TABLE `gsp_notification_recipients` ( `user_id` int(11) NOT NULL, `notification_id` int(11) NOT NULL, `status` tinyint(4) NOT NULL @@ -549,10 +549,10 @@ CREATE TABLE `ogp_notification_recipients` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_rcon_presets` +-- Table structure for table `gsp_rcon_presets` -- -CREATE TABLE `ogp_rcon_presets` ( +CREATE TABLE `gsp_rcon_presets` ( `preset_id` int(50) NOT NULL, `name` varchar(20) NOT NULL, `command` varchar(100) NOT NULL, @@ -563,13 +563,13 @@ CREATE TABLE `ogp_rcon_presets` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_remote_servers` +-- Table structure for table `gsp_remote_servers` -- -CREATE TABLE `ogp_remote_servers` ( +CREATE TABLE `gsp_remote_servers` ( `remote_server_id` int(11) NOT NULL, `remote_server_name` varchar(100) NOT NULL, - `ogp_user` varchar(100) NOT NULL, + `gsp_user` varchar(100) NOT NULL, `agent_ip` varchar(255) NOT NULL, `agent_port` int(11) NOT NULL, `ftp_port` int(11) NOT NULL, @@ -585,10 +585,10 @@ CREATE TABLE `ogp_remote_servers` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_remote_server_ips` +-- Table structure for table `gsp_remote_server_ips` -- -CREATE TABLE `ogp_remote_server_ips` ( +CREATE TABLE `gsp_remote_server_ips` ( `ip_id` int(11) NOT NULL, `remote_server_id` int(11) NOT NULL, `ip` varchar(255) NOT NULL @@ -597,10 +597,10 @@ CREATE TABLE `ogp_remote_server_ips` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_reseller_accounts` +-- Table structure for table `gsp_reseller_accounts` -- -CREATE TABLE `ogp_reseller_accounts` ( +CREATE TABLE `gsp_reseller_accounts` ( `account_id` int(11) NOT NULL, `service_id` int(11) NOT NULL, `user_id` int(11) NOT NULL, @@ -618,10 +618,10 @@ CREATE TABLE `ogp_reseller_accounts` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_reseller_carts` +-- Table structure for table `gsp_reseller_carts` -- -CREATE TABLE `ogp_reseller_carts` ( +CREATE TABLE `gsp_reseller_carts` ( `cart_id` int(11) NOT NULL, `user_id` int(11) NOT NULL, `paid` int(11) DEFAULT NULL, @@ -632,10 +632,10 @@ CREATE TABLE `ogp_reseller_carts` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_reseller_discount_codes` +-- Table structure for table `gsp_reseller_discount_codes` -- -CREATE TABLE `ogp_reseller_discount_codes` ( +CREATE TABLE `gsp_reseller_discount_codes` ( `discount_id` int(11) NOT NULL, `service_id` int(11) NOT NULL, `percentage` int(11) NOT NULL, @@ -646,10 +646,10 @@ CREATE TABLE `ogp_reseller_discount_codes` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_reseller_homes` +-- Table structure for table `gsp_reseller_homes` -- -CREATE TABLE `ogp_reseller_homes` ( +CREATE TABLE `gsp_reseller_homes` ( `home_id` int(11) NOT NULL, `user_id` int(11) NOT NULL, `account_id` int(11) NOT NULL, @@ -660,10 +660,10 @@ CREATE TABLE `ogp_reseller_homes` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_reseller_services` +-- Table structure for table `gsp_reseller_services` -- -CREATE TABLE `ogp_reseller_services` ( +CREATE TABLE `gsp_reseller_services` ( `service_id` int(11) NOT NULL, `service_name` varchar(60) NOT NULL, `slot_max_qty` int(11) NOT NULL, @@ -679,10 +679,10 @@ CREATE TABLE `ogp_reseller_services` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_server_homes` +-- Table structure for table `gsp_server_homes` -- -CREATE TABLE `ogp_server_homes` ( +CREATE TABLE `gsp_server_homes` ( `home_id` int(50) NOT NULL, `remote_server_id` int(11) NOT NULL, `user_id_main` int(11) NOT NULL, @@ -702,10 +702,10 @@ CREATE TABLE `ogp_server_homes` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_server_status` +-- Table structure for table `gsp_server_status` -- -CREATE TABLE `ogp_server_status` ( +CREATE TABLE `gsp_server_status` ( `status_id` int(11) NOT NULL, `remote_server_id` int(11) NOT NULL, `server_name` varchar(255) NOT NULL, @@ -722,10 +722,10 @@ CREATE TABLE `ogp_server_status` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_settings` +-- Table structure for table `gsp_settings` -- -CREATE TABLE `ogp_settings` ( +CREATE TABLE `gsp_settings` ( `setting` varchar(63) NOT NULL, `value` varchar(1024) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -733,10 +733,10 @@ CREATE TABLE `ogp_settings` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_status_cache` +-- Table structure for table `gsp_status_cache` -- -CREATE TABLE `ogp_status_cache` ( +CREATE TABLE `gsp_status_cache` ( `date_timestamp` char(16) NOT NULL, `ip_id` char(3) NOT NULL, `port` char(6) NOT NULL, @@ -746,10 +746,10 @@ CREATE TABLE `ogp_status_cache` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_tickets` +-- Table structure for table `gsp_tickets` -- -CREATE TABLE `ogp_tickets` ( +CREATE TABLE `gsp_tickets` ( `tid` int(11) NOT NULL, `uid` varchar(32) NOT NULL, `user_id` int(11) NOT NULL, @@ -766,10 +766,10 @@ CREATE TABLE `ogp_tickets` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_ticket_attachments` +-- Table structure for table `gsp_ticket_attachments` -- -CREATE TABLE `ogp_ticket_attachments` ( +CREATE TABLE `gsp_ticket_attachments` ( `attachment_id` int(11) NOT NULL, `ticket_id` int(11) NOT NULL, `reply_id` int(11) DEFAULT NULL, @@ -780,10 +780,10 @@ CREATE TABLE `ogp_ticket_attachments` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_ticket_messages` +-- Table structure for table `gsp_ticket_messages` -- -CREATE TABLE `ogp_ticket_messages` ( +CREATE TABLE `gsp_ticket_messages` ( `reply_id` int(11) NOT NULL, `ticket_id` int(11) NOT NULL, `user_id` int(11) NOT NULL, @@ -797,10 +797,10 @@ CREATE TABLE `ogp_ticket_messages` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_ticket_settings` +-- Table structure for table `gsp_ticket_settings` -- -CREATE TABLE `ogp_ticket_settings` ( +CREATE TABLE `gsp_ticket_settings` ( `id` int(11) NOT NULL, `setting_name` varchar(32) NOT NULL, `setting_value` text NOT NULL @@ -809,10 +809,10 @@ CREATE TABLE `ogp_ticket_settings` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_ts3_homes` +-- Table structure for table `gsp_ts3_homes` -- -CREATE TABLE `ogp_ts3_homes` ( +CREATE TABLE `gsp_ts3_homes` ( `ts3_id` int(50) NOT NULL, `rserver_id` int(50) NOT NULL, `ip` varchar(20) NOT NULL, @@ -825,10 +825,10 @@ CREATE TABLE `ogp_ts3_homes` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_tshock` +-- Table structure for table `gsp_tshock` -- -CREATE TABLE `ogp_tshock` ( +CREATE TABLE `gsp_tshock` ( `token_id` int(11) NOT NULL, `ip` varchar(255) NOT NULL, `port` int(11) NOT NULL, @@ -838,20 +838,20 @@ CREATE TABLE `ogp_tshock` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_update_blacklist` +-- Table structure for table `gsp_update_blacklist` -- -CREATE TABLE `ogp_update_blacklist` ( +CREATE TABLE `gsp_update_blacklist` ( `file_path` varchar(1000) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -- -------------------------------------------------------- -- --- Table structure for table `ogp_users` +-- Table structure for table `gsp_users` -- -CREATE TABLE `ogp_users` ( +CREATE TABLE `gsp_users` ( `user_id` int(11) NOT NULL, `users_login` varchar(255) NOT NULL, `users_passwd` varchar(255) NOT NULL, @@ -876,10 +876,10 @@ CREATE TABLE `ogp_users` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_user_groups` +-- Table structure for table `gsp_user_groups` -- -CREATE TABLE `ogp_user_groups` ( +CREATE TABLE `gsp_user_groups` ( `user_id` int(11) NOT NULL, `role_id` int(11) DEFAULT NULL, `group_id` int(11) NOT NULL @@ -888,10 +888,10 @@ CREATE TABLE `ogp_user_groups` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_user_group_homes` +-- Table structure for table `gsp_user_group_homes` -- -CREATE TABLE `ogp_user_group_homes` ( +CREATE TABLE `gsp_user_group_homes` ( `home_id` int(11) NOT NULL, `group_id` int(11) NOT NULL, `access_rights` varchar(63) DEFAULT NULL, @@ -901,10 +901,10 @@ CREATE TABLE `ogp_user_group_homes` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_user_group_info` +-- Table structure for table `gsp_user_group_info` -- -CREATE TABLE `ogp_user_group_info` ( +CREATE TABLE `gsp_user_group_info` ( `group_id` int(11) NOT NULL, `group_name` varchar(255) DEFAULT NULL, `main_user_id` int(11) DEFAULT NULL @@ -913,10 +913,10 @@ CREATE TABLE `ogp_user_group_info` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_user_group_remote_servers` +-- Table structure for table `gsp_user_group_remote_servers` -- -CREATE TABLE `ogp_user_group_remote_servers` ( +CREATE TABLE `gsp_user_group_remote_servers` ( `remote_server_id` int(11) NOT NULL, `group_id` int(11) NOT NULL, `access_rights` varchar(63) DEFAULT NULL @@ -925,10 +925,10 @@ CREATE TABLE `ogp_user_group_remote_servers` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_user_homes` +-- Table structure for table `gsp_user_homes` -- -CREATE TABLE `ogp_user_homes` ( +CREATE TABLE `gsp_user_homes` ( `home_id` int(11) NOT NULL, `user_id` int(11) NOT NULL, `access_rights` varchar(63) DEFAULT NULL, @@ -938,10 +938,10 @@ CREATE TABLE `ogp_user_homes` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_user_role_info` +-- Table structure for table `gsp_user_role_info` -- -CREATE TABLE `ogp_user_role_info` ( +CREATE TABLE `gsp_user_role_info` ( `role_id` int(11) NOT NULL, `role_name` varchar(100) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -949,10 +949,10 @@ CREATE TABLE `ogp_user_role_info` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_widgets` +-- Table structure for table `gsp_widgets` -- -CREATE TABLE `ogp_widgets` ( +CREATE TABLE `gsp_widgets` ( `id` int(11) NOT NULL, `column_id` int(11) NOT NULL, `sort_no` int(11) NOT NULL, @@ -963,10 +963,10 @@ CREATE TABLE `ogp_widgets` ( -- -------------------------------------------------------- -- --- Table structure for table `ogp_widgets_users` +-- Table structure for table `gsp_widgets_users` -- -CREATE TABLE `ogp_widgets_users` ( +CREATE TABLE `gsp_widgets_users` ( `user_id` int(11) NOT NULL, `widget_id` int(11) NOT NULL, `column_id` int(11) NOT NULL, @@ -1010,54 +1010,54 @@ ALTER TABLE `gsp_process_samples` ADD KEY `idx_ts` (`ts`); -- --- Indexes for table `ogp_addons` +-- Indexes for table `gsp_addons` -- -ALTER TABLE `ogp_addons` +ALTER TABLE `gsp_addons` ADD PRIMARY KEY (`addon_id`); -- --- Indexes for table `ogp_adminexternallinks` +-- Indexes for table `gsp_adminexternallinks` -- -ALTER TABLE `ogp_adminexternallinks` +ALTER TABLE `gsp_adminexternallinks` ADD PRIMARY KEY (`link_id`); -- --- Indexes for table `ogp_adminlte_settings` +-- Indexes for table `gsp_adminlte_settings` -- -ALTER TABLE `ogp_adminlte_settings` +ALTER TABLE `gsp_adminlte_settings` ADD PRIMARY KEY (`id`), ADD UNIQUE KEY `UniqueSetting` (`user`,`name`); -- --- Indexes for table `ogp_api_tokens` +-- Indexes for table `gsp_api_tokens` -- -ALTER TABLE `ogp_api_tokens` +ALTER TABLE `gsp_api_tokens` ADD PRIMARY KEY (`user_id`), ADD UNIQUE KEY `user_id` (`user_id`); -- --- Indexes for table `ogp_arrange_ports` +-- Indexes for table `gsp_arrange_ports` -- -ALTER TABLE `ogp_arrange_ports` +ALTER TABLE `gsp_arrange_ports` ADD PRIMARY KEY (`range_id`), ADD UNIQUE KEY `ip_id` (`ip_id`,`home_cfg_id`); -- --- Indexes for table `ogp_backup_restore` +-- Indexes for table `gsp_backup_restore` -- -ALTER TABLE `ogp_backup_restore` +ALTER TABLE `gsp_backup_restore` ADD PRIMARY KEY (`id`); -- --- Indexes for table `ogp_ban_list` +-- Indexes for table `gsp_ban_list` -- -ALTER TABLE `ogp_ban_list` +ALTER TABLE `gsp_ban_list` ADD PRIMARY KEY (`client_ip`); -- --- Indexes for table `ogp_billing_coupons` +-- Indexes for table `gsp_billing_coupons` -- -ALTER TABLE `ogp_billing_coupons` +ALTER TABLE `gsp_billing_coupons` ADD PRIMARY KEY (`coupon_id`), ADD UNIQUE KEY `code` (`code`), ADD UNIQUE KEY `idx_code` (`code`), @@ -1065,9 +1065,9 @@ ALTER TABLE `ogp_billing_coupons` ADD KEY `idx_created_by` (`created_by`); -- --- Indexes for table `ogp_billing_invoices` +-- Indexes for table `gsp_billing_invoices` -- -ALTER TABLE `ogp_billing_invoices` +ALTER TABLE `gsp_billing_invoices` ADD PRIMARY KEY (`invoice_id`), ADD KEY `order_id` (`order_id`), ADD KEY `user_id` (`user_id`), @@ -1077,289 +1077,289 @@ ALTER TABLE `ogp_billing_invoices` ADD KEY `idx_coupon` (`coupon_id`); -- --- Indexes for table `ogp_billing_orders` +-- Indexes for table `gsp_billing_orders` -- -ALTER TABLE `ogp_billing_orders` +ALTER TABLE `gsp_billing_orders` ADD PRIMARY KEY (`order_id`), ADD KEY `idx_user_id` (`user_id`), ADD KEY `idx_status` (`status`), ADD KEY `idx_home_id` (`home_id`); -- --- Indexes for table `ogp_billing_services` +-- Indexes for table `gsp_billing_services` -- -ALTER TABLE `ogp_billing_services` +ALTER TABLE `gsp_billing_services` ADD PRIMARY KEY (`service_id`); -- --- Indexes for table `ogp_circular` +-- Indexes for table `gsp_circular` -- -ALTER TABLE `ogp_circular` +ALTER TABLE `gsp_circular` ADD PRIMARY KEY (`circular_id`); -- --- Indexes for table `ogp_circular_recipients` +-- Indexes for table `gsp_circular_recipients` -- -ALTER TABLE `ogp_circular_recipients` +ALTER TABLE `gsp_circular_recipients` ADD PRIMARY KEY (`user_id`,`circular_id`); -- --- Indexes for table `ogp_config_homes` +-- Indexes for table `gsp_config_homes` -- -ALTER TABLE `ogp_config_homes` +ALTER TABLE `gsp_config_homes` ADD PRIMARY KEY (`home_cfg_id`), ADD UNIQUE KEY `game_key` (`game_key`); -- --- Indexes for table `ogp_config_mods` +-- Indexes for table `gsp_config_mods` -- -ALTER TABLE `ogp_config_mods` +ALTER TABLE `gsp_config_mods` ADD PRIMARY KEY (`mod_cfg_id`), ADD UNIQUE KEY `home_cfg_id` (`home_cfg_id`,`mod_key`); -- --- Indexes for table `ogp_game_mods` +-- Indexes for table `gsp_game_mods` -- -ALTER TABLE `ogp_game_mods` +ALTER TABLE `gsp_game_mods` ADD PRIMARY KEY (`mod_id`), ADD UNIQUE KEY `home_id` (`home_id`,`mod_cfg_id`); -- --- Indexes for table `ogp_home_ip_ports` +-- Indexes for table `gsp_home_ip_ports` -- -ALTER TABLE `ogp_home_ip_ports` +ALTER TABLE `gsp_home_ip_ports` ADD PRIMARY KEY (`ip_id`,`port`); -- --- Indexes for table `ogp_lgsl` +-- Indexes for table `gsp_lgsl` -- -ALTER TABLE `ogp_lgsl` +ALTER TABLE `gsp_lgsl` ADD PRIMARY KEY (`id`); -- --- Indexes for table `ogp_logger` +-- Indexes for table `gsp_logger` -- -ALTER TABLE `ogp_logger` +ALTER TABLE `gsp_logger` ADD PRIMARY KEY (`log_id`); -- --- Indexes for table `ogp_master_server_homes` +-- Indexes for table `gsp_master_server_homes` -- -ALTER TABLE `ogp_master_server_homes` +ALTER TABLE `gsp_master_server_homes` ADD PRIMARY KEY (`remote_server_id`,`home_cfg_id`); -- --- Indexes for table `ogp_modules` +-- Indexes for table `gsp_modules` -- -ALTER TABLE `ogp_modules` +ALTER TABLE `gsp_modules` ADD PRIMARY KEY (`id`), ADD UNIQUE KEY `folder` (`folder`); -- --- Indexes for table `ogp_module_access_rights` +-- Indexes for table `gsp_module_access_rights` -- -ALTER TABLE `ogp_module_access_rights` +ALTER TABLE `gsp_module_access_rights` ADD UNIQUE KEY `flag` (`flag`); -- --- Indexes for table `ogp_module_menus` +-- Indexes for table `gsp_module_menus` -- -ALTER TABLE `ogp_module_menus` +ALTER TABLE `gsp_module_menus` ADD PRIMARY KEY (`module_id`,`subpage`,`group`); -- --- Indexes for table `ogp_mysql_databases` +-- Indexes for table `gsp_mysql_databases` -- -ALTER TABLE `ogp_mysql_databases` +ALTER TABLE `gsp_mysql_databases` ADD PRIMARY KEY (`db_id`), ADD UNIQUE KEY `mysql_server_id` (`mysql_server_id`,`db_name`), ADD UNIQUE KEY `mysql_server_id_2` (`mysql_server_id`,`db_user`); -- --- Indexes for table `ogp_mysql_servers` +-- Indexes for table `gsp_mysql_servers` -- -ALTER TABLE `ogp_mysql_servers` +ALTER TABLE `gsp_mysql_servers` ADD PRIMARY KEY (`mysql_server_id`); -- --- Indexes for table `ogp_notification` +-- Indexes for table `gsp_notification` -- -ALTER TABLE `ogp_notification` +ALTER TABLE `gsp_notification` ADD PRIMARY KEY (`notification_id`); -- --- Indexes for table `ogp_notification_recipients` +-- Indexes for table `gsp_notification_recipients` -- -ALTER TABLE `ogp_notification_recipients` +ALTER TABLE `gsp_notification_recipients` ADD PRIMARY KEY (`user_id`,`notification_id`); -- --- Indexes for table `ogp_rcon_presets` +-- Indexes for table `gsp_rcon_presets` -- -ALTER TABLE `ogp_rcon_presets` +ALTER TABLE `gsp_rcon_presets` ADD PRIMARY KEY (`preset_id`); -- --- Indexes for table `ogp_remote_servers` +-- Indexes for table `gsp_remote_servers` -- -ALTER TABLE `ogp_remote_servers` +ALTER TABLE `gsp_remote_servers` ADD PRIMARY KEY (`remote_server_id`), ADD UNIQUE KEY `agent_ip` (`agent_ip`,`agent_port`); -- --- Indexes for table `ogp_remote_server_ips` +-- Indexes for table `gsp_remote_server_ips` -- -ALTER TABLE `ogp_remote_server_ips` +ALTER TABLE `gsp_remote_server_ips` ADD PRIMARY KEY (`ip_id`); -- --- Indexes for table `ogp_reseller_accounts` +-- Indexes for table `gsp_reseller_accounts` -- -ALTER TABLE `ogp_reseller_accounts` +ALTER TABLE `gsp_reseller_accounts` ADD PRIMARY KEY (`account_id`); -- --- Indexes for table `ogp_reseller_carts` +-- Indexes for table `gsp_reseller_carts` -- -ALTER TABLE `ogp_reseller_carts` +ALTER TABLE `gsp_reseller_carts` ADD PRIMARY KEY (`cart_id`); -- --- Indexes for table `ogp_reseller_discount_codes` +-- Indexes for table `gsp_reseller_discount_codes` -- -ALTER TABLE `ogp_reseller_discount_codes` +ALTER TABLE `gsp_reseller_discount_codes` ADD PRIMARY KEY (`discount_id`); -- --- Indexes for table `ogp_reseller_homes` +-- Indexes for table `gsp_reseller_homes` -- -ALTER TABLE `ogp_reseller_homes` +ALTER TABLE `gsp_reseller_homes` ADD PRIMARY KEY (`home_id`); -- --- Indexes for table `ogp_reseller_services` +-- Indexes for table `gsp_reseller_services` -- -ALTER TABLE `ogp_reseller_services` +ALTER TABLE `gsp_reseller_services` ADD PRIMARY KEY (`service_id`); -- --- Indexes for table `ogp_server_homes` +-- Indexes for table `gsp_server_homes` -- -ALTER TABLE `ogp_server_homes` +ALTER TABLE `gsp_server_homes` ADD PRIMARY KEY (`home_id`); -- --- Indexes for table `ogp_server_status` +-- Indexes for table `gsp_server_status` -- -ALTER TABLE `ogp_server_status` +ALTER TABLE `gsp_server_status` ADD PRIMARY KEY (`status_id`), ADD UNIQUE KEY `unique_server` (`remote_server_id`), ADD KEY `idx_remote_server` (`remote_server_id`); -- --- Indexes for table `ogp_settings` +-- Indexes for table `gsp_settings` -- -ALTER TABLE `ogp_settings` +ALTER TABLE `gsp_settings` ADD PRIMARY KEY (`setting`); -- --- Indexes for table `ogp_tickets` +-- Indexes for table `gsp_tickets` -- -ALTER TABLE `ogp_tickets` +ALTER TABLE `gsp_tickets` ADD PRIMARY KEY (`tid`), ADD UNIQUE KEY `uid` (`uid`); -- --- Indexes for table `ogp_ticket_attachments` +-- Indexes for table `gsp_ticket_attachments` -- -ALTER TABLE `ogp_ticket_attachments` +ALTER TABLE `gsp_ticket_attachments` ADD PRIMARY KEY (`attachment_id`), ADD UNIQUE KEY `unique_name` (`unique_name`); -- --- Indexes for table `ogp_ticket_messages` +-- Indexes for table `gsp_ticket_messages` -- -ALTER TABLE `ogp_ticket_messages` +ALTER TABLE `gsp_ticket_messages` ADD PRIMARY KEY (`reply_id`), - ADD KEY `ogp_ticket_messages_fk0` (`ticket_id`); + ADD KEY `gsp_ticket_messages_fk0` (`ticket_id`); -- --- Indexes for table `ogp_ticket_settings` +-- Indexes for table `gsp_ticket_settings` -- -ALTER TABLE `ogp_ticket_settings` +ALTER TABLE `gsp_ticket_settings` ADD PRIMARY KEY (`id`), ADD UNIQUE KEY `setting_name` (`setting_name`); -- --- Indexes for table `ogp_ts3_homes` +-- Indexes for table `gsp_ts3_homes` -- -ALTER TABLE `ogp_ts3_homes` +ALTER TABLE `gsp_ts3_homes` ADD PRIMARY KEY (`ts3_id`), ADD UNIQUE KEY `rserver_id` (`rserver_id`,`vserver_id`,`user_id`); -- --- Indexes for table `ogp_tshock` +-- Indexes for table `gsp_tshock` -- -ALTER TABLE `ogp_tshock` +ALTER TABLE `gsp_tshock` ADD PRIMARY KEY (`token_id`); -- --- Indexes for table `ogp_update_blacklist` +-- Indexes for table `gsp_update_blacklist` -- -ALTER TABLE `ogp_update_blacklist` +ALTER TABLE `gsp_update_blacklist` ADD UNIQUE KEY `file_path` (`file_path`), ADD UNIQUE KEY `file_path_2` (`file_path`); -- --- Indexes for table `ogp_users` +-- Indexes for table `gsp_users` -- -ALTER TABLE `ogp_users` +ALTER TABLE `gsp_users` ADD PRIMARY KEY (`users_login`), ADD UNIQUE KEY `id` (`user_id`), ADD UNIQUE KEY `email` (`users_email`); -- --- Indexes for table `ogp_user_groups` +-- Indexes for table `gsp_user_groups` -- -ALTER TABLE `ogp_user_groups` +ALTER TABLE `gsp_user_groups` ADD PRIMARY KEY (`user_id`,`group_id`); -- --- Indexes for table `ogp_user_group_homes` +-- Indexes for table `gsp_user_group_homes` -- -ALTER TABLE `ogp_user_group_homes` +ALTER TABLE `gsp_user_group_homes` ADD PRIMARY KEY (`home_id`,`group_id`); -- --- Indexes for table `ogp_user_group_info` +-- Indexes for table `gsp_user_group_info` -- -ALTER TABLE `ogp_user_group_info` +ALTER TABLE `gsp_user_group_info` ADD PRIMARY KEY (`group_id`), ADD UNIQUE KEY `group_name` (`group_name`); -- --- Indexes for table `ogp_user_group_remote_servers` +-- Indexes for table `gsp_user_group_remote_servers` -- -ALTER TABLE `ogp_user_group_remote_servers` +ALTER TABLE `gsp_user_group_remote_servers` ADD PRIMARY KEY (`remote_server_id`,`group_id`); -- --- Indexes for table `ogp_user_homes` +-- Indexes for table `gsp_user_homes` -- -ALTER TABLE `ogp_user_homes` +ALTER TABLE `gsp_user_homes` ADD PRIMARY KEY (`user_id`,`home_id`); -- --- Indexes for table `ogp_user_role_info` +-- Indexes for table `gsp_user_role_info` -- -ALTER TABLE `ogp_user_role_info` +ALTER TABLE `gsp_user_role_info` ADD PRIMARY KEY (`role_id`), ADD UNIQUE KEY `role_name` (`role_name`); -- --- Indexes for table `ogp_widgets` +-- Indexes for table `gsp_widgets` -- -ALTER TABLE `ogp_widgets` +ALTER TABLE `gsp_widgets` ADD PRIMARY KEY (`id`); -- @@ -1385,231 +1385,231 @@ ALTER TABLE `gsp_process_samples` MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_addons` +-- AUTO_INCREMENT for table `gsp_addons` -- -ALTER TABLE `ogp_addons` +ALTER TABLE `gsp_addons` MODIFY `addon_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_adminexternallinks` +-- AUTO_INCREMENT for table `gsp_adminexternallinks` -- -ALTER TABLE `ogp_adminexternallinks` +ALTER TABLE `gsp_adminexternallinks` MODIFY `link_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_adminlte_settings` +-- AUTO_INCREMENT for table `gsp_adminlte_settings` -- -ALTER TABLE `ogp_adminlte_settings` +ALTER TABLE `gsp_adminlte_settings` MODIFY `id` int(20) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_arrange_ports` +-- AUTO_INCREMENT for table `gsp_arrange_ports` -- -ALTER TABLE `ogp_arrange_ports` +ALTER TABLE `gsp_arrange_ports` MODIFY `range_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_backup_restore` +-- AUTO_INCREMENT for table `gsp_backup_restore` -- -ALTER TABLE `ogp_backup_restore` +ALTER TABLE `gsp_backup_restore` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_billing_coupons` +-- AUTO_INCREMENT for table `gsp_billing_coupons` -- -ALTER TABLE `ogp_billing_coupons` +ALTER TABLE `gsp_billing_coupons` MODIFY `coupon_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_billing_invoices` +-- AUTO_INCREMENT for table `gsp_billing_invoices` -- -ALTER TABLE `ogp_billing_invoices` +ALTER TABLE `gsp_billing_invoices` MODIFY `invoice_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_billing_orders` +-- AUTO_INCREMENT for table `gsp_billing_orders` -- -ALTER TABLE `ogp_billing_orders` +ALTER TABLE `gsp_billing_orders` MODIFY `order_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_billing_services` +-- AUTO_INCREMENT for table `gsp_billing_services` -- -ALTER TABLE `ogp_billing_services` +ALTER TABLE `gsp_billing_services` MODIFY `service_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_circular` +-- AUTO_INCREMENT for table `gsp_circular` -- -ALTER TABLE `ogp_circular` +ALTER TABLE `gsp_circular` MODIFY `circular_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_config_homes` +-- AUTO_INCREMENT for table `gsp_config_homes` -- -ALTER TABLE `ogp_config_homes` +ALTER TABLE `gsp_config_homes` MODIFY `home_cfg_id` int(20) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_config_mods` +-- AUTO_INCREMENT for table `gsp_config_mods` -- -ALTER TABLE `ogp_config_mods` +ALTER TABLE `gsp_config_mods` MODIFY `mod_cfg_id` int(50) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_game_mods` +-- AUTO_INCREMENT for table `gsp_game_mods` -- -ALTER TABLE `ogp_game_mods` +ALTER TABLE `gsp_game_mods` MODIFY `mod_id` int(50) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_lgsl` +-- AUTO_INCREMENT for table `gsp_lgsl` -- -ALTER TABLE `ogp_lgsl` +ALTER TABLE `gsp_lgsl` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_logger` +-- AUTO_INCREMENT for table `gsp_logger` -- -ALTER TABLE `ogp_logger` +ALTER TABLE `gsp_logger` MODIFY `log_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_modules` +-- AUTO_INCREMENT for table `gsp_modules` -- -ALTER TABLE `ogp_modules` +ALTER TABLE `gsp_modules` MODIFY `id` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_mysql_databases` +-- AUTO_INCREMENT for table `gsp_mysql_databases` -- -ALTER TABLE `ogp_mysql_databases` +ALTER TABLE `gsp_mysql_databases` MODIFY `db_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_mysql_servers` +-- AUTO_INCREMENT for table `gsp_mysql_servers` -- -ALTER TABLE `ogp_mysql_servers` +ALTER TABLE `gsp_mysql_servers` MODIFY `mysql_server_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_notification` +-- AUTO_INCREMENT for table `gsp_notification` -- -ALTER TABLE `ogp_notification` +ALTER TABLE `gsp_notification` MODIFY `notification_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_rcon_presets` +-- AUTO_INCREMENT for table `gsp_rcon_presets` -- -ALTER TABLE `ogp_rcon_presets` +ALTER TABLE `gsp_rcon_presets` MODIFY `preset_id` int(50) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_remote_servers` +-- AUTO_INCREMENT for table `gsp_remote_servers` -- -ALTER TABLE `ogp_remote_servers` +ALTER TABLE `gsp_remote_servers` MODIFY `remote_server_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_remote_server_ips` +-- AUTO_INCREMENT for table `gsp_remote_server_ips` -- -ALTER TABLE `ogp_remote_server_ips` +ALTER TABLE `gsp_remote_server_ips` MODIFY `ip_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_reseller_accounts` +-- AUTO_INCREMENT for table `gsp_reseller_accounts` -- -ALTER TABLE `ogp_reseller_accounts` +ALTER TABLE `gsp_reseller_accounts` MODIFY `account_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_reseller_carts` +-- AUTO_INCREMENT for table `gsp_reseller_carts` -- -ALTER TABLE `ogp_reseller_carts` +ALTER TABLE `gsp_reseller_carts` MODIFY `cart_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_reseller_discount_codes` +-- AUTO_INCREMENT for table `gsp_reseller_discount_codes` -- -ALTER TABLE `ogp_reseller_discount_codes` +ALTER TABLE `gsp_reseller_discount_codes` MODIFY `discount_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_reseller_services` +-- AUTO_INCREMENT for table `gsp_reseller_services` -- -ALTER TABLE `ogp_reseller_services` +ALTER TABLE `gsp_reseller_services` MODIFY `service_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_server_homes` +-- AUTO_INCREMENT for table `gsp_server_homes` -- -ALTER TABLE `ogp_server_homes` +ALTER TABLE `gsp_server_homes` MODIFY `home_id` int(50) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_server_status` +-- AUTO_INCREMENT for table `gsp_server_status` -- -ALTER TABLE `ogp_server_status` +ALTER TABLE `gsp_server_status` MODIFY `status_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_tickets` +-- AUTO_INCREMENT for table `gsp_tickets` -- -ALTER TABLE `ogp_tickets` +ALTER TABLE `gsp_tickets` MODIFY `tid` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_ticket_attachments` +-- AUTO_INCREMENT for table `gsp_ticket_attachments` -- -ALTER TABLE `ogp_ticket_attachments` +ALTER TABLE `gsp_ticket_attachments` MODIFY `attachment_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_ticket_messages` +-- AUTO_INCREMENT for table `gsp_ticket_messages` -- -ALTER TABLE `ogp_ticket_messages` +ALTER TABLE `gsp_ticket_messages` MODIFY `reply_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_ticket_settings` +-- AUTO_INCREMENT for table `gsp_ticket_settings` -- -ALTER TABLE `ogp_ticket_settings` +ALTER TABLE `gsp_ticket_settings` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_ts3_homes` +-- AUTO_INCREMENT for table `gsp_ts3_homes` -- -ALTER TABLE `ogp_ts3_homes` +ALTER TABLE `gsp_ts3_homes` MODIFY `ts3_id` int(50) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_tshock` +-- AUTO_INCREMENT for table `gsp_tshock` -- -ALTER TABLE `ogp_tshock` +ALTER TABLE `gsp_tshock` MODIFY `token_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_users` +-- AUTO_INCREMENT for table `gsp_users` -- -ALTER TABLE `ogp_users` +ALTER TABLE `gsp_users` MODIFY `user_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_user_group_info` +-- AUTO_INCREMENT for table `gsp_user_group_info` -- -ALTER TABLE `ogp_user_group_info` +ALTER TABLE `gsp_user_group_info` MODIFY `group_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_user_role_info` +-- AUTO_INCREMENT for table `gsp_user_role_info` -- -ALTER TABLE `ogp_user_role_info` +ALTER TABLE `gsp_user_role_info` MODIFY `role_id` int(11) NOT NULL AUTO_INCREMENT; -- --- AUTO_INCREMENT for table `ogp_widgets` +-- AUTO_INCREMENT for table `gsp_widgets` -- -ALTER TABLE `ogp_widgets` +ALTER TABLE `gsp_widgets` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; -- @@ -1617,10 +1617,10 @@ ALTER TABLE `ogp_widgets` -- -- --- Constraints for table `ogp_ticket_messages` +-- Constraints for table `gsp_ticket_messages` -- -ALTER TABLE `ogp_ticket_messages` - ADD CONSTRAINT `ogp_ticket_messages_fk0` FOREIGN KEY (`ticket_id`) REFERENCES `ogp_tickets` (`tid`); +ALTER TABLE `gsp_ticket_messages` + ADD CONSTRAINT `gsp_ticket_messages_fk0` FOREIGN KEY (`ticket_id`) REFERENCES `gsp_tickets` (`tid`); COMMIT; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/Panel/protocol/PROTOCOL_UPGRADE_REVIEW.md b/Panel/protocol/PROTOCOL_UPGRADE_REVIEW.md index fea9eafc..d7004ff3 100644 --- a/Panel/protocol/PROTOCOL_UPGRADE_REVIEW.md +++ b/Panel/protocol/PROTOCOL_UPGRADE_REVIEW.md @@ -92,7 +92,7 @@ ## Proposed query cache table (planning only, no migration applied) ```sql -CREATE TABLE IF NOT EXISTS OGP_DB_PREFIXserver_query_cache ( +CREATE TABLE IF NOT EXISTS GSP_DB_PREFIXserver_query_cache ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, home_id INT NOT NULL, ip VARCHAR(64) NOT NULL, diff --git a/Panel/protocol/TeamSpeak3/TS3Monitor.php b/Panel/protocol/TeamSpeak3/TS3Monitor.php index b3ac5056..99d8bc4c 100644 --- a/Panel/protocol/TeamSpeak3/TS3Monitor.php +++ b/Panel/protocol/TeamSpeak3/TS3Monitor.php @@ -7,20 +7,20 @@ if(isset($server_home['control_password']) && $server_home['control_password'] ! $num_of_servers = $db->getNumberOfOwnedServersPerUser( $_SESSION['user_id'] ); else $num_of_servers = 0; - + if(isset($settings['query_num_servers_stop']) && is_numeric($settings['query_num_servers_stop'])){ $numberservers_to_skip_query = $settings['query_num_servers_stop']; }else{ $numberservers_to_skip_query = 15; } - + if($num_of_servers < $numberservers_to_skip_query) { $query_cache_life = isset($settings['query_cache_life']) ? $settings['query_cache_life'] : 30; $ip_id = $db->getIpIdByIp($server_home['ip']); $port = $server_home['port']; $statusCache = $db->getServerStatusCache($ip_id,$port); - + if( !empty($statusCache) AND date('YmdHis',$statusCache['date_timestamp'] + $query_cache_life) >= date('YmdHis') ) { $ts3 = $statusCache; @@ -35,7 +35,7 @@ if(isset($server_home['control_password']) && $server_home['control_password'] ! $cfg["voice"] = $server_home['port']; $cfg["query"] = 10011; require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']); + $remote = new GSPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']); foreach($db->getHomeIpPorts($server_home['home_id']) as $ts3Port) { if($remote->rfile_exists( "startups/".$ts3Port['ip']."-".$ts3Port['port'] ) === 1) @@ -45,7 +45,7 @@ if(isset($server_home['control_password']) && $server_home['control_password'] ! $cfg["host"] = $server_home['agent_ip']; else $cfg["host"] = $server_home['ip']; - + $internal_query_ip = $cfg["host"]; $port = $cfg["voice"]; $status = "online"; @@ -83,7 +83,7 @@ if(isset($server_home['control_password']) && $server_home['control_password'] ! $i=0; foreach ((array)$clients as $key => $value) { - /* $playerarray[$i]= */ + /* $playerarray[$i]= */ $ts3['playersList'][$i]['name'] = trim($value); $i++; } @@ -91,7 +91,7 @@ if(isset($server_home['control_password']) && $server_home['control_password'] ! } $db->saveServerStatusCache($ip_id,$port,$ts3); } - + if ( $ts3['status'] == "online" ) { $port = $ts3['port']; diff --git a/Panel/protocol/TeamSpeak3/functions.php b/Panel/protocol/TeamSpeak3/functions.php index 872834f2..09e556e6 100644 --- a/Panel/protocol/TeamSpeak3/functions.php +++ b/Panel/protocol/TeamSpeak3/functions.php @@ -1,10 +1,10 @@ addGameIpPort($server_home['home_id'], $server_home['ip_id'], $new_port); if ($AddVirtual === TRUE) { @@ -80,32 +80,32 @@ try } $view->refresh("?m=gamemanager&p=game_monitor&home_id-mod_id-ip-port=" . $server_home['home_id'] . "-" . $server_home['mod_id'] . "-" . $server_home['ip'] . "-" . $new_port, 0); } - elseif ($AddVirtual === FALSE) + elseif ($AddVirtual === FALSE) { echo "The chosen port is already in use."; } } - + if(isset($_POST['del_ts3_port']) && $_POST['del_ts3_port'] == $cfg["voice"] AND $server_home['home_id'] == $_POST['home_id'] ) { if( ! $startup_file_exists ) { - /* Delete port to home on ogp db */ + /* Delete port to home on gsp db */ $del_port = $_POST['del_ts3_port']; $DelVirtual = $db->delGameIpPort($server_home['home_id'], $server_home['ip_id'], $del_port); - + if ($DelVirtual === TRUE) { if(isset($ts3_ServerInstance)) unset($ts3_ServerInstance); $ts3_ServerInstance = TeamSpeak3::factory("serverquery://" . $cfg["user"] . ":" . $cfg["pass"] . "@" . $cfg["host"] . ":" . $cfg["query"] . "/"); - + /* stop & remove server using given ID */ $sid = (int)$_POST['id']; if ($sid !== 0) { $ts3_ServerInstance->serverStop($sid); $ts3_ServerInstance->serverDelete($sid); - $db->query( "DELETE FROM OGP_DB_PREFIXts3_homes WHERE vserver_id=" . $db->real_escape_string($sid)); + $db->query( "DELETE FROM GSP_DB_PREFIXts3_homes WHERE vserver_id=" . $db->real_escape_string($sid)); } /* refresh */ @@ -121,7 +121,7 @@ try $add_remove_virtual .= "Remove This
    Virtual Server
    - +
    "; @@ -153,40 +153,40 @@ try if(isset($_POST['assign_to_user']) && (int)$_POST['vserver_id'] == $ts3_ServerInstance->getId() AND $server_home['remote_server_id'] == $_POST['remote_server_id'] ) { $query_ip = $server_home['use_nat'] == 1 ? $server_home['agent_ip'] : $server_home['ip']; - $db->query("INSERT INTO OGP_DB_PREFIXts3_homes (`rserver_id`, `ip`, `pwd`, `vserver_id`, `user_id`, `port`) VALUES ('".$server_home['remote_server_id']."', '".$query_ip."', '".$cfg["pass"]."', '".(int)$_POST['vserver_id']."', '".$db->real_escape_string($_POST['assign_to_user'])."', '".$cfg['query']."');"); + $db->query("INSERT INTO GSP_DB_PREFIXts3_homes (`rserver_id`, `ip`, `pwd`, `vserver_id`, `user_id`, `port`) VALUES ('".$server_home['remote_server_id']."', '".$query_ip."', '".$cfg["pass"]."', '".(int)$_POST['vserver_id']."', '".$db->real_escape_string($_POST['assign_to_user'])."', '".$cfg['query']."');"); } if(isset($_POST['remove_vuser_id']) && (int)$_POST['vserver_id'] == $ts3_ServerInstance->getId() AND $server_home['remote_server_id'] == (int)$_POST['remote_server_id'] ) { - $db->query( "DELETE FROM OGP_DB_PREFIXts3_homes WHERE vserver_id='" . (int)$_POST['vserver_id'] . "' AND user_id='".(int)$_POST['remove_vuser_id']."' AND rserver_id='".(int)$_POST['remote_server_id']."';" ); + $db->query( "DELETE FROM GSP_DB_PREFIXts3_homes WHERE vserver_id='" . (int)$_POST['vserver_id'] . "' AND user_id='".(int)$_POST['remove_vuser_id']."' AND rserver_id='".(int)$_POST['remote_server_id']."';" ); } $add_remove_virtual .= "Assign This Virtual
    Server To User
    "; - $ts3vservers = $db->resultQuery("SELECT * FROM OGP_DB_PREFIXts3_homes WHERE vserver_id='".$ts3_ServerInstance->getId()."' AND rserver_id=".$server_home['remote_server_id'] ); + $ts3vservers = $db->resultQuery("SELECT * FROM GSP_DB_PREFIXts3_homes WHERE vserver_id='".$ts3_ServerInstance->getId()."' AND rserver_id=".$server_home['remote_server_id'] ); if($ts3vservers != 0) { $ts3vuserlist = "TeamSpeak 3
    "; foreach ((array)$ts3vservers as $ts3vserver) { $ts3vuser = $db->getUserById($ts3vserver['user_id']); - + $ts3vuserlist .= "
    - ".$ts3vuser['users_login']." + ".$ts3vuser['users_login']."
    "; } } diff --git a/Panel/protocol/lgsl/lgsl_protocol.php b/Panel/protocol/lgsl/lgsl_protocol.php index 75733ea6..1c9818e9 100644 --- a/Panel/protocol/lgsl/lgsl_protocol.php +++ b/Panel/protocol/lgsl/lgsl_protocol.php @@ -128,14 +128,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION "rfactor" => "RFactor", "risingstorm2" => "Rising Storm 2: Vietnam", "ror" => "Rigs of Rods", - "rust" => "Rust", + "rust" => "Rust", "samp" => "San Andreas Multiplayer", "sandstorm" => "Insurgency: Sandstorm", "savage" => "Savage", "savage2" => "Savage 2", "valheim" => "Valheim", "serioussam" => "Serious Sam", - "shoutcast" => "SHOUTcast Server", + "shoutcast" => "SHOUTcast Server", "serioussam2" => "Serious Sam 2", "shatteredh" => "Shattered Horizon", "sinusbot" => "SinusBot for TS 3 and Discord", @@ -677,9 +677,9 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $response = call_user_func_array($lgsl_function, array(&$server, &$lgsl_need, &$lgsl_fp)); return $server; } - //------------------Open Game Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ + //------------------GameServer Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ global $settings; - + if( isset($_GET['m']) and $_GET['m'] == "lgsl" ) $lgsl_config['feed']['method'] = 0; else @@ -756,7 +756,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION { //---------------------------------------------------------+ $lgsl_fp = @fsockopen("{$scheme}://{$server['b']['ip']}", $server['b']['q_port'], $errno, $errstr, 1); - + if (!$lgsl_fp) { return FALSE; } $lgsl_config['timeout'] = 0; $lgsl_config['timeout'] = intval($lgsl_config['timeout']); @@ -3958,7 +3958,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if(count((array)$users) > 0) { $server['s']['players'] = count((array)$users); - + $i=0; foreach ((array)$users as $user) { @@ -3998,7 +3998,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_close($ch); //Parser preg_match_all("((.*))siU", $result, $matches); - foreach ((array)$matches[1] as $servers) + foreach ((array)$matches[1] as $servers) { if (preg_match("/$ip:$port/",$servers)) { @@ -4010,7 +4010,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION //players preg_match_all("(
    (.*))siU", $servers, $playerscnt); $pieces = explode(' / ', $playerscnt[1][0]); - $server['s']['players'] = $pieces[0]; + $server['s']['players'] = $pieces[0]; $server['s']['playersmax'] = str_replace(' [full]', "", $pieces[1]); //map preg_match_all("((.*)(.*))siU", $servers, $playerslist); $players_array[0] = ""; - foreach ((array)$playerslist[1] as $player_row) + foreach ((array)$playerslist[1] as $player_row) { preg_match_all("((.*) <)siU", $player_row, $player_name); $i = 0; - - foreach ((array)$player_name[1] as $player) + + foreach ((array)$player_name[1] as $player) { trim($player); $server['p'][$i]['name'] = $player; @@ -4061,11 +4061,11 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $ip = $server['b']['ip']; $port = $server['b']['c_port']; $home_info = $server_home = $db->getGameHomeByIP($ip, $port); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']); $data = ""; $home_id = sprintf('%09d', $home_info['home_id']); - $screenlog = "screenlog.OGP_HOME_".$home_id; + $screenlog = "screenlog.GSP_HOME_".$home_id; $home_log = $remote->remote_readfile($home_info['home_path'].'/'.$server_xml->exe_location.$screenlog,$data); $data = substr($data, -10000, 10000); if ( !empty($data) ) @@ -4074,13 +4074,13 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION preg_match_all("(\| INFO\|(.*)\\n)siU", $data, $matches); $matches = array_reverse($matches); $rows = ""; - foreach ((array)$matches[1] as $info_row) + foreach ((array)$matches[1] as $info_row) { $rows .= $info_row; $info_row = $info_row."INFO
    "; if (preg_match_all("(servername:(.*)INFO)siU", $info_row, $info)) { - foreach ((array)$info[1] as $value) + foreach ((array)$info[1] as $value) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/servername.txt',$value); @@ -4090,7 +4090,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } if (preg_match_all("(terrain:(.*)INFO)siU", $info_row, $info)) { - foreach ((array)$info[1] as $value) + foreach ((array)$info[1] as $value) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/terrain.txt',$value); @@ -4099,7 +4099,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } if (preg_match_all("(maxclients:(.*)INFO)siU", $info_row, $info)) { - foreach ((array)$info[1] as $value) + foreach ((array)$info[1] as $value) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/maxclients.txt',$value); @@ -4127,7 +4127,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if (preg_match_all("(FO\|(.*)\|.IN)siU", $info_row, $info)) { $i = 0; - foreach ((array)$info[1] as $value) + foreach ((array)$info[1] as $value) { $value = trim($value); $value = str_replace('|', "", $value); @@ -4140,7 +4140,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } $server['s']['players'] = $i; } - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if($screen_running) { return TRUE; @@ -4194,14 +4194,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $ip = $server['b']['ip']; $port = $server['b']['c_port']; $home_info = $server_home = $db->getGameHomeByIP($ip, $port); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $data = ""; $data = $remote->exec("VBoxManage showvminfo \"".$home_info['home_name']."\""); if ( !empty($data) ) { $settings = explode("\n", $data); $i = 0; - foreach ((array)$settings as $setting) + foreach ((array)$settings as $setting) { $setting = trim($setting); $setting = explode(":", $setting); @@ -4225,7 +4225,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $server['p'][$i]['score'] = $setting[1]; $i++; } - + if($setting[0] == "Guest OS") { $map = trim($setting[1]); @@ -4240,8 +4240,8 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } $server['s']['players'] = $i; $server['s']['playersmax'] = $i; - } - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + } + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if($screen_running) { return TRUE; @@ -4286,14 +4286,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } } //------------------------------------------------------------------------------------------------------------+ -//------------------------------------------------------------------------------------------------------------+ +//------------------------------------------------------------------------------------------------------------+ function lgsl_query_40(&$server, &$lgsl_need, &$lgsl_fp) { //---------------------------------------------------------+ // REFERENCE: http://developer.valvesoftware.com/wiki/Server_Queries fwrite($lgsl_fp, "\xFF\xFF\xFF\xFF\x54Source Engine Query\x00"); - $buffer = fread($lgsl_fp, 4096); + $buffer = fread($lgsl_fp, 4096); if (!$buffer) { return FALSE; } $header = lgsl_cut_byte($buffer, 4); @@ -4375,7 +4375,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION function lgsl_query_42(&$server, &$lgsl_need, &$lgsl_fp) { //---------------------------------------------------------+ - // Check for a 200 status code on http://ip:port/ + // Check for a 200 status code on http://ip:port/ $ip = $server['b']['ip']; $port = $server['b']['c_port']; @@ -4390,7 +4390,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_close( $ch ); if ( ( $http_code == "200" ) ) { return true; - } + } } //------------------------------------------------------------------------------------------------------------+ //------------------------------------------------------------------------------------------------------------+ @@ -4406,7 +4406,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_setopt($ch, CURLOPT_URL, $url); $data = curl_exec($ch); curl_close($ch); - // Test if list contains $ip:$port + // Test if list contains $ip:$port $ip = $server['b']['ip']; $port = $server['b']['c_port']; $xserver = "$ip:$port"; @@ -4418,7 +4418,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $server['s']['players'] = $xdatas["$xserver"]['players']; $server['s']['playersmax'] = $xdatas["$xserver"]['maxplayers']; return true; - } + } } //------------------------------------------------------------------------------------------------------------+ @@ -4429,7 +4429,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if(is_array($home_info) && !empty($home_info)) { require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']); $http_reply = $remote->remote_query('lgsl', $server['b']['type'], $server['b']['ip'], $server['b']['c_port'], $server['b']['q_port'], $server['b']['s_port']); if($http_reply == NULL) exit("REMOTE LGSL: BAD RESPONSE"); } @@ -4450,7 +4450,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $referrer = empty($_SERVER['QUERY_STRING']) ? $referrer : "{$referrer}?{$_SERVER['QUERY_STRING']}"; $destport = isset($host['port']) ? $host['port'] : ( $host['scheme'] == "https" ? "443" : "80" ); //---------------------------------------------------------+ - + if (function_exists('curl_init') && function_exists('curl_setopt') && function_exists('curl_exec') && $lgsl_feed_method == 1) { $lgsl_curl = curl_init(); @@ -4470,7 +4470,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_setopt($lgsl_curl, CURLOPT_SSL_VERIFYHOST, FALSE); } curl_setopt($lgsl_curl, CURLOPT_URL, "$host[scheme]://{$host['host']}:$destport{$host['path']}{$host_query}"); - + $http_reply = curl_exec($lgsl_curl); if (curl_error($lgsl_curl)) diff --git a/Panel/protocol/lgsl/lgsl_protocol.php.080723 b/Panel/protocol/lgsl/lgsl_protocol.php.080723 index 28b95754..a461cd10 100644 --- a/Panel/protocol/lgsl/lgsl_protocol.php.080723 +++ b/Panel/protocol/lgsl/lgsl_protocol.php.080723 @@ -128,14 +128,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION "rfactor" => "RFactor", "risingstorm2" => "Rising Storm 2: Vietnam", "ror" => "Rigs of Rods", - "rust" => "Rust", + "rust" => "Rust", "samp" => "San Andreas Multiplayer", "sandstorm" => "Insurgency: Sandstorm", "savage" => "Savage", "savage2" => "Savage 2", "valheim" => "Valheim", "serioussam" => "Serious Sam", - "shoutcast" => "SHOUTcast Server", + "shoutcast" => "SHOUTcast Server", "serioussam2" => "Serious Sam 2", "shatteredh" => "Shattered Horizon", "sinusbot" => "SinusBot for TS 3 and Discord", @@ -677,9 +677,9 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $response = call_user_func_array($lgsl_function, array(&$server, &$lgsl_need, &$lgsl_fp)); return $server; } - //------------------Open Game Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ + //------------------GameServer Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ global $settings; - + if( isset($_GET['m']) and $_GET['m'] == "lgsl" ) $lgsl_config['feed']['method'] = 0; else @@ -756,7 +756,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION { //---------------------------------------------------------+ $lgsl_fp = @fsockopen("{$scheme}://{$server['b']['ip']}", $server['b']['q_port'], $errno, $errstr, 1); - + if (!$lgsl_fp) { return FALSE; } $lgsl_config['timeout'] = 0; $lgsl_config['timeout'] = intval($lgsl_config['timeout']); @@ -3958,7 +3958,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if(count($users) > 0) { $server['s']['players'] = count($users); - + $i=0; foreach($users as $user) { @@ -3998,7 +3998,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_close($ch); //Parser preg_match_all("((.*))siU", $result, $matches); - foreach ( $matches[1] as $servers ) + foreach ( $matches[1] as $servers ) { if (preg_match("/$ip:$port/",$servers)) { @@ -4010,7 +4010,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION //players preg_match_all("((.*))siU", $servers, $playerscnt); $pieces = explode(' / ', $playerscnt[1][0]); - $server['s']['players'] = $pieces[0]; + $server['s']['players'] = $pieces[0]; $server['s']['playersmax'] = str_replace(' [full]', "", $pieces[1]); //map preg_match_all("((.*)(.*))siU", $servers, $playerslist); $players_array[0] = ""; - foreach ( $playerslist[1] as $player_row ) + foreach ( $playerslist[1] as $player_row ) { preg_match_all("((.*) <)siU", $player_row, $player_name); $i = 0; - - foreach ( $player_name[1] as $player ) + + foreach ( $player_name[1] as $player ) { trim($player); $server['p'][$i]['name'] = $player; @@ -4061,11 +4061,11 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $ip = $server['b']['ip']; $port = $server['b']['c_port']; $home_info = $server_home = $db->getGameHomeByIP($ip, $port); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']); $data = ""; $home_id = sprintf('%09d', $home_info['home_id']); - $screenlog = "screenlog.OGP_HOME_".$home_id; + $screenlog = "screenlog.GSP_HOME_".$home_id; $home_log = $remote->remote_readfile($home_info['home_path'].'/'.$server_xml->exe_location.$screenlog,$data); $data = substr($data, -10000, 10000); if ( !empty($data) ) @@ -4074,13 +4074,13 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION preg_match_all("(\| INFO\|(.*)\\n)siU", $data, $matches); $matches = array_reverse($matches); $rows = ""; - foreach ( $matches[1] as $info_row ) + foreach ( $matches[1] as $info_row ) { $rows .= $info_row; $info_row = $info_row."INFO
    "; if (preg_match_all("(servername:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/servername.txt',$value); @@ -4090,7 +4090,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } if (preg_match_all("(terrain:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/terrain.txt',$value); @@ -4099,7 +4099,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } if (preg_match_all("(maxclients:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/maxclients.txt',$value); @@ -4127,7 +4127,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if (preg_match_all("(FO\|(.*)\|.IN)siU", $info_row, $info)) { $i = 0; - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $value = str_replace('|', "", $value); @@ -4140,7 +4140,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } $server['s']['players'] = $i; } - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if($screen_running) { return TRUE; @@ -4194,14 +4194,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $ip = $server['b']['ip']; $port = $server['b']['c_port']; $home_info = $server_home = $db->getGameHomeByIP($ip, $port); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $data = ""; $data = $remote->exec("VBoxManage showvminfo \"".$home_info['home_name']."\""); if ( !empty($data) ) { $settings = explode("\n", $data); $i = 0; - foreach ( $settings as $setting ) + foreach ( $settings as $setting ) { $setting = trim($setting); $setting = explode(":", $setting); @@ -4225,7 +4225,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $server['p'][$i]['score'] = $setting[1]; $i++; } - + if($setting[0] == "Guest OS") { $map = trim($setting[1]); @@ -4240,8 +4240,8 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } $server['s']['players'] = $i; $server['s']['playersmax'] = $i; - } - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + } + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if($screen_running) { return TRUE; @@ -4286,14 +4286,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } } //------------------------------------------------------------------------------------------------------------+ -//------------------------------------------------------------------------------------------------------------+ +//------------------------------------------------------------------------------------------------------------+ function lgsl_query_40(&$server, &$lgsl_need, &$lgsl_fp) { //---------------------------------------------------------+ // REFERENCE: http://developer.valvesoftware.com/wiki/Server_Queries fwrite($lgsl_fp, "\xFF\xFF\xFF\xFF\x54Source Engine Query\x00"); - $buffer = fread($lgsl_fp, 4096); + $buffer = fread($lgsl_fp, 4096); if (!$buffer) { return FALSE; } $header = lgsl_cut_byte($buffer, 4); @@ -4375,7 +4375,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION function lgsl_query_42(&$server, &$lgsl_need, &$lgsl_fp) { //---------------------------------------------------------+ - // Check for a 200 status code on http://ip:port/ + // Check for a 200 status code on http://ip:port/ $ip = $server['b']['ip']; $port = $server['b']['c_port']; @@ -4390,7 +4390,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_close( $ch ); if ( ( $http_code == "200" ) ) { return true; - } + } } //------------------------------------------------------------------------------------------------------------+ //------------------------------------------------------------------------------------------------------------+ @@ -4406,7 +4406,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_setopt($ch, CURLOPT_URL, $url); $data = curl_exec($ch); curl_close($ch); - // Test if list contains $ip:$port + // Test if list contains $ip:$port $ip = $server['b']['ip']; $port = $server['b']['c_port']; $xserver = "$ip:$port"; @@ -4418,7 +4418,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $server['s']['players'] = $xdatas["$xserver"]['players']; $server['s']['playersmax'] = $xdatas["$xserver"]['maxplayers']; return true; - } + } } //------------------------------------------------------------------------------------------------------------+ @@ -4429,7 +4429,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if(is_array($home_info) && !empty($home_info)) { require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']); $http_reply = $remote->remote_query('lgsl', $server['b']['type'], $server['b']['ip'], $server['b']['c_port'], $server['b']['q_port'], $server['b']['s_port']); if($http_reply == NULL) exit("REMOTE LGSL: BAD RESPONSE"); } @@ -4450,7 +4450,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $referrer = empty($_SERVER['QUERY_STRING']) ? $referrer : "{$referrer}?{$_SERVER['QUERY_STRING']}"; $destport = isset($host['port']) ? $host['port'] : ( $host['scheme'] == "https" ? "443" : "80" ); //---------------------------------------------------------+ - + if (function_exists('curl_init') && function_exists('curl_setopt') && function_exists('curl_exec') && $lgsl_feed_method == 1) { $lgsl_curl = curl_init(); @@ -4470,7 +4470,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_setopt($lgsl_curl, CURLOPT_SSL_VERIFYHOST, FALSE); } curl_setopt($lgsl_curl, CURLOPT_URL, "$host[scheme]://{$host['host']}:$destport{$host['path']}{$host_query}"); - + $http_reply = curl_exec($lgsl_curl); if (curl_error($lgsl_curl)) diff --git a/Panel/protocol/lgsl/lgsl_protocol.php.save.1 b/Panel/protocol/lgsl/lgsl_protocol.php.save.1 index 66411382..393164dc 100644 --- a/Panel/protocol/lgsl/lgsl_protocol.php.save.1 +++ b/Panel/protocol/lgsl/lgsl_protocol.php.save.1 @@ -128,14 +128,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION "rfactor" => "RFactor", "risingstorm2" => "Rising Storm 2: Vietnam", "ror" => "Rigs of Rods", - "rust" => "Rust", + "rust" => "Rust", "samp" => "San Andreas Multiplayer", "sandstorm" => "Insurgency: Sandstorm", "savage" => "Savage", "savage2" => "Savage 2", "valheim" => "Valheim", "serioussam" => "Serious Sam", - "shoutcast" => "SHOUTcast Server", + "shoutcast" => "SHOUTcast Server", "serioussam2" => "Serious Sam 2", "shatteredh" => "Shattered Horizon", "sinusbot" => "SinusBot for TS 3 and Discord", @@ -668,9 +668,9 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $response = call_user_func_array($lgsl_function, array(&$server, &$lgsl_need, &$lgsl_fp)); return $server; } - //------------------Open Game Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ + //------------------GameServer Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ global $settings; - + if( isset($_GET['m']) and $_GET['m'] == "lgsl" ) $lgsl_config['feed']['method'] = 0; else @@ -747,7 +747,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION { //---------------------------------------------------------+ $lgsl_fp = @fsockopen("{$scheme}://{$server['b']['ip']}", $server['b']['q_port'], $errno, $errstr, 1); - + if (!$lgsl_fp) { return FALSE; } $lgsl_config['timeout'] = 0; $lgsl_config['timeout'] = intval($lgsl_config['timeout']); @@ -3949,7 +3949,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if(count($users) > 0) { $server['s']['players'] = count($users); - + $i=0; foreach($users as $user) { @@ -3989,7 +3989,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_close($ch); //Parser preg_match_all("((.*))siU", $result, $matches); - foreach ( $matches[1] as $servers ) + foreach ( $matches[1] as $servers ) { if (preg_match("/$ip:$port/",$servers)) { @@ -4001,7 +4001,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION //players preg_match_all("((.*))siU", $servers, $playerscnt); $pieces = explode(' / ', $playerscnt[1][0]); - $server['s']['players'] = $pieces[0]; + $server['s']['players'] = $pieces[0]; $server['s']['playersmax'] = str_replace(' [full]', "", $pieces[1]); //map preg_match_all("((.*)(.*))siU", $servers, $playerslist); $players_array[0] = ""; - foreach ( $playerslist[1] as $player_row ) + foreach ( $playerslist[1] as $player_row ) { preg_match_all("((.*) <)siU", $player_row, $player_name); $i = 0; - - foreach ( $player_name[1] as $player ) + + foreach ( $player_name[1] as $player ) { trim($player); $server['p'][$i]['name'] = $player; @@ -4052,11 +4052,11 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $ip = $server['b']['ip']; $port = $server['b']['c_port']; $home_info = $server_home = $db->getGameHomeByIP($ip, $port); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']); $data = ""; $home_id = sprintf('%09d', $home_info['home_id']); - $screenlog = "screenlog.OGP_HOME_".$home_id; + $screenlog = "screenlog.GSP_HOME_".$home_id; $home_log = $remote->remote_readfile($home_info['home_path'].'/'.$server_xml->exe_location.$screenlog,$data); $data = substr($data, -10000, 10000); if ( !empty($data) ) @@ -4065,13 +4065,13 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION preg_match_all("(\| INFO\|(.*)\\n)siU", $data, $matches); $matches = array_reverse($matches); $rows = ""; - foreach ( $matches[1] as $info_row ) + foreach ( $matches[1] as $info_row ) { $rows .= $info_row; $info_row = $info_row."INFO
    "; if (preg_match_all("(servername:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/servername.txt',$value); @@ -4081,7 +4081,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } if (preg_match_all("(terrain:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/terrain.txt',$value); @@ -4090,7 +4090,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } if (preg_match_all("(maxclients:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/maxclients.txt',$value); @@ -4118,7 +4118,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if (preg_match_all("(FO\|(.*)\|.IN)siU", $info_row, $info)) { $i = 0; - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $value = str_replace('|', "", $value); @@ -4131,7 +4131,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } $server['s']['players'] = $i; } - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if($screen_running) { return TRUE; @@ -4185,14 +4185,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $ip = $server['b']['ip']; $port = $server['b']['c_port']; $home_info = $server_home = $db->getGameHomeByIP($ip, $port); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $data = ""; $data = $remote->exec("VBoxManage showvminfo \"".$home_info['home_name']."\""); if ( !empty($data) ) { $settings = explode("\n", $data); $i = 0; - foreach ( $settings as $setting ) + foreach ( $settings as $setting ) { $setting = trim($setting); $setting = explode(":", $setting); @@ -4216,7 +4216,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $server['p'][$i]['score'] = $setting[1]; $i++; } - + if($setting[0] == "Guest OS") { $map = trim($setting[1]); @@ -4231,8 +4231,8 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } $server['s']['players'] = $i; $server['s']['playersmax'] = $i; - } - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + } + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if($screen_running) { return TRUE; @@ -4277,14 +4277,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } } //------------------------------------------------------------------------------------------------------------+ -//------------------------------------------------------------------------------------------------------------+ +//------------------------------------------------------------------------------------------------------------+ function lgsl_query_40(&$server, &$lgsl_need, &$lgsl_fp) { //---------------------------------------------------------+ // REFERENCE: http://developer.valvesoftware.com/wiki/Server_Queries fwrite($lgsl_fp, "\xFF\xFF\xFF\xFF\x54Source Engine Query\x00"); - $buffer = fread($lgsl_fp, 4096); + $buffer = fread($lgsl_fp, 4096); if (!$buffer) { return FALSE; } $header = lgsl_cut_byte($buffer, 4); @@ -4366,7 +4366,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION function lgsl_query_42(&$server, &$lgsl_need, &$lgsl_fp) { //---------------------------------------------------------+ - // Check for a 200 status code on http://ip:port/ + // Check for a 200 status code on http://ip:port/ $ip = $server['b']['ip']; $port = $server['b']['c_port']; @@ -4381,7 +4381,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_close( $ch ); if ( ( $http_code == "200" ) ) { return true; - } + } } //------------------------------------------------------------------------------------------------------------+ //------------------------------------------------------------------------------------------------------------+ @@ -4397,7 +4397,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_setopt($ch, CURLOPT_URL, $url); $data = curl_exec($ch); curl_close($ch); - // Test if list contains $ip:$port + // Test if list contains $ip:$port $ip = $server['b']['ip']; $port = $server['b']['c_port']; $xserver = "$ip:$port"; @@ -4409,7 +4409,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $server['s']['players'] = $xdatas["$xserver"]['players']; $server['s']['playersmax'] = $xdatas["$xserver"]['maxplayers']; return true; - } + } } //------------------------------------------------------------------------------------------------------------+ @@ -4420,7 +4420,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if(is_array($home_info) && !empty($home_info)) { require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']); $http_reply = $remote->remote_query('lgsl', $server['b']['type'], $server['b']['ip'], $server['b']['c_port'], $server['b']['q_port'], $server['b']['s_port']); if($http_reply == NULL) exit("REMOTE LGSL: BAD RESPONSE"); } @@ -4441,7 +4441,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $referrer = empty($_SERVER['QUERY_STRING']) ? $referrer : "{$referrer}?{$_SERVER['QUERY_STRING']}"; $destport = isset($host['port']) ? $host['port'] : ( $host['scheme'] == "https" ? "443" : "80" ); //---------------------------------------------------------+ - + if (function_exists('curl_init') && function_exists('curl_setopt') && function_exists('curl_exec') && $lgsl_feed_method == 1) { $lgsl_curl = curl_init(); @@ -4461,7 +4461,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_setopt($lgsl_curl, CURLOPT_SSL_VERIFYHOST, FALSE); } curl_setopt($lgsl_curl, CURLOPT_URL, "$host[scheme]://{$host['host']}:$destport{$host['path']}{$host_query}"); - + $http_reply = curl_exec($lgsl_curl); if (curl_error($lgsl_curl)) diff --git a/Panel/protocol/lgsl/lgsl_protocol.php.save.2 b/Panel/protocol/lgsl/lgsl_protocol.php.save.2 index 1b45a3d5..998fc242 100644 --- a/Panel/protocol/lgsl/lgsl_protocol.php.save.2 +++ b/Panel/protocol/lgsl/lgsl_protocol.php.save.2 @@ -128,14 +128,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION "rfactor" => "RFactor", "risingstorm2" => "Rising Storm 2: Vietnam", "ror" => "Rigs of Rods", - "rust" => "Rust", + "rust" => "Rust", "samp" => "San Andreas Multiplayer", "sandstorm" => "Insurgency: Sandstorm", "savage" => "Savage", "savage2" => "Savage 2", "valheim" => "Valheim", "serioussam" => "Serious Sam", - "shoutcast" => "SHOUTcast Server", + "shoutcast" => "SHOUTcast Server", "serioussam2" => "Serious Sam 2", "shatteredh" => "Shattered Horizon", "sinusbot" => "SinusBot for TS 3 and Discord", @@ -669,9 +669,9 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $response = call_user_func_array($lgsl_function, array(&$server, &$lgsl_need, &$lgsl_fp)); return $server; } - //------------------Open Game Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ + //------------------GameServer Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ global $settings; - + if( isset($_GET['m']) and $_GET['m'] == "lgsl" ) $lgsl_config['feed']['method'] = 0; else @@ -748,7 +748,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION { //---------------------------------------------------------+ $lgsl_fp = @fsockopen("{$scheme}://{$server['b']['ip']}", $server['b']['q_port'], $errno, $errstr, 1); - + if (!$lgsl_fp) { return FALSE; } $lgsl_config['timeout'] = 0; $lgsl_config['timeout'] = intval($lgsl_config['timeout']); @@ -3950,7 +3950,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if(count($users) > 0) { $server['s']['players'] = count($users); - + $i=0; foreach($users as $user) { @@ -3990,7 +3990,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_close($ch); //Parser preg_match_all("((.*))siU", $result, $matches); - foreach ( $matches[1] as $servers ) + foreach ( $matches[1] as $servers ) { if (preg_match("/$ip:$port/",$servers)) { @@ -4002,7 +4002,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION //players preg_match_all("((.*))siU", $servers, $playerscnt); $pieces = explode(' / ', $playerscnt[1][0]); - $server['s']['players'] = $pieces[0]; + $server['s']['players'] = $pieces[0]; $server['s']['playersmax'] = str_replace(' [full]', "", $pieces[1]); //map preg_match_all("((.*)(.*))siU", $servers, $playerslist); $players_array[0] = ""; - foreach ( $playerslist[1] as $player_row ) + foreach ( $playerslist[1] as $player_row ) { preg_match_all("((.*) <)siU", $player_row, $player_name); $i = 0; - - foreach ( $player_name[1] as $player ) + + foreach ( $player_name[1] as $player ) { trim($player); $server['p'][$i]['name'] = $player; @@ -4053,11 +4053,11 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $ip = $server['b']['ip']; $port = $server['b']['c_port']; $home_info = $server_home = $db->getGameHomeByIP($ip, $port); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']); $data = ""; $home_id = sprintf('%09d', $home_info['home_id']); - $screenlog = "screenlog.OGP_HOME_".$home_id; + $screenlog = "screenlog.GSP_HOME_".$home_id; $home_log = $remote->remote_readfile($home_info['home_path'].'/'.$server_xml->exe_location.$screenlog,$data); $data = substr($data, -10000, 10000); if ( !empty($data) ) @@ -4066,13 +4066,13 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION preg_match_all("(\| INFO\|(.*)\\n)siU", $data, $matches); $matches = array_reverse($matches); $rows = ""; - foreach ( $matches[1] as $info_row ) + foreach ( $matches[1] as $info_row ) { $rows .= $info_row; $info_row = $info_row."INFO
    "; if (preg_match_all("(servername:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/servername.txt',$value); @@ -4082,7 +4082,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } if (preg_match_all("(terrain:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/terrain.txt',$value); @@ -4091,7 +4091,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } if (preg_match_all("(maxclients:(.*)INFO)siU", $info_row, $info)) { - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $remote->remote_writefile($home_info['home_path'].'/maxclients.txt',$value); @@ -4119,7 +4119,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if (preg_match_all("(FO\|(.*)\|.IN)siU", $info_row, $info)) { $i = 0; - foreach ( $info[1] as $value ) + foreach ( $info[1] as $value ) { $value = trim($value); $value = str_replace('|', "", $value); @@ -4132,7 +4132,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } $server['s']['players'] = $i; } - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if($screen_running) { return TRUE; @@ -4186,14 +4186,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $ip = $server['b']['ip']; $port = $server['b']['c_port']; $home_info = $server_home = $db->getGameHomeByIP($ip, $port); - $remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']); $data = ""; $data = $remote->exec("VBoxManage showvminfo \"".$home_info['home_name']."\""); if ( !empty($data) ) { $settings = explode("\n", $data); $i = 0; - foreach ( $settings as $setting ) + foreach ( $settings as $setting ) { $setting = trim($setting); $setting = explode(":", $setting); @@ -4217,7 +4217,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $server['p'][$i]['score'] = $setting[1]; $i++; } - + if($setting[0] == "Guest OS") { $map = trim($setting[1]); @@ -4232,8 +4232,8 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } $server['s']['players'] = $i; $server['s']['playersmax'] = $i; - } - $screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; + } + $screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1; if($screen_running) { return TRUE; @@ -4278,14 +4278,14 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION } } //------------------------------------------------------------------------------------------------------------+ -//------------------------------------------------------------------------------------------------------------+ +//------------------------------------------------------------------------------------------------------------+ function lgsl_query_40(&$server, &$lgsl_need, &$lgsl_fp) { //---------------------------------------------------------+ // REFERENCE: http://developer.valvesoftware.com/wiki/Server_Queries fwrite($lgsl_fp, "\xFF\xFF\xFF\xFF\x54Source Engine Query\x00"); - $buffer = fread($lgsl_fp, 4096); + $buffer = fread($lgsl_fp, 4096); if (!$buffer) { return FALSE; } $header = lgsl_cut_byte($buffer, 4); @@ -4367,7 +4367,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION function lgsl_query_42(&$server, &$lgsl_need, &$lgsl_fp) { //---------------------------------------------------------+ - // Check for a 200 status code on http://ip:port/ + // Check for a 200 status code on http://ip:port/ $ip = $server['b']['ip']; $port = $server['b']['c_port']; @@ -4382,7 +4382,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_close( $ch ); if ( ( $http_code == "200" ) ) { return true; - } + } } //------------------------------------------------------------------------------------------------------------+ //------------------------------------------------------------------------------------------------------------+ @@ -4398,7 +4398,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_setopt($ch, CURLOPT_URL, $url); $data = curl_exec($ch); curl_close($ch); - // Test if list contains $ip:$port + // Test if list contains $ip:$port $ip = $server['b']['ip']; $port = $server['b']['c_port']; $xserver = "$ip:$port"; @@ -4410,7 +4410,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $server['s']['players'] = $xdatas["$xserver"]['players']; $server['s']['playersmax'] = $xdatas["$xserver"]['maxplayers']; return true; - } + } } //------------------------------------------------------------------------------------------------------------+ @@ -4421,7 +4421,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION if(is_array($home_info) && !empty($home_info)) { require_once('includes/lib_remote.php'); - $remote = new OGPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']); + $remote = new GSPRemoteLibrary($home_info['agent_ip'], $home_info['agent_port'], $home_info['encryption_key'], $home_info['timeout']); $http_reply = $remote->remote_query('lgsl', $server['b']['type'], $server['b']['ip'], $server['b']['c_port'], $server['b']['q_port'], $server['b']['s_port']); if($http_reply == NULL) exit("REMOTE LGSL: BAD RESPONSE"); } @@ -4442,7 +4442,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $referrer = empty($_SERVER['QUERY_STRING']) ? $referrer : "{$referrer}?{$_SERVER['QUERY_STRING']}"; $destport = isset($host['port']) ? $host['port'] : ( $host['scheme'] == "https" ? "443" : "80" ); //---------------------------------------------------------+ - + if (function_exists('curl_init') && function_exists('curl_setopt') && function_exists('curl_exec') && $lgsl_feed_method == 1) { $lgsl_curl = curl_init(); @@ -4462,7 +4462,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION curl_setopt($lgsl_curl, CURLOPT_SSL_VERIFYHOST, FALSE); } curl_setopt($lgsl_curl, CURLOPT_URL, "$host[scheme]://{$host['host']}:$destport{$host['path']}{$host_query}"); - + $http_reply = curl_exec($lgsl_curl); if (curl_error($lgsl_curl)) diff --git a/Panel/protocol/lgsl/lgsl_protocol.save b/Panel/protocol/lgsl/lgsl_protocol.save index 217a8fcf..f75ebc07 100644 --- a/Panel/protocol/lgsl/lgsl_protocol.save +++ b/Panel/protocol/lgsl/lgsl_protocol.save @@ -127,13 +127,13 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION "rfactor" => "RFactor", "risingstorm2" => "Rising Storm 2: Vietnam", "ror" => "Rigs of Rods", - "rust" => "Rust", + "rust" => "Rust", "samp" => "San Andreas Multiplayer", "sandstorm" => "Insurgency: Sandstorm", "savage" => "Savage", "savage2" => "Savage 2", "serioussam" => "Serious Sam", - "shoutcast" => "SHOUTcast Server", + "shoutcast" => "SHOUTcast Server", "serioussam2" => "Serious Sam 2", "shatteredh" => "Shattered Horizon", "sinusbot" => "SinusBot for TS 3 and Discord", @@ -661,9 +661,9 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION $response = call_user_func_array($lgsl_function, array(&$server, &$lgsl_need, &$lgsl_fp)); return $server; } - //------------------Open Game Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ + //------------------GameServer Panel LGSL FEED CONFIGURATION (found on web settings)-----------------------+ global $settings; - + if( isset($_GET['m']) and $_GET['m'] == "lgsl" ) $lgsl_config['feed']['method'] = 0; else @@ -740,7 +740,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION { //---------------------------------------------------------+ $lgsl_fp = @fsockopen("{$scheme}://{$server['b']['ip']}", $server['b']['q_port'], $errno, $errstr, 1); - + if (!$lgsl_fp) { return FALSE; } $lgsl_config['timeout'] = 0; $lgsl_config['timeout'] = intval($lgsl_config['timeout']); @@ -1213,4 +1213,4 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION //---------------------------------------------------------------------------------------------------------------------------------+ // NEWER HL1 SERVERS REPLY TO A2S_INFO WITH 3 PACKETS ( HL1 FORMAT INFO, SOURCE FORMAT INFO, PLAYERS ) - + diff --git a/Panel/scripts/build_pdfs.py b/Panel/scripts/build_pdfs.py index e3a9d2e4..c197ce21 100644 --- a/Panel/scripts/build_pdfs.py +++ b/Panel/scripts/build_pdfs.py @@ -28,23 +28,23 @@ from datetime import datetime import pandas as pd class GameGuideGenerator: - def __init__(self, csv_path="all_hostable_games_union.csv", + def __init__(self, csv_path="all_hostable_games_union.csv", output_md="out/md", output_pdf="out/pdfs", template_path="templates/game_guide.md"): self.csv_path = Path(csv_path) self.output_md = Path(output_md) self.output_pdf = Path(output_pdf) self.template_path = Path(template_path) - + # Ensure output directories exist self.output_md.mkdir(parents=True, exist_ok=True) self.output_pdf.mkdir(parents=True, exist_ok=True) - + # Forbidden provider mentions (must be filtered out) self.forbidden_terms = [ - 'OGP', 'LinuxGSM', 'Nitrado', 'GameServers.com', 'G-Portal', - 'OpenGamePanel' + 'GSP', 'LinuxGSM', 'Nitrado', 'GameServers.com', 'G-Portal', + 'GameServerPanel' ] - + # Common game engines for enhanced data self.engine_mapping = { 'Counter-Strike': 'Source Engine', 'Counter-Strike 2': 'Source 2', @@ -68,13 +68,13 @@ class GameGuideGenerator: 'V Rising': 'Unity', 'Core Keeper': 'Unity', 'Enshrouded': 'Custom', 'Palworld': 'Unreal Engine 5' } - + # Common Steam App IDs self.appid_mapping = { 'Counter-Strike 2': '730', 'Counter-Strike: Global Offensive': '730', 'Team Fortress 2': '440', 'Left 4 Dead 2': '550', 'Garry\'s Mod': '4000', 'Rust': '258550', - 'ARK: Survival Evolved': '376030', 'Squad': '393380', + 'ARK: Survival Evolved': '376030', 'Squad': '393380', 'Valheim': '892970', '7 Days to Die': '294420', 'Unturned': '304930', 'ARMA 3': '107410', 'DayZ': '221100', 'Terraria': '105600', @@ -83,7 +83,7 @@ class GameGuideGenerator: 'The Forest': '242760', 'Killing Floor 2': '232090', 'Insurgency: Sandstorm': '581320', 'Mordhau': '629760' } - + def load_template(self): """Load the Markdown template""" try: @@ -92,29 +92,29 @@ class GameGuideGenerator: except FileNotFoundError: print(f"Error: Template file not found: {self.template_path}") sys.exit(1) - + def read_csv_games(self): """Read games from CSV file""" if not self.csv_path.exists(): print(f"Error: CSV file not found: {self.csv_path}") sys.exit(1) - + games = [] try: df = pd.read_csv(self.csv_path) - + # Find the game name column (could be 'Game', 'Title', etc.) game_column = None for col in df.columns: if col.lower() in ['game', 'title', 'name']: game_column = col break - + if not game_column: # Use first column as fallback game_column = df.columns[0] print(f"Warning: Using first column '{game_column}' as game name column") - + # Extract unique games (remove duplicates and empty entries) for _, row in df.iterrows(): game_name = row[game_column] @@ -123,30 +123,30 @@ class GameGuideGenerator: game_name = re.sub(r'^\d+\.', '', str(game_name)).strip() if game_name and game_name not in [g['name'] for g in games]: games.append({'name': game_name}) - + print(f"Loaded {len(games)} unique games from {self.csv_path}") return sorted(games, key=lambda x: x['name']) - + except Exception as e: print(f"Error reading CSV file: {e}") sys.exit(1) - + def sanitize_filename(self, name): """Create a safe filename from game name""" # Remove special characters, replace spaces with hyphens sanitized = re.sub(r'[^\w\s-]', '', name) sanitized = re.sub(r'[-\s]+', '-', sanitized).strip('-').lower() return sanitized - + def detect_engine(self, game_name): """Detect game engine based on name patterns""" # Direct mapping first if game_name in self.engine_mapping: return self.engine_mapping[game_name] - + # Pattern-based detection name_lower = game_name.lower() - + if any(x in name_lower for x in ['source', 'half-life', 'counter-strike']): return 'Source Engine' elif any(x in name_lower for x in ['unreal', 'squad', 'insurgency']): @@ -161,11 +161,11 @@ class GameGuideGenerator: return 'id Tech' else: return 'Custom/Unknown' - + def get_app_id(self, game_name): """Get Steam App ID for the game""" return self.appid_mapping.get(game_name, 'N/A') - + def supports_workshop(self, game_name): """Determine if game supports Steam Workshop""" # Games known to support Workshop @@ -176,13 +176,13 @@ class GameGuideGenerator: 'Cities: Skylines', 'Civilization VI', 'Europa Universalis IV', 'Stellaris', 'Hearts of Iron IV', 'Prison Architect' ] - + return game_name in workshop_games - + def generate_port_table(self, game_name, engine): """Generate port mapping table based on game type""" ports = [] - + # Common patterns based on engine/game type if 'Source' in engine: ports = [ @@ -213,18 +213,18 @@ class GameGuideGenerator: {'feature': 'Query Port', 'port': '25566', 'protocol': 'UDP', 'relation': 'Game + 1', 'notes': 'Server status queries'}, {'feature': 'RCON', 'port': '25575', 'protocol': 'TCP', 'relation': 'Game + 10', 'notes': 'Remote administration'} ] - + # Format as table table_rows = [] for port in ports: table_rows.append(f"| {port['feature']} | {port['port']} | {port['protocol']} | {port['relation']} | {port['notes']} |") - + return '\n'.join(table_rows) - + def generate_startup_flags(self, game_name, engine): """Generate exhaustive startup parameters based on game engine""" flags = [] - + if 'Source' in engine: flags = [ ('+map', '', 'string', 'Starting map name', '+map de_dust2'), @@ -313,26 +313,26 @@ class GameGuideGenerator: ('--headless', '', 'flag', 'Run without graphics', '--headless'), ('--threads', '0', 'integer 0-16', 'Worker thread count', '--threads 4') ] - + # Format as table table_rows = [] for flag_data in flags: flag, default, type_info, desc, example = flag_data table_rows.append(f"| {flag} | {default} | {type_info} | {desc} | {example} |") - + return '\n'.join(table_rows) - + def generate_config_files_section(self, game_name, engine): """Generate configuration files section""" configs = [] - + if 'Source' in engine: configs = [ "### Core Configuration Files", "", "**Windows Paths:**", "- `server.cfg` - Main server configuration", - "- `autoexec.cfg` - Auto-executed commands on startup", + "- `autoexec.cfg` - Auto-executed commands on startup", "- `banned_user.cfg` - Banned Steam IDs", "- `banned_ip.cfg` - Banned IP addresses", "- `listip.cfg` - Reserved slot IP addresses", @@ -348,7 +348,7 @@ class GameGuideGenerator: ] elif 'Unity' in engine or 'Rust' in game_name: configs = [ - "### Core Configuration Files", + "### Core Configuration Files", "", "**Windows Paths:**", "- `server.cfg` - Main server settings", @@ -369,7 +369,7 @@ class GameGuideGenerator: "", "**Windows Paths:**", "- `server.properties` - Main server configuration", - "- `whitelist.json` - Allowed players list", + "- `whitelist.json` - Allowed players list", "- `ops.json` - Server operators list", "- `banned-players.json` - Banned players", "- `banned-ips.json` - Banned IP addresses", @@ -380,14 +380,14 @@ class GameGuideGenerator: "- `/opt/gameserver/world/` - World save files", "" ] - + return '\n'.join(configs) - + def generate_workshop_section(self, game_name, supports_workshop): """Generate Steam Workshop integration section""" if not supports_workshop: return "This game does not support Steam Workshop integration." - + return """### Steam Workshop Setup **Authentication Requirements:** @@ -416,7 +416,7 @@ class GameGuideGenerator: # Subscribe to workshop item workshop.download -# Update all subscribed items +# Update all subscribed items workshop.update # List subscribed items @@ -443,7 +443,7 @@ hostname "My Self-Hosted Server" sv_password "" rcon_password "secure_rcon_password_here" -// Game settings +// Game settings mp_maxrounds 30 mp_timelimit 0 mp_roundtime 115 @@ -501,19 +501,19 @@ max-tick-time=60000 def generate_game_guide(self, game_name): """Generate complete guide for a single game""" template = self.load_template() - + # Gather game information engine = self.detect_engine(game_name) app_id = self.get_app_id(game_name) workshop_support = self.supports_workshop(game_name) - + # Generate content sections port_table = self.generate_port_table(game_name, engine) startup_flags_table = self.generate_startup_flags(game_name, engine) config_files_section = self.generate_config_files_section(game_name, engine) workshop_section = self.generate_workshop_section(game_name, workshop_support) sample_configs = self.generate_sample_configs(game_name, engine) - + # Template replacements replacements = { '{game_name}': game_name, @@ -532,14 +532,14 @@ max-tick-time=60000 '{windows_batch_example}': f'server.exe --dedicated --console\npause', '{linux_service_example}': f'/opt/gameserver/server --dedicated --console' } - + # Apply replacements content = template for placeholder, replacement in replacements.items(): content = content.replace(placeholder, replacement) - + return content - + def convert_to_pdf(self, markdown_file, pdf_file): """Convert Markdown to PDF using Pandoc""" try: @@ -556,9 +556,9 @@ max-tick-time=60000 '--metadata=author:Self-Hosting Guide', f'--metadata=date:{datetime.now().strftime("%Y-%m-%d")}' ] - + result = subprocess.run(cmd, capture_output=True, text=True, timeout=120) - + if result.returncode == 0: print(f"✓ PDF generated: {pdf_file.name}") return True @@ -566,94 +566,94 @@ max-tick-time=60000 print(f"✗ PDF generation failed for {markdown_file.name}") print(f" Error: {result.stderr}") return False - + except subprocess.TimeoutExpired: print(f"✗ PDF generation timed out for {markdown_file.name}") return False except Exception as e: print(f"✗ PDF generation error for {markdown_file.name}: {e}") return False - + def validate_content(self, content, game_name): """Validate content for forbidden terms and requirements""" issues = [] - + # Check for forbidden provider mentions content_lower = content.lower() for term in self.forbidden_terms: if term.lower() in content_lower: issues.append(f"Contains forbidden term: {term}") - + # Check for HTML entity escapes if '<' in content or '>' in content: issues.append("Contains HTML entity escapes (<, >)") - + # Check for required sections required_sections = [ '## Overview', '## System Requirements', '## Ports & Networking', '## Startup Parameters', '## Configuration Files', '## Troubleshooting' ] - + for section in required_sections: if section not in content: issues.append(f"Missing required section: {section}") - + if issues: print(f"⚠️ Validation issues for {game_name}:") for issue in issues: print(f" - {issue}") return False - + return True - + def generate_all_guides(self): """Generate guides for all games in CSV""" games = self.read_csv_games() - + if not games: print("No games found in CSV file") return False - + print(f"\nGenerating guides for {len(games)} games...") print("=" * 50) - + generated_md = 0 generated_pdf = 0 failed_games = [] - + for game in games: game_name = game['name'] sanitized_name = self.sanitize_filename(game_name) - + print(f"\nProcessing: {game_name}") - + try: # Generate Markdown content content = self.generate_game_guide(game_name) - + # Validate content if not self.validate_content(content, game_name): failed_games.append(f"{game_name} (validation failed)") continue - + # Write Markdown file md_file = self.output_md / f"{sanitized_name}.md" with open(md_file, 'w', encoding='utf-8') as f: f.write(content) print(f" ✓ Markdown: {md_file.name}") generated_md += 1 - + # Generate PDF pdf_file = self.output_pdf / f"{sanitized_name}.pdf" if self.convert_to_pdf(md_file, pdf_file): generated_pdf += 1 else: failed_games.append(f"{game_name} (PDF generation failed)") - + except Exception as e: print(f" ✗ Error processing {game_name}: {e}") failed_games.append(f"{game_name} (processing error)") - + # Generate summary print("\n" + "=" * 50) print("GENERATION SUMMARY") @@ -662,12 +662,12 @@ max-tick-time=60000 print(f"Markdown files generated: {generated_md}") print(f"PDF files generated: {generated_pdf}") print(f"Failed games: {len(failed_games)}") - + if failed_games: print(f"\nFailed games:") for failed in failed_games: print(f" - {failed}") - + # Save generation manifest manifest = { "generated_at": datetime.now().isoformat(), @@ -677,12 +677,12 @@ max-tick-time=60000 "failed_games": failed_games, "games": [{"name": g["name"], "sanitized": self.sanitize_filename(g["name"])} for g in games] } - + manifest_file = self.output_pdf / "manifest.json" with open(manifest_file, 'w', encoding='utf-8') as f: json.dump(manifest, f, indent=2) print(f"\nManifest saved: {manifest_file}") - + return len(failed_games) == 0 if __name__ == "__main__": diff --git a/Panel/scripts/quality_control.py b/Panel/scripts/quality_control.py index e64fd051..25e1dcc0 100644 --- a/Panel/scripts/quality_control.py +++ b/Panel/scripts/quality_control.py @@ -20,143 +20,143 @@ class GuideQualityControl: def __init__(self, md_dir="out/md", pdf_dir="out/pdfs"): self.md_dir = Path(md_dir) self.pdf_dir = Path(pdf_dir) - + # Forbidden terms that should not appear in output self.forbidden_terms = [ - 'OGP', 'OpenGamePanel', 'LinuxGSM', 'Nitrado', + 'GSP', 'GameServerPanel', 'LinuxGSM', 'Nitrado', 'GameServers.com', 'G-Portal', 'gameservers.com', - 'control panel', 'panel setup', 'OGP module' + 'control panel', 'panel setup', 'GSP module' ] - + # Required sections that must be present self.required_sections = [ '## Overview', - '## System Requirements', + '## System Requirements', '## Ports & Networking', '## Startup Parameters', '## Configuration Files', '## Steam Workshop', - '## Admin & RCON', + '## Admin & RCON', '## Saves, Backups & Wipes', '## Performance Tuning', '## Troubleshooting', '## Appendices' ] - + self.errors = [] self.warnings = [] - + def check_forbidden_terms(self, content, file_name): """Check for forbidden provider mentions""" content_lower = content.lower() found_terms = [] - + for term in self.forbidden_terms: if term.lower() in content_lower: # Count occurrences for severity assessment count = content_lower.count(term.lower()) found_terms.append(f"{term} ({count}x)") - + if found_terms: self.errors.append(f"{file_name}: Contains forbidden terms: {', '.join(found_terms)}") - + def check_html_entities(self, content, file_name): """Check for HTML entity escapes""" html_entities = ['<', '>', '&', '"', '&#'] found_entities = [] - + for entity in html_entities: if entity in content: count = content.count(entity) found_entities.append(f"{entity} ({count}x)") - + if found_entities: self.errors.append(f"{file_name}: Contains HTML entities: {', '.join(found_entities)}") - + def check_placeholder_handling(self, content, file_name): """Verify text is literal, not escaped""" # Check for properly formatted placeholders placeholder_pattern = r'<[A-Z_]+>' placeholders = re.findall(placeholder_pattern, content) - + # Check for escaped placeholders that shouldn't be escaped_pattern = r'<[A-Z_]+>' escaped_placeholders = re.findall(escaped_pattern, content) - + if escaped_placeholders: self.errors.append(f"{file_name}: Contains escaped placeholders: {', '.join(escaped_placeholders)}") - + # Log found placeholders for information if placeholders: self.warnings.append(f"{file_name}: Contains {len(placeholders)} placeholders: {', '.join(placeholders[:3])}{'...' if len(placeholders) > 3 else ''}") - + def check_required_sections(self, content, file_name): """Verify all required sections are present""" missing_sections = [] - + for section in self.required_sections: if section not in content: missing_sections.append(section) - + if missing_sections: self.errors.append(f"{file_name}: Missing required sections: {', '.join(missing_sections)}") - + def check_startup_parameters(self, content, file_name): """Verify sufficient startup parameters are documented""" # Look for startup parameters table param_pattern = r'\| [+\-][a-zA-Z0-9_.]+' parameters = re.findall(param_pattern, content) - + param_count = len(parameters) if param_count < 10: self.warnings.append(f"{file_name}: Only {param_count} startup parameters found (minimum 10 recommended)") elif param_count < 15: self.warnings.append(f"{file_name}: {param_count} startup parameters found (15+ recommended for exhaustive coverage)") - + def check_port_mappings(self, content, file_name): """Verify port mapping table is comprehensive""" # Look for port table entries port_pattern = r'\| [A-Za-z ]+ \| \d+ \| [A-Z]+ \|' port_entries = re.findall(port_pattern, content) - + port_count = len(port_entries) if port_count < 3: self.warnings.append(f"{file_name}: Only {port_count} port mappings found (3+ recommended)") - + def check_troubleshooting_depth(self, content, file_name): """Verify troubleshooting section is comprehensive""" # Look for troubleshooting subsections troubleshooting_match = re.search(r'## Troubleshooting.*?(?=## |\Z)', content, re.DOTALL) - + if troubleshooting_match: troubleshooting_content = troubleshooting_match.group(0) - + # Count subsections (### headers) subsection_pattern = r'###' subsections = re.findall(subsection_pattern, troubleshooting_content) subsection_count = len(subsections) - + if subsection_count < 5: self.warnings.append(f"{file_name}: Troubleshooting has only {subsection_count} subsections (5+ recommended for deep coverage)") - + # Check for common troubleshooting topics required_topics = ['startup', 'connection', 'performance', 'save', 'network'] content_lower = troubleshooting_content.lower() missing_topics = [topic for topic in required_topics if topic not in content_lower] - + if missing_topics: self.warnings.append(f"{file_name}: Troubleshooting missing topics: {', '.join(missing_topics)}") else: self.errors.append(f"{file_name}: No troubleshooting section found") - + def validate_markdown_file(self, md_file): """Validate a single Markdown file""" try: with open(md_file, 'r', encoding='utf-8') as f: content = f.read() - + file_name = md_file.name - + # Run all validation checks self.check_forbidden_terms(content, file_name) self.check_html_entities(content, file_name) @@ -165,15 +165,15 @@ class GuideQualityControl: self.check_startup_parameters(content, file_name) self.check_port_mappings(content, file_name) self.check_troubleshooting_depth(content, file_name) - + except Exception as e: self.errors.append(f"{md_file.name}: Error reading file: {e}") - + def validate_pdf_file(self, pdf_file): """Basic validation of PDF file""" try: size = pdf_file.stat().st_size - + # Check file size is reasonable (not empty, not too large) if size < 1000: # Less than 1KB self.errors.append(f"{pdf_file.name}: PDF file too small ({size} bytes)") @@ -182,75 +182,75 @@ class GuideQualityControl: else: # File size is reasonable pass - + except Exception as e: self.errors.append(f"{pdf_file.name}: Error checking PDF: {e}") - + def validate_all_guides(self): """Validate all generated guides""" print("=== Quality Control Validation ===\n") - + if not self.md_dir.exists(): self.errors.append(f"Markdown directory does not exist: {self.md_dir}") return False - + if not self.pdf_dir.exists(): self.errors.append(f"PDF directory does not exist: {self.pdf_dir}") return False - + # Get all markdown files md_files = list(self.md_dir.glob("*.md")) pdf_files = list(self.pdf_dir.glob("*.pdf")) - + if not md_files: self.errors.append("No Markdown files found for validation") return False - + print(f"Validating {len(md_files)} Markdown files...") - + # Validate each markdown file for md_file in md_files: print(f" Checking: {md_file.name}") self.validate_markdown_file(md_file) - + # Check if corresponding PDF exists pdf_name = md_file.stem + ".pdf" pdf_file = self.pdf_dir / pdf_name - + if pdf_file.exists(): self.validate_pdf_file(pdf_file) else: self.errors.append(f"Missing PDF for {md_file.name}: {pdf_name}") - + print(f"\nValidation completed.") return self.print_results() - + def print_results(self): """Print validation results""" print("\n" + "=" * 50) print("VALIDATION RESULTS") print("=" * 50) - + total_issues = len(self.errors) + len(self.warnings) - + if self.errors: print(f"\n❌ ERRORS ({len(self.errors)}):") for error in self.errors: print(f" • {error}") - + if self.warnings: print(f"\n⚠️ WARNINGS ({len(self.warnings)}):") for warning in self.warnings: print(f" • {warning}") - + if not self.errors and not self.warnings: print("✅ All validations passed! No issues found.") - + print(f"\nSummary: {len(self.errors)} errors, {len(self.warnings)} warnings") - + # Return True if no errors (warnings are acceptable) return len(self.errors) == 0 - + def generate_report(self): """Generate a JSON report of validation results""" report = { @@ -261,11 +261,11 @@ class GuideQualityControl: "warnings": self.warnings, "validation_passed": len(self.errors) == 0 } - + report_file = self.pdf_dir / "quality_report.json" with open(report_file, 'w', encoding='utf-8') as f: json.dump(report, f, indent=2) - + print(f"Quality report saved: {report_file}") return report @@ -273,5 +273,5 @@ if __name__ == "__main__": qc = GuideQualityControl() success = qc.validate_all_guides() qc.generate_report() - + sys.exit(0 if success else 1) \ No newline at end of file diff --git a/Panel/server_status.php b/Panel/server_status.php index 62b78d1b..fc7c020e 100644 --- a/Panel/server_status.php +++ b/Panel/server_status.php @@ -1,10 +1,10 @@ getUserById($_SESSION['user_id']); // Get settings $settings = $db->getSettings(); @$GLOBALS['panel_language'] = $settings['panel_language']; -ogpLang(); +gspLang(); function ping_host($host, $timeout = 5) { if (function_exists('exec')) { $output = array(); $result = 0; - + // Use ping command based on OS if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { exec("ping -n 1 -w " . ($timeout * 1000) . " " . escapeshellarg($host), $output, $result); } else { exec("ping -c 1 -W " . $timeout . " " . escapeshellarg($host), $output, $result); } - + if ($result === 0) { // Extract ping time from output foreach ((array)$output as $line) { @@ -104,7 +104,7 @@ $servers = $db->getRemoteServers(); - Server Status - OGP + Server Status - GSP \ No newline at end of file diff --git a/Panel/themes/AdminLTE-2/dist/js/main.js b/Panel/themes/AdminLTE-2/dist/js/main.js index 99dcbcba..a8b027cd 100644 --- a/Panel/themes/AdminLTE-2/dist/js/main.js +++ b/Panel/themes/AdminLTE-2/dist/js/main.js @@ -147,13 +147,13 @@ $(document).ready(function() { var recaptcha = ""; } - + // login form mod if($('form[name="login_form"]').length > 0) { // clear possible storage vars clearLocalStorageItems(); - + $('select[name=lang]').addClass('form-control'); var title = $('.main h4').text(); @@ -183,7 +183,7 @@ $(document).ready(function()

    \ '; } - + new_form = '\
    \
    \ @@ -411,7 +411,7 @@ $(document).ready(function() var boxClass = 'login-box'; var headerContent = '\ \ - \ + \ '; if(new_form !== undefined) @@ -458,7 +458,7 @@ $(document).ready(function() "disableTimeOut" : true, "closeButton": true, }); - toastr.error('', langConsts['OGP_LANG_maintenance_mode_on'], { + toastr.error('', langConsts['GSP_LANG_maintenance_mode_on'], { "timeOut": 0, "extendedTimeOut": 0, "preventDuplicates": true, @@ -931,12 +931,12 @@ $(document).ready(function() /* *** Footer Mod *** */ - $('.main-footer .OGPVersionArea').addClass('d-none'); + $('.main-footer .GSPVersionArea').addClass('d-none'); $('.main-footer a').attr('target', '_blank').addClass('text-dark'); - $('.main-footer .footer').html($('.main-footer .footer').html().replace("Theme - ", "Theme for OGP by oNdsen - ")) + $('.main-footer .footer').html($('.main-footer .footer').html().replace("Theme - ", "Theme for GSP by oNdsen - ")) $('.main-footer .footer.center').removeClass('center'); - $('.main-footer .OGPVersionArea .version').remove() - $('.main-footer .OGPVersionArea').removeClass('inline-block').addClass('d-inline-block'); + $('.main-footer .GSPVersionArea .version').remove() + $('.main-footer .GSPVersionArea').removeClass('inline-block').addClass('d-inline-block'); $('.main-footer .footer > br').last().remove() } @@ -1173,17 +1173,17 @@ $(window).load(function() $('.main-footer .versionInfo').click(function() { - $('.OGPVersionArea, .OGPVersionArea .version, .OGPVersionArea .versionNumber').removeClass('d-none').removeClass('hide'); + $('.GSPVersionArea, .GSPVersionArea .version, .GSPVersionArea .versionNumber').removeClass('d-none').removeClass('hide'); // add blink class to versionNumber - $('.OGPVersionArea .versionNumber').addClass('shortblink'); + $('.GSPVersionArea .versionNumber').addClass('shortblink'); // remove after 4 seconds setTimeout(function(){ - $('.OGPVersionArea .versionNumber').removeClass('shortblink'); + $('.GSPVersionArea .versionNumber').removeClass('shortblink'); }, 4000); - var copy = copyToClipboard($('.OGPVersionArea .versionNumber')); - toastr.info('"' + copy + '" ' + $('.OGPVersionArea .copyVersionResult').attr('lang')); + var copy = copyToClipboard($('.GSPVersionArea .versionNumber')); + toastr.info('"' + copy + '" ' + $('.GSPVersionArea .copyVersionResult').attr('lang')); }); // circular notifications if($('body > #notification').length > 0) @@ -1287,7 +1287,7 @@ function themeChanger(changeTo, save = false) if(!localStorage.getItem('themeLogo')) { - $('img.brand-image').attr('src', 'themes/AdminLTE/dist/img/ogp_logo_dark.svg'); + $('img.brand-image').attr('src', 'themes/AdminLTE/dist/img/gsp_logo_dark.svg'); } $('link[href*="jquery-ui.min"]').attr('href', 'themes/AdminLTE/plugins/jquery-ui/jquery-ui.min.dark.css'); @@ -1318,7 +1318,7 @@ function themeChanger(changeTo, save = false) if(!localStorage.getItem('themeLogo')) { - $('img.brand-image').attr('src', 'themes/AdminLTE/dist/img/ogp_logo_light.svg'); + $('img.brand-image').attr('src', 'themes/AdminLTE/dist/img/gsp_logo_light.svg'); } $('link[href*="jquery-ui.min"]').attr('href', 'themes/AdminLTE/plugins/jquery-ui/jquery-ui.min.light.css'); @@ -1349,7 +1349,7 @@ function themeChanger(changeTo, save = false) if(!localStorage.getItem('themeLogo')) { - $('img.brand-image').attr('src', 'themes/AdminLTE/dist/img/ogp_logo_dark.svg'); + $('img.brand-image').attr('src', 'themes/AdminLTE/dist/img/gsp_logo_dark.svg'); } $('link[href*="jquery-ui.min"]').attr('href', 'themes/AdminLTE/plugins/jquery-ui/jquery-ui.min.light.css'); diff --git a/Panel/themes/AdminLTE-2/dist/php/settings.php b/Panel/themes/AdminLTE-2/dist/php/settings.php index f1166343..8dd378ed 100644 --- a/Panel/themes/AdminLTE-2/dist/php/settings.php +++ b/Panel/themes/AdminLTE-2/dist/php/settings.php @@ -3,7 +3,7 @@ include("../../../../includes/helpers.php"); include("./db.class.php"); include("./theme.class.php"); -// start ogp session +// start gsp session startSession(); // initialize classes @@ -90,7 +90,7 @@ if(isset($_GET['m'])) if($_GET['v']=='maintenance') { $data = $ThemeDB->getMaintenanceMode(); - + header("Content-Type: application/json"); echo json_encode($data); exit(); @@ -134,7 +134,7 @@ if(isset($_GET['m'])) $theme = $ThemeDB->setSetting('theme', 'dark'); } } - + header("Content-Type: application/json"); echo json_encode($theme); } @@ -144,13 +144,13 @@ if(isset($_GET['m'])) { // load global setting (id -1) $themeLogo = $ThemeDB->getSetting('themeLogo', -1); - + if(empty($themeLogo)) { echo 0; exit(); } - + header("Content-Type: application/json"); echo json_encode($themeLogo); exit(); @@ -161,12 +161,12 @@ if(isset($_GET['m'])) { // load global setting (id -1) $themeNavWidth = $ThemeDB->getSetting('themeNavWidth', -1); - + if(empty($themeNavWidth)) { $themeNavWidth = 250; } - + header("Content-Type: application/json"); echo json_encode($themeNavWidth); } @@ -179,18 +179,18 @@ if(isset($_GET['m'])) if(isset($_GET['v']) && $_GET['v']=='displayNum') { $themeServerstatsNum = $ThemeDB->getSetting('themeServerstatsNum', -1); - + if(empty($themeServerstatsNum) || $themeServerstatsNum<1 || $themeServerstatsNum>20) { $themeServerstatsNum = 10; } - + echo $themeServerstatsNum; }else { // check if token is set to check if themeServerstats are enabled or not $themeServerstats = $ThemeDB->getSetting('updateToken', -1); - + echo empty($themeServerstats) ? 'remove' : 'activate'; } } @@ -217,7 +217,7 @@ if(isset($_GET['m'])) { $avatarPath = $avatar; } - + echo $avatarPath; exit; } @@ -258,13 +258,13 @@ if(isset($_GET['m'])) $newColumns[] = array('item' => 'item8', 'section' => 'column6', 'collapsed' => 0); // server status $newColumns[] = array('item' => 'item9', 'section' => 'column4', 'collapsed' => 0); - + // write default value to db $setSetting = $ThemeDB->setSetting('dashboard_columns', $newColumns); - + $columns = $newColumns; } - + header("Content-Type: application/json"); echo json_encode($columns); exit(); @@ -273,13 +273,13 @@ if(isset($_GET['m'])) { // only allow new generated items from theme $allowedItems = array('item6', 'item7', 'item8', 'item9'); - + // decode all items $items = json_decode($_POST['data'], 1)['items']; - + // specify new columns $newColumns = array(); - + foreach($items AS $item) { if(in_array($item['id'], $allowedItems)) @@ -287,10 +287,10 @@ if(isset($_GET['m'])) $newColumns[] = array('item' => $item['id'], 'section' => $item['column'], 'collapsed' => $item['collapsed']); } } - + // write to db $setSetting = $ThemeDB->setSetting('dashboard_columns', $newColumns); - + echo "success"; exit(); } @@ -319,18 +319,18 @@ if(isset($_GET['m'])) { // load global setting (id -1) $themeLogo = $ThemeDB->getSetting('themeLogo', -1); - + if(!empty($themeLogo)) { // build direct path $oldLogo = $uploadsFolder."/".basename($themeLogo); - + // delete old logo if exists if(file_exists($oldLogo)) { unlink($oldLogo); } - + // remove logo from db echo $ThemeDB->removeSetting('themeLogo', -1); } @@ -342,7 +342,7 @@ if(isset($_GET['m'])) { // save new width $setSetting = $ThemeDB->setSetting('themeNavWidth', $_GET['v'], -1); - + echo $_GET['v']; exit; }else @@ -360,10 +360,10 @@ if(isset($_GET['m'])) { // generate token $newToken = bin2hex(random_bytes(20)); - + // set token $ThemeDB->setSetting('updateToken', $newToken, -1); - + // set cronjob $Theme->checkForCronjob(); } @@ -371,7 +371,7 @@ if(isset($_GET['m'])) { // remove token $ThemeDB->removeSetting('updateToken', -1); - + // remove cronjob $Theme->checkForCronjob(true); } @@ -380,18 +380,18 @@ if(isset($_GET['m'])) if(isset($_GET['num']) && is_numeric($_GET['num'])) { $setNum = $_GET['num']; - + if($setNum<1 || $setNum>20) { $setNum = 10; } - + // set num $ThemeDB->setSetting('themeServerstatsNum', $setNum, -1); } } } - + exit; } } @@ -404,7 +404,7 @@ if(isset($_GET['m'])) function _NewFileUpload($filesField, $uploadName, $settingName, $systemSetting = false) { Global $uploadsFolder, $ThemeDB, $themeUploadsPath; - + if(isset($filesField)) { // check if uploads folder is writable @@ -416,10 +416,10 @@ function _NewFileUpload($filesField, $uploadName, $settingName, $systemSetting = ); return json_encode($retArr); } - + // define svg mime types $svgMimeTypes = array('image/svg+xml', 'image/svg'); - + // check if file is an image or a valid svg mime type $isImage = getimagesize($filesField['tmp_name']); if($isImage === false && !in_array(mime_content_type($filesField['tmp_name']), $svgMimeTypes)) @@ -431,7 +431,7 @@ function _NewFileUpload($filesField, $uploadName, $settingName, $systemSetting = ); return json_encode($retArr); } - + // check file size if($filesField['size'] > 5242880) // 5mb in bytes { @@ -442,7 +442,7 @@ function _NewFileUpload($filesField, $uploadName, $settingName, $systemSetting = ); return json_encode($retArr); } - + // check if setting/upload already exists if($systemSetting) { @@ -455,19 +455,19 @@ function _NewFileUpload($filesField, $uploadName, $settingName, $systemSetting = { // build file path $oldLogo = $uploadsFolder."/".basename($oldUpload); - + // delete old upload if(file_exists($oldLogo)) { unlink($oldLogo); } } - + // get file extension $fileExt = pathinfo($filesField['name'])['extension']; $destFile = $uploadsFolder."/".$uploadName.".".$fileExt; $newUpload = $themeUploadsPath.$uploadName.".".$fileExt; - + if(move_uploaded_file($filesField['tmp_name'], $destFile)) { // write to db @@ -478,7 +478,7 @@ function _NewFileUpload($filesField, $uploadName, $settingName, $systemSetting = { $setSetting = $ThemeDB->setSetting($settingName, $newUpload); } - + $retArr = array( 'code' => 'success', 'data' => $newUpload, diff --git a/Panel/themes/AdminLTE-2/dist/php/theme.class.php b/Panel/themes/AdminLTE-2/dist/php/theme.class.php index ccb861a2..242797ae 100644 --- a/Panel/themes/AdminLTE-2/dist/php/theme.class.php +++ b/Panel/themes/AdminLTE-2/dist/php/theme.class.php @@ -3,18 +3,18 @@ class Theme { private $absolutePath = "../../../.."; - - private function getOGPPublicPath() + + private function getGSPPublicPath() { return str_replace("themes/AdminLTE/dist/php/settings.php", "", $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']); } - + public function checkIsAdmin($user_id) { // load ThemeDB class require_once("./db.class.php"); $ThemeDB = new ThemeDB; - + if(is_numeric($user_id)) { $query = " @@ -22,30 +22,30 @@ class Theme FROM ".$ThemeDB->tablePrefix()."users WHERE user_id = ".$user_id." "; - + $data = $ThemeDB->query($query); if($data) { // reset users_group session for on the fly changes $_SESSION['users_group'] = $data[0]['users_role']; - + if($data[0]['users_role']=='admin') { return true; } } } - + return false; } - private function getOGPServers($all = false) + private function getGSPServers($all = false) { // load ThemeDB class require_once("./db.class.php"); $ThemeDB = new ThemeDB; - - // list all ogp servers + + // list all gsp servers if($all) { $query = " @@ -61,30 +61,30 @@ class Theme LIMIT 1 "; } - + $data = $ThemeDB->query($query); if($data) { return $data; } - + return false; } - + private function getAllCrons() { - return $this->OGPCronjob('get'); + return $this->GSPCronjob('get'); } - - private function OGPCronjob($type, $id = false, $url = false) + + private function GSPCronjob($type, $id = false, $url = false) { - // load ogp lib_remote + // load gsp lib_remote require_once($this->absolutePath."/includes/lib_remote.php"); - - $firstRemoteServer = $this->getOGPServers(); + + $firstRemoteServer = $this->getGSPServers(); if($firstRemoteServer) { - $remote = new OGPRemoteLibrary($firstRemoteServer[0]['agent_ip'], $firstRemoteServer[0]['agent_port'], $firstRemoteServer[0]['encryption_key'], $firstRemoteServer[0]['timeout']); + $remote = new GSPRemoteLibrary($firstRemoteServer[0]['agent_ip'], $firstRemoteServer[0]['agent_port'], $firstRemoteServer[0]['encryption_key'], $firstRemoteServer[0]['timeout']); if($remote->status_chk() != 1) { return false; @@ -94,7 +94,7 @@ class Theme // no server available return false; } - + if($type=="get") { return $remote->scheduler_list_tasks(); @@ -112,20 +112,20 @@ class Theme return $remote->scheduler_del_task($id); } } - + public function checkForCronjob($remove = false) { // load ThemeDB class require_once("./db.class.php"); $ThemeDB = new ThemeDB; - - $checkURL = $this->getOGPPublicPath().'themes/AdminLTE/dist/php/settings.php?m=global&p=check&v=updateserverstats'; - + + $checkURL = $this->getGSPPublicPath().'themes/AdminLTE/dist/php/settings.php?m=global&p=check&v=updateserverstats'; + $updateToken = $ThemeDB->getSetting('updateToken', -1); - + $foundCron = false; $validCron = false; - $allCrons = $this->OGPCronjob('get'); + $allCrons = $this->GSPCronjob('get'); foreach($allCrons AS $cronNum => $cronVal) { // check if current cron is updateserverstats @@ -134,23 +134,23 @@ class Theme if($remove) { // remove cron - $this->OGPCronjob('del', $cronNum); + $this->GSPCronjob('del', $cronNum); }else { if($foundCron) { // possible duplicates, remove them all - $this->OGPCronjob('del', $cronNum); + $this->GSPCronjob('del', $cronNum); continue; } else { $foundCron = $cronNum; - + preg_match('/"(.*)"/', $cronVal, $cronURL); $cronComponents = parse_url(end($cronURL)); parse_str($cronComponents['query'], $cronParams); - + if($updateToken==$cronParams['token']) { $validCron = true; @@ -159,41 +159,41 @@ class Theme } } } - + if(!$remove && ($foundCron || !$validCron)) { // specify cron url $goodCronEntry = '*/5 * * * * wget -qO- "'.$checkURL.'&token='.$updateToken.'" --no-check-certificate'; - + if($foundCron && !$validCron) { // cron existent but invalid - update entry - $this->OGPCronjob('edit', $foundCron, $goodCronEntry); + $this->GSPCronjob('edit', $foundCron, $goodCronEntry); return 'updated cronjob'; } elseif(!$foundCron) { // cron not existent - create entry - $this->OGPCronjob('add', false, $goodCronEntry); + $this->GSPCronjob('add', false, $goodCronEntry); return 'created cronjob'; } } - + return false; } - + public function getGameServer($user_id = false) { // load ThemeDB class require_once("./db.class.php"); $ThemeDB = new ThemeDB; - - // load ogp server_config_parser to get SERVER_CONFIG_LOCATION variable + + // load gsp server_config_parser to get SERVER_CONFIG_LOCATION variable require_once($this->absolutePath."/modules/config_games/server_config_parser.php"); - - // load ogp lib_remote + + // load gsp lib_remote require_once($this->absolutePath."/includes/lib_remote.php"); - + // first get all server homes, specific configs and ip/port config $query = " SELECT * @@ -205,7 +205,7 @@ class Theme NATURAL JOIN ".$ThemeDB->tablePrefix()."config_mods NATURAL JOIN ".$ThemeDB->tablePrefix()."game_mods "; - + if($user_id !== false) { $query .= " @@ -222,7 +222,7 @@ class Theme ) temp "; } - + $query .= " WHERE force_mod_id IN ( @@ -231,15 +231,15 @@ class Theme WHERE force_mod_id = ".$ThemeDB->tablePrefix()."game_mods.mod_id OR force_mod_id = 0 ) ORDER BY home_user_order ASC, ".$ThemeDB->tablePrefix()."server_homes.home_id ASC "; - + $serverHomes = $ThemeDB->query($query); if($serverHomes) { foreach($serverHomes AS $key => $shData) { // check if the screen running the server is running. - $remote = new OGPRemoteLibrary($shData['agent_ip'], $shData['agent_port'], $shData['encryption_key'], $shData['timeout']); - if( $remote->is_screen_running(OGP_SCREEN_TYPE_HOME, $shData['home_id'])) + $remote = new GSPRemoteLibrary($shData['agent_ip'], $shData['agent_port'], $shData['encryption_key'], $shData['timeout']); + if( $remote->is_screen_running(GSP_SCREEN_TYPE_HOME, $shData['home_id'])) { $queryData = $this->getProtocolAndQuery($serverHomes[$key]); $serverHomes[$key]['qProtocol'] = $queryData['qProtocol']; @@ -252,7 +252,7 @@ class Theme unset($serverHomes[$key]); } } - + return $serverHomes; } else @@ -260,12 +260,12 @@ class Theme return false; } } - + private function gameServerQuery($serverObject) { // declarations $timeout = 5; - + // default output $gsq = array( 'online' => 0, @@ -273,23 +273,23 @@ class Theme 'serverOnline' => false, 'map' => false, ); - + // change serverIP to agent ip if server is behind nat $serverIP = ($serverObject['use_nat']==0) ? $serverObject['ip'] : $serverObject['agent_ip']; - + // gameq if($serverObject['qProtocol']=='gameq') { // load gameq class require_once($this->absolutePath."/protocol/GameQ/Autoloader.php"); - - // ogp lgsl_port_conversion + + // gsp lgsl_port_conversion require_once($this->absolutePath."/protocol/lgsl/lgsl_protocol.php"); $portConversion = lgsl_port_conversion($serverObject['qName'], $serverObject['port'], "", ""); $c_port = $portConversion['0']; // conn port $q_port = $portConversion['1']; // query port $s_port = $portConversion['2']; // software port - + $gq = new \GameQ\GameQ(); $gq->addServer(array( 'id' => 'server', @@ -300,10 +300,10 @@ class Theme ], )); $gq->setOption('timeout', $timeout); - + // process gameq request $data = $gq->process(); - + // only update if server is running if(!empty($data['gq_online']) && $data['gq_online']) { @@ -318,16 +318,16 @@ class Theme // lgsl elseif($serverObject['qProtocol']=='lgsl') { - // ogp lgsl_port_conversion + // gsp lgsl_port_conversion require_once($this->absolutePath."/protocol/lgsl/lgsl_protocol.php"); $portConversion = lgsl_port_conversion($serverObject['qName'], $serverObject['port'], "", ""); $c_port = $portConversion['0']; // conn port $q_port = $portConversion['1']; // query port $s_port = $portConversion['2']; // software port - + // get live data $data = lgsl_query_live($serverObject['qName'], $serverIP, $c_port, $q_port, $s_port, "sa"); - + // only update if server is running if($data['b']['status']) { @@ -344,12 +344,12 @@ class Theme elseif($serverObject['qProtocol']=='teamspeak3') { require_once($this->absolutePath."/protocol/TeamSpeak3/TeamSpeak3.php"); - + try { $ts3_VirtualServer = TeamSpeak3::factory('serverquery://'.$serverIP.':'.($serverObject['port'] + 24).'/?server_port='.$serverObject['port'].'&timeout='.$timeout); $ts3_VirtualServer->setExcludeQueryClients(true); - + $gsq['online'] = $ts3_VirtualServer->virtualserver_clientsonline-$ts3_VirtualServer->virtualserver_queryclientsonline; $gsq['max'] = $ts3_VirtualServer->virtualserver_maxclients; $gsq['serverOnline'] = true; @@ -363,13 +363,13 @@ class Theme return $gsq; } - + public function updateGameserverStats($token = false) { // load ThemeDB class require_once("./db.class.php"); $ThemeDB = new ThemeDB; - + // check token if($token) { @@ -383,19 +383,19 @@ class Theme foreach($getGameServer AS $key => $gameServer) { $gsq = $this->gameServerQuery($gameServer); - + // write player stats into db $ThemeDB->query(" INSERT INTO ".$ThemeDB->serverStatsTable." (home_id, users_online) VALUES('".$gameServer['home_id']."', '".$gsq['online']."') "); } - + // delete old stats (keep only entries from last 1 day) $ThemeDB->query(" DELETE FROM ".$ThemeDB->serverStatsTable." WHERE current_stamp < DATE_ADD(NOW(), INTERVAL -1 DAY) "); - + return "successfully updated"; }else { @@ -406,21 +406,21 @@ class Theme return "invalid token"; } } - + return "no token"; } - + public function listServersFromDB() { $allServers = ''; - + $filterUserId = $_SESSION['user_id']; if(isset($_SESSION['users_group']) && $_SESSION['users_group']=='admin') { // user is admin, so display all servers $filterUserId = false; } - + // get all servers from db $getGameServer = $this->getGameServer($filterUserId); if($getGameServer) @@ -430,41 +430,41 @@ class Theme $allServers .= $this->buildServerBox($val); } } - + return $allServers; } - + private function buildServerBox($serverObject) { $gameName = (strtolower($serverObject['mod_name'])=='none') ? $serverObject['game_name'] : $serverObject['game_name'].' ('.$serverObject['mod_name'].')'; $gameMonitorLink = 'home.php?m=gamemanager&p=game_monitor&home_id-mod_id-ip-port='.$serverObject['home_id'].'-'.$serverObject['mod_id'].'-'.$serverObject['ip'].'-'.$serverObject['port']; - + // call game config file to get protocol, query and mod values $queryData = $this->getProtocolAndQuery($serverObject); $serverObject['qProtocol'] = $queryData['qProtocol']; $serverObject['qName'] = $queryData['qName']; $serverObject['qMod'] = $queryData['qMod']; - + // start server query to get online/unknown status and map parameter $gsq = $this->gameServerQuery($serverObject); $serverOnline = ($gsq['serverOnline']) ? 'online' : 'unknown'; $serverObject['qMap'] = $gsq['map']; - + // small map fix for special servers $serverObject['qMap'] = ($serverObject['qMap']=='-') ? '_' : $serverObject['qMap']; - + // declare icon box $iconBox = ' '; - + if($gsq['serverOnline']) { // check if a map image exists $mapImage = $this->getServerImage($serverObject); - if($mapImage!=$this->getOGPPublicPath().'images/online_big.png') + if($mapImage!=$this->getGSPPublicPath().'images/online_big.png') { $iconBox = ' '.$iconBox.' @@ -497,22 +497,22 @@ class Theme
    '; - + return $serverBox; } - + private function buildPlayerChart($serverObject) { // load ThemeDB class require_once("./db.class.php"); $ThemeDB = new ThemeDB; - + $showElements = $ThemeDB->getSetting('themeServerstatsNum', -1); if(empty($showElements)) { $showElements = 10; } - + $onlineStatsQuery = $ThemeDB->query(" SELECT users_online FROM ".$ThemeDB->serverStatsTable." @@ -520,7 +520,7 @@ class Theme ORDER BY current_stamp DESC LIMIT ".$showElements." "); - + $labels = array(); $onlineStats = array(); foreach($onlineStatsQuery AS $osq) @@ -528,13 +528,13 @@ class Theme $labels[] = ''; $onlineStats[] = $osq['users_online']; } - + $chart = '
    - +
    '; - + return $chart; } - + private function getProtocolAndQuery($serverObject) { - // load ogp server_config_parser to get SERVER_CONFIG_LOCATION variable + // load gsp server_config_parser to get SERVER_CONFIG_LOCATION variable require_once($this->absolutePath."/modules/config_games/server_config_parser.php"); - + // load home config file $serverConfig = simplexml_load_file($this->absolutePath."/".SERVER_CONFIG_LOCATION.$serverObject['home_cfg_file']); if($serverConfig) @@ -666,29 +666,29 @@ class Theme { $queryName = (string)$serverConfig->{'protocol'}; } - + return array( 'qName' => $queryName, 'qProtocol' => (string)$serverConfig->{'protocol'}, 'qMod' => (string)$serverConfig->{'mods'}->{'mod'}['key'], ); } - + return false; } - + private function getServerImage($serverObject) { - // load ogp helpers + // load gsp helpers require_once($this->absolutePath."/includes/helpers.php"); - + $query_name = strtolower($serverObject['qName']); $mod = strtolower($serverObject['qMod']); $map = str_replace("-", "_", strtolower($serverObject['qMap'])); - - // adapting get_map_path() from OGP + + // adapting get_map_path() from GSP $mod_gt = $mod; - + if($mod == "cstrike") { if ($query_name == "halflife") @@ -703,10 +703,10 @@ class Theme elseif($query_name == "source") $mod_gt = "tf2"; } - + // ts3 fix $query_name = ($query_name == "teamspeak3") ? "ts3" : $query_name; - + $mod_gt = $mod == "fof" ? "hl2dm" : $mod_gt; $mod_gt = $mod == "insurgency" ? "ins" : $mod_gt; $mod_gt = $mod == "redorchestra2" ? "ro2" : $mod_gt; @@ -720,17 +720,17 @@ class Theme $mod_gt = $query_name == "callofdutywaw" ? "codww" : $mod_gt; $mod_gt = $query_name == "callofdutymw3" ? "mw3" : $mod_gt; $mod_gt = $query_name == "conanexiles" ? "conan" : $mod_gt; - + $map_paths = array( - $this->getOGPPublicPath()."protocol/lgsl/maps/$query_name/$mod/$map.jpg", - $this->getOGPPublicPath()."protocol/lgsl/maps/$query_name/$mod/$map.gif", - $this->getOGPPublicPath()."protocol/lgsl/maps/$query_name/$mod/$map.png", - $this->getOGPPublicPath()."protocol/lgsl/maps/$query_name/$map.jpg", - $this->getOGPPublicPath()."protocol/lgsl/maps/$query_name/$map.gif", - $this->getOGPPublicPath()."protocol/lgsl/maps/$query_name/$map.png", + $this->getGSPPublicPath()."protocol/lgsl/maps/$query_name/$mod/$map.jpg", + $this->getGSPPublicPath()."protocol/lgsl/maps/$query_name/$mod/$map.gif", + $this->getGSPPublicPath()."protocol/lgsl/maps/$query_name/$mod/$map.png", + $this->getGSPPublicPath()."protocol/lgsl/maps/$query_name/$map.jpg", + $this->getGSPPublicPath()."protocol/lgsl/maps/$query_name/$map.gif", + $this->getGSPPublicPath()."protocol/lgsl/maps/$query_name/$map.png", "https://image.gametracker.com/images/maps/160x120/$mod_gt/$map.jpg", "https://image.gametracker.com/images/maps/160x120/$query_name/$map.jpg", - $this->getOGPPublicPath()."images/online_big.png" + $this->getGSPPublicPath()."images/online_big.png" ); return get_first_existing_file($map_paths, 'https://gametracker.com', 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0'); diff --git a/Panel/themes/AdminLTE-2/layout.html b/Panel/themes/AdminLTE-2/layout.html index 77caa37d..b2eaffc4 100644 --- a/Panel/themes/AdminLTE-2/layout.html +++ b/Panel/themes/AdminLTE-2/layout.html @@ -4,7 +4,7 @@ - + %title% @@ -30,7 +30,7 @@ - + @@ -74,7 +74,7 @@