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

Revert "Complete rebrand from Open Game Panel (OGP) to GameServer Panel (GSP)"

Browse source
This commit is contained in:
Frank Harris 2025-09-08 12:42:34 -05:00 • committed by GitHub
parent 02c94766c6
commit deee7d6ac5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
308 changed files with 1412 additions and 1412 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/gamemanager/cfg_text_replace.php
View file

@ -103,7 +103,7 @@ print_r($file_replacements);
echo "</xmp>"; */
require_once('includes/lib_remote.php');
$remote = new GSPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
$remote = new OGPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
foreach($file_replacements as $filepath => $replacements)
{

4
modules/gamemanager/get_server_log.php
View file

@ -16,14 +16,14 @@ if (!$home_id || !$mod_id) {
$db = getOGPDBInstance(); // Replace with your DB instance
$home_info = $db->getGameHome($home_id);
$server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']);
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$home_log = "";
if( isset( $server_xml->console_log ) ) {
$log_path = preg_replace("/%mod%/i", $home_info['mods'][$mod_id]['mod_key'], $server_xml->console_log);
$log_retval = $remote->remote_readfile( $home_info['home_path'].'/'.$log_path, $home_log );
} else {
$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME, $home_info['home_id'], clean_path($home_info['home_path']."/".$server_xml->exe_location), $home_log);
$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME, $home_info['home_id'], clean_path($home_info['home_path']."/".$server_xml->exe_location), $home_log);
}
$lines = explode("\n", $home_log);
$home_log = implode("\n", array_slice($lines, -40));

6
modules/gamemanager/home_handling_functions.php
View file

