[V2] CHANGE UNIX_TIMESTAMP(CURDATE()) TO UNIX_TIMESTAMP(NOW())

Lua/TFS_10/globalevent powergamers/powergamers.lua

@@ -25,23 +25,23 @@ end
 
 -- SQL Query to execute: --
 --[[
-ALTER TABLE `znote_players` ADD `exphist_lastexp` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist1` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist2` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist3` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist4` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist5` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist6` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist7` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `onlinetimetoday` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime1` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime2` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime3` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime4` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime5` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime6` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime7` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetimeall` BIGINT NOT NULL DEFAULT '0';
+ALTER TABLE `znote_players` ADD `exphist_lastexp` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist1` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist2` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist3` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist4` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist5` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist6` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist7` BIGINT NOT NULL DEFAULT '0',
+ADD `onlinetimetoday` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime1` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime2` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime3` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime4` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime5` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime6` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime7` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetimeall` INT UNSIGNED NOT NULL DEFAULT '0';
 ]]--
 
 -- after that execute: --

Lua/TFS_10/revscriptsys/player_history.lua

@@ -0,0 +1,229 @@
+-- Auto install tables if we dont got them yet (first install)
+db.query([[
+	CREATE TABLE IF NOT EXISTS `player_history_skill` (
+	  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+	  `player_id` int(11) NOT NULL,
+	  `lastlogin` bigint(20) unsigned NOT NULL,
+	  `lastlogout` bigint(20) unsigned NOT NULL,
+	  `town_id` int(11) NOT NULL,
+	  `lastip` int(10) unsigned NOT NULL,
+	  `skull` tinyint(1) NOT NULL,
+	  `blessings` tinyint(2) NOT NULL,
+	  `onlinetime` int(11) NOT NULL,
+	  `balance` bigint(20) unsigned NOT NULL,
+	  `level` int(11) NOT NULL,
+	  `experience` bigint(20) NOT NULL,
+	  `maglevel` int(11) NOT NULL,
+	  `skill_fist` int(10) unsigned NOT NULL,
+	  `skill_club` int(10) unsigned NOT NULL,
+	  `skill_sword` int(10) unsigned NOT NULL,
+	  `skill_axe` int(10) unsigned NOT NULL,
+	  `skill_dist` int(10) unsigned NOT NULL,
+	  `skill_shielding` int(10) unsigned NOT NULL,
+	  `skill_fishing` int(10) unsigned NOT NULL,
+	  PRIMARY KEY (`id`),
+	  FOREIGN KEY (`player_id`) REFERENCES `players` (`id`) ON DELETE CASCADE
+	) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
+]])
+
+
+-- Auto populate table if it is empty
+local resultId = db.storeQuery("SELECT `id` FROM `player_history_skill` LIMIT 1;")
+if resultId == false then
+	db.asyncQuery([[
+		INSERT INTO `player_history_skill` (
+			`player_id`,
+			`lastlogin`, 
+			`lastlogout`, 
+			`town_id`,
+			`lastip`,
+			`skull`,
+			`blessings`,
+			`onlinetime`,
+			`balance`, 
+			`level`, 
+			`experience`, 
+			`maglevel`, 
+			`skill_fist`, 
+			`skill_club`, 
+			`skill_sword`, 
+			`skill_axe`, 
+			`skill_dist`, 
+			`skill_shielding`, 
+			`skill_fishing`
+		)
+		SELECT 
+			`p`.`id` AS `player_id`, 
+			`zp`.`created` AS `lastlogin`, 
+			CASE WHEN `p`.`lastlogout` > 0 
+				THEN `p`.`lastlogout` 
+				ELSE `zp`.`created` 
+			END AS `lastlogout`, 
+			`p`.`town_id`,
+			`p`.`lastip`,
+			`p`.`skull`,
+			`p`.`blessings`,
+			`p`.`onlinetime`,
+			`p`.`balance`, 
+			`p`.`level`, 
+			`p`.`experience`, 
+			`p`.`maglevel`, 
+			`p`.`skill_fist`, 
+			`p`.`skill_club`, 
+			`p`.`skill_sword`, 
+			`p`.`skill_axe`, 
+			`p`.`skill_dist`, 
+			`p`.`skill_shielding`, 
+			`p`.`skill_fishing` 
+		FROM `players` AS `p`
+		INNER JOIN `znote_players` AS `zp`
+			ON `p`.`id` = `zp`.`player_id`
+		ORDER BY `zp`.`created`
+	]])
+else
+	result.free(resultId)
+end
+
+
+-- Logout event, triggered by logout, and death
+function historyLogoutEvent(player)
+	local blessdec = 0
+	local i = 0
+	while player:hasBlessing(i+1) do
+		blessdec = blessdec+2^i
+		i = i+1
+	end
+
+	local playerGuid = player:getGuid()
+	db.query([[
+		INSERT INTO `player_history_skill` (
+			`player_id`,
+			`lastlogin`, 
+			`lastlogout`, 
+			`town_id`,
+			`lastip`,
+			`skull`,
+			`blessings`,
+			`onlinetime`,
+			`balance`, 
+			`level`, 
+			`experience`, 
+			`maglevel`, 
+			`skill_fist`, 
+			`skill_club`, 
+			`skill_sword`, 
+			`skill_axe`, 
+			`skill_dist`, 
+			`skill_shielding`, 
+			`skill_fishing`
+		) VALUES (
+			]]..table.concat({
+				playerGuid,
+				player:getLastLoginSaved(),
+				os.time(),
+				player:getTown():getId(),
+				player:getIp(),
+				player:getSkull(),
+				blessdec,
+				"(SELECT `onlinetime` FROM `players` WHERE `id`='"..playerGuid.."') + ".. os.time() - player:getLastLoginSaved(),
+				player:getBankBalance(),
+				player:getLevel(),
+				player:getExperience(),
+				player:getMagicLevel(),
+				player:getSkillLevel(SKILL_FIST),
+				player:getSkillLevel(SKILL_CLUB),
+				player:getSkillLevel(SKILL_SWORD),
+				player:getSkillLevel(SKILL_AXE),
+				player:getSkillLevel(SKILL_DISTANCE),
+				player:getSkillLevel(SKILL_SHIELD),
+				player:getSkillLevel(SKILL_FISHING)
+			}, ",")..[[
+		);
+	]])
+end
+
+
+-- Log player state on logout
+local player_history_skill = CreatureEvent("player_history_skill")
+function player_history_skill.onLogout(player)
+	--print("2-logout["..player:getName().."]")
+	historyLogoutEvent(player)
+	return true
+end
+player_history_skill:register()
+
+
+-- And on death
+local player_history_skill_death = CreatureEvent("player_history_skill_death")
+function player_history_skill_death.onDeath(creature, corpse, killer, mostDamageKiller, lastHitUnjustified, mostDamageUnjustified)
+	--print("3-death["..creature:getName().."]")
+	historyLogoutEvent(Player(creature))
+end
+player_history_skill_death:register()
+
+
+-- If this is first login, insert current progress
+local player_history_skill_login = CreatureEvent("player_history_skill_login")
+function player_history_skill_login.onLogin(player)
+	--print("1-login["..player:getName().."]")
+	player:registerEvent("player_history_skill_death")
+
+	local playerGuid = player:getGuid()
+	local resultId = db.storeQuery("SELECT `id` FROM `player_history_skill` WHERE `player_id`="..playerGuid.." LIMIT 1;")
+	if resultId == false then
+		db.query([[
+			INSERT INTO `player_history_skill` (
+				`player_id`,
+				`lastlogin`, 
+				`lastlogout`, 
+				`town_id`,
+				`lastip`,
+				`skull`,
+				`blessings`,
+				`onlinetime`,
+				`balance`, 
+				`level`, 
+				`experience`, 
+				`maglevel`, 
+				`skill_fist`, 
+				`skill_club`, 
+				`skill_sword`, 
+				`skill_axe`, 
+				`skill_dist`, 
+				`skill_shielding`, 
+				`skill_fishing`
+			)
+			SELECT 
+				`p`.`id` AS `player_id`, 
+				`zp`.`created` AS `lastlogin`, 
+				CASE WHEN `p`.`lastlogout` > 0 
+					THEN `p`.`lastlogout` 
+					ELSE `zp`.`created` 
+				END AS `lastlogout`, 
+				`p`.`town_id`,
+				`p`.`lastip`,
+				`p`.`skull`,
+				`p`.`blessings`,
+				`p`.`onlinetime`,
+				`p`.`balance`, 
+				`p`.`level`, 
+				`p`.`experience`, 
+				`p`.`maglevel`, 
+				`p`.`skill_fist`, 
+				`p`.`skill_club`, 
+				`p`.`skill_sword`, 
+				`p`.`skill_axe`, 
+				`p`.`skill_dist`, 
+				`p`.`skill_shielding`, 
+				`p`.`skill_fishing` 
+			FROM `players` AS `p`
+			INNER JOIN `znote_players` AS `zp`
+				ON `p`.`id` = `zp`.`player_id`
+			WHERE `p`.`id` = ]]..playerGuid..[[
+		]])
+	else
+		result.free(resultId)
+	end
+	return true
+end
+player_history_skill_login:register()

