xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-09 12:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear some dead code!

Browse Source 
Clear some dead code!
This commit is contained in:
novgorodschi catalin
2026-08-03 07:51:50 +03:00
parent aeccc54cb9
commit 613d800e29
16 changed files with 123 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/editServerSet.tpl
+21
View File
@@ -198,6 +198,27 @@ function refresh(tz) {
<td class="b"><?php echo CONF_SERV_NATARS_WW_SPAWN_TIME ?> <em class="tooltip">?<span class="classic"><?php echo CONF_SERV_NATARS_WW_SPAWN_TIME_TOOLTIP ?></span></em></td>
<td><input class="fm" name="natars_ww_spawn_time" value="<?php echo NATARS_WW_SPAWN_TIME;?>" style="width: 20%;"></td>
</tr>
<tr>
<td class="b"><?php echo CONF_SERV_USRNM_MIN ?> <em class="tooltip">?<span class="classic"><?php echo CONF_SERV_REGRULES_TOOLTIP ?></span></em></td>
<td><input class="fm" name="usrnm_min" value="<?php echo defined('USRNM_MIN_LENGTH') ? USRNM_MIN_LENGTH : 3;?>" style="width: 20%;"></td>
</tr>
<tr>
<td class="b"><?php echo CONF_SERV_USRNM_MAX ?></td>
<td><input class="fm" name="usrnm_max" value="<?php echo defined('USRNM_MAX_LENGTH') ? USRNM_MAX_LENGTH : 15;?>" style="width: 20%;"></td>
</tr>
<tr>
<td class="b"><?php echo CONF_SERV_PW_MIN ?></td>
<td><input class="fm" name="pw_min" value="<?php echo defined('PW_MIN_LENGTH') ? PW_MIN_LENGTH : 4;?>" style="width: 20%;"></td>
</tr>
<tr>
<td class="b"><?php echo CONF_SERV_USRNM_SPECIAL ?> <em class="tooltip">?<span class="classic"><?php echo CONF_SERV_USRNM_SPECIAL_TOOLTIP ?></span></em></td>
<td>
<select name="usrnm_special">
<option value="true" <?php if (!defined('USRNM_SPECIAL') || USRNM_SPECIAL) echo "selected"; ?>>True</option>
<option value="false" <?php if (defined('USRNM_SPECIAL') && !USRNM_SPECIAL) echo "selected"; ?>>False</option>
</select>
</td>
</tr>
<tr>
<td class="b"><?php echo CONF_SERV_NATARS_WW_BUILDING_PLAN_SPAWN_TIME ?> <em class="tooltip">?<span class="classic"><?php echo CONF_SERV_NATARS_WW_BUILDING_PLAN_SPAWN_TIME_TOOLTIP ?></span></em></td>
<td><input class="fm" name="natars_ww_building_plan_spawn_time" value="<?php echo NATARS_WW_BUILDING_PLAN_SPAWN_TIME;?>" style="width: 20%;"></td>
Admin/Templates/server_info.tpl
+4 -1
View File
@@ -32,7 +32,10 @@ function q1($sql){ global $database; $r=$database->query($sql); return $r ? $r->
// ---- DATE ----
$users = (int)(q1("SELECT COUNT(*) c FROM ".TB_PREFIX."users WHERE tribe IN (1,2,3,6,7,8,9)")['c'] ?? 0);
$active = (int)(q1("SELECT COUNT(*) c FROM ".TB_PREFIX."active")['c'] ?? 0);
// Jucatori online: se numara din users.timestamp, ca in home.tpl si in pagina
// Online Players - aceeasi fereastra de 5 minute, aceeasi sursa.
// Tabela separata "active" a fost eliminata: dubla exact aceasta informatie.
$active = (int)(q1("SELECT COUNT(*) c FROM ".TB_PREFIX."users WHERE timestamp > ".(time()-300)." AND id > 5")['c'] ?? 0);
$online = (int)(q1("SELECT COUNT(*) c FROM ".TB_PREFIX."users WHERE timestamp > ".(time()-300)." AND tribe>0")['c'] ?? 0);
$banned = (int)(q1("SELECT COUNT(*) c FROM ".TB_PREFIX."users WHERE access=0")['c'] ?? 0);
$villages = (int)(q1("SELECT COUNT(*) c FROM ".TB_PREFIX."vdata")['c'] ?? 0);
GameEngine/Admin/Mods/editExtraSet.php
+1 -2
View File
@@ -143,8 +143,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
tz_config_set($text, '%ANAME%', ADMIN_NAME);
tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
tz_config_set($text, '%UTRACK%', "TRACK_USR"); // not in use, text only in a comment
tz_config_set($text, '%UTOUT%', "USER_TIMEOUT"); // not in use, text only in a comment
tz_config_set($text, '%DOMAIN%', DOMAIN);
tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
tz_config_set($text, '%SERVER%', SERVER);
GameEngine/Admin/Mods/editNewFunctions.php
+1 -2
View File
@@ -127,8 +127,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
tz_config_set($text, '%ANAME%', ADMIN_NAME);
tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
tz_config_set($text, '%UTRACK%', "TRACK_USR"); // not in use, text only in a comment
tz_config_set($text, '%UTOUT%', "USER_TIMEOUT"); // not in use, text only in a comment
tz_config_set($text, '%DOMAIN%', DOMAIN);
tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
tz_config_set($text, '%SERVER%', SERVER);
GameEngine/Admin/Mods/editPlusSet.php
+1 -2
View File
@@ -128,8 +128,7 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
tz_config_set($text, '%ANAME%', ADMIN_NAME);
tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
tz_config_set($text, '%UTRACK%', "TRACK_USR"); // not in use, text only in a comment
tz_config_set($text, '%UTOUT%', "USER_TIMEOUT"); // not in use, text only in a comment
tz_config_set($text, '%DOMAIN%', DOMAIN);
tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
tz_config_set($text, '%SERVER%', SERVER);
GameEngine/Admin/Mods/editServerSet.php
+17 -2
View File
@@ -124,6 +124,22 @@ $text = admin_config_template_contents(array(
));
tz_config_set($text, '%ERRORREPORT%', $_POST['error'] ?? '');
tz_config_set($text, '%ERROR%', $_POST['error'] ?? '', 'code');
// Regulile de inregistrare
tz_config_set($text, '%USRNMSPECIAL%',
(isset($_POST['usrnm_special']) && $_POST['usrnm_special'] === 'false') ? 'false' : 'true');
$uMin = isset($_POST['usrnm_min']) ? (int) $_POST['usrnm_min'] : 3;
if ($uMin < 1 || $uMin > 50) { $uMin = 3; }
tz_config_set($text, '%USRNMMIN%', $uMin);
$uMax = isset($_POST['usrnm_max']) ? (int) $_POST['usrnm_max'] : 15;
if ($uMax < $uMin || $uMax > 100) { $uMax = max(15, $uMin); }
tz_config_set($text, '%USRNMMAX%', $uMax);
$pMin = isset($_POST['pw_min']) ? (int) $_POST['pw_min'] : 4;
if ($pMin < 1 || $pMin > 100) { $pMin = 4; }
tz_config_set($text, '%PWMIN%', $pMin);
tz_config_set($text, '%SERVERNAME%', $_POST['servername'] ?? '');
// Fusul orar se scrie intr-un fisier PHP (define("TIMEZONE","...")), deci
// valoarea NU are voie sa ajunga acolo nefiltrata: pana acum $_POST['tzone']
@@ -224,8 +240,7 @@ $text = admin_config_template_contents(array(
tz_config_set($text, '%ASUPPMSGS%', $SUPPORT_MSGS_IN_ADMIN);
tz_config_set($text, '%ARAIDS%', $ADMINS_RAIDABLE);
tz_config_set($text, '%ANAME%', ADMIN_NAME);
tz_config_set($text, '%UTRACK%', "");
tz_config_set($text, '%UTOUT%', "");
tz_config_set($text, '%DOMAIN%', DOMAIN);
tz_config_set($text, '%HOMEPAGE%', HOMEPAGE);
tz_config_set($text, '%SERVER%', SERVER);
GameEngine/Automation/AutomationAccountMaintenance.php
+1 -9
View File
@@ -92,15 +92,7 @@ trait AutomationAccountMaintenance {
}
}
private function ClearInactive() {
global $database;
if(TRACK_USR) {
$timeout = time()-USER_TIMEOUT * 60;
$q = "DELETE FROM ".TB_PREFIX."active WHERE timestamp < $timeout";
$database->query($q);
}
}
private function checkInvitedPlayes() {
global $database;
GameEngine/Database/DatabaseUserQueries.php
+10 -16
View File
@@ -462,17 +462,6 @@ trait DatabaseUserQueries {
return mysqli_query($this->dblink,$q);
}
function addActiveUser($username, $time) {
list($username, $time) = $this->escape_input($username, $time);
$q = "REPLACE into " . TB_PREFIX . "active values ('$username',$time)";
if(mysqli_query($this->dblink,$q)) {
return true;
} else {
return false;
}
}
function updateActiveUser($username, $time) {
static $updated = false;
@@ -482,15 +471,20 @@ trait DatabaseUserQueries {
list($username, $time) = $this->escape_input($username, $time);
$res1 = $this->addActiveUser($username, $time);
// Marcam ultima activitate DOAR in users.timestamp.
//
// Exista si o tabela separata "active" care tinea aceeasi informatie,
// dar era citita de o singura pagina din panou, iar users.timestamp e
// oricum sursa pentru lista de jucatori online, harta de caldura si
// stergerea conturilor inactive. Tabela a fost eliminata.
$q = "UPDATE " . TB_PREFIX . "users set timestamp = $time where username = '$username'";
$res2 = mysqli_query($this->dblink,$q);
if($res1 && $res2) {
if (mysqli_query($this->dblink, $q)) {
$updated = true;
return true;
} else {
return false;
}
return false;
}
function submitProfile($uid, $gender, $location, $birthday, $desc1, $desc2) {
GameEngine/Lang/en.php
+10
View File
@@ -4318,3 +4318,13 @@ tz_def('TZ_WS_VS_NATARS', 'Against Natars');
// MESAJ DE SISTEM - previzualizare
//////////////////////////////////////////////////////////////////////////////////////////////////////
tz_def('ADM_PREVIEW', 'Preview');
//////////////////////////////////////////////////////////////////////////////////////////////////////
// REGULI DE INREGISTRARE (Server Configuration)
//////////////////////////////////////////////////////////////////////////////////////////////////////
tz_def('CONF_SERV_USRNM_MIN', 'Minimum username length');
tz_def('CONF_SERV_USRNM_MAX', 'Maximum username length');
tz_def('CONF_SERV_PW_MIN', 'Minimum password length');
tz_def('CONF_SERV_USRNM_SPECIAL', 'Allow . - _ in usernames');
tz_def('CONF_SERV_USRNM_SPECIAL_TOOLTIP', 'With True, usernames may contain a dot, hyphen or underscore, and single spaces between words. With False, only letters and digits are accepted.');
tz_def('CONF_SERV_REGRULES_TOOLTIP', 'Rules checked when a player registers. Changing them does not affect existing accounts.');
GameEngine/Lang/fr.php
+10
View File
@@ -4261,3 +4261,13 @@ tz_def('TZ_WS_VS_NATARS', 'Contre les Natars');
// MESAJ DE SISTEM - previzualizare
//////////////////////////////////////////////////////////////////////////////////////////////////////
tz_def('ADM_PREVIEW', 'Aperçu');
//////////////////////////////////////////////////////////////////////////////////////////////////////
// REGULI DE INREGISTRARE (Server Configuration)
//////////////////////////////////////////////////////////////////////////////////////////////////////
tz_def('CONF_SERV_USRNM_MIN', 'Longueur minimale du nom');
tz_def('CONF_SERV_USRNM_MAX', 'Longueur maximale du nom');
tz_def('CONF_SERV_PW_MIN', 'Longueur minimale du mot de passe');
tz_def('CONF_SERV_USRNM_SPECIAL', 'Autoriser . - _ dans les noms');
tz_def('CONF_SERV_USRNM_SPECIAL_TOOLTIP', 'Avec True, les noms peuvent contenir un point, un tiret ou un underscore, et des espaces simples entre les mots. Avec False, seules les lettres et les chiffres sont acceptes.');
tz_def('CONF_SERV_REGRULES_TOOLTIP', 'Regles verifiees lors de l\'inscription. Les modifier n\'affecte pas les comptes existants.');
GameEngine/Lang/ro.php
+10
View File
@@ -4058,3 +4058,13 @@ tz_def('TZ_WS_VS_NATARS', 'Contra Natarilor');
// MESAJ DE SISTEM - previzualizare
//////////////////////////////////////////////////////////////////////////////////////////////////////
tz_def('ADM_PREVIEW', 'Previzualizare');
//////////////////////////////////////////////////////////////////////////////////////////////////////
// REGULI DE INREGISTRARE (Server Configuration)
//////////////////////////////////////////////////////////////////////////////////////////////////////
tz_def('CONF_SERV_USRNM_MIN', 'Lungimea minima a numelui');
tz_def('CONF_SERV_USRNM_MAX', 'Lungimea maxima a numelui');
tz_def('CONF_SERV_PW_MIN', 'Lungimea minima a parolei');
tz_def('CONF_SERV_USRNM_SPECIAL', 'Permite . - _ in nume');
tz_def('CONF_SERV_USRNM_SPECIAL_TOOLTIP', 'Cu True, numele pot contine punct, liniuta sau underscore, si spatii simple intre cuvinte. Cu False, se accepta doar litere si cifre.');
tz_def('CONF_SERV_REGRULES_TOOLTIP', 'Reguli verificate la inregistrare. Schimbarea lor nu afecteaza conturile existente.');
GameEngine/Session.php
+5 -1
View File
@@ -106,7 +106,11 @@ function __construct() {
$this->logged_in = $this->checkLogin();
if ($this->logged_in && TRACK_USR) {
// users.timestamp nu mai e optional: din el se scot lista de jucatori
// online, harta de caldura si stergerea conturilor inactive. Inainte era
// in spatele lui TRACK_USR - cu flagul stins, stergerea automata ar fi
// considerat TOTI jucatorii inactivi.
if ($this->logged_in) {
$database->updateActiveUser($this->username, $this->time);
}
install/data/constant_format.tpl
+10 -8
View File
@@ -188,6 +188,16 @@ define("PLUS_STATS_INTERVAL_HOURS", %PLUSSTATSHOURS%);
// lifetime of an entire server, this only amounts to a few tens of thousands of records.
define("PLUS_STATS_KEEP_DAYS", %PLUSSTATSKEEP%);
// ***** Registration rules
// Regulile verificate la inregistrare (vezi Account.php).
//
// USRNM_SPECIAL: cu true se accepta punct, liniuta si underscore in nume, si
// spatii simple intre cuvinte; cu false doar litere si cifre.
define("USRNM_SPECIAL", %USRNMSPECIAL%);
define("USRNM_MIN_LENGTH", %USRNMMIN%);
define("USRNM_MAX_LENGTH", %USRNMMAX%);
define("PW_MIN_LENGTH", %PWMIN%);
// ***** Graphic Pack
//
// SERVER_GP is the pack every player sees by default (chosen at install or in
@@ -495,10 +505,6 @@ define("NEW_FUNCTION_REGISTRATION_GOLD_VALUE", %NEW_FUNCTION_REGISTRATION_GOLD_V
//////////////////////////////////////////
define("AUTO_DEL_INACTIVE",false); // auto-delete inactive players; default = false
define("UN_ACT_TIME", 3628800); // 6 weeks to consider a player inactive
//define("TRACK_USR","%UTRACK%");
//define("USER_TIMEOUT","%UTOUT%");
define("TRACK_USR",true); // track users' being active or not
define("USER_TIMEOUT",3600); // 1 hour of no activity counts as inactivity
define("ALLOW_BURST",false);
define("BASIC_MAX",1);
define("INNER_MAX",1);
@@ -506,10 +512,6 @@ define("PLUS_MAX",1);
define("ALLOW_ALL_TRIBE",false);
define("CFM_ADMIN_ACT",true);
define("SERVER_WEB_ROOT",false);
define("USRNM_SPECIAL",true);
define("USRNM_MIN_LENGTH",3);
define("USRNM_MAX_LENGTH",15);
define("PW_MIN_LENGTH",4);
// === IP ban (issue #185) ===
// Master switch for IP-ban enforcement.
install/process.php
+15 -8
View File
@@ -74,10 +74,6 @@ class Process {
$findReplace["%CRANNYCAP%"] = $_POST['crannycap'];
$findReplace["%TRAPPERCAP%"] = $_POST['trappercap'];
$findReplace["%STORAGE_MULTIPLIER%"] = $_POST['storage_multiplier'];
//$findReplace["%UTRACK%"] = $_POST['trackusers'];
//$findReplace["%UTOUT%"] = $_POST['timeout'];
//$findReplace["%AUTOD%"] = $_POST['autodel'];
//$findReplace["%AUTODT%"] = $_POST['autodeltime'];
$findReplace["%MAX%"] = $_POST['wmax'];
// Comutatorul de pachete grafice proprii. Linia era comentata, deci %GP%
// ramanea neinlocuit in config.php si constanta nu se definea deloc.
@@ -95,6 +91,21 @@ class Process {
if ($psKeep < 0 || $psKeep > 3650) { $psKeep = 0; }
$findReplace["%PLUSSTATSKEEP%"] = $psKeep;
// Regulile de inregistrare
$findReplace["%USRNMSPECIAL%"] = (isset($_POST['usrnm_special']) && $_POST['usrnm_special'] === 'false') ? 'false' : 'true';
$uMin = isset($_POST['usrnm_min']) ? (int) $_POST['usrnm_min'] : 3;
if ($uMin < 1 || $uMin > 50) { $uMin = 3; }
$findReplace["%USRNMMIN%"] = $uMin;
$uMax = isset($_POST['usrnm_max']) ? (int) $_POST['usrnm_max'] : 15;
if ($uMax < $uMin || $uMax > 100) { $uMax = max(15, $uMin); }
$findReplace["%USRNMMAX%"] = $uMax;
$pMin = isset($_POST['pw_min']) ? (int) $_POST['pw_min'] : 4;
if ($pMin < 1 || $pMin > 100) { $pMin = 4; }
$findReplace["%PWMIN%"] = $pMin;
$findReplace["%GP%"] = (isset($_POST['gpack']) && $_POST['gpack'] === 'true') ? 'true' : 'false';
$findReplace["%SSERVER%"] = $_POST['sserver'];
$findReplace["%SPORT%"] = $_POST['sport'];
@@ -105,7 +116,6 @@ class Process {
$findReplace["%CONNECTT%"] = $_POST['connectt'];
$findReplace["%ASUPPMSGS%"] = 'true';
$findReplace["%ARAIDS%"] = 'false';
//$findReplace["%SUBDOM%"] = $_POST['subdom'];
$findReplace["%LOGBUILD%"] = $_POST['log_build'];
$findReplace["%LOGTECH%"] = $_POST['log_tech'];
$findReplace["%LOGLOGIN%"] = $_POST['log_login'];
@@ -114,9 +124,6 @@ class Process {
$findReplace["%LOGWAR%"] = $_POST['log_war'];
$findReplace["%LOGMARKET%"] = $_POST['log_market'];
$findReplace["%LOGILLEGAL%"] = $_POST['log_illegal'];
//$findReplace["%MINUSERLENGTH%"] = $_POST['userlength'];
//$findReplace["%MINPASSLENGTH%"] = $_POST['passlength'];
//$findReplace["%SPECIALCHARS%"] = $_POST['specialchars'];
$findReplace["%ACTIVATE%"] = $_POST['activate'];
$findReplace["%ARANK%"] = 'false';
$findReplace["%QUEST%"] = $_POST['quest'];
install/templates/config.tpl
+7
View File
@@ -323,6 +323,13 @@ foreach($mechs as $k => $l){
<option value="false" selected>No</option>
<option value="true">Yes</option>
</select></div>
<div><label>Minimum username length</label><input class="input" type="text" name="usrnm_min" value="3"></div>
<div><label>Maximum username length</label><input class="input" type="text" name="usrnm_max" value="15"></div>
<div><label>Minimum password length</label><input class="input" type="text" name="pw_min" value="4"></div>
<div><label>Allow . - _ in usernames</label><select class="input" name="usrnm_special">
<option value="true" selected>Yes</option>
<option value="false">No &ndash; letters and digits only</option>
</select></div>
<div><label>Allow player graphic packs</label><select class="input" name="gpack">
<option value="false" selected>No &ndash; everyone sees the server pack</option>
<option value="true">Yes &ndash; players may pick their own in Profile</option>
var/db/struct.sql
-16
View File
@@ -124,22 +124,6 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%activate` (
-- --------------------------------------------------------
--
-- Table structure for table `%PREFIX%active`
--
CREATE TABLE IF NOT EXISTS `%PREFIX%active` (
`username` varchar(100) NOT NULL,
`timestamp` int(11) NULL,
PRIMARY KEY (`username`),
KEY `timestamp` (`timestamp`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
-- Dumping data for table `%PREFIX%active`
--
-- --------------------------------------------------------
--