@ -32,7 +32,7 @@ function get_start_cmd($remote,$server_xml,$home_info,$mod_id,$ip,$port,$db)
$cli_param_data['IP'] = $ip;
$cli_param_data['PORT'] = $port;
$cli_param_data['HOSTNAME'] = $home_info['home_name'];
$cli_param_data['PID_FILE'] = "gsp_game_startup.pid";
$cli_param_data['PID_FILE'] = "ogp_game_startup.pid";
// Linux
if( preg_match("/Linux/", $os) )
@ -217,7 +217,7 @@ function exec_operation( $action, $home_id, $mod_id, $ip, $port, $override = fal
return FALSE;
require_once('includes/lib_remote.php');
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$os = $remote->what_os();
if ( $action != "stop" )
@ -231,7 +231,7 @@ function exec_operation( $action, $home_id, $mod_id, $ip, $port, $override = fal
}
}
$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']) === 1;
if ( $action == "stop" AND $screen_running )
{

8
modules/gamemanager/log.php
View file

@ -42,20 +42,20 @@ require_once("modules/config_games/server_config_parser.php");
}
require_once('includes/lib_remote.php');
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$home_log = "";
if( isset( $server_xml->console_log ) )
{
$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
$home_info['home_id'],
clean_path($home_info['home_path']),
$home_log, 100, (string) $server_xml->console_log);
}
else
{
$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
$home_info['home_id'],
clean_path($home_info['home_path']."/".$server_xml->exe_location),
$home_log);
@ -68,7 +68,7 @@ require_once("modules/config_games/server_config_parser.php");
}
elseif ($log_retval == 1 || $log_retval == 2)
{
// Force log file contents to be UTF-8 (fixes http://www.gameserver-panel.org/forum/viewthread.php?thread_id=5379)
// Force log file contents to be UTF-8 (fixes http://www.opengamepanel.org/forum/viewthread.php?thread_id=5379)
if(hasValue($home_log)){
$home_log = utf8_encode($home_log);
}

8
modules/gamemanager/mini_start.php
View file

@ -85,7 +85,7 @@ if( !isset( $_POST['start_server'] ) )
<input type='hidden' name='home_id' value='$server_home[home_id]' />\n
<input type='hidden' name='remote_server_id' value='".$server_home['remote_server_id']."' />\n
<table class='start-server'>
<tr><td class='right'>". get_lang("gsp_agent_ip") .
<tr><td class='right'>". get_lang("ogp_agent_ip") .
":</td><td class='left'>".$server_home['agent_ip']."</td></tr>";
$max_players = $server_home['max_players'];
@ -294,7 +294,7 @@ elseif($server_home['home_id'] == $_POST['home_id'])
$cli_param_data['HOSTNAME'] = $server_home['home_name'];
$cli_param_data['PID_FILE'] = "gsp_game_startup.pid";
$cli_param_data['PID_FILE'] = "ogp_game_startup.pid";
$os = $remote->what_os();
@ -337,7 +337,7 @@ elseif($server_home['home_id'] == $_POST['home_id'])
// We do this check because sometimes server does not answer to lgsl check
// done below and is still running.
if ( $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1 )
if ( $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1 )
{
echo "<p>".get_lang_f('server_already_running')."<a href=?m=gamemanager&amp;p=stop&amp;home_id=".$server_home['home_id'].
"&amp;ip=".$ip."&amp;port=".
@ -565,7 +565,7 @@ elseif($server_home['home_id'] == $_POST['home_id'])
$db->changeLastParam($server_home['home_id'],json_encode($save_param));
echo "<table class='server-starting'>";
echo "<tr><td class='right'>". get_lang("gsp_agent_ip") .
echo "<tr><td class='right'>". get_lang("ogp_agent_ip") .
":</td><td class='left'>".$server_home['agent_ip']."</td></tr>\n";
echo "<tr><td class='right'>". get_lang("game_home") .
":</td><td class='left'>".$server_home['home_path']."</td></tr>";

44
modules/gamemanager/module.php
View file

@ -12,16 +12,16 @@ $module_menus = array( array( 'subpage' => 'game_monitor', 'name'=>'Game Monitor
$module_access_rights = array('u' => 'allow_updates', 'p' => 'allow_parameter_usage', 'e' => 'allow_extra_params', 'c' => 'allow_custom_fields');
$install_queries[0] = array(
"DROP TABLE IF EXISTS `".GSP_DB_PREFIX."home_ip_ports`;",
"CREATE TABLE IF NOT EXISTS `".GSP_DB_PREFIX."home_ip_ports` (
"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."home_ip_ports`;",
"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."home_ip_ports` (
`ip_id` int(11) NOT NULL,
`port` int(11) NOT NULL,
`home_id` int(11) NOT NULL,
PRIMARY KEY (`ip_id`,`port`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
"DROP TABLE IF EXISTS ".GSP_DB_PREFIX."server_homes",
"CREATE TABLE IF NOT EXISTS `".GSP_DB_PREFIX."server_homes` (
"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."server_homes",
"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."server_homes` (
`home_id` int(50) NOT NULL auto_increment,
`remote_server_id` int(11) NOT NULL,
`user_id_main` int(11) NOT NULL,
@ -35,8 +35,8 @@ $install_queries[0] = array(
UNIQUE KEY remote_server_id (remote_server_id,home_path)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
"DROP TABLE IF EXISTS ".GSP_DB_PREFIX."rcon_presets;",
"CREATE TABLE ".GSP_DB_PREFIX."rcon_presets (
"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."rcon_presets;",
"CREATE TABLE ".OGP_DB_PREFIX."rcon_presets (
`preset_id` int(50) NOT NULL auto_increment,
`name` varchar(20) NOT NULL,
`command` varchar(100) NOT NULL,
@ -45,8 +45,8 @@ UNIQUE KEY remote_server_id (remote_server_id,home_path)
PRIMARY KEY (`preset_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
"DROP TABLE IF EXISTS ".GSP_DB_PREFIX."game_mods",
"CREATE TABLE IF NOT EXISTS ".GSP_DB_PREFIX."game_mods (
"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."game_mods",
"CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."game_mods (
`mod_id` int(50) NOT NULL auto_increment,
`home_id` int(255) NOT NULL,
`mod_cfg_id` int(11) NOT NULL,
@ -61,12 +61,12 @@ UNIQUE KEY home_id (home_id,mod_cfg_id)
) ENGINE=MyISAM;");
$install_queries[1] = array(
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` ADD `ftp_login` varchar(32) NULL;",
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` ADD `ftp_status` int(11) NOT NULL DEFAULT '0';");
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `ftp_login` varchar(32) NULL;",
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `ftp_status` int(11) NOT NULL DEFAULT '0';");
$install_queries[2] = array(
"DROP TABLE IF EXISTS `".GSP_DB_PREFIX."status_cache`",
"CREATE TABLE IF NOT EXISTS `".GSP_DB_PREFIX."status_cache` (
"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."status_cache`",
"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."status_cache` (
`date_timestamp` char(16) NOT NULL,
`ip_id` char(3) NOT NULL,
`port` char(6) NOT NULL,
@ -74,28 +74,28 @@ $install_queries[2] = array(
) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
$install_queries[3] = array(
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` ADD `custom_fields` LONGTEXT NULL;");
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `custom_fields` LONGTEXT NULL;");
$install_queries[4] = array(
"ALTER TABLE `".GSP_DB_PREFIX."home_ip_ports` ADD `force_mod_id` int(11) NOT NULL DEFAULT '0';");
"ALTER TABLE `".OGP_DB_PREFIX."home_ip_ports` ADD `force_mod_id` int(11) NOT NULL DEFAULT '0';");
$install_queries[5] = array(
"TRUNCATE `".GSP_DB_PREFIX."status_cache`;");
"TRUNCATE `".OGP_DB_PREFIX."status_cache`;");
$install_queries[6] = array(
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` ADD `server_expiration_date` VARCHAR(21) NOT NULL default 'X';");
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `server_expiration_date` VARCHAR(21) NOT NULL default 'X';");
$install_queries[7] = array(
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` drop index `remote_server_id`;"
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` drop index `remote_server_id`;"
);
$install_queries[8] = array(
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` ADD `home_user_order` INT NOT NULL default 99999;");
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `home_user_order` INT NOT NULL default 99999;");
// Increase default column sizes
$install_queries[9] = array(
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` MODIFY COLUMN `home_path` VARCHAR(500);",
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` MODIFY COLUMN `home_name` VARCHAR(500);",
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` MODIFY COLUMN `control_password` VARCHAR(128);",
"ALTER TABLE `".GSP_DB_PREFIX."server_homes` MODIFY COLUMN `ftp_password` VARCHAR(128);");
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` MODIFY COLUMN `home_path` VARCHAR(500);",
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` MODIFY COLUMN `home_name` VARCHAR(500);",
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` MODIFY COLUMN `control_password` VARCHAR(128);",
"ALTER TABLE `".OGP_DB_PREFIX."server_homes` MODIFY COLUMN `ftp_password` VARCHAR(128);");
?>

2
modules/gamemanager/monitor_buttons.php
View file

@ -78,7 +78,7 @@ if (preg_match("/u/",$server_home['access_rights']))
}
/*
$module_buttons[] = "<a class='monitorbutton getAPILinks' hassteam='" . ($hasSteamAutoUpdate ? 'true' : 'false') . "' hasrcon='" . ($server_xml->control_protocol || ($server_xml->lgsl_query_name and $server_xml->lgsl_query_name == "7dtd") || ($server_xml->gameq_query_name and $server_xml->gameq_query_name == "minecraft") ? 'true' : 'false') . "' copyfail='" . get_lang("auto_update_copy_me_fail") . "' copysuccess='" . get_lang("auto_update_copy_me_success") . "' autoupdatetext='" . get_lang("auto_update_title_popup") . "' copyme='" . get_lang("auto_update_copy_me") . "' token='".$db->getApiToken($_SESSION['user_id'])."' ip='".$server_home['ip']."' port='".$server_home['port']."' modkey='".$server_home['mod_key']."' panelurl='" . getGSPSiteURL() . "'>
$module_buttons[] = "<a class='monitorbutton getAPILinks' hassteam='" . ($hasSteamAutoUpdate ? 'true' : 'false') . "' hasrcon='" . ($server_xml->control_protocol || ($server_xml->lgsl_query_name and $server_xml->lgsl_query_name == "7dtd") || ($server_xml->gameq_query_name and $server_xml->gameq_query_name == "minecraft") ? 'true' : 'false') . "' copyfail='" . get_lang("auto_update_copy_me_fail") . "' copysuccess='" . get_lang("auto_update_copy_me_success") . "' autoupdatetext='" . get_lang("auto_update_title_popup") . "' copyme='" . get_lang("auto_update_copy_me") . "' token='".$db->getApiToken($_SESSION['user_id'])."' ip='".$server_home['ip']."' port='".$server_home['port']."' modkey='".$server_home['mod_key']."' panelurl='" . getOGPSiteURL() . "'>
<img src='" . check_theme_image("images/auto_update.png") . "' title='". get_lang("show_api_actions") . "'>
<span>". get_lang("show_api_actions") . "</span>
</a>";

2
modules/gamemanager/rcon_presets.php
View file

@ -3,7 +3,7 @@
* Component of the gamemanager module
*/
function exec_gsp_module() {
function exec_ogp_module() {
global $db;

4
modules/gamemanager/ref_servermonitor.php
View file

@ -6,7 +6,7 @@
require_once('modules/gamemanager/home_handling_functions.php');
require_once("modules/config_games/server_config_parser.php");
require_once('includes/lib_remote.php');
function exec_gsp_module()
function exec_ogp_module()
{
global $db;
@ -99,7 +99,7 @@ function exec_gsp_module()
}
$remote_server_id = $server_home['remote_server_id'];
$rserver = $db->getRemoteServerById($remote_server_id);
$remote = new GSPRemoteLibrary($rserver['agent_ip'], $rserver['agent_port'], $rserver['encryption_key'], $rserver['timeout']);
$remote = new OGPRemoteLibrary($rserver['agent_ip'], $rserver['agent_port'], $rserver['encryption_key'], $rserver['timeout']);
$startup_file_exists = $remote->rfile_exists( "startups/".$ip."-".$port ) === 1;
$SrvCtrl = "<table class='srvctrl'><tr><td style='border:0;text-align:center;background:transparent'><a href='?m=gamemanager&amp;p=restart&amp;home_id=".
$home_id."&amp;mod_id=".$mod_id."&amp;ip=".$ip."&amp;port=".$port.

8
modules/gamemanager/restart_server.php
View file

@ -6,7 +6,7 @@
require_once('home_handling_functions.php');
require_once("modules/config_games/server_config_parser.php");
function exec_gsp_module() {
function exec_ogp_module() {
global $view,$db;
$ip = $_REQUEST['ip'];
@ -27,7 +27,7 @@ function exec_gsp_module() {
}
require_once('includes/lib_remote.php');
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$os = $remote->what_os();
@ -66,7 +66,7 @@ function exec_gsp_module() {
}
else
{
$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
$home_id,
clean_path($home_info['home_path']."/".$server_xml->exe_location),
$home_log);
@ -247,7 +247,7 @@ function exec_gsp_module() {
}
else
{
$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_id);
$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_id);
if ( $screen_running == 1 )
{
print("<p class='note'>".get_lang('restarting_server')."</p>");

16
modules/gamemanager/rsync_install.php
View file

@ -51,7 +51,7 @@ function update_local_copies()
}
echo "Updating local cache of rsync meta data files<br>";
$update_files = array('sizes.list', 'rsync.list', 'rsync_sites.list');
$update_urls = array('rsync.gameserver-panel.org', 'dls.atl.webehostin.com');
$update_urls = array('rsync.opengamepanel.org', 'dls.atl.webehostin.com');
$context = array(
'ssl' => array(
@ -96,7 +96,7 @@ function update_local_copies()
require_once("includes/lib_remote.php");
require_once("modules/config_games/server_config_parser.php");
function exec_gsp_module() {
function exec_ogp_module() {
//update_local_copies(); #Disabled until the rsync_sites.list file from master servers is corrected.
global $db,$view,$settings;
@ -134,7 +134,7 @@ function exec_gsp_module() {
$home_id = $home_info['home_id'];
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$remote = new OGPRemoteLibrary($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']);
if( isset($server_xml->lgsl_query_name) )
@ -172,12 +172,12 @@ function exec_gsp_module() {
echo "<h2>Update $home_info[home_name]</h2>";
if ( $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_id) == 1 )
if ( $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_id) == 1 )
{
print_failure( get_lang("server_running_cant_update") );
return;
}
$update_active = $remote->get_log(GSP_SCREEN_TYPE_UPDATE,
$update_active = $remote->get_log(OGP_SCREEN_TYPE_UPDATE,
// Note exec location should not be added here as the log is in root where rsync is executed.
$home_id,clean_path($home_info['home_path']),
$log_txt,30);
@ -331,9 +331,9 @@ function exec_gsp_module() {
{
if(!is_file("modules/gamemanager/rsync.list"))
{
print_failure("Trouble accessing http://www.gameserver-panel.org/rsync.list<br>".
"Make sure allow_fopen_url is set to \"On\" in your php.ini and gameserver-panel.org is online<br>".
"In the mean time, you can get a local copy of the file by running wget http://www.gameserver-panel.org/sync_data/rsync.list -O /path/to/ogpweb/modules/gamemanager/rsync.list");
print_failure("Trouble accessing http://www.opengamepanel.org/rsync.list<br>".
"Make sure allow_fopen_url is set to \"On\" in your php.ini and opengamepanel.org is online<br>".
"In the mean time, you can get a local copy of the file by running wget http://www.opengamepanel.org/sync_data/rsync.list -O /path/to/ogpweb/modules/gamemanager/rsync.list");
return;
}
# print_failure("Error loading rsync.list");

12
modules/gamemanager/server_monitor.php
View file

@ -127,7 +127,7 @@ function get_sync_name($server_xml)
return $sync_name;
}
function exec_gsp_module() {
function exec_ogp_module() {
global $db, $settings, $loggedInUserInfo;
echo "<h2 class='gameMonitor " . ($db->isAdmin( $_SESSION['user_id'] ) ? "isAdminUser" : "") . "'>". get_lang("game_monitor") ."</h2>";
$refresh = new refreshed();
@ -322,7 +322,7 @@ echo "<table id='servermonitor' class='tablesorter' data-sortlist='[[0,0],[3,1]]
//default is it never expires
$expiration_dates = "This Server Will NEVER Expire";
//get all orders thare are active or invoiced
$query = "SELECT * FROM gsp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status >= -2" ;
$query = "SELECT * FROM ogp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status >= -2" ;
$results = $db->resultQuery($query);
if(!is_null($results[0]['status']))
{
@ -419,7 +419,7 @@ echo "<table id='servermonitor' class='tablesorter' data-sortlist='[[0,0],[3,1]]
//End
$remote = new GSPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
$remote = new OGPRemoteLibrary($server_home['agent_ip'], $server_home['agent_port'], $server_home['encryption_key'], $server_home['timeout']);
$host_stat = $remote->status_chk();
if( $host_stat === 1)
@ -429,8 +429,8 @@ echo "<table id='servermonitor' class='tablesorter' data-sortlist='[[0,0],[3,1]]
$displayIP = checkDisplayPublicIP($server_home['display_public_ip'], $ip);
$address = "";
$screen_running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;
$update_in_progress = $remote->is_screen_running(GSP_SCREEN_TYPE_UPDATE,$server_home['home_id']) === 1;
$screen_running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$server_home['home_id']) === 1;
$update_in_progress = $remote->is_screen_running(OGP_SCREEN_TYPE_UPDATE,$server_home['home_id']) === 1;
if($screen_running)
{
// Check if the screen running the server is running.
@ -513,7 +513,7 @@ echo "<table id='servermonitor' class='tablesorter' data-sortlist='[[0,0],[3,1]]
$address = "<span style='color:darkred;font-weight:bold;'>Agent Offline</span>";
}
$user = $db->getUserById($server_home['user_id_main']);
$query = "SELECT * FROM gsp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status > 0" ;
$query = "SELECT * FROM ogp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status > 0" ;
//DISABLE SHOWING EXPIRATION DATES
//$expiration_dates = "";

8
modules/gamemanager/start_server.php
View file

@ -6,7 +6,7 @@
require_once('home_handling_functions.php');
require_once("modules/config_games/server_config_parser.php");
function exec_gsp_module()
function exec_ogp_module()
{
global $db;
global $view;
@ -38,7 +38,7 @@ function exec_gsp_module()
echo "</h2>";
require_once('includes/lib_remote.php');
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$remote = new OGPRemoteLibrary($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']);
@ -88,7 +88,7 @@ function exec_gsp_module()
}
else
{
$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
$home_info['home_id'],
clean_path($home_info['home_path']."/".$server_xml->exe_location),
$home_log);
@ -160,7 +160,7 @@ function exec_gsp_module()
else
$query_ip = $ip;
$running = $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_info['home_id']);
$running = $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_info['home_id']);
if ( $server_xml->lgsl_query_name )
{

4
modules/gamemanager/stop_server.php
View file

@ -6,7 +6,7 @@
require_once('home_handling_functions.php');
require_once("modules/config_games/server_config_parser.php");
function exec_gsp_module() {
function exec_ogp_module() {
global $view,$db;
@ -58,7 +58,7 @@ function exec_gsp_module() {
}
else
{
$remote = new GSPRemoteLibrary($rserver['agent_ip'],
$remote = new OGPRemoteLibrary($rserver['agent_ip'],
$rserver['agent_port'],
$rserver['encryption_key'],
$rserver['timeout']);

8
modules/gamemanager/update_server.php
View file

@ -6,7 +6,7 @@
require_once("includes/lib_remote.php");
require_once("modules/config_games/server_config_parser.php");
function exec_gsp_module() {
function exec_ogp_module() {
global $db;
global $view;
@ -40,7 +40,7 @@ function exec_gsp_module() {
print_failure( get_lang("xml_steam_error") );
return;
}
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'], $home_info['timeout']);
$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'], $home_info['timeout']);
$host_stat = $remote->status_chk();
if( $host_stat === 0 )
{
@ -50,14 +50,14 @@ function exec_gsp_module() {
}
else
{
if ( $remote->is_screen_running(GSP_SCREEN_TYPE_HOME,$home_id) == 1 )
if ( $remote->is_screen_running(OGP_SCREEN_TYPE_HOME,$home_id) == 1 )
{
print_failure( get_lang("server_running_cant_update") );
return;
}
$log_txt = '';
$update_active = $remote->get_log(GSP_SCREEN_TYPE_UPDATE,
$update_active = $remote->get_log(OGP_SCREEN_TYPE_UPDATE,
// Note exec location should not be added here as the log is in root where steam is executed.
$home_id,clean_path($home_info['home_path']),
$log_txt);

4
modules/gamemanager/update_server_manual.php
View file

@ -22,7 +22,7 @@ function do_progress($kbytes,$totalsize)
require_once("includes/lib_remote.php");
require_once("modules/config_games/server_config_parser.php");
function exec_gsp_module() {
function exec_ogp_module() {
global $db, $view;
@ -53,7 +53,7 @@ function exec_gsp_module() {
if ( !empty($state) )
{
$server_xml = read_server_config(SERVER_CONFIG_LOCATION."/".$home_info['home_cfg_file']);
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
if ( $state == "start" )
{
$postinstall = $server_xml->post_install ? $server_xml->post_install : "";

2
modules/gamemanager/upload_map_image.php
View file

@ -118,7 +118,7 @@ function smart_resize_image($file,
return true;
}
function exec_gsp_module() {
function exec_ogp_module() {
global $db;

10
modules/gamemanager/view_server_log.php
View file

@ -6,7 +6,7 @@
require_once('home_handling_functions.php');
require_once("modules/config_games/server_config_parser.php");
function exec_gsp_module()
function exec_ogp_module()
{
global $db;
global $view;
@ -46,20 +46,20 @@ function exec_gsp_module()
}
require_once('includes/lib_remote.php');
$remote = new GSPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$remote = new OGPRemoteLibrary($home_info['agent_ip'],$home_info['agent_port'],$home_info['encryption_key'],$home_info['timeout']);
$home_log = "";
if( isset( $server_xml->console_log ) )
{
$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
$home_info['home_id'],
clean_path($home_info['home_path']),
$home_log, 100, (string) $server_xml->console_log);
}
else
{
$log_retval = $remote->get_log(GSP_SCREEN_TYPE_HOME,
$log_retval = $remote->get_log(OGP_SCREEN_TYPE_HOME,
$home_info['home_id'],
clean_path($home_info['home_path']."/".$server_xml->exe_location),
$home_log);
@ -72,7 +72,7 @@ function exec_gsp_module()
}
elseif ($log_retval == 1 || $log_retval == 2)
{
// Force log file contents to be UTF-8 (fixes http://www.gameserver-panel.org/forum/viewthread.php?thread_id=5379)
// Force log file contents to be UTF-8 (fixes http://www.opengamepanel.org/forum/viewthread.php?thread_id=5379)
if(hasValue($home_log)){
$home_log = utf8_encode($home_log);
}