From fcb2fc3002bc404513cdbd3db3a28c8f35e9442b Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 5 Aug 2023 11:57:15 +0200 Subject: [PATCH 1/4] Add .htaccess to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 5206d08b..6c1db9b7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ Thumbs.db .DS_Store .idea +# +/.htaccess + # composer composer.lock vendor From 41fa695d8bef0aa3c58c8444465cc0affe66efec Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 5 Aug 2023 19:58:04 +0200 Subject: [PATCH 2/4] Add some functions to compatibility layer of gesioraac --- system/compat/classes.php | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/system/compat/classes.php b/system/compat/classes.php index 051fbdf2..2009140b 100644 --- a/system/compat/classes.php +++ b/system/compat/classes.php @@ -9,7 +9,30 @@ */ defined('MYAAC') or die('Direct access not allowed!'); -class Player extends OTS_Player {} -class Guild extends OTS_Guild {} +class Account extends OTS_Account { + public function loadById($id) { + $this->load($id); + } + public function loadByName($name) { + $this->find($name); + } +} + +class Player extends OTS_Player { + public function loadById($id) { + $this->load($id); + } + public function loadByName($name) { + $this->find($name); + } +} +class Guild extends OTS_Guild { + public function loadById($id) { + $this->load($id); + } + public function loadByName($name) { + $this->find($name); + } +} class GuildRank extends OTS_GuildRank {} class House extends OTS_House {} From 757ec28028e7e8abfae6bc774dadaec50a373cff Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 5 Aug 2023 19:58:52 +0200 Subject: [PATCH 3/4] Removed deprecated functions: utf8_encode & decode --- system/libs/pot/OTS_ServerInfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libs/pot/OTS_ServerInfo.php b/system/libs/pot/OTS_ServerInfo.php index fd06749e..30a81f7b 100644 --- a/system/libs/pot/OTS_ServerInfo.php +++ b/system/libs/pot/OTS_ServerInfo.php @@ -123,7 +123,7 @@ class OTS_ServerInfo { // loads respond XML $info = new OTS_InfoRespond(); - if(!$info->loadXML( utf8_encode($status->getBuffer()))) + if(!$info->loadXML( $status->getBuffer())) return false; return $info; From aacc12036081cb2b2fa0815ea21c26fd992a3d4d Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 5 Aug 2023 20:52:01 +0200 Subject: [PATCH 4/4] Remove deprecated utf8_decode --- templates/tibiacom/headline.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/tibiacom/headline.php b/templates/tibiacom/headline.php index dbef28a1..85dae0f2 100644 --- a/templates/tibiacom/headline.php +++ b/templates/tibiacom/headline.php @@ -14,7 +14,7 @@ imagecolortransparent($image, imagecolorallocate($image, 0, 0, 0)); // set text $font = getenv('GDFONTPATH') . DIRECTORY_SEPARATOR . 'martel.ttf'; -imagettftext($image, 18, 0, 4, 20, imagecolorallocate($image, 240, 209, 164), $font, utf8_decode($text)); +imagettftext($image, 18, 0, 4, 20, imagecolorallocate($image, 240, 209, 164), $font, $text); // header mime type header('Content-type: image/gif');