diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b90ab4f..37a1b73d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.3 - 10.03.2025] + +### Changed +* Use latest outfit-images host from @gesior (https://github.com/slawkens/myaac/commit/529bdcf016dd0f9dffbc34d81f99a046a9ddb70d) +* Change monster link to $_GET ?name= (https://github.com/slawkens/myaac/commit/4c5cc8b573b2b3e7ec00a22b7ede30a68083a924) + +### Fixed +* Fixed house links (https://github.com/slawkens/myaac/commit/887b5068ad11c4cdab614afd34525caba785ce13) +* Fixed long title on headline.php (https://github.com/slawkens/myaac/commit/3e3f4bb5a514158ec8777684ca6c7f1c2a37bed5) +* Fixed menu colors once again, plus add !important tag (https://github.com/slawkens/myaac/commit/aa52df6e2ec92cafc25b655ae907bf2e1746d9cc) +* Fix: add possibility to remove all menu items in admin panel (https://github.com/slawkens/myaac/commit/00fe1adc15ea7646596d755f6e6e1f7854ffc1d5, https://github.com/slawkens/myaac/commit/9239a4f4198c3ad260802ac3b47e9c41b80b754e) + ## [1.2 - 09.02.2025] ### Added diff --git a/system/libs/pot/OTS_Account.php b/system/libs/pot/OTS_Account.php index 0de49ccc..231230af 100644 --- a/system/libs/pot/OTS_Account.php +++ b/system/libs/pot/OTS_Account.php @@ -445,19 +445,19 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable throw new E_OTS_NotLoaded(); } + $configFreePremium = configLua('freePremium'); + if(isset($configFreePremium) && getBoolean($configFreePremium)) {return -1;} + if(isset($this->data['premium_ends_at']) || isset($this->data['premend'])) { $col = isset($this->data['premium_ends_at']) ? 'premium_ends_at' : 'premend'; $ret = ceil(($this->data[$col] - time()) / (24 * 60 * 60)); - return $ret > 0 ? $ret : 0; + return max($ret, 0); } if($this->data['premdays'] == 0) { return 0; } - global $config; - if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return -1; - if($this->data['premdays'] == self::GRATIS_PREMIUM_DAYS){ return self::GRATIS_PREMIUM_DAYS; }