Lua/TFS_10/revscriptsys/powergamers.lua

@@ -25,23 +25,23 @@ end
 
 -- SQL Query to execute: --
 --[[
-ALTER TABLE `znote_players` ADD `exphist_lastexp` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist1` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist2` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist3` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist4` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist5` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist6` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `exphist7` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-ADD `onlinetimetoday` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime1` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime2` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime3` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime4` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime5` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime6` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetime7` BIGINT NOT NULL DEFAULT '0',
-ADD `onlinetimeall` BIGINT NOT NULL DEFAULT '0';
+ALTER TABLE `znote_players` ADD `exphist_lastexp` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist1` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist2` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist3` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist4` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist5` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist6` BIGINT NOT NULL DEFAULT '0',
+ADD `exphist7` BIGINT NOT NULL DEFAULT '0',
+ADD `onlinetimetoday` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime1` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime2` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime3` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime4` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime5` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime6` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetime7` MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+ADD `onlinetimeall` INT UNSIGNED NOT NULL DEFAULT '0';
 ]]--
 
 -- after that execute: --

README.md

@@ -1,6 +1,14 @@
 ZnoteAAC
 ========
 [![CodeFactor](https://www.codefactor.io/repository/github/znote/znoteaac/badge)](https://www.codefactor.io/repository/github/znote/znoteaac)
+### Branch: v2
+The purpose of this branch is to server as code cleanup, and strip distro compatibility for anything below TFS 1.4. 
+I want to refactor some code, try to get Znote AAC a bit more lightweight. Remove single-use functions from globally included function files etc. 
+
+New features and bugfixes might arrive here first, and then backported to 1.5/6 (master branch).
+
+---
+
 ### What is Znote AAC?
 
 Znote AAC is a full-fledged website used together with an Open Tibia(OT) server.

admin_helpdesk.php

@@ -36,6 +36,11 @@
 	}
 
 	$ticketData = mysql_select_single("SELECT * FROM znote_tickets WHERE id='$view' LIMIT 1;");
+	if(!$ticketData) {
+		echo 'You can not view this ticket!';
+		include 'layout/overall/footer.php';
+		die;
+	}
 	?>
 	<h1>View Ticket #<?php echo $ticketData['id']; ?></h1>
 	<table class="znoteTable ThreadTable table table-striped">
@@ -144,4 +149,4 @@
 	} else echo 'No helpdesk tickets has been submitted.';
 }
 include 'layout/overall/footer.php';
-?>
+?>

api/api.php

@@ -1,12 +1,14 @@
 <?php
 // Verify the PHP version, gives tutorial if fail.
-if (version_compare(phpversion(), '5.3.3', '<')) die('PHP 5.3.3 or higher is required');
+if (version_compare(phpversion(), '7.2', '<')) die('PHP version 7.2 or higher is required.');
 if (!isset($filepath)) $filepath = '../';
 
-$version = '1.5_SVN';
+$version = '2.0_DEV';
 session_start();
 ob_start();
 require_once $filepath.'config.php';
+$sessionPrefix = $config['session_prefix'];
+
 require_once $filepath.'engine/database/connect.php';
 require_once $filepath.'engine/function/general.php';
 require_once $filepath.'engine/function/cache.php';

changelog.php

@@ -54,6 +54,7 @@
 <h1>Changelog</h1>
 <?php
 $cache = new Cache('engine/cache/changelog');
+$cache->useMemory(false);
 if ($updateCache === true) {
 	$changelogs = mysql_select_multi("SELECT `id`, `text`, `time`, `report_id`, `status` FROM `znote_changelog` ORDER BY `id` DESC;");