diff --git a/index.php b/index.php
index 0a42deed..4526e892 100644
--- a/index.php
+++ b/index.php
@@ -31,11 +31,11 @@ require_once 'common.php';
require_once SYSTEM . 'functions.php';
$uri = $_SERVER['REQUEST_URI'];
-if(false !== strpos($uri, 'index.php')) {
+if(str_contains($uri, 'index.php')) {
$uri = str_replace_first('/index.php', '', $uri);
}
-if(0 === strpos($uri, '/')) {
+if(str_starts_with($uri, '/')) {
$uri = str_replace_first('/', '', $uri);
}
diff --git a/nginx-sample.conf b/nginx-sample.conf
index d3cf8b6c..bb107f02 100644
--- a/nginx-sample.conf
+++ b/nginx-sample.conf
@@ -1,6 +1,6 @@
server {
listen 80;
- root /home/otserv/www/public;
+ root /var/www/html;
index index.php;
server_name your-domain.com;
diff --git a/system/functions.php b/system/functions.php
index 5076b054..b0dbc82e 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -1018,12 +1018,19 @@ function load_config_lua($filename)
}
else
{
- foreach($result as $tmp_key => $tmp_value) // load values defined by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
+ foreach($result as $tmp_key => $tmp_value) { // load values defined by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
$value = str_replace($tmp_key, $tmp_value, $value);
- $ret = @eval("return $value;");
- if((string) $ret == '' && trim($value) !== '""') // = parser error
- {
- throw new RuntimeException('ERROR: Loading config.lua file. Line ' . ($ln + 1) . ' of LUA config file is not valid [key: ' . $key . ']');
+ }
+
+ try {
+ $ret = eval("return $value;");
+ }
+ catch (Throwable $e) {
+ throw new RuntimeException('ERROR: Loading config.lua file. Line: ' . ($ln + 1) . ' - Unable to parse value "' . $value . '" - ' . $e->getMessage());
+ }
+
+ if((string) $ret == '' && trim($value) !== '""') {
+ throw new RuntimeException('ERROR: Loading config.lua file. Line ' . ($ln + 1) . ' is not valid [key: ' . $key . ']');
}
$result[$key] = $ret;
}