feat: add GSP customized install.php with port support, auto-admin, and ogp_ migration
Agent-Logs-Url: https://github.com/GameServerPanel/GSP/sessions/4b32e3c2-afec-458b-bf16-48e58045cc8b Co-authored-by: iaretechnician <2749183+iaretechnician@users.noreply.github.com>
This commit is contained in:
parent
15f9e9e18c
commit
b8543dfbc5
10 changed files with 528 additions and 10 deletions
|
|
@ -52,7 +52,7 @@ class OGPDatabaseMySQL extends OGPDatabase
|
|||
/// \return -11 When connection to database could not be established
|
||||
/// \return -12 When database was not valid.
|
||||
/// \return -99 When mysql php module is not available.
|
||||
public function connect($db_host, $db_user, $db_pass, $db_name, $table_prefix = NULL) {
|
||||
public function connect($db_host, $db_user, $db_pass, $db_name, $table_prefix = NULL, $db_port = NULL) {
|
||||
if ( !extension_loaded("mysqli") )
|
||||
return -99;
|
||||
|
||||
|
|
@ -62,7 +62,9 @@ class OGPDatabaseMySQL extends OGPDatabase
|
|||
if ( $db_host === NULL )
|
||||
return -1;
|
||||
|
||||
$this->link = mysqli_connect( $db_host, $db_user, $db_pass, $db_name );
|
||||
// Use explicit port when provided; otherwise fall back to MySQL default (3306).
|
||||
$port = ($db_port !== NULL && $db_port !== '') ? (int)$db_port : NULL;
|
||||
$this->link = mysqli_connect( $db_host, $db_user, $db_pass, $db_name, $port );
|
||||
|
||||
if ( $this->link === FALSE )
|
||||
return -11;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ if(file_exists(__DIR__ . "/lang.php")){
|
|||
/// \return the database object when the creation was successfull.
|
||||
/// \return FALSE if database type was invalid.
|
||||
/// \return negative value in case of error
|
||||
function createDatabaseConnection($db_type,$db_host,$db_user,$db_pass,$db_name,$table_prefix)
|
||||
function createDatabaseConnection($db_type,$db_host,$db_user,$db_pass,$db_name,$table_prefix,$db_port=NULL)
|
||||
{
|
||||
if ( $db_type == "mysql" )
|
||||
{
|
||||
|
|
@ -54,7 +54,7 @@ function createDatabaseConnection($db_type,$db_host,$db_user,$db_pass,$db_name,$
|
|||
else
|
||||
die("<p class='failure'>OGP requires the <a href='http://php.net/manual/en/book.mysqli.php' target='_blank'>mysqli PHP extension</a>. Please install it, and then try again.</p>");
|
||||
$database = new OGPDatabaseMysql();
|
||||
$connect_value = $database->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
|
||||
$connect_value = $database->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,$db_port);
|
||||
|
||||
if ($connect_value === TRUE)
|
||||
return $database;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue