Can't open file: GameEngine\con
$text = preg_replace("'%BOX2%'", $NEWSBOX2, $text);
$text = preg_replace("'%BOX3%'", $NEWSBOX3, $text);
$text = preg_replace("'%SSERVER%'", SQL_SERVER, $text);
+ $text = str_replace("%SPORT%", SQL_PORT, $text);
$text = preg_replace("'%SUSER%'", SQL_USER, $text);
$text = preg_replace("'%SPASS%'", SQL_PASS, $text);
$text = preg_replace("'%SDB%'", SQL_DB, $text);
diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index 25f5000d..6f85e475 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -5350,7 +5350,7 @@ References:
// database is not needed if we're displaying static pages
$req_file = basename($_SERVER['PHP_SELF']);
if (!in_array($req_file, ['tutorial.php', 'anleitung.php'])) {
- $database = new MYSQLi_DB(SQL_SERVER, SQL_USER, SQL_PASS, SQL_DB);
+ $database = new MYSQLi_DB(SQL_SERVER, SQL_USER, SQL_PASS, SQL_DB, SQL_PORT);
$link = $database->return_link();
$GLOBALS['db'] = $database;
$GLOBALS['link'] = $database->return_link();
diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php
index 3f3d82a2..99f4dc07 100755
--- a/GameEngine/Technology.php
+++ b/GameEngine/Technology.php
@@ -10,6 +10,28 @@
## ##
#################################################################################
+global $autoprefix;
+
+// even with autoloader created, we can't use it here yet, as it's not been created
+// ... so, let's see where it is and include it
+$autoloader_found = false;
+// go max 5 levels up - we don't have folders that go deeper than that
+for ($i = 0; $i < 5; $i++) {
+ $autoprefix = str_repeat('../', $i);
+ if (file_exists($autoprefix.'autoloader.php')) {
+ $autoloader_found = true;
+ include_once $autoprefix.'autoloader.php';
+ break;
+ }
+}
+
+if (!$autoloader_found) {
+ die('Could not find autoloading class.');
+}
+
+// this is needed for installation, since the lang file would not be included yet
+include_once($autoprefix."GameEngine/lang/en.php");
+
class Technology {
public $unarray = array(1=>U1,U2,U3,U4,U5,U6,U7,U8,U9,U10,U11,U12,U13,U14,U15,U16,U17,U18,U19,U20,U21,U22,U23,U24,U25,U26,U27,U28,U29,U30,U31,U32,U33,U34,U35,U36,U37,U38,U39,U40,U41,U42,U43,U44,U45,U46,U47,U48,U49,U50,U99,U0);
diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl
index 693fe078..4cef5752 100644
--- a/install/data/constant_format.tpl
+++ b/install/data/constant_format.tpl
@@ -54,7 +54,7 @@ define("SPEED", "%SPEED%");
define("WORLD_MAX", "%MAX%");
// ***** Graphic Pack
-// True = enabled, false = disabled
+// true = enabled, false = disabled
//!!!!!!!!!!!! DO NOT ENABLE !!!!!!!!!!!!
define("GP_ENABLE",false);
// Graphic pack location (default: gpack/travian_default/)
@@ -213,11 +213,15 @@ define("NEWSBOX3",%BOX3%);
//////////////////////////////////
// ***** SQL Hostname
-// example. sql106.000space.com / localhost
+// example: sql106.000space.com / localhost
// If you host server on own PC than this value is: localhost
// If you use online hosting, value must be written in host cpanel
define("SQL_SERVER", "%SSERVER%");
+// ***** SQL Port
+// default: 3306
+define("SQL_PORT", %SPORT%);
+
// ***** Database Username
define("SQL_USER", "%SUSER%");
diff --git a/install/process.php b/install/process.php
index 68f4938e..e203f9c8 100755
--- a/install/process.php
+++ b/install/process.php
@@ -32,104 +32,120 @@ class Process {
}
private function constForm() {
- $myFile = "../GameEngine/config.php";
- $fh = @fopen($myFile, 'w') or die("
Can't create or update file: GameEngine\config.php");
+
+ // copy the contents of the config template file into a new location, used when editing
+ // game configuration from the in-game Admin (since the install folder would be deleted at that point)
+ $templateFile = @fopen($configTemplateFile, 'w') or die("