diff --git a/gsp_api.php b/gsp_api.php index 2c63e9f2..721e6321 100644 --- a/gsp_api.php +++ b/gsp_api.php @@ -510,7 +510,7 @@ function api_user_games() } } else - $game_path = "/home/".$remote_server['ogp_user']."/User_Files/"; // Default + $game_path = "/home/".$remote_server['gsp_user']."/User_Files/"; // Default $game_path = clean_path($game_path); // Clean it @@ -611,7 +611,7 @@ function api_user_games() } } else - $game_path = "/home/".$game_home['ogp_user']."/User_Files/"; // Default + $game_path = "/home/".$game_home['gsp_user']."/User_Files/"; // Default $game_path = clean_path($game_path); // Clean it @@ -641,7 +641,7 @@ function api_user_games() $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)); diff --git a/home.php b/home.php index f841a1e0..c763429c 100644 --- a/home.php +++ b/home.php @@ -40,7 +40,7 @@ $settings = $db->getSettings(); gspLang(); 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') diff --git a/includes/database.php b/includes/database.php index ffe4b36d..034f8660 100644 --- a/includes/database.php +++ b/includes/database.php @@ -134,7 +134,7 @@ abstract class GSPDatabase { abstract public function getCurrentHomeConfigMods($clear_all); - abstract public function updateOGPGameModsWithNewIDs($oldModStructure); + abstract public function updateGSPGameModsWithNewIDs($oldModStructure); abstract public function clearGameCfgs($clear_all); diff --git a/includes/database_mysqli.php b/includes/database_mysqli.php index 97921cef..6d380ba5 100644 --- a/includes/database_mysqli.php +++ b/includes/database_mysqli.php @@ -938,7 +938,7 @@ class GSPDatabaseMySQL extends GSPDatabase return false; } - public function updateOGPGameModsWithNewIDs($oldModStructure){ + public function updateGSPGameModsWithNewIDs($oldModStructure){ $currentStructure = $this->getCurrentHomeConfigMods(false); if(isset($oldModStructure) && is_array($oldModStructure) && isset($currentStructure) && is_array($currentStructure)){ @@ -1217,7 +1217,7 @@ class GSPDatabaseMySQL extends GSPDatabase return false; $rhost_name = trim($rhost_name); - $query = sprintf("INSERT INTO `%sremote_servers` (`agent_ip`,remote_server_name,ogp_user,agent_port,ftp_ip,ftp_port,`encryption_key`,timeout,use_nat,display_public_ip) + $query = sprintf("INSERT INTO `%sremote_servers` (`agent_ip`,remote_server_name,gsp_user,agent_port,ftp_ip,ftp_port,`encryption_key`,timeout,use_nat,display_public_ip) VALUES('%s','%s','%s','%d','%s','%s','%s','%s','%s','%s');", $this->table_prefix, $this->realEscapeSingle($rhost_ip), @@ -1379,7 +1379,7 @@ class GSPDatabaseMySQL extends GSPDatabase $query = sprintf("UPDATE %sremote_servers SET agent_ip='%s', agent_port='%s', encryption_key='%s', remote_server_name='%s', - ogp_user='%s', + gsp_user='%s', ftp_ip='%s', ftp_port='%s', timeout='%s', diff --git a/includes/functions.php b/includes/functions.php index a2b2990a..ae2c1036 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -626,7 +626,7 @@ function getClientIPAddress(){ return $_SERVER['REMOTE_ADDR']; } -function getOGPSiteURL(){ +function getGSPSiteURL(){ $url = ''; $scheme = ( isset($_SERVER['HTTPS']) and get_true_boolean($_SERVER['HTTPS']) ) ? "https://" : "http://"; $url .= $scheme; diff --git a/includes/helpers.php b/includes/helpers.php index 1e583f83..5695c319 100644 --- a/includes/helpers.php +++ b/includes/helpers.php @@ -411,8 +411,8 @@ function runPostUpdateOperations(){ } function getGSPGitHubURL($gitHubUsername, $repo){ - $OGPGitHub = "https://github.com/OpenGamePanel/"; - $gitHubURL = $OGPGitHub; + $GSPGitHub = "https://github.com/Gameservers-World/"; + $gitHubURL = $GSPGitHub; if(isset($gitHubUsername) && !empty($gitHubUsername)){ $gitHubURL = "https://github.com/" . $gitHubUsername . "/"; } @@ -423,12 +423,12 @@ function getGSPGitHubURL($gitHubUsername, $repo){ return $gitHubURL; } - return $OGPGitHub; + return $GSPGitHub; } function getGSPGitHubURLUnstrict($gitHubUsername){ - $OGPGitHub = "https://github.com/OpenGamePanel/"; - $gitHubURL = $OGPGitHub; + $GSPGitHub = "https://github.com/Gameservers-World/"; + $gitHubURL = $GSPGitHub; if(isset($gitHubUsername) && !empty($gitHubUsername)){ $gitHubURL = "https://github.com/" . $gitHubUsername . "/"; } @@ -440,7 +440,7 @@ function getGSPGitHubURLUnstrict($gitHubUsername){ return $gitHubURL; } - return $OGPGitHub; + return $GSPGitHub; } function getGitHubOrganization($gitHubURL){ @@ -456,7 +456,7 @@ function getGitHubOrganization($gitHubURL){ return $gitHubOrg; } -function getOGPLangConstantsJSON(){ +function getGSPLangConstantsJSON(){ global $GSPLangPre; $finalConsts = array(); diff --git a/includes/view.php b/includes/view.php index bbadd8c1..1b43d08f 100644 --- a/includes/view.php +++ b/includes/view.php @@ -5,7 +5,7 @@ define("DEFAULT_REFRESH_TIME","2"); -class OGPView { +class GSPView { private $meta; private $title; @@ -80,7 +80,7 @@ class OGPView { $this->title = $title == "" ? $this->title : $this->title . " [$title]"; // Dump defined constants to json (for language javascript) - $jsonStrConsts = getOGPLangConstantsJSON(); + $jsonStrConsts = getGSPLangConstantsJSON(); if($jsonStrConsts !== false){ $this->header_code .= '' . "\n"; } diff --git a/index.php b/index.php index 0a07321a..409d5d89 100644 --- a/index.php +++ b/index.php @@ -57,7 +57,7 @@ $settings = $db->getSettings(); gspLang(); require_once("includes/view.php"); -$view = new OGPView(); +$view = new GSPView(); $view->setCharset( get_lang('lang_charset') ); if(isset($_GET['type']) && $_GET['type'] == 'cleared') { diff --git a/js/modules/user_games-assign.js b/js/modules/user_games-assign.js index 19793df2..dfc99324 100644 --- a/js/modules/user_games-assign.js +++ b/js/modules/user_games-assign.js @@ -30,9 +30,9 @@ function change_access_rights(id_type, assign_id) { return true; } - check_access_rights += "" + + check_access_rights += "" + "" + - "" + langConsts['OGP_LANG_' + value + '_info'] + ""; + "" + langConsts['GSP_LANG_' + value + '_info'] + ""; }); check_access_rights += ''; diff --git a/modules/billing/add_to_cart.php b/modules/billing/add_to_cart.php index 57b5ff05..6f31d8f7 100644 --- a/modules/billing/add_to_cart.php +++ b/modules/billing/add_to_cart.php @@ -1,8 +1,8 @@ getRemoteServer($remote_server_id); - $ogp_user = $r_server['ogp_user']; + $gsp_user = $r_server['gsp_user']; // request the user name and the game name to generate a game home name. $home_name = $_POST['home_name']; diff --git a/modules/billing/bak/add_to_cart.php b/modules/billing/bak/add_to_cart.php index 57b5ff05..6f31d8f7 100644 --- a/modules/billing/bak/add_to_cart.php +++ b/modules/billing/bak/add_to_cart.php @@ -1,8 +1,8 @@ getRemoteServer($remote_server_id); - $ogp_user = $r_server['ogp_user']; + $gsp_user = $r_server['gsp_user']; // request the user name and the game name to generate a game home name. $home_name = $_POST['home_name']; diff --git a/modules/billing/bak/cart.php b/modules/billing/bak/cart.php index 674960d5..cf1b6368 100644 --- a/modules/billing/bak/cart.php +++ b/modules/billing/bak/cart.php @@ -41,7 +41,7 @@ function assignOrdersToCart($user_id,$tax_amount,$currency,$coupon_id){ return $db->resultInsertId( 'billing_carts', $fields ); } -function exec_ogp_module() +function exec_gsp_module() { error_reporting(E_ALL); @@ -84,7 +84,7 @@ function exec_ogp_module() if ($coupon_count > 0) { $coupon_count--; - $db->resultquery("UPDATE ogp_billing_coupons SET count = $coupon_count WHERE code = '$_POST[coupon_code]'"); + $db->resultquery("UPDATE gsp_billing_coupons SET count = $coupon_count WHERE code = '$_POST[coupon_code]'"); } } } @@ -369,7 +369,7 @@ function exec_ogp_module() //see if user is a new customer, //check number of orders they have had or if user is an admin (to be able to create server) $isAdmin = $db->isAdmin( $_SESSION['user_id'] ); - $result = $db->resultQuery("SELECT * FROM ogp_billing_orders WHERE user_id=".$user_id); + $result = $db->resultQuery("SELECT * FROM gsp_billing_orders WHERE user_id=".$user_id); $server_price = number_format( $order['price'], 2 ); if(isset($settings['display_free'])) { $display_free = $settings['display_free']; diff --git a/modules/billing/bak/create_servers.php b/modules/billing/bak/create_servers.php index 887b8c48..c3457071 100644 --- a/modules/billing/bak/create_servers.php +++ b/modules/billing/bak/create_servers.php @@ -81,8 +81,8 @@ function exec_gsp_module() $settings = $db->getSettings(); $subject = "Gameserver Renewel at " . $settings['panel_name']; $email = $db->resultQuery(" SELECT DISTINCT users_email - FROM ogp_users, ogp_billing_orders - WHERE ogp_users.user_id = $user_id")[0]["users_email"]; + FROM gsp_users, gsp_billing_orders + WHERE gsp_users.user_id = $user_id")[0]["users_email"]; $message = "Your server, " . $home_name ." ID #". $home_id . " at " . $settings['panel_name'] . " has just been renewed.
Thank You for your continued support.
@@ -246,8 +246,8 @@ function exec_gsp_module() $settings = $db->getSettings(); $subject = "New Gameserver installed at " . $settings['panel_name']; $email = $db->resultQuery(" SELECT DISTINCT users_email - FROM ogp_users, ogp_billing_orders - WHERE ogp_users.user_id = $user_id")[0]["users_email"]; + FROM gsp_users, gsp_billing_orders + WHERE gsp_users.user_id = $user_id")[0]["users_email"]; $message = "Your server, " . $home_name ." ID #". $home_id . " at " . $settings['panel_name'] . " has just been created.
Thank You for your continued support.
@@ -286,7 +286,7 @@ function exec_gsp_module() } - // Set expiration date in ogp database + // Set expiration date in gsp database //status is -3 -2 -1 0 and 1 // deleted, suspended, invoiced, inactive, active //finish_date the server will be suspended diff --git a/modules/billing/bak/cron-shop.php b/modules/billing/bak/cron-shop.php index 92529690..30ca2485 100644 --- a/modules/billing/bak/cron-shop.php +++ b/modules/billing/bak/cron-shop.php @@ -1,8 +1,8 @@ resultQuery( "SELECT discount FROM ogp_billing_coupons WHERE id=".$db->realEscapeSingle($cartDB['coupon_id'])); + $result = $db->resultQuery( "SELECT discount FROM gsp_billing_coupons WHERE id=".$db->realEscapeSingle($cartDB['coupon_id'])); foreach ($result as $couponDB){ $coupon_discount=$couponDB['discount']; } diff --git a/modules/billing/bak/services.php b/modules/billing/bak/services.php index e8b7484d..5a5f3b28 100644 --- a/modules/billing/bak/services.php +++ b/modules/billing/bak/services.php @@ -1,5 +1,5 @@ resultQuery("SELECT DISTINCT remote_server_id, remote_server_name, agent_ip, ogp_user FROM GSP_DB_PREFIXremote_servers"); + $result3 = $db->resultQuery("SELECT DISTINCT remote_server_id, remote_server_name, agent_ip, gsp_user FROM GSP_DB_PREFIXremote_servers"); ?> diff --git a/modules/billing/bak/shop.php b/modules/billing/bak/shop.php index b9f47231..225aae6b 100644 --- a/modules/billing/bak/shop.php +++ b/modules/billing/bak/shop.php @@ -1,8 +1,8 @@ getSettings(); $subject = "Gameserver Renewel at " . $settings['panel_name']; $email = $db->resultQuery(" SELECT DISTINCT users_email - FROM ogp_users, ogp_billing_orders - WHERE ogp_users.user_id = $user_id")[0]["users_email"]; + FROM gsp_users, gsp_billing_orders + WHERE gsp_users.user_id = $user_id")[0]["users_email"]; $message = "Your server, " . $home_name ." ID #". $home_id . " at " . $settings['panel_name'] . " has just been renewed.
Thank You for your continued support.
@@ -246,8 +246,8 @@ function exec_ogp_module() $settings = $db->getSettings(); $subject = "New Gameserver installed at " . $settings['panel_name']; $email = $db->resultQuery(" SELECT DISTINCT users_email - FROM ogp_users, ogp_billing_orders - WHERE ogp_users.user_id = $user_id")[0]["users_email"]; + FROM gsp_users, gsp_billing_orders + WHERE gsp_users.user_id = $user_id")[0]["users_email"]; $message = "Your server, " . $home_name ." ID #". $home_id . " at " . $settings['panel_name'] . " has just been created.
Thank You for your continued support.
@@ -286,7 +286,7 @@ function exec_ogp_module() } - // Set expiration date in ogp database + // Set expiration date in gsp database //status is -3 -2 -1 0 and 1 // deleted, suspended, invoiced, inactive, active //finish_date the server will be suspended diff --git a/modules/billing/cron-shop.php b/modules/billing/cron-shop.php index e0f3aa87..0289f965 100644 --- a/modules/billing/cron-shop.php +++ b/modules/billing/cron-shop.php @@ -1,8 +1,8 @@ resultQuery( "SELECT discount FROM ogp_billing_coupons WHERE id=".$db->realEscapeSingle($cartDB['coupon_id'])); + $result = $db->resultQuery( "SELECT discount FROM gsp_billing_coupons WHERE id=".$db->realEscapeSingle($cartDB['coupon_id'])); foreach ($result as $couponDB){ $coupon_discount=$couponDB['discount']; } diff --git a/modules/billing/services.php b/modules/billing/services.php index ba6c2fa2..5a5f3b28 100644 --- a/modules/billing/services.php +++ b/modules/billing/services.php @@ -128,7 +128,7 @@ function exec_gsp_module() resultQuery("SELECT DISTINCT remote_server_id, remote_server_name, agent_ip, ogp_user FROM GSP_DB_PREFIXremote_servers"); + $result3 = $db->resultQuery("SELECT DISTINCT remote_server_id, remote_server_name, agent_ip, gsp_user FROM GSP_DB_PREFIXremote_servers"); ?> diff --git a/modules/billing/shop.php b/modules/billing/shop.php index 4218b776..225aae6b 100644 --- a/modules/billing/shop.php +++ b/modules/billing/shop.php @@ -1,8 +1,8 @@ query("UPDATE ogp_remote_servers SET enabled={$e} WHERE remote_server_id={$id}"); + $db->query("UPDATE gsp_remote_servers SET enabled={$e} WHERE remote_server_id={$id}"); } $flash[] = "Server locations updated."; } @@ -93,7 +93,7 @@ function update_service_row(mysqli $db, string $locationCol, int $sid, array $sv $locList = implode(' ', $selected); $locListEsc = esc_mysqli($db, $locList); - $sql = "UPDATE ogp_billing_services + $sql = "UPDATE gsp_billing_services SET service_name='{$name}', `{$locationCol}`='{$locListEsc}', slot_min_qty={$minSlots}, @@ -125,13 +125,13 @@ if (isset($_POST['bulk_update']) && !empty($_POST['service']) && is_array($_POST /* C) Remove a service (separate small form) */ if (isset($_POST['remove_service'], $_POST['service_id_remove'])) { $sid = (int)$_POST['service_id_remove']; - $db->query("DELETE FROM ogp_billing_services WHERE service_id={$sid}"); + $db->query("DELETE FROM gsp_billing_services WHERE service_id={$sid}"); $flash[] = "Service #{$sid} removed."; } /* fetch data for UI */ -$remoteServers = fetch_all_assoc($db, "SELECT remote_server_id, remote_server_name, enabled FROM ogp_remote_servers ORDER BY remote_server_name"); -$services = fetch_all_assoc($db, "SELECT service_id, service_name, `{$locationCol}` AS locs, slot_min_qty, slot_max_qty, price_monthly, img_url, enabled FROM ogp_billing_services ORDER BY service_name"); +$remoteServers = fetch_all_assoc($db, "SELECT remote_server_id, remote_server_name, enabled FROM gsp_remote_servers ORDER BY remote_server_name"); +$services = fetch_all_assoc($db, "SELECT service_id, service_name, `{$locationCol}` AS locs, slot_min_qty, slot_max_qty, price_monthly, img_url, enabled FROM gsp_billing_services ORDER BY service_name"); ?> diff --git a/modules/billing/website_cart.php b/modules/billing/website_cart.php index b247acb8..c614d54e 100644 --- a/modules/billing/website_cart.php +++ b/modules/billing/website_cart.php @@ -21,21 +21,21 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['delete_single'])) { $order_id = intval($_POST['delete_single']); if ($order_id > 0) { // First, check if the status is 'renew' - $stmt = $db->prepare("SELECT status FROM ogp_billing_orders WHERE order_id = ? AND user_id = ?"); + $stmt = $db->prepare("SELECT status FROM gsp_billing_orders WHERE order_id = ? AND user_id = ?"); $stmt->bind_param("ii", $order_id, $user_id); $stmt->execute(); $stmt->bind_result($status); if ($stmt->fetch() && strtolower($status) === 'renew') { $stmt->close(); // Set status to 'expired' if currently 'renew' - $update = $db->prepare("UPDATE ogp_billing_orders SET status = 'expired' WHERE order_id = ? AND user_id = ?"); + $update = $db->prepare("UPDATE gsp_billing_orders SET status = 'expired' WHERE order_id = ? AND user_id = ?"); $update->bind_param("ii", $order_id, $user_id); $update->execute(); $update->close(); } else { $stmt->close(); // Otherwise, delete the order - $delete = $db->prepare("DELETE FROM ogp_billing_orders WHERE order_id = ? AND user_id = ?"); + $delete = $db->prepare("DELETE FROM gsp_billing_orders WHERE order_id = ? AND user_id = ?"); $delete->bind_param("ii", $order_id, $user_id); $delete->execute(); $delete->close(); @@ -44,7 +44,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['delete_single'])) { } if ($db){ - $carts = $db->query("SELECT * FROM ogp_billing_orders AS cart + $carts = $db->query("SELECT * FROM gsp_billing_orders AS cart WHERE (status = 'in-cart' OR status = 'renew') AND user_id = " . $user_id . " ORDER BY order_id ASC"); diff --git a/modules/billing/website_db.php b/modules/billing/website_db.php index a8a3e464..d7e336c3 100644 --- a/modules/billing/website_db.php +++ b/modules/billing/website_db.php @@ -19,7 +19,7 @@ if (!$db) { //returning true/false //$isAdmin = isAdmin(186); function isAdmin($userID){ - $adminField = $db->query("SELECT 'users_role' FROM ogp_users WHERE userID = $userID"); + $adminField = $db->query("SELECT 'users_role' FROM gsp_users WHERE userID = $userID"); if($adminField == "admin"){ $adminStatus = true; }else{ diff --git a/modules/billing/website_order.php b/modules/billing/website_order.php index 9ad0e61b..8766487d 100644 --- a/modules/billing/website_order.php +++ b/modules/billing/website_order.php @@ -8,7 +8,7 @@ When the user clicks the "Add to Cart" button, the next page to load is "add_to_ All the configuration info is passed to the add_to_cart.php in hidden fields In our website, we are setting "post" pages with a "Tag". The first tag in our post should be the service ID from the services table -There are other methods that might be better to get the info. But all we need is the "service_ID" in the "ogp_billing_services" table +There are other methods that might be better to get the info. But all we need is the "service_ID" in the "gsp_billing_services" table This method means we can use one code block in every game page and fill in the data dynamically. */ include "website_db.php"; @@ -37,7 +37,7 @@ THIS IS WHAT WE DISPLAY ON THE SHOP PAGE AT THE TOP query($qry_services); if (isset($_REQUEST['service_id']) && $services === false) { @@ -173,7 +173,7 @@ if ($row['price_monthly'] == 0.0) { //loop through each of the assigned servers and see if its disabled foreach($rsiArray as $rsi) { - $query = "SELECT * FROM ogp_remote_servers WHERE remote_server_id = ".$rsi; + $query = "SELECT * FROM gsp_remote_servers WHERE remote_server_id = ".$rsi; $result = $db->query($query); foreach($result as $rs) { diff --git a/modules/billing/website_serverlist.php b/modules/billing/website_serverlist.php index 80b78fb4..8d1f14da 100644 --- a/modules/billing/website_serverlist.php +++ b/modules/billing/website_serverlist.php @@ -11,7 +11,7 @@ include "website_db.php"; if (isset($_POST['save']) && !empty($_POST['description'])) { $new_description = str_replace("\\r\\n", "
", $_POST['description']); $service = intval($_POST['service_id']); - $stmt = $db->prepare("UPDATE ogp_billing_services SET description = ? WHERE service_id = ?"); + $stmt = $db->prepare("UPDATE gsp_billing_services SET description = ? WHERE service_id = ?"); $stmt->bind_param("si", $new_description, $service); $stmt->execute(); $stmt->close(); @@ -20,7 +20,7 @@ if (isset($_POST['save']) && !empty($_POST['description'])) { // Fetch services $service_id = isset($_REQUEST['service_id']) ? intval($_REQUEST['service_id']) : 0; $where_service_id = $service_id !== 0 ? "WHERE enabled = 1 AND service_id = $service_id" : "WHERE enabled = 1"; -$qry_services = "SELECT * FROM ogp_billing_services $where_service_id ORDER BY service_name"; +$qry_services = "SELECT * FROM gsp_billing_services $where_service_id ORDER BY service_name"; $services = $db->query($qry_services); if (!$services) { diff --git a/modules/circular/module.php b/modules/circular/module.php index 6f6a50b0..867e1f8d 100644 --- a/modules/circular/module.php +++ b/modules/circular/module.php @@ -1,8 +1,8 @@ updateOGPGameModsWithNewIDs($oldStructure); + $db->updateGSPGameModsWithNewIDs($oldStructure); } print_success(get_lang('configs_updated_ok')); diff --git a/modules/cron/cron.php b/modules/cron/cron.php index 1bc6764a..a34e8e4b 100644 --- a/modules/cron/cron.php +++ b/modules/cron/cron.php @@ -12,7 +12,7 @@ function exec_gsp_module() $homes = $db->getIpPorts(); if(!$homes) { - print_failure(get_lang('cron_admin_no_ogp_servers_to_display')); + print_failure(get_lang('cron_admin_no_gsp_servers_to_display')); return 0; } @@ -44,7 +44,7 @@ function exec_gsp_module() if(isset($_POST['homeid_ip_port']) and isset($server_homes[$_POST['homeid_ip_port']])) { - $panelURL = getOGPSiteURL(); + $panelURL = getGSPSiteURL(); if($panelURL === false) { print_failure('Failed to retrieve panel URL.'); diff --git a/modules/cron/shared_cron_functions.php b/modules/cron/shared_cron_functions.php index 5766146a..a45984ca 100644 --- a/modules/cron/shared_cron_functions.php +++ b/modules/cron/shared_cron_functions.php @@ -203,7 +203,7 @@ function updateCronJobsToNewApi() { require_once 'includes/lib_remote.php'; - $panelURL = getOGPSiteURL(); + $panelURL = getGSPSiteURL(); if($panelURL === false) return false; diff --git a/modules/cron/user_cron.php b/modules/cron/user_cron.php index 44fb248e..b03d0de1 100644 --- a/modules/cron/user_cron.php +++ b/modules/cron/user_cron.php @@ -45,7 +45,7 @@ function exec_gsp_module() if ( isset( $_POST['homeid_ip_port'] ) and isset($server_homes[$_POST['homeid_ip_port']]) ) { - $panelURL = getOGPSiteURL(); + $panelURL = getGSPSiteURL(); if($panelURL === false) { print_failure('Failed to retrieve panel URL.'); diff --git a/modules/editconfigfiles/configFileList.php b/modules/editconfigfiles/configFileList.php index 79b2eb9e..2b043e0c 100644 --- a/modules/editconfigfiles/configFileList.php +++ b/modules/editconfigfiles/configFileList.php @@ -1,8 +1,8 @@ $bl) ? -1 : +1; } -function exec_ogp_module() +function exec_gsp_module() { global $db, $settings; @@ -374,7 +374,7 @@ function exec_ogp_module() foreach($repos_info_array as $key => $repository) { - if(preg_match('/^(OGP-Website|OGP-Agent-Linux|OGP-Agent-Windows)$/',$repository['name'])) + if(preg_match('/^(GSP-Website|OGP-Agent-Linux|OGP-Agent-Windows)$/',$repository['name'])) continue; $REMOTE_REPO_FILE = $gitHubURL . $repository['name'] . '/commits/master.atom'; diff --git a/modules/gamemanager/monitor_buttons.php b/modules/gamemanager/monitor_buttons.php index 74cb9983..ba84b5e5 100644 --- a/modules/gamemanager/monitor_buttons.php +++ b/modules/gamemanager/monitor_buttons.php @@ -78,7 +78,7 @@ if (preg_match("/u/",$server_home['access_rights'])) } /* - $module_buttons[] = " + $module_buttons[] = " ". get_lang("show_api_actions") . " "; diff --git a/modules/gamemanager/server_monitor.php b/modules/gamemanager/server_monitor.php index f7180d04..fd91b681 100644 --- a/modules/gamemanager/server_monitor.php +++ b/modules/gamemanager/server_monitor.php @@ -127,7 +127,7 @@ function get_sync_name($server_xml) return $sync_name; } -function exec_ogp_module() { +function exec_gsp_module() { global $db, $settings, $loggedInUserInfo; echo "

". get_lang("game_monitor") ."

"; $refresh = new refreshed(); @@ -322,7 +322,7 @@ echo "= -2" ; + $query = "SELECT * FROM gsp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status >= -2" ; $results = $db->resultQuery($query); if(!is_null($results[0]['status'])) { @@ -513,7 +513,7 @@ echo "
Agent Offline"; } $user = $db->getUserById($server_home['user_id_main']); - $query = "SELECT * FROM ogp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status > 0" ; + $query = "SELECT * FROM gsp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status > 0" ; //DISABLE SHOWING EXPIRATION DATES //$expiration_dates = ""; diff --git a/modules/lgsl_with_img_mod/image.php b/modules/lgsl_with_img_mod/image.php index 56e9a7a9..a24d2f22 100644 --- a/modules/lgsl_with_img_mod/image.php +++ b/modules/lgsl_with_img_mod/image.php @@ -1,8 +1,8 @@ add_field('string','remote_host',$remote_server['agent_ip']); $ft->add_field('string','remote_host_port',$remote_server['agent_port']); $ft->add_field('string','remote_host_name',$remote_server['remote_server_name']); - $ft->add_field('string','ogp_user',$remote_server['ogp_user']); + $ft->add_field('string','gsp_user',$remote_server['gsp_user']); $ft->add_field('string','remote_host_ftp_ip',$ftp_ip); $ft->add_field('string','remote_host_ftp_port',$remote_server['ftp_port']); $ft->add_field('string','remote_encryption_key',$remote_server['encryption_key']); diff --git a/modules/server/module.php b/modules/server/module.php index c6a17102..493b253c 100644 --- a/modules/server/module.php +++ b/modules/server/module.php @@ -25,7 +25,7 @@ $install_queries[0] = array( "CREATE TABLE IF NOT EXISTS `".GSP_DB_PREFIX."remote_servers` ( `remote_server_id` int(11) NOT NULL auto_increment, `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, diff --git a/modules/server/servers.php b/modules/server/servers.php index 29f3b752..4b9db63a 100644 --- a/modules/server/servers.php +++ b/modules/server/servers.php @@ -91,7 +91,7 @@ function exec_gsp_module() { $ftp_ip = empty( $server_row['ftp_ip'] ) ? $server_row['agent_ip'] : $server_row['ftp_ip']; $data = ""; } -function exec_ogp_module() +function exec_gsp_module() { global $db, $settings; global $view; @@ -81,7 +81,7 @@ 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 ) { @@ -90,7 +90,7 @@ function exec_ogp_module() $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)){ diff --git a/modules/user_games/clone_home.php b/modules/user_games/clone_home.php index 9ec12dc5..449b4c2a 100644 --- a/modules/user_games/clone_home.php +++ b/modules/user_games/clone_home.php @@ -35,7 +35,7 @@ function exec_gsp_module() $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)){ @@ -179,7 +179,7 @@ function exec_gsp_module() $ft->add_field('string','new_home_name',htmlentities($server_row['home_name'])); echo ""; - echo ""; + echo ""; echo "
$booble - ". get_lang("ogp_user") .": ".$server_row['ogp_user']."
+ ". get_lang("gsp_user") .": ".$server_row['gsp_user']."
". get_lang("agent_ip_port") .": ".$server_row['agent_ip'].":".$server_row['agent_port']."
". get_lang("remote_host_ftp_ip") .": ".$ftp_ip."
". get_lang("remote_host_ftp_port") .": ".$server_row['ftp_port']."
diff --git a/modules/steam_workshop/main.php b/modules/steam_workshop/main.php index c5c592a0..8bf7c0e0 100644 --- a/modules/steam_workshop/main.php +++ b/modules/steam_workshop/main.php @@ -10,7 +10,7 @@ echo ''."\ ''."\n". ''; -function exec_ogp_module() +function exec_gsp_module() { Global $db,$view,$settings; diff --git a/modules/support/module.php b/modules/support/module.php index 35194435..6dada185 100644 --- a/modules/support/module.php +++ b/modules/support/module.php @@ -1,8 +1,8 @@
".get_lang($selection.'_info')."
".get_lang('clone_mods').":
"; $ft->add_button('submit','clone_home',get_lang('clone_home')); echo "

".get_lang('the_name_of_the_server_to_help_users_to_identify_it')."

"; diff --git a/modules/user_games/del_home.php b/modules/user_games/del_home.php index 38cb05a9..07464f84 100644 --- a/modules/user_games/del_home.php +++ b/modules/user_games/del_home.php @@ -7,8 +7,8 @@ function logHandling($home_id, $action = 'delete', &$remote){ $fileId = str_pad($home_id, 9, '0', STR_PAD_LEFT); $files = array( - 'screenlogs/screenlog.OGP_HOME_'.$fileId => 'file', - 'screenlogs/screenlog.OGP_UPDATE_'.$fileId => 'file', + 'screenlogs/screenlog.GSP_HOME_'.$fileId => 'file', + 'screenlogs/screenlog.GSP_UPDATE_'.$fileId => 'file', 'screenlogs/home_id_'.$home_id.'/' => 'dir', ); diff --git a/modules/user_games/edit_home.php b/modules/user_games/edit_home.php index 5be1bca4..7d299596 100644 --- a/modules/user_games/edit_home.php +++ b/modules/user_games/edit_home.php @@ -5,7 +5,7 @@ require_once("modules/config_games/server_config_parser.php"); -function exec_ogp_module() +function exec_gsp_module() { global $db; $isAdmin = $db->isAdmin( $_SESSION['user_id'] ); @@ -413,7 +413,7 @@ 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");