mirror of
https://github.com/slawkens/myaac.git
synced 2025-09-14 20:43:34 +02:00
Compare commits
2 Commits
v1.8.1
...
feature/hi
| Author | SHA1 | Date | |
|---|---|---|---|
|
1a6ef4125e | ||
|
|
606fb0673c |
111
CHANGELOG-1.x.md
111
CHANGELOG-1.x.md
@@ -1,116 +1,5 @@
|
||||
# Changelog
|
||||
|
||||
## [1.8.1 - 05.09.2025]
|
||||
|
||||
### Added
|
||||
* New Commands: plugin:enable/disable/uninstall {plugin-name} (https://github.com/slawkens/myaac/commit/7a08f91d3fc0897c1ff76089ef3c649a2c6d2003, https://github.com/slawkens/myaac/commit/fec773ba4b740f35c0a3ef92ca8444a4c7d02082)
|
||||
* Gifts: Added Transferable Coins to the store dropdown menu in the admin area (by @andreoam, #321) (https://github.com/slawkens/myaac/commit/42671c5c199dd9e91c774d8c9d30da9e12f1b695)
|
||||
|
||||
### Changed
|
||||
* Commands: Allow settings to be changed/reset by plugin name (https://github.com/slawkens/myaac/commit/f8c4332e03e838d285ea0afb4b72b7c23e324d45, https://github.com/slawkens/myaac/commit/4b948e9510f7ba69d00f84d7fdaea8b3bf05b630)
|
||||
* Templates: Menus should be saved for each template separately (https://github.com/slawkens/myaac/commit/482f4067b2a2e7513d9ba214274a361ffaf123d8)
|
||||
|
||||
### Fixed
|
||||
* Online: Fix skulls display (#320) (https://github.com/slawkens/myaac/commit/98073a110ae13f9592ec9d2c4d1d1aace87587a9)
|
||||
* Online: Fix if there is no world_id in the server_record table (https://github.com/slawkens/myaac/commit/b6e1620f14c20eecfc9001a7d86dfb67942985c6) (Reported by @gesior in #318)
|
||||
* tibiacom: some fixes to menus (https://github.com/slawkens/myaac/commit/20f99903ae80c74ad66c1cf5a5ea8d0b0fc2fd70, https://github.com/slawkens/myaac/commit/11dae90fa94fbbf47447017db5e5847c33d6aadf)
|
||||
* Guilds: Fix for some servers that don't have guild_invites table (https://github.com/slawkens/myaac/commit/9725a3c2bdb7003f5cb48febb77604c31a9b805b)
|
||||
|
||||
## [1.8 - 02.08.2025]
|
||||
|
||||
### Added
|
||||
* Templates - Kathrine: Possibility to add custom menu categories (https://github.com/slawkens/myaac/commit/ec11c1402417c25980582467546d1c1e9bb8267f)
|
||||
* Admin Panel - Accounts Editor: Add Coins Transferable (https://github.com/slawkens/myaac/commit/45d6047031c9c3a0e7e512dc5d15c75629aec5a2, https://github.com/slawkens/myaac/commit/bb097b69ce106500a49686d6f4fe604348eaa310)
|
||||
* Highscores:
|
||||
* Revamped: (https://github.com/slawkens/myaac/commit/d8132d4d76e03d5aa0c042be426320655a601392)
|
||||
* Show real rank, if 2 or more players have the same skill, show them with same rank
|
||||
* New setting: highscores_online_status
|
||||
* Additional fields passed to twig: updatedAt, totalResults, page, baseLink
|
||||
* Add new Setting: Display Skills Box (https://github.com/slawkens/myaac/commit/36ca755243ef1c83f6ac87465b426d4d8d3b0bb9)
|
||||
* Functions: Add getExperienceForLevel (level) (https://github.com/slawkens/myaac/commit/1566deb84a082176b8c683fda205d828bc38fbcc)
|
||||
* Commands - cache:clear : Add warning about APCu clear in CLI (https://github.com/slawkens/myaac/commit/83f84172e02e8ea2ccb6dca29bc033e44c35aebc)
|
||||
* Models - PlayerOnline: Add missing $fillable into model (https://github.com/slawkens/myaac/commit/43415cf35db1c1307f2684c1728693d65065ffff)
|
||||
* Twig: add cache variable (https://github.com/slawkens/myaac/commit/0efe47ce71c4b364a9e96bc5a55b1655326ae6da)
|
||||
|
||||
### Changed
|
||||
* pages/online: add cache, resulting in 20x performance boost
|
||||
* (for an example server with 2k players) (https://github.com/slawkens/myaac/commit/c8363086015cbb6e8786c398c7b9ac3959a26ec4)
|
||||
* Admin Bar: Move admin bar code into body_start place_holder (https://github.com/slawkens/myaac/commit/f17269e44ce9dd38447bd2e2a8e1bdb065d4161f)
|
||||
* Cache::remember: $ttl = 0 means no cache (https://github.com/slawkens/myaac/commit/3b47e9df2f4051807c5ff87892f7fa3d348f9c55)
|
||||
* Templates: Load config.ini with $process_sections set to true (https://github.com/slawkens/myaac/commit/a89f9a84847630eb75b4890fdcc8b7a7bfa6b8ac)
|
||||
* Twig: Allow for timestamp as integer in the timeago twig function
|
||||
(https://github.com/slawkens/myaac/commit/34fead906ea13b9f09d7a3c41ed88109d34d386c)
|
||||
|
||||
### Fixed
|
||||
* Settings: Fixed two exceptions (https://github.com/slawkens/myaac/commit/6e5a4ff8c78ff5373aba091baa66cae029557643, https://github.com/slawkens/myaac/commit/20d69a641c0a933d14889a89da6d32f6a4bc6c7d)
|
||||
* Models\Account + OTS_Account -> isPremium -> ignore config.freePremium (https://github.com/slawkens/myaac/commit/5271633bdbfbbfed0b1d59c403093ce6fc2b7d20)
|
||||
* Admin Panel - Mailer:
|
||||
* Fix send to email link redirecting from accounts page (https://github.com/slawkens/myaac/commit/080cc2781f034c844af658229e495e9a47fd2298)
|
||||
* Option to send only to verified accounts - only if setting('core.account_mail_verify') enabled (https://github.com/slawkens/myaac/commit/cf7fd20452e863980045bb5d6012ec86c6e8e01f)
|
||||
|
||||
### Internal
|
||||
* Rewrite to use constants (account transferable coins) (https://github.com/slawkens/myaac/commit/bccf8e056df985bbe1bab5f7ab5492f714d6b62b)
|
||||
* Refactor to use HAS_ACCOUNT_COINS (https://github.com/slawkens/myaac/commit/caf326a6584a234775ebc6c8000ea02b3fecd160)
|
||||
|
||||
## [1.7.1 - 27.06.2025]
|
||||
|
||||
### Changed
|
||||
* Rename plugin:install:install to plugin:setup, also add alias to previous command (https://github.com/slawkens/myaac/commit/13d33822b59df349199e885a78a3d6beb0863d0b)
|
||||
|
||||
### Fixed
|
||||
* Fix commands: setup + cache:clear (https://github.com/slawkens/myaac/commit/0da524fefe93b3028392e9014550eea3324d3a22, https://github.com/slawkens/myaac/commit/fe8281594e989f00280ba1adc734a9198c6b5cc1)
|
||||
* Fix polls link in tibiacom template (https://github.com/slawkens/myaac/commit/d90fa323d7c77d81768df60feeb1c374b1650a0c)
|
||||
|
||||
## [1.7 - 22.06.2025]
|
||||
|
||||
### Added
|
||||
* Feature: plugins versions check (#310)
|
||||
* New hooks: HOOK_ACCOUNT_MANAGE_AFTER_CHARACTERS, HOOK_GUILDS_AFTER_MANAGE_BUTTON (https://github.com/slawkens/myaac/commit/c074a48f245df55646b6705737f667b6a84149b2, https://github.com/slawkens/myaac/commit/e6100a1b72de8695bba1dae9ba4e28bfdce47b10)
|
||||
* Add OTS_Toolbox::getVocationName(id, promotion) + OTS_Player->isNameLocked() (https://github.com/slawkens/myaac/commit/e222957893c4a1de0dc8dbba55bce1a43418d275, https://github.com/slawkens/myaac/commit/522f6c11d835afd36fd07a07074d96d7e219b488)
|
||||
* Add missing csrf in more places, causing white page with error about Request (https://github.com/slawkens/myaac/commit/dca904e61d21d856bf809070e7652803a2df0f58, https://github.com/slawkens/myaac/commit/c720ccc451ff90ef40b2a1595468d061ffd7e1e4)
|
||||
|
||||
### Changed
|
||||
* Revamped online page (https://github.com/slawkens/myaac/commit/9a90e4aae280e607430511c6727d9a714b11f4c5, https://github.com/slawkens/myaac/commit/4767120043b09141870383e249f3729638d53dc2)
|
||||
* Better $title inventing (https://github.com/slawkens/myaac/commit/0c95bcfd06b68b21512e477646ef7bd3a0d4912b)
|
||||
|
||||
### Fixed
|
||||
* Use apcu cache clear (https://github.com/slawkens/myaac/commit/b329da52aae9d0e21120a6444d3caf442420ce50, https://github.com/slawkens/myaac/commit/566c2a9151ab6392286f74e26853faa19a1b4f24)
|
||||
* fix: boostedcreatures for 13.40 (by @GooseWithAKnife) (#307)
|
||||
|
||||
## [1.6.1 - 11.06.2025]
|
||||
|
||||
### Fixed
|
||||
* Fixed "Request has been cancelled due to security reasons", cause of missing csrf() in twig files (https://github.com/slawkens/myaac/commit/10cd71a6630ffec91b43a26a6d685b66c5836a6a)
|
||||
* Fix: Ignore duplicated route exception (https://github.com/slawkens/myaac/commit/9d8e9d27bd87167d8d4005942a6af62bfe4c0892)
|
||||
|
||||
### Changed
|
||||
* Move counter & visitors code before router (In case someone wants to include that info on page) (https://github.com/slawkens/myaac/commit/f78285030708ad3c74ab048711f73bbf3ee5281e)
|
||||
* Set TinyMCE license key to gpl (Avoid warning message in browser console) (https://github.com/slawkens/myaac/commit/8d29fdb98b92dbc3d2853ef88a185c67036b4a77)
|
||||
|
||||
### Removed
|
||||
* Remove deprecated TinyMCE plugin - template (https://github.com/slawkens/myaac/commit/309c1fb715b882e67cb673b1544a03befbf64a22)
|
||||
|
||||
## [1.6 - 03.06.2025]
|
||||
|
||||
### Added
|
||||
* Add new setting/configurable: site_url, prevents domain spoofing (https://github.com/slawkens/myaac/commit/d8a6090be382c35c19117cfef964b594ed02b8d4)
|
||||
* Add new account coins setting (https://github.com/slawkens/myaac/commit/28886551e86fe562172c4c7f2afb89a2e7672c2e)
|
||||
* autoload: settings/install/init.php (https://github.com/slawkens/myaac/commit/e5749437074c3b3556628a2aeb5bad2edf97bde0, https://github.com/slawkens/myaac/commit/7d213f479a7e40c6254069b5fc4e578dc32bf8d9, https://github.com/slawkens/myaac/commit/207d6bc69120aba1af2b51808f17e0059b571fed)
|
||||
* Protect against csrf in more places (accounts & guilds & forums pages) (https://github.com/slawkens/myaac/commit/6eda38603c8ed7e99b92a78a4600b1245377f74d, https://github.com/slawkens/myaac/commit/e776bd52beb3064a9e694efd1b9021ec972ee2f6, https://github.com/slawkens/myaac/commit/84d502bf105f2a789481fba1acc820d236b4de66)
|
||||
* Added two new hooks for pages loaded from database (custom pages): HOOK_BEFORE_PAGE_CUSTOM, HOOK_AFTER_PAGE_CUSTOM (https://github.com/slawkens/myaac/commit/c961a1ebf837f2ab1734a825ff2c57b4937610c9)
|
||||
* Add global variables into $hooks->executeFilter (https://github.com/slawkens/myaac/commit/8fdea943768b20193eede99d60313ee84511a0be)
|
||||
* Add getNPCsCount() to OTS_InfoRespond (https://github.com/slawkens/myaac/commit/7d435ff6433ef1fb2295ee79ed043ee10dc725e9)
|
||||
|
||||
### Fixed
|
||||
* Allow [] in character name (https://github.com/slawkens/myaac/commit/de6603a51347b9e656c58637ed9971fffdd7cedd)
|
||||
* Do not allow access to tools/ folder after install (https://github.com/slawkens/myaac/commit/6e0f5913831f8dba69fd2d1505be3e2a303c6324)
|
||||
* Fix CHANGELOG-1.x.md loading in admin panel (https://github.com/slawkens/myaac/commit/4a30fb495dbfbe1d434e8d52419eaf44fe517aee)
|
||||
* Fix links not working in admin dashboard modules (https://github.com/slawkens/myaac/commit/be7b27c31aa3bbd6c0289c34d1e61139a3fe015c)
|
||||
* Fix twig variables: logged + account_logged being not set directly after login (https://github.com/slawkens/myaac/commit/1e9b10d6489c488cadf7f6ed17b42f1ea6c767a8)
|
||||
|
||||
### Changed
|
||||
* OTS_ServerInfo -> move setTimeout out of class - Possibility to use the class without MyAAC (https://github.com/slawkens/myaac/commit/40d65a6613149fda51bdceb82c807e5301a3388b)
|
||||
|
||||
## [1.5 - 14.05.2025]
|
||||
|
||||
### Added
|
||||
|
||||
@@ -80,7 +80,7 @@ Pull requests should be made to the *develop* branch as that is the working bran
|
||||
|
||||
Bug fixes to current release should be done to master branch.
|
||||
|
||||
Look: [Contributing](https://docs.my-aac.org/misc/contributing) in our wiki.
|
||||
Look: [Contributing](https://github.com/otsoft/myaac/wiki/Contributing) in our wiki.
|
||||
|
||||
### Other Notes
|
||||
|
||||
@@ -95,4 +95,4 @@ Many thanks to Jetbrains for kindly providing a license for me to work on this a
|
||||
### License
|
||||
|
||||
This program and all associated files are released under the GNU Public License.
|
||||
See [LICENSE](https://github.com/slawkens/myaac/blob/main/LICENSE) for details.
|
||||
See [LICENSE](https://github.com/slawkens/myaac/blob/master/LICENSE) for details.
|
||||
|
||||
@@ -26,6 +26,7 @@ if (setting('core.account_country'))
|
||||
$nameOrNumberColumn = getAccountIdentityColumn();
|
||||
|
||||
$hasSecretColumn = $db->hasColumn('accounts', 'secret');
|
||||
$hasCoinsColumn = $db->hasColumn('accounts', 'coins');
|
||||
$hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
|
||||
$hasTypeColumn = $db->hasColumn('accounts', 'type');
|
||||
$hasGroupColumn = $db->hasColumn('accounts', 'group_id');
|
||||
@@ -135,18 +136,11 @@ else if (isset($_REQUEST['search'])) {
|
||||
if (!Validator::email($email))
|
||||
$errors['email'] = Validator::getLastError();
|
||||
|
||||
// tibia coins
|
||||
if (HAS_ACCOUNT_COINS) {
|
||||
//tibia coins
|
||||
if ($hasCoinsColumn) {
|
||||
$t_coins = $_POST['t_coins'];
|
||||
verify_number($t_coins, 'Tibia coins', 12);
|
||||
}
|
||||
|
||||
// transferable tibia coins
|
||||
if (HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS) {
|
||||
$t_coins_transferable = $_POST['t_coins_transferable'];
|
||||
verify_number($t_coins_transferable, 'Transferable Tibia coins', 12);
|
||||
}
|
||||
|
||||
// prem days
|
||||
$p_days = (int)$_POST['p_days'];
|
||||
verify_number($p_days, 'Prem days', 11);
|
||||
@@ -191,18 +185,12 @@ else if (isset($_REQUEST['search'])) {
|
||||
if ($hasSecretColumn) {
|
||||
$account->setCustomField('secret', $secret);
|
||||
}
|
||||
|
||||
$account->setCustomField('key', $key);
|
||||
$account->setEMail($email);
|
||||
|
||||
if (HAS_ACCOUNT_COINS) {
|
||||
if ($hasCoinsColumn) {
|
||||
$account->setCustomField('coins', $t_coins);
|
||||
}
|
||||
|
||||
if (HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS) {
|
||||
$account->setCustomField(ACCOUNT_COINS_TRANSFERABLE_COLUMN, $t_coins_transferable);
|
||||
}
|
||||
|
||||
$lastDay = 0;
|
||||
if($p_days != 0 && $p_days != OTS_Account::GRATIS_PREMIUM_DAYS) {
|
||||
$lastDay = time();
|
||||
@@ -235,6 +223,9 @@ else if (isset($_REQUEST['search'])) {
|
||||
|
||||
$password = encrypt($password);
|
||||
$account->setPassword($password);
|
||||
|
||||
if (USE_ACCOUNT_SALT)
|
||||
$account->setCustomField('salt', $salt);
|
||||
}
|
||||
|
||||
$account->save();
|
||||
@@ -404,18 +395,12 @@ else if (isset($_REQUEST['search'])) {
|
||||
<label for="email">Email:</label><?php echo (setting('core.mail_enabled') ? ' (<a href="' . ADMIN_URL . '?p=mailer&mail_to=' . $account->getEMail() . '">Send Mail</a>)' : ''); ?>
|
||||
<input type="text" class="form-control" id="email" name="email" autocomplete="off" value="<?php echo $account->getEMail(); ?>"/>
|
||||
</div>
|
||||
<?php if (HAS_ACCOUNT_COINS): ?>
|
||||
<?php if ($hasCoinsColumn): ?>
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<label for="t_coins">Tibia Coins:</label>
|
||||
<input type="text" class="form-control" id="t_coins" name="t_coins" autocomplete="off" maxlength="11" value="<?php echo $account->getCustomField('coins') ?>"/>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<?php if (HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS): ?>
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<label for="t_coins_transferable">Transferable Tibia Coins:</label>
|
||||
<input type="text" class="form-control" id="t_coins_transferable" name="t_coins_transferable" autocomplete="off" maxlength="11" value="<?php echo $account->getCustomField(ACCOUNT_COINS_TRANSFERABLE_COLUMN) ?>"/>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<label for="p_days">Premium Days:</label>
|
||||
<input type="text" class="form-control" id="p_days" name="p_days" autocomplete="off" maxlength="11" value="<?php echo $account->getPremDays(); ?>"/>
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
defined('MYAAC') or die('Direct access not allowed!');
|
||||
$title = 'MyAAC Changelog';
|
||||
|
||||
if (!file_exists(BASE . 'CHANGELOG-1.x.md')) {
|
||||
if (!file_exists(BASE . 'CHANGELOG.md')) {
|
||||
echo 'File CHANGELOG.md doesn\'t exist.';
|
||||
return;
|
||||
}
|
||||
|
||||
$changelog = file_get_contents(BASE . 'CHANGELOG-1.x.md');
|
||||
$changelog = file_get_contents(BASE . 'CHANGELOG.md');
|
||||
|
||||
$Parsedown = new Parsedown();
|
||||
|
||||
|
||||
@@ -25,10 +25,9 @@ if (!setting('core.mail_enabled')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$mail_to = isset($_REQUEST['mail_to']) ? stripslashes(trim($_REQUEST['mail_to'])) : null;
|
||||
$mail_to = isset($_POST['mail_to']) ? stripslashes(trim($_POST['mail_to'])) : null;
|
||||
$mail_subject = isset($_POST['mail_subject']) ? stripslashes($_POST['mail_subject']) : null;
|
||||
$mail_content = isset($_POST['mail_content']) ? stripslashes($_POST['mail_content']) : null;
|
||||
$mail_verified_only = $_POST['mail_verified_only'] ?? false;
|
||||
|
||||
if (isset($_POST['submit'])) {
|
||||
if (empty($mail_subject)) {
|
||||
@@ -59,14 +58,14 @@ if (!empty($mail_content) && !empty($mail_subject) && empty($mail_to)) {
|
||||
$success = 0;
|
||||
$failed = 0;
|
||||
|
||||
$query = Account::where('email', '!=', '');
|
||||
|
||||
if ($mail_verified_only) {
|
||||
info('Note: Sending only to users with verified E-Mail.');
|
||||
$query->where('email_verified', 1);
|
||||
$add = '';
|
||||
if (setting('core.account_mail_verify')) {
|
||||
note('Note: Sending only to users with verified E-Mail.');
|
||||
$add = ' AND `email_verified` = 1';
|
||||
}
|
||||
|
||||
foreach ($query->get(['email']) as $email) {
|
||||
$query = Account::where('email', '!=', '')->get(['email']);
|
||||
foreach ($query as $email) {
|
||||
if (_mail($email->email, $mail_subject, $mail_content)) {
|
||||
$success++;
|
||||
}
|
||||
@@ -85,6 +84,5 @@ if (!empty($mail_content) && !empty($mail_subject) && empty($mail_to)) {
|
||||
$twig->display('admin.mailer.html.twig', [
|
||||
'mail_to' => $mail_to,
|
||||
'mail_subject' => $mail_subject,
|
||||
'mail_content' => $mail_content,
|
||||
'mail_verified_only' => $mail_verified_only,
|
||||
'mail_content' => $mail_content
|
||||
]);
|
||||
|
||||
@@ -18,6 +18,7 @@ $title = 'Mass Account Actions';
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$hasCoinsColumn = $db->hasColumn('accounts', 'coins');
|
||||
$hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
|
||||
$freePremium = $config['lua']['freePremium'];
|
||||
|
||||
@@ -39,7 +40,9 @@ function admin_give_points($points)
|
||||
|
||||
function admin_give_coins($coins)
|
||||
{
|
||||
if (!HAS_ACCOUNT_COINS) {
|
||||
global $hasCoinsColumn;
|
||||
|
||||
if (!$hasCoinsColumn) {
|
||||
displayMessage('Coins not supported.');
|
||||
return;
|
||||
}
|
||||
@@ -164,19 +167,19 @@ if (!empty(ACTION) && isRequestMethod('post')) {
|
||||
}
|
||||
else {
|
||||
$twig->display('admin.tools.account.html.twig', array(
|
||||
'hasCoinsColumn' => HAS_ACCOUNT_COINS,
|
||||
'hasCoinsColumn' => $hasCoinsColumn,
|
||||
'hasPointsColumn' => $hasPointsColumn,
|
||||
'freePremium' => $freePremium,
|
||||
));
|
||||
}
|
||||
|
||||
function displayMessage($message, $success = false) {
|
||||
global $twig, $hasPointsColumn, $freePremium;
|
||||
global $twig, $hasCoinsColumn, $hasPointsColumn, $freePremium;
|
||||
|
||||
$success ? success($message): error($message);
|
||||
|
||||
$twig->display('admin.tools.account.html.twig', array(
|
||||
'hasCoinsColumn' => HAS_ACCOUNT_COINS,
|
||||
'hasCoinsColumn' => $hasCoinsColumn,
|
||||
'hasPointsColumn' => $hasPointsColumn,
|
||||
'freePremium' => $freePremium,
|
||||
));
|
||||
|
||||
@@ -7,7 +7,7 @@ defined('MYAAC') or die('Direct access not allowed!');
|
||||
$balance = 0;
|
||||
|
||||
if ($db->hasColumn('players', 'balance')) {
|
||||
$balance = Player::orderByDesc('balance')->limit(10)->get(['id', 'name', 'balance'])->toArray();
|
||||
$balance = Player::orderByDesc('balance')->limit(10)->get(['balance', 'id','name', 'level'])->toArray();
|
||||
}
|
||||
|
||||
$twig->display('balance.html.twig', array(
|
||||
|
||||
@@ -6,13 +6,8 @@ defined('MYAAC') or die('Direct access not allowed!');
|
||||
|
||||
$coins = 0;
|
||||
|
||||
if (HAS_ACCOUNT_COINS) {
|
||||
$whatToGet = ['id', 'coins'];
|
||||
if (USE_ACCOUNT_NAME) {
|
||||
$whatToGet[] = 'name';
|
||||
}
|
||||
|
||||
$coins = Account::orderByDesc('coins')->limit(10)->get($whatToGet)->toArray();
|
||||
if ($db->hasColumn('accounts', 'coins')) {
|
||||
$coins = Account::orderByDesc('coins')->limit(10)->get(['coins', (USE_ACCOUNT_NAME ? 'name' : 'id')])->toArray();
|
||||
}
|
||||
|
||||
$twig->display('coins.html.twig', array(
|
||||
|
||||
@@ -7,7 +7,7 @@ defined('MYAAC') or die('Direct access not allowed!');
|
||||
$players = 0;
|
||||
|
||||
if ($db->hasColumn('players', 'lastlogin')) {
|
||||
$players = Player::orderByDesc('lastlogin')->limit(10)->get(['id', 'name', 'level', 'lastlogin'])->toArray();
|
||||
$players = Player::orderByDesc('lastlogin')->limit(10)->get(['name', 'level', 'lastlogin'])->toArray();
|
||||
}
|
||||
|
||||
$twig->display('lastlogin.html.twig', array(
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
{% set i = i + 1 %}
|
||||
<tr>
|
||||
<th>{{ i }}</th>
|
||||
<td><a href="?p=players&id={{ result.id }}">{{ result.name }}</a></td>
|
||||
<td><a href="?p=players&search_name={{ result.name }}">{{ result.name }}</a></td>
|
||||
<td>{{ result.balance }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
{% set i = i + 1 %}
|
||||
<tr>
|
||||
<th>{{ i }}</th>
|
||||
<td><a href="?p=accounts&id={{ result.id }}">{{ result.name ?? result.id }}</a></td>
|
||||
<td><a href="?p=accounts&search_name={{ result.name }}">{{ result.name }}</a></td>
|
||||
<td>{{ result.coins }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
{% set i = i + 1 %}
|
||||
<tr>
|
||||
<th>{{ i }}</th>
|
||||
<td><a href="?p=players&id={{ result.id }}">{{ result.name }}</a></td>
|
||||
<td><a href="?p=players&search_name={{ result.name }}">{{ result.name }}</a></td>
|
||||
<td>{{ result.lastlogin|date("M d Y, H:i:s") }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
{% set i = i + 1 %}
|
||||
<tr>
|
||||
<th>{{ i }}</th>
|
||||
<td><a href="?p=accounts&id={{ result.id }}">{{ result.name }}</a></td>
|
||||
<td><a href="?p=accounts&search_name={{ result.name }}">{{ result.name }}</a></td>
|
||||
<td>{{ result.premium_points }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
@@ -51,56 +51,6 @@ else {
|
||||
} else {
|
||||
error('Error while disabling plugin ' . $disable . ': ' . Plugins::getError());
|
||||
}
|
||||
}
|
||||
else if (isset($_GET['check-updates'])) {
|
||||
$repoUri = $config['admin_plugins_api_uri'] ?? 'https://plugins.my-aac.org/api/';
|
||||
success("Fetching latest info from $repoUri..");
|
||||
|
||||
$adminPlugins = new \MyAAC\Admin\Plugins();
|
||||
|
||||
$adminPlugins->setApiBaseUri($repoUri);
|
||||
|
||||
try {
|
||||
$plugins = $adminPlugins->getLatestVersions();
|
||||
}
|
||||
catch (Exception $e) {
|
||||
error($e->getMessage());
|
||||
}
|
||||
|
||||
if (isset($plugins) && count($plugins) > 0) {
|
||||
$outdated = [];
|
||||
|
||||
foreach (get_plugins(true) as $plugin) {
|
||||
$string = file_get_contents(BASE . 'plugins/' . $plugin . '.json');
|
||||
$plugin_info = json_decode($string, true);
|
||||
|
||||
if (!$plugin_info) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$disabled = (str_contains($plugin, 'disabled.'));
|
||||
$pluginOriginal = ($disabled ? str_replace('disabled.', '', $plugin) : $plugin);
|
||||
|
||||
$info = $plugins[$pluginOriginal] ?? false;
|
||||
if ($info && version_compare($info['version'], $plugin_info['version'], '>')) {
|
||||
$outdated[] = [
|
||||
'name' => $pluginOriginal,
|
||||
'yourVersion' => $plugin_info['version'],
|
||||
'latestVersion' => $info['version'],
|
||||
'link' => $info['link'] ?? 'Unknown',
|
||||
'download_link' => $info['download_link'] ?? 'Unknown',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
if (count($outdated) > 0) {
|
||||
info('Following updates have been found for your plugins:');
|
||||
$twig->display('admin.plugins.outdated.html.twig', ['plugins' => $outdated]);
|
||||
}
|
||||
else {
|
||||
success('All plugins up to date!');
|
||||
}
|
||||
}
|
||||
} else if (isset($_FILES['plugin']['name'])) {
|
||||
$file = $_FILES['plugin'];
|
||||
$filename = $file['name'];
|
||||
|
||||
@@ -19,7 +19,8 @@ $use_datatable = true;
|
||||
|
||||
if (!setting('core.visitors_counter')): ?>
|
||||
Visitors counter is disabled.<br/>
|
||||
You can enable it in Settings -> General -> Visitors Counter.<br/>
|
||||
You can enable it by editing this configurable in <b>config.local.php</b> file:<br/>
|
||||
<p style="margin-left: 3em;"><b>$config['visitors_counter'] = true;</b></p>
|
||||
<?php
|
||||
return;
|
||||
endif;
|
||||
@@ -45,7 +46,7 @@ foreach ($tmp as &$visitor) {
|
||||
if ($dd->isBot()) {
|
||||
$bot = $dd->getBot();
|
||||
$message = '(Bot) %s, <a href="%s" target="_blank">%s</a>';
|
||||
$browser = sprintf($message, $bot['category'] ?? 'Unknown', $bot['url'] ?? '', $bot['name'] ?? 'Unknown name');
|
||||
$browser = sprintf($message, $bot['category'], $bot['url'], $bot['name']);
|
||||
}
|
||||
else {
|
||||
$osFamily = OperatingSystem::getOsFamily($dd->getOs('name'));
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?php
|
||||
|
||||
use MyAAC\Hooks;
|
||||
use MyAAC\Settings;
|
||||
|
||||
const MYAAC_ADMIN = true;
|
||||
|
||||
36
common.php
36
common.php
@@ -26,7 +26,7 @@
|
||||
if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.');
|
||||
|
||||
const MYAAC = true;
|
||||
const MYAAC_VERSION = '1.8.1';
|
||||
const MYAAC_VERSION = '1.5.1-dev';
|
||||
const DATABASE_VERSION = 45;
|
||||
const TABLE_PREFIX = 'myaac_';
|
||||
define('START_TIME', microtime(true));
|
||||
@@ -122,28 +122,36 @@ if (!IS_CLI) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
if (file_exists(BASE . 'config.local.php')) {
|
||||
require BASE . 'config.local.php';
|
||||
}
|
||||
// basedir
|
||||
$basedir = '';
|
||||
$tmp = explode('/', $_SERVER['SCRIPT_NAME']);
|
||||
$size = count($tmp) - 1;
|
||||
for($i = 1; $i < $size; $i++)
|
||||
$basedir .= '/' . $tmp[$i];
|
||||
|
||||
require SYSTEM . 'base.php';
|
||||
define('BASE_DIR', $baseDir);
|
||||
$basedir = str_replace(['/' . ADMIN_PANEL_FOLDER, '/install', '/tools'], '', $basedir);
|
||||
define('BASE_DIR', $basedir);
|
||||
|
||||
if(!IS_CLI) {
|
||||
if (isset($config['site_url'])) {
|
||||
$hasSlashAtEnd = ($config['site_url'][strlen($config['site_url']) - 1] == '/');
|
||||
|
||||
define('SERVER_URL', $config['site_url']);
|
||||
define('BASE_URL', SERVER_URL . ($hasSlashAtEnd ? '' : '/'));
|
||||
define('ADMIN_URL', SERVER_URL . ($hasSlashAtEnd ? '' : '/') . ADMIN_PANEL_FOLDER . '/');
|
||||
if (isset($_SERVER['HTTP_HOST'][0])) {
|
||||
$baseHost = $_SERVER['HTTP_HOST'];
|
||||
} else {
|
||||
if (isset($_SERVER['SERVER_NAME'][0])) {
|
||||
$baseHost = $_SERVER['SERVER_NAME'];
|
||||
} else {
|
||||
$baseHost = $_SERVER['SERVER_ADDR'];
|
||||
}
|
||||
else {
|
||||
}
|
||||
|
||||
define('SERVER_URL', 'http' . (isHttps() ? 's' : '') . '://' . $baseHost);
|
||||
define('BASE_URL', SERVER_URL . BASE_DIR . '/');
|
||||
define('ADMIN_URL', SERVER_URL . BASE_DIR . '/' . ADMIN_PANEL_FOLDER . '/');
|
||||
|
||||
//define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']);
|
||||
}
|
||||
}
|
||||
|
||||
if (file_exists(BASE . 'config.local.php')) {
|
||||
require BASE . 'config.local.php';
|
||||
}
|
||||
|
||||
/** @var array $config */
|
||||
|
||||
@@ -18,8 +18,7 @@
|
||||
"symfony/string": "^6.4",
|
||||
"symfony/var-dumper": "^6.4",
|
||||
"filp/whoops": "^2.15",
|
||||
"maximebf/debugbar": "1.*",
|
||||
"guzzlehttp/guzzle": "7.9.3"
|
||||
"maximebf/debugbar": "1.*"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpstan/phpstan": "^1.10"
|
||||
|
||||
537
composer.lock
generated
537
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "5317e97a5025ebc2a977214bd3fa964c",
|
||||
"content-hash": "be4d1489a53a9cd8eec6bcaa7a096f30",
|
||||
"packages": [
|
||||
{
|
||||
"name": "brick/math",
|
||||
@@ -493,331 +493,6 @@
|
||||
],
|
||||
"time": "2024-09-25T12:00:00+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/guzzle",
|
||||
"version": "7.9.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/guzzle.git",
|
||||
"reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
|
||||
"reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
"guzzlehttp/promises": "^1.5.3 || ^2.0.3",
|
||||
"guzzlehttp/psr7": "^2.7.0",
|
||||
"php": "^7.2.5 || ^8.0",
|
||||
"psr/http-client": "^1.0",
|
||||
"symfony/deprecation-contracts": "^2.2 || ^3.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/http-client-implementation": "1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"bamarni/composer-bin-plugin": "^1.8.2",
|
||||
"ext-curl": "*",
|
||||
"guzzle/client-integration-tests": "3.0.2",
|
||||
"php-http/message-factory": "^1.1",
|
||||
"phpunit/phpunit": "^8.5.39 || ^9.6.20",
|
||||
"psr/log": "^1.1 || ^2.0 || ^3.0"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-curl": "Required for CURL handler support",
|
||||
"ext-intl": "Required for Internationalized Domain Name (IDN) support",
|
||||
"psr/log": "Required for using the Log middleware"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"bamarni-bin": {
|
||||
"bin-links": true,
|
||||
"forward-command": false
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"files": [
|
||||
"src/functions_include.php"
|
||||
],
|
||||
"psr-4": {
|
||||
"GuzzleHttp\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Graham Campbell",
|
||||
"email": "hello@gjcampbell.co.uk",
|
||||
"homepage": "https://github.com/GrahamCampbell"
|
||||
},
|
||||
{
|
||||
"name": "Michael Dowling",
|
||||
"email": "mtdowling@gmail.com",
|
||||
"homepage": "https://github.com/mtdowling"
|
||||
},
|
||||
{
|
||||
"name": "Jeremy Lindblom",
|
||||
"email": "jeremeamia@gmail.com",
|
||||
"homepage": "https://github.com/jeremeamia"
|
||||
},
|
||||
{
|
||||
"name": "George Mponos",
|
||||
"email": "gmponos@gmail.com",
|
||||
"homepage": "https://github.com/gmponos"
|
||||
},
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
},
|
||||
{
|
||||
"name": "Márk Sági-Kazár",
|
||||
"email": "mark.sagikazar@gmail.com",
|
||||
"homepage": "https://github.com/sagikazarmark"
|
||||
},
|
||||
{
|
||||
"name": "Tobias Schultze",
|
||||
"email": "webmaster@tubo-world.de",
|
||||
"homepage": "https://github.com/Tobion"
|
||||
}
|
||||
],
|
||||
"description": "Guzzle is a PHP HTTP client library",
|
||||
"keywords": [
|
||||
"client",
|
||||
"curl",
|
||||
"framework",
|
||||
"http",
|
||||
"http client",
|
||||
"psr-18",
|
||||
"psr-7",
|
||||
"rest",
|
||||
"web service"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/guzzle/guzzle/issues",
|
||||
"source": "https://github.com/guzzle/guzzle/tree/7.9.3"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/GrahamCampbell",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/Nyholm",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-03-27T13:37:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/promises",
|
||||
"version": "2.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/promises.git",
|
||||
"reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
|
||||
"reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.2.5 || ^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"bamarni/composer-bin-plugin": "^1.8.2",
|
||||
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"bamarni-bin": {
|
||||
"bin-links": true,
|
||||
"forward-command": false
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"GuzzleHttp\\Promise\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Graham Campbell",
|
||||
"email": "hello@gjcampbell.co.uk",
|
||||
"homepage": "https://github.com/GrahamCampbell"
|
||||
},
|
||||
{
|
||||
"name": "Michael Dowling",
|
||||
"email": "mtdowling@gmail.com",
|
||||
"homepage": "https://github.com/mtdowling"
|
||||
},
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
},
|
||||
{
|
||||
"name": "Tobias Schultze",
|
||||
"email": "webmaster@tubo-world.de",
|
||||
"homepage": "https://github.com/Tobion"
|
||||
}
|
||||
],
|
||||
"description": "Guzzle promises library",
|
||||
"keywords": [
|
||||
"promise"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/guzzle/promises/issues",
|
||||
"source": "https://github.com/guzzle/promises/tree/2.2.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/GrahamCampbell",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/Nyholm",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-03-27T13:27:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/psr7",
|
||||
"version": "2.7.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/psr7.git",
|
||||
"reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
|
||||
"reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.2.5 || ^8.0",
|
||||
"psr/http-factory": "^1.0",
|
||||
"psr/http-message": "^1.1 || ^2.0",
|
||||
"ralouphie/getallheaders": "^3.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/http-factory-implementation": "1.0",
|
||||
"psr/http-message-implementation": "1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"bamarni/composer-bin-plugin": "^1.8.2",
|
||||
"http-interop/http-factory-tests": "0.9.0",
|
||||
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
|
||||
},
|
||||
"suggest": {
|
||||
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"bamarni-bin": {
|
||||
"bin-links": true,
|
||||
"forward-command": false
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"GuzzleHttp\\Psr7\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Graham Campbell",
|
||||
"email": "hello@gjcampbell.co.uk",
|
||||
"homepage": "https://github.com/GrahamCampbell"
|
||||
},
|
||||
{
|
||||
"name": "Michael Dowling",
|
||||
"email": "mtdowling@gmail.com",
|
||||
"homepage": "https://github.com/mtdowling"
|
||||
},
|
||||
{
|
||||
"name": "George Mponos",
|
||||
"email": "gmponos@gmail.com",
|
||||
"homepage": "https://github.com/gmponos"
|
||||
},
|
||||
{
|
||||
"name": "Tobias Nyholm",
|
||||
"email": "tobias.nyholm@gmail.com",
|
||||
"homepage": "https://github.com/Nyholm"
|
||||
},
|
||||
{
|
||||
"name": "Márk Sági-Kazár",
|
||||
"email": "mark.sagikazar@gmail.com",
|
||||
"homepage": "https://github.com/sagikazarmark"
|
||||
},
|
||||
{
|
||||
"name": "Tobias Schultze",
|
||||
"email": "webmaster@tubo-world.de",
|
||||
"homepage": "https://github.com/Tobion"
|
||||
},
|
||||
{
|
||||
"name": "Márk Sági-Kazár",
|
||||
"email": "mark.sagikazar@gmail.com",
|
||||
"homepage": "https://sagikazarmark.hu"
|
||||
}
|
||||
],
|
||||
"description": "PSR-7 message implementation that also provides common utility methods",
|
||||
"keywords": [
|
||||
"http",
|
||||
"message",
|
||||
"psr-7",
|
||||
"request",
|
||||
"response",
|
||||
"stream",
|
||||
"uri",
|
||||
"url"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/guzzle/psr7/issues",
|
||||
"source": "https://github.com/guzzle/psr7/tree/2.7.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://github.com/GrahamCampbell",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/Nyholm",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-03-27T12:30:47+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/collections",
|
||||
"version": "v10.48.25",
|
||||
@@ -1797,166 +1472,6 @@
|
||||
},
|
||||
"time": "2021-11-05T16:47:00+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/http-client",
|
||||
"version": "1.0.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-fig/http-client.git",
|
||||
"reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
|
||||
"reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.0 || ^8.0",
|
||||
"psr/http-message": "^1.0 || ^2.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Psr\\Http\\Client\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "PHP-FIG",
|
||||
"homepage": "https://www.php-fig.org/"
|
||||
}
|
||||
],
|
||||
"description": "Common interface for HTTP clients",
|
||||
"homepage": "https://github.com/php-fig/http-client",
|
||||
"keywords": [
|
||||
"http",
|
||||
"http-client",
|
||||
"psr",
|
||||
"psr-18"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/php-fig/http-client"
|
||||
},
|
||||
"time": "2023-09-23T14:17:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/http-factory",
|
||||
"version": "1.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-fig/http-factory.git",
|
||||
"reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
|
||||
"reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.1",
|
||||
"psr/http-message": "^1.0 || ^2.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Psr\\Http\\Message\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "PHP-FIG",
|
||||
"homepage": "https://www.php-fig.org/"
|
||||
}
|
||||
],
|
||||
"description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
|
||||
"keywords": [
|
||||
"factory",
|
||||
"http",
|
||||
"message",
|
||||
"psr",
|
||||
"psr-17",
|
||||
"psr-7",
|
||||
"request",
|
||||
"response"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/php-fig/http-factory"
|
||||
},
|
||||
"time": "2024-04-15T12:06:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/http-message",
|
||||
"version": "2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-fig/http-message.git",
|
||||
"reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
|
||||
"reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.2 || ^8.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.0.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Psr\\Http\\Message\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "PHP-FIG",
|
||||
"homepage": "https://www.php-fig.org/"
|
||||
}
|
||||
],
|
||||
"description": "Common interface for HTTP messages",
|
||||
"homepage": "https://github.com/php-fig/http-message",
|
||||
"keywords": [
|
||||
"http",
|
||||
"http-message",
|
||||
"psr",
|
||||
"psr-7",
|
||||
"request",
|
||||
"response"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/php-fig/http-message/tree/2.0"
|
||||
},
|
||||
"time": "2023-04-04T09:54:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
"version": "3.0.2",
|
||||
@@ -2058,50 +1573,6 @@
|
||||
},
|
||||
"time": "2021-10-29T13:26:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ralouphie/getallheaders",
|
||||
"version": "3.0.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/ralouphie/getallheaders.git",
|
||||
"reference": "120b605dfeb996808c31b6477290a714d356e822"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
|
||||
"reference": "120b605dfeb996808c31b6477290a714d356e822",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.6"
|
||||
},
|
||||
"require-dev": {
|
||||
"php-coveralls/php-coveralls": "^2.1",
|
||||
"phpunit/phpunit": "^5 || ^6.5"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"files": [
|
||||
"src/getallheaders.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Ralph Khattar",
|
||||
"email": "ralph.khattar@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A polyfill for getallheaders.",
|
||||
"support": {
|
||||
"issues": "https://github.com/ralouphie/getallheaders/issues",
|
||||
"source": "https://github.com/ralouphie/getallheaders/tree/develop"
|
||||
},
|
||||
"time": "2019-03-08T08:55:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v6.4.17",
|
||||
@@ -3439,7 +2910,7 @@
|
||||
],
|
||||
"aliases": [],
|
||||
"minimum-stability": "stable",
|
||||
"stability-flags": {},
|
||||
"stability-flags": [],
|
||||
"prefer-stable": false,
|
||||
"prefer-lowest": false,
|
||||
"platform": {
|
||||
@@ -3450,6 +2921,6 @@
|
||||
"ext-xml": "*",
|
||||
"ext-dom": "*"
|
||||
},
|
||||
"platform-dev": {},
|
||||
"plugin-api-version": "2.6.0"
|
||||
"platform-dev": [],
|
||||
"plugin-api-version": "2.3.0"
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 56 B |
Binary file not shown.
|
Before Width: | Height: | Size: 56 B |
25
index.php
25
index.php
@@ -93,7 +93,6 @@ if(setting('core.backward_support')) {
|
||||
if($logged && $account_logged)
|
||||
$group_id_of_acc_logged = $account_logged->getGroupId();
|
||||
|
||||
$config['serverPath'] = $config['server_path'];
|
||||
$config['site'] = &$config;
|
||||
$config['server'] = &$config['lua'];
|
||||
$config['site']['shop_system'] = setting('core.gifts_system');
|
||||
@@ -118,14 +117,6 @@ if(setting('core.backward_support')) {
|
||||
$config['status']['serverStatus_' . $key] = $value;
|
||||
}
|
||||
|
||||
if(setting('core.views_counter')) {
|
||||
require_once SYSTEM . 'counter.php';
|
||||
}
|
||||
|
||||
if(setting('core.visitors_counter')) {
|
||||
$visitors = new Visitors(setting('core.visitors_counter_ttl'));
|
||||
}
|
||||
|
||||
require_once SYSTEM . 'router.php';
|
||||
|
||||
// anonymous usage statistics
|
||||
@@ -162,6 +153,22 @@ if(setting('core.anonymous_usage_statistics')) {
|
||||
}
|
||||
}
|
||||
|
||||
if(setting('core.views_counter'))
|
||||
require_once SYSTEM . 'counter.php';
|
||||
|
||||
if(setting('core.visitors_counter')) {
|
||||
$visitors = new Visitors(setting('core.visitors_counter_ttl'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @var OTS_Account $account_logged
|
||||
*/
|
||||
if ($logged && admin()) {
|
||||
$content .= $twig->render('admin-bar.html.twig', [
|
||||
'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
|
||||
]);
|
||||
}
|
||||
|
||||
$title_full = (isset($title) ? $title . ' - ' : '') . $config['lua']['serverName'];
|
||||
require $template_path . '/' . $template_index;
|
||||
|
||||
|
||||
@@ -10,14 +10,6 @@ foreach($config['clients'] as $client) {
|
||||
$clients[$client] = $client_version;
|
||||
}
|
||||
|
||||
if (empty($_SESSION['var_site_url'])) {
|
||||
//require SYSTEM . 'base.php';
|
||||
$serverUrl = 'http' . (isHttps() ? 's' : '') . '://' . $baseHost;
|
||||
$siteURL = $serverUrl . $baseDir;
|
||||
|
||||
$_SESSION['var_site_url'] = $siteURL;
|
||||
}
|
||||
|
||||
$twig->display('install.config.html.twig', array(
|
||||
'clients' => $clients,
|
||||
'timezones' => DateTimeZone::listIdentifiers(),
|
||||
|
||||
@@ -195,4 +195,13 @@ if(!isset($_SESSION['installed'])) {
|
||||
$_SESSION['installed'] = true;
|
||||
}
|
||||
|
||||
foreach($_SESSION as $key => $value) {
|
||||
if(strpos($key, 'var_') !== false)
|
||||
unset($_SESSION[$key]);
|
||||
}
|
||||
unset($_SESSION['saved']);
|
||||
if(file_exists(CACHE . 'install.txt')) {
|
||||
unlink(CACHE . 'install.txt');
|
||||
}
|
||||
|
||||
$hooks->trigger(HOOK_INSTALL_FINISH_END);
|
||||
|
||||
@@ -7,11 +7,6 @@ require SYSTEM . 'functions.php';
|
||||
require BASE . 'install/includes/functions.php';
|
||||
require BASE . 'install/includes/locale.php';
|
||||
|
||||
if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
|
||||
warning($locale['already_installed']);
|
||||
return;
|
||||
}
|
||||
|
||||
$error = false;
|
||||
require BASE . 'install/includes/config.php';
|
||||
|
||||
|
||||
@@ -17,11 +17,11 @@ ini_set('max_execution_time', 300);
|
||||
ob_implicit_flush();
|
||||
|
||||
header('X-Accel-Buffering: no');
|
||||
|
||||
/*
|
||||
if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
|
||||
warning($locale['already_installed']);
|
||||
return;
|
||||
}
|
||||
}*/
|
||||
|
||||
require SYSTEM . 'init.php';
|
||||
|
||||
@@ -94,17 +94,6 @@ $hooks->trigger(HOOK_INSTALL_FINISH);
|
||||
|
||||
$db->setClearCacheAfter(true);
|
||||
|
||||
// cleanup
|
||||
foreach($_SESSION as $key => $value) {
|
||||
if(str_contains($key, 'var_')) {
|
||||
unset($_SESSION[$key]);
|
||||
}
|
||||
}
|
||||
unset($_SESSION['saved']);
|
||||
if(file_exists(CACHE . 'install.txt')) {
|
||||
unlink(CACHE . 'install.txt');
|
||||
}
|
||||
|
||||
$locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(str_replace('tools/', '',ADMIN_URL), $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']);
|
||||
$locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(str_replace('tools/', '', BASE_URL), $locale['step_finish_homepage'], true), $locale['step_finish_desc']);
|
||||
$locale['step_finish_desc'] = str_replace('$LINK$', generateLink('https://my-aac.org', 'https://my-aac.org', true), $locale['step_finish_desc']);
|
||||
|
||||
@@ -88,8 +88,8 @@ switch ($action) {
|
||||
case 'boostedcreature':
|
||||
$clientVersion = (int)setting('core.client');
|
||||
|
||||
// 13.40 and up
|
||||
if ($clientVersion >= 1340) {
|
||||
// 14.00 and up
|
||||
if ($clientVersion >= 1400) {
|
||||
$creatureBoost = $db->query("SELECT * FROM " . $db->tableName('boosted_creature'))->fetchAll();
|
||||
$bossBoost = $db->query("SELECT * FROM " . $db->tableName('boosted_boss'))->fetchAll();
|
||||
die(json_encode([
|
||||
|
||||
13
package-lock.json
generated
13
package-lock.json
generated
@@ -976,16 +976,15 @@
|
||||
}
|
||||
},
|
||||
"node_modules/form-data": {
|
||||
"version": "4.0.4",
|
||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
|
||||
"integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
|
||||
"integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"asynckit": "^0.4.0",
|
||||
"combined-stream": "^1.0.8",
|
||||
"es-set-tostringtag": "^2.1.0",
|
||||
"hasown": "^2.0.2",
|
||||
"mime-types": "^2.1.12"
|
||||
},
|
||||
"engines": {
|
||||
@@ -2085,9 +2084,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/tmp": {
|
||||
"version": "0.2.4",
|
||||
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz",
|
||||
"integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==",
|
||||
"version": "0.2.3",
|
||||
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
|
||||
"integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
|
||||
@@ -28,9 +28,10 @@ parameters:
|
||||
- '#Variable \$guild might not be defined#'
|
||||
- '#Variable \$[a-zA-Z0-9\\_]+ might not be defined#'
|
||||
# Eloquent models
|
||||
- '#Call to an undefined method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\)#'
|
||||
- '#Call to an undefined static method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\)#'
|
||||
- '#Call to an undefined method object::toArray\(\)#'
|
||||
# system/pages/highscores.php
|
||||
- '#Call to an undefined method Illuminate\\Database\\Query\\Builder::withOnlineStatus\(\)#'
|
||||
- '#Access to an undefined property Illuminate\\Database\\Eloquent\\Model::\$online_status#'
|
||||
- '#Access to an undefined property Illuminate\\Database\\Eloquent\\Model::\$vocation_name#'
|
||||
-
|
||||
|
||||
@@ -51,8 +51,5 @@
|
||||
"themes": true,
|
||||
"admin-pages": true,
|
||||
"admin-pages-sub-folders": true,
|
||||
"settings": true,
|
||||
"install": true,
|
||||
"init": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
<?php
|
||||
|
||||
$baseDir = '';
|
||||
$tmp = explode('/', $_SERVER['SCRIPT_NAME']);
|
||||
$size = count($tmp) - 1;
|
||||
for($i = 1; $i < $size; $i++)
|
||||
$baseDir .= '/' . $tmp[$i];
|
||||
|
||||
$baseDir = str_replace(['/' . ADMIN_PANEL_FOLDER, '/install', '/tools'], '', $baseDir);
|
||||
|
||||
if(!IS_CLI) {
|
||||
if (isset($_SERVER['HTTP_HOST'][0])) {
|
||||
$baseHost = $_SERVER['HTTP_HOST'];
|
||||
} else {
|
||||
if (isset($_SERVER['SERVER_NAME'][0])) {
|
||||
$baseHost = $_SERVER['SERVER_NAME'];
|
||||
} else {
|
||||
$baseHost = $_SERVER['SERVER_ADDR'];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -512,13 +512,6 @@ function template_place_holder($type): string
|
||||
}
|
||||
elseif ($type === 'body_start') {
|
||||
$ret .= $twig->render('browsehappy.html.twig');
|
||||
|
||||
if (admin()) {
|
||||
global $account_logged;
|
||||
$ret .= $twig->render('admin-bar.html.twig', [
|
||||
'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
|
||||
]);
|
||||
}
|
||||
}
|
||||
elseif($type === 'body_end') {
|
||||
$ret .= template_ga_code();
|
||||
@@ -774,10 +767,6 @@ function formatExperience($exp, $color = true)
|
||||
return $ret;
|
||||
}
|
||||
|
||||
function getExperienceForLevel($level): float|int {
|
||||
return ( 50 / 3 ) * pow( $level, 3 ) - ( 100 * pow( $level, 2 ) ) + ( ( 850 / 3 ) * $level ) - 200;
|
||||
}
|
||||
|
||||
function get_locales()
|
||||
{
|
||||
$ret = array();
|
||||
@@ -993,12 +982,11 @@ function load_config_lua($filename)
|
||||
foreach($lines as $ln => $line)
|
||||
{
|
||||
$line = trim($line);
|
||||
if(isset($line[0]) && ($line[0] === '{' || $line[0] === '}')) {
|
||||
if(@$line[0] === '{' || @$line[0] === '}') {
|
||||
// arrays are not supported yet
|
||||
// just ignore the error
|
||||
continue;
|
||||
}
|
||||
|
||||
$tmp_exp = explode('=', $line, 2);
|
||||
if(str_contains($line, 'dofile')) {
|
||||
$delimiter = '"';
|
||||
@@ -1228,8 +1216,7 @@ function setting($key)
|
||||
return $settings[$key[0]] = $key[1];
|
||||
}
|
||||
|
||||
$ret = $settings[$key];
|
||||
return isset($ret) ? $ret['value'] : null;
|
||||
return $settings[$key]['value'];
|
||||
}
|
||||
|
||||
function clearCache()
|
||||
@@ -1278,15 +1265,14 @@ function clearCache()
|
||||
$db->setClearCacheAfter(true);
|
||||
}
|
||||
|
||||
if (function_exists('apcu_clear_cache')) {
|
||||
apcu_clear_cache();
|
||||
}
|
||||
|
||||
deleteDirectory(CACHE . 'signatures', ['index.html'], true);
|
||||
deleteDirectory(CACHE . 'twig', ['index.html'], true);
|
||||
deleteDirectory(CACHE . 'plugins', ['index.html'], true);
|
||||
deleteDirectory(CACHE, ['signatures', 'twig', 'plugins', 'index.html', 'persistent'], true);
|
||||
|
||||
// routes cache
|
||||
clearRouteCache();
|
||||
|
||||
global $hooks;
|
||||
$hooks->trigger(HOOK_CACHE_CLEAR, ['cache' => Cache::getInstance()]);
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@ use DebugBar\StandardDebugBar;
|
||||
use MyAAC\Cache\Cache;
|
||||
use MyAAC\CsrfToken;
|
||||
use MyAAC\Hooks;
|
||||
use MyAAC\Plugins;
|
||||
use MyAAC\Models\Town;
|
||||
use MyAAC\Settings;
|
||||
|
||||
@@ -47,11 +46,6 @@ if(isset($config['gzip_output']) && $config['gzip_output'] && isset($_SERVER['HT
|
||||
global $cache;
|
||||
$cache = Cache::getInstance();
|
||||
|
||||
// load plugins init.php
|
||||
foreach (Plugins::getInits() as $init) {
|
||||
require $init;
|
||||
}
|
||||
|
||||
// event system
|
||||
global $hooks;
|
||||
$hooks = new Hooks();
|
||||
@@ -144,15 +138,6 @@ $ots = POT::getInstance();
|
||||
$eloquentConnection = null;
|
||||
require_once SYSTEM . 'database.php';
|
||||
|
||||
define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
|
||||
define('USE_ACCOUNT_NUMBER', $db->hasColumn('accounts', 'number'));
|
||||
define('USE_ACCOUNT_SALT', $db->hasColumn('accounts', 'salt'));
|
||||
|
||||
define('HAS_ACCOUNT_COINS', $db->hasColumn('accounts', 'coins'));
|
||||
define('HAS_ACCOUNT_COINS_TRANSFERABLE', $db->hasColumn('accounts', 'coins_transferable'));
|
||||
define('HAS_ACCOUNT_TRANSFERABLE_COINS', $db->hasColumn('accounts', 'transferable_coins'));
|
||||
const ACCOUNT_COINS_TRANSFERABLE_COLUMN = (HAS_ACCOUNT_COINS_TRANSFERABLE ? 'coins_transferable' : 'transferable_coins');
|
||||
|
||||
$twig->addGlobal('logged', false);
|
||||
$twig->addGlobal('account_logged', new \OTS_Account());
|
||||
|
||||
@@ -197,6 +182,10 @@ if($settingsItemImagesURL[strlen($settingsItemImagesURL) - 1] !== '/') {
|
||||
setting(['core.item_images_url', $settingsItemImagesURL . '/']);
|
||||
}
|
||||
|
||||
define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
|
||||
define('USE_ACCOUNT_NUMBER', $db->hasColumn('accounts', 'number'));
|
||||
define('USE_ACCOUNT_SALT', $db->hasColumn('accounts', 'salt'));
|
||||
|
||||
$towns = Cache::remember('towns', 10 * 60, function () use ($db) {
|
||||
if ($db->hasTable('towns') && Town::count() > 0) {
|
||||
return Town::orderBy('id', 'ASC')->pluck('name', 'id')->toArray();
|
||||
|
||||
@@ -415,11 +415,9 @@ class POT
|
||||
* @tutorial POT/Server_status.pkg
|
||||
* @deprecated 0.1.4 Use OTS_ServerInfo->status().
|
||||
*/
|
||||
public static function serverStatus($server, $port, $timeout = 2.0)
|
||||
public static function serverStatus($server, $port)
|
||||
{
|
||||
$status = new OTS_ServerInfo($server, $port);
|
||||
$status->setTimeout($timeout);
|
||||
|
||||
return $status->status();
|
||||
}
|
||||
|
||||
|
||||
@@ -473,6 +473,9 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
|
||||
|
||||
public function isPremium()
|
||||
{
|
||||
global $config;
|
||||
if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return true;
|
||||
|
||||
if(isset($this->data['premium_ends_at'])) {
|
||||
return $this->data['premium_ends_at'] > time();
|
||||
}
|
||||
|
||||
@@ -219,16 +219,11 @@ class OTS_InfoRespond extends DOMDocument
|
||||
* @return int Count of monsters.
|
||||
* @throws DOMException On DOM operation error.
|
||||
*/
|
||||
public function getMonstersCount(): int
|
||||
public function getMonstersCount()
|
||||
{
|
||||
return (int) $this->documentElement->getElementsByTagName('monsters')->item(0)->getAttribute('total');
|
||||
}
|
||||
|
||||
public function getNPCsCount(): int
|
||||
{
|
||||
return (int) $this->documentElement->getElementsByTagName('npcs')->item(0)->getAttribute('total');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns map name.
|
||||
*
|
||||
|
||||
@@ -2919,32 +2919,6 @@ class OTS_Player extends OTS_Row_DAO
|
||||
$this->data['banned'] = $ban['active'];
|
||||
$this->data['banned_time'] = $ban['expires'];
|
||||
}
|
||||
|
||||
public function isNameLocked(): bool
|
||||
{
|
||||
// nothing can't be banned
|
||||
if( !$this->isLoaded() ) {
|
||||
throw new E_OTS_NotLoaded();
|
||||
}
|
||||
|
||||
if($this->db->hasTable('player_namelocks')) {
|
||||
$ban = $this->db->query('SELECT 1 FROM `player_namelocks` WHERE `player_id` = ' . $this->data['id'])->fetch(PDO::FETCH_ASSOC);
|
||||
return (isset($ban['1']));
|
||||
}
|
||||
else if($this->db->hasTable('bans')) {
|
||||
if($this->db->hasColumn('bans', 'active')) {
|
||||
$ban = $this->db->query('SELECT `active`, `expires` FROM `bans` WHERE `type` = 2 AND `active` = 1 AND `value` = ' . $this->data['id'] . ' AND (`expires` > ' . time() .' OR `expires` = -1) ORDER BY `expires` DESC')->fetch();
|
||||
return isset($ban['active']);
|
||||
}
|
||||
else { // tfs 0.2
|
||||
$ban = $this->db->query('SELECT `time` FROM `bans` WHERE `type` = 2 AND `account` = ' . $this->data['account_id'] . ' AND (`time` > ' . time() .' OR `time` = -1) ORDER BY `time` DESC')->fetch();
|
||||
|
||||
return isset($ban['time']) && ($ban['time'] == -1 || $ban['time'] > 0);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
/**
|
||||
* Deletes player.
|
||||
*
|
||||
@@ -2979,14 +2953,21 @@ class OTS_Player extends OTS_Row_DAO
|
||||
* @return string Player proffesion name.
|
||||
* @throws E_OTS_NotLoaded If player is not loaded or global vocations list is not loaded.
|
||||
*/
|
||||
public function getVocationName(): string
|
||||
public function getVocationName()
|
||||
{
|
||||
if( !isset($this->data['vocation']) )
|
||||
{
|
||||
throw new E_OTS_NotLoaded();
|
||||
}
|
||||
|
||||
return OTS_Toolbox::getVocationName($this->data['vocation'], $this->data['promotion'] ?? 0);
|
||||
global $config;
|
||||
$voc = $this->getVocation();
|
||||
if(!isset($config['vocations'][$voc])) {
|
||||
return 'Unknown';
|
||||
}
|
||||
|
||||
return $config['vocations'][$voc];
|
||||
//return POT::getInstance()->getVocationsList()->getVocationName($this->data['vocation']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -26,19 +26,14 @@ class OTS_ServerInfo
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private string $server;
|
||||
private $server;
|
||||
|
||||
/**
|
||||
* Connection port.
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private int $port;
|
||||
|
||||
/**
|
||||
* Status timeout
|
||||
*/
|
||||
private float $timeout = 2.0;
|
||||
private $port;
|
||||
|
||||
/**
|
||||
* Creates handler for new server.
|
||||
@@ -62,7 +57,7 @@ class OTS_ServerInfo
|
||||
private function send(OTS_Buffer $packet)
|
||||
{
|
||||
// connects to server
|
||||
$socket = @fsockopen($this->server, $this->port, $error, $message, $this->timeout);
|
||||
$socket = @fsockopen($this->server, $this->port, $error, $message, setting('core.status_timeout'));
|
||||
|
||||
// if connected then checking statistics
|
||||
if($socket)
|
||||
@@ -229,10 +224,6 @@ class OTS_ServerInfo
|
||||
throw new OutOfBoundsException();
|
||||
}
|
||||
}
|
||||
|
||||
public function setTimeout($timeout) {
|
||||
$this->timeout = $timeout;
|
||||
}
|
||||
}
|
||||
|
||||
/**#@-*/
|
||||
|
||||
@@ -110,15 +110,6 @@ class OTS_Toolbox
|
||||
$list->setFilter($filter);
|
||||
return $list;
|
||||
}
|
||||
|
||||
public static function getVocationName($id, $promotion = 0): string
|
||||
{
|
||||
if($promotion > 0) {
|
||||
$id = ($id + ($promotion * config('vocations_amount')));
|
||||
}
|
||||
|
||||
return config('vocations')[$id] ?? 'Unknown';
|
||||
}
|
||||
}
|
||||
|
||||
/**#@-*/
|
||||
|
||||
@@ -48,8 +48,6 @@ $locale['step_config'] = 'Konfiguration';
|
||||
$locale['step_config_title'] = 'Grundkonfiguration';
|
||||
$locale['step_config_server_path'] = 'Serverpfad';
|
||||
$locale['step_config_server_path_desc'] = 'Pfad zu Ihrem TFS-Hauptverzeichnis, in dem sich die config.lua befinden.';
|
||||
$locale['step_config_site_url'] = 'Website URL';
|
||||
$locale['step_config_site_url_desc'] = 'Ihre Website-Adresse.';
|
||||
$locale['step_config_mail_admin'] = 'Admin E-Mail';
|
||||
$locale['step_config_mail_admin_desc'] = 'Adresse, an die E-Mails aus dem Kontaktformular gesendet werden, z. B. admin@gmail.com';
|
||||
$locale['step_config_mail_admin_error'] = 'Admin E-Mail ist nicht korrekt.';
|
||||
|
||||
@@ -52,8 +52,6 @@ $locale['step_config'] = 'Configuration';
|
||||
$locale['step_config_title'] = 'Basic configuration';
|
||||
$locale['step_config_server_path'] = 'Server path';
|
||||
$locale['step_config_server_path_desc'] = 'Path to your TFS main directory, where you have config.lua located.';
|
||||
$locale['step_config_site_url'] = 'Website URL';
|
||||
$locale['step_config_site_url_desc'] = 'Your website address.';
|
||||
$locale['step_config_mail_admin'] = 'Admin Email';
|
||||
$locale['step_config_mail_admin_desc'] = 'Address where emails from contact form will be delivered, for example admin@gmail.com';
|
||||
$locale['step_config_mail_admin_error'] = 'Admin Email is not correct.';
|
||||
|
||||
@@ -52,8 +52,6 @@ $locale['step_config'] = 'Konfiguracja';
|
||||
$locale['step_config_title'] = 'Podstawowa konfiguracja';
|
||||
$locale['step_config_server_path'] = 'Ścieżka do serwera';
|
||||
$locale['step_config_server_path_desc'] = 'Ścieżka do Twojego folderu z TFS, gdzie znajduje się plik config.lua.';
|
||||
$locale['step_config_server_url'] = 'Adres strony';
|
||||
$locale['step_config_server_url_desc'] = 'Adres tej strony www.';
|
||||
$locale['step_config_mail_admin'] = 'E-Mail admina';
|
||||
$locale['step_config_mail_admin_desc'] = 'Na ten adres będą dostarczane E-Maile z formularza kontaktowego, przykładowo admin@gmail.com';
|
||||
$locale['step_config_mail_admin_error'] = 'E-Mail admina jest niepoprawny.';
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* @link https://my-aac.org
|
||||
*/
|
||||
defined('MYAAC') or die('Direct access not allowed!');
|
||||
$title = 'Not Found';
|
||||
$title = '404 Not Found';
|
||||
|
||||
header('HTTP/1.0 404 Not Found');
|
||||
?>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* @link https://my-aac.org
|
||||
*/
|
||||
defined('MYAAC') or die('Direct access not allowed!');
|
||||
$title = 'Method Not Allowed';
|
||||
$title = '405 Method Not Allowed';
|
||||
|
||||
header('HTTP/1.0 405 Method Not Allowed');
|
||||
?>
|
||||
|
||||
@@ -17,8 +17,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$email_new_time = $account_logged->getCustomField("email_new_time");
|
||||
|
||||
if($email_new_time > 10) {
|
||||
@@ -166,7 +164,7 @@ if(isset($_POST['emailchangecancel']) && $_POST['emailchangecancel'] == 1) {
|
||||
$account_logged->setCustomField("email_new", "");
|
||||
$account_logged->setCustomField("email_new_time", 0);
|
||||
|
||||
$custom_buttons = '<div style="text-align:center"><table border="0" cellspacing="0" cellpadding="0" ><form action="' . getLink('account/manage') . '" method="post" >' . csrf(true) . '<tr><td style="border:0px;" >' . $twig->render('buttons.back.html.twig') . '</td></tr></form></table></div>';
|
||||
$custom_buttons = '<div style="text-align:center"><table border="0" cellspacing="0" cellpadding="0" ><form action="' . getLink('account/manage') . '" method="post" ><tr><td style="border:0px;" >' . $twig->render('buttons.back.html.twig') . '</td></tr></form></table></div>';
|
||||
|
||||
$twig->display('success.html.twig', array(
|
||||
'title' => 'Email Address Change Cancelled',
|
||||
|
||||
@@ -20,8 +20,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
if(setting('core.account_country'))
|
||||
require SYSTEM . 'countries.conf.php';
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$new_password = $_POST['newpassword'] ?? NULL;
|
||||
$new_password_confirm = $_POST['newpassword_confirm'] ?? NULL;
|
||||
$old_password = $_POST['oldpassword'] ?? NULL;
|
||||
|
||||
@@ -20,8 +20,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$player = null;
|
||||
$player_name = isset($_REQUEST['name']) ? stripslashes(urldecode($_REQUEST['name'])) : null;
|
||||
$new_comment = isset($_POST['comment']) ? htmlspecialchars(stripslashes(substr($_POST['comment'],0,2000))) : NULL;
|
||||
|
||||
@@ -17,8 +17,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$player_id = isset($_POST['player_id']) ? (int)$_POST['player_id'] : NULL;
|
||||
$name = isset($_POST['name']) ? stripslashes(ucwords(strtolower($_POST['name']))) : NULL;
|
||||
if((!setting('core.account_change_character_name')))
|
||||
|
||||
@@ -17,8 +17,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$sex_changed = false;
|
||||
$player_id = isset($_POST['player_id']) ? (int)$_POST['player_id'] : NULL;
|
||||
$new_sex = isset($_POST['new_sex']) ? (int)$_POST['new_sex'] : NULL;
|
||||
|
||||
@@ -20,8 +20,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$character_name = isset($_POST['name']) ? stripslashes($_POST['name']) : null;
|
||||
$character_sex = isset($_POST['sex']) ? (int)$_POST['sex'] : null;
|
||||
$character_vocation = isset($_POST['vocation']) ? (int)$_POST['vocation'] : null;
|
||||
|
||||
@@ -17,8 +17,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$player_name = isset($_POST['delete_name']) ? stripslashes($_POST['delete_name']) : null;
|
||||
$password_verify = isset($_POST['delete_password']) ? $_POST['delete_password'] : null;
|
||||
$password_verify = encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $password_verify);
|
||||
|
||||
@@ -23,8 +23,6 @@ if($logged)
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
if(setting('core.account_create_character_create')) {
|
||||
$createCharacter = new CreateCharacter();
|
||||
}
|
||||
@@ -221,19 +219,8 @@ if($save)
|
||||
}
|
||||
}
|
||||
|
||||
$accountDefaultPremiumPoints = setting('core.account_premium_points');
|
||||
if($accountDefaultPremiumPoints > 0) {
|
||||
$new_account->setCustomField('premium_points', $accountDefaultPremiumPoints);
|
||||
}
|
||||
|
||||
$accountDefaultCoins = setting('core.account_coins');
|
||||
if(HAS_ACCOUNT_COINS && $accountDefaultCoins > 0) {
|
||||
$new_account->setCustomField('coins', $accountDefaultCoins);
|
||||
}
|
||||
|
||||
$accountDefaultCoinsTransferable = setting('core.account_coins_transferable');
|
||||
if((HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS) && $accountDefaultCoinsTransferable > 0) {
|
||||
$new_account->setCustomField(ACCOUNT_COINS_TRANSFERABLE_COLUMN, $accountDefaultCoinsTransferable);
|
||||
if(setting('core.account_premium_points') && setting('core.account_premium_points') > 0) {
|
||||
$new_account->setCustomField('premium_points', setting('core.account_premium_points'));
|
||||
}
|
||||
|
||||
$tmp_account = $email;
|
||||
|
||||
@@ -18,8 +18,6 @@ if($logged || !isset($_POST['account_login']) || !isset($_POST['password_login']
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$login_account = $_POST['account_login'];
|
||||
$login_password = $_POST['password_login'];
|
||||
$remember_me = isset($_POST['remember_me']);
|
||||
|
||||
@@ -34,8 +34,6 @@ if(isset($_REQUEST['redirect']))
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$groups = new OTS_Groups_List();
|
||||
|
||||
$freePremium = isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium']) || $account_logged->getPremDays() == OTS_Account::GRATIS_PREMIUM_DAYS;
|
||||
|
||||
23
system/pages/account/redirect.php
Normal file
23
system/pages/account/redirect.php
Normal file
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
/**
|
||||
* Change comment
|
||||
*
|
||||
* @package MyAAC
|
||||
* @author Gesior <jerzyskalski@wp.pl>
|
||||
* @author Slawkens <slawkens@gmail.com>
|
||||
* @copyright 2019 MyAAC
|
||||
* @link https://my-aac.org
|
||||
*/
|
||||
defined('MYAAC') or die('Direct access not allowed!');
|
||||
|
||||
$redirect = urldecode($_REQUEST['redirect']);
|
||||
|
||||
// should never happen, unless hacker modify the URL
|
||||
if (!str_contains($redirect, BASE_URL)) {
|
||||
error('Fatal error: Cannot redirect outside the website.');
|
||||
return;
|
||||
}
|
||||
|
||||
$twig->display('account.redirect.html.twig', array(
|
||||
'redirect' => $redirect
|
||||
));
|
||||
@@ -17,8 +17,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
if(isset($_POST['reg_password']))
|
||||
$reg_password = encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $_POST['reg_password']);
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$_POST['reg_password'] = $_POST['reg_password'] ?? '';
|
||||
$reg_password = encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $_POST['reg_password']);
|
||||
$old_key = $account_logged->getCustomField("key");
|
||||
|
||||
@@ -17,8 +17,6 @@ if(!$canEdit) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
$groupsList = new OTS_Groups_List();
|
||||
$groups = [
|
||||
['id' => 0, 'name' => 'Guest'],
|
||||
@@ -32,24 +30,23 @@ foreach ($groupsList as $group) {
|
||||
}
|
||||
|
||||
if(!empty($action)) {
|
||||
if($action == 'delete_board' || $action == 'edit_board' || $action == 'hide_board' || $action == 'moveup_board' || $action == 'movedown_board') {
|
||||
if($action == 'delete_board' || $action == 'edit_board' || $action == 'hide_board' || $action == 'moveup_board' || $action == 'movedown_board')
|
||||
$id = $_REQUEST['id'];
|
||||
|
||||
if(isset($_REQUEST['access'])) {
|
||||
$access = $_REQUEST['access'];
|
||||
}
|
||||
|
||||
if(isset($_POST['access'])) {
|
||||
$access = $_POST['access'];
|
||||
if(isset($_REQUEST['guild'])) {
|
||||
$guild = $_REQUEST['guild'];
|
||||
}
|
||||
|
||||
if(isset($_POST['guild'])) {
|
||||
$guild = $_POST['guild'];
|
||||
if(isset($_REQUEST['name'])) {
|
||||
$name = $_REQUEST['name'];
|
||||
}
|
||||
|
||||
if(isset($_POST['name'])) {
|
||||
$name = $_POST['name'];
|
||||
}
|
||||
|
||||
if(isset($_POST['description'])) {
|
||||
$description = stripslashes($_POST['description']);
|
||||
if(isset($_REQUEST['description'])) {
|
||||
$description = stripslashes($_REQUEST['description']);
|
||||
}
|
||||
|
||||
$errors = [];
|
||||
@@ -58,13 +55,12 @@ if(!empty($action)) {
|
||||
if(Forum::add_board($name, $description, $access, $guild, $errors)) {
|
||||
$action = $name = $description = '';
|
||||
header('Location: ' . getLink('forum'));
|
||||
exit;
|
||||
}
|
||||
}
|
||||
else if($action == 'delete_board') {
|
||||
Forum::delete_board($id, $errors);
|
||||
header('Location: ' . getLink('forum'));
|
||||
exit;
|
||||
$action = '';
|
||||
}
|
||||
else if($action == 'edit_board')
|
||||
{
|
||||
@@ -78,27 +74,28 @@ if(!empty($action)) {
|
||||
else {
|
||||
Forum::update_board($id, $name, $access, $guild, $description);
|
||||
header('Location: ' . getLink('forum'));
|
||||
exit;
|
||||
$action = $name = $description = '';
|
||||
$access = $guild = 0;
|
||||
}
|
||||
}
|
||||
else if($action == 'hide_board') {
|
||||
Forum::toggleHide_board($id, $errors);
|
||||
header('Location: ' . getLink('forum'));
|
||||
exit;
|
||||
$action = '';
|
||||
}
|
||||
else if($action == 'moveup_board') {
|
||||
Forum::move_board($id, -1, $errors);
|
||||
header('Location: ' . getLink('forum'));
|
||||
exit;
|
||||
$action = '';
|
||||
}
|
||||
else if($action == 'movedown_board') {
|
||||
Forum::move_board($id, 1, $errors);
|
||||
header('Location: ' . getLink('forum'));
|
||||
exit;
|
||||
$action = '';
|
||||
}
|
||||
|
||||
if(!empty($errors)) {
|
||||
$twig->display('error_box.html.twig', ['errors' => $errors]);
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
$action = '';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,9 +23,8 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
if(Forum::canPost($account_logged)) {
|
||||
if(Forum::canPost($account_logged))
|
||||
{
|
||||
$post_id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : false;
|
||||
if(!$post_id) {
|
||||
$errors[] = 'Please enter post id.';
|
||||
@@ -42,12 +41,12 @@ if(Forum::canPost($account_logged)) {
|
||||
$char_id = $post_topic = $text = $smile = $html = null;
|
||||
$players_from_account = $db->query("SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = ".(int) $account_logged->getId())->fetchAll();
|
||||
$saved = false;
|
||||
if(isset($_POST['save'])) {
|
||||
$text = stripslashes(trim($_POST['text']));
|
||||
$char_id = (int) $_POST['char_id'];
|
||||
$post_topic = stripslashes(trim($_POST['topic']));
|
||||
$smile = isset($_POST['smile']) ? (int)$_POST['smile'] : 0;
|
||||
$html = isset($_POST['html']) ? (int)$_POST['html'] : 0;
|
||||
if(isset($_REQUEST['save'])) {
|
||||
$text = stripslashes(trim($_REQUEST['text']));
|
||||
$char_id = (int) $_REQUEST['char_id'];
|
||||
$post_topic = stripslashes(trim($_REQUEST['topic']));
|
||||
$smile = isset($_REQUEST['smile']) ? (int)$_REQUEST['smile'] : 0;
|
||||
$html = isset($_REQUEST['html']) ? (int)$_REQUEST['html'] : 0;
|
||||
|
||||
if (!superAdmin()) {
|
||||
$html = 0;
|
||||
|
||||
@@ -23,17 +23,15 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
if(!Forum::isModerator()) {
|
||||
echo 'You are not logged in or you are not moderator.';
|
||||
return;
|
||||
}
|
||||
|
||||
$save = isset($_POST['save']) && (int)$_POST['save'] == 1;
|
||||
$save = isset($_REQUEST['save']) && (int)$_REQUEST['save'] == 1;
|
||||
if($save) {
|
||||
$post_id = (int)$_POST['id'];
|
||||
$board = (int)$_POST['section'];
|
||||
$post_id = (int)$_REQUEST['id'];
|
||||
$board = (int)$_REQUEST['section'];
|
||||
if(!Forum::hasAccess($board)) {
|
||||
$errors[] = "You don't have access to this board.";
|
||||
displayErrorBoxWithBackButton($errors, getLink('forum'));
|
||||
|
||||
@@ -28,8 +28,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
if(Forum::canPost($account_logged)) {
|
||||
$players_from_account = $db->query("SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = ".(int) $account_logged->getId())->fetchAll();
|
||||
$thread_id = isset($_REQUEST['thread_id']) ? (int) $_REQUEST['thread_id'] : 0;
|
||||
@@ -45,11 +43,11 @@ if(Forum::canPost($account_logged)) {
|
||||
echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread_id) . '">'.htmlspecialchars($thread['post_topic']).'</a> >> <b>Post new reply</b><br /><h3>'.htmlspecialchars($thread['post_topic']).'</h3>';
|
||||
|
||||
$quote = isset($_REQUEST['quote']) ? (int) $_REQUEST['quote'] : NULL;
|
||||
$text = isset($_POST['text']) ? stripslashes(trim($_POST['text'])) : NULL;
|
||||
$char_id = (int) ($_POST['char_id'] ?? 0);
|
||||
$post_topic = isset($_POST['topic']) ? stripslashes(trim($_POST['topic'])) : '';
|
||||
$smile = (int)($_POST['smile'] ?? 0);
|
||||
$html = (int)($_POST['html'] ?? 0);
|
||||
$text = isset($_REQUEST['text']) ? stripslashes(trim($_REQUEST['text'])) : NULL;
|
||||
$char_id = (int) ($_REQUEST['char_id'] ?? 0);
|
||||
$post_topic = isset($_REQUEST['topic']) ? stripslashes(trim($_REQUEST['topic'])) : '';
|
||||
$smile = (int)($_REQUEST['smile'] ?? 0);
|
||||
$html = (int)($_REQUEST['html'] ?? 0);
|
||||
$saved = false;
|
||||
|
||||
if (!superAdmin()) {
|
||||
@@ -62,10 +60,10 @@ if(Forum::canPost($account_logged)) {
|
||||
$text = '[i]Originally posted by ' . $quoted_post[0]['name'] . ' on ' . date('d.m.y H:i:s', $quoted_post[0]['post_date']) . ':[/i][quote]' . $quoted_post[0]['post_text'] . '[/quote]';
|
||||
}
|
||||
}
|
||||
elseif(isset($_POST['save'])) {
|
||||
elseif(isset($_REQUEST['save'])) {
|
||||
$length = strlen($text);
|
||||
if($length < 1 || strlen($text) > 15000) {
|
||||
$errors[] = "Too short or too long post (Length: $length letters). Minimum 1 letter, maximum 15000 letters.";
|
||||
$errors[] = 'Too short or too long post (Length: $length letters). Minimum 1 letter, maximum 15000 letters.';
|
||||
}
|
||||
|
||||
if($char_id == 0) {
|
||||
@@ -81,14 +79,15 @@ if(Forum::canPost($account_logged)) {
|
||||
}
|
||||
|
||||
if(!$player_on_account) {
|
||||
$errors[] = "Player with selected ID $char_id doesn't exist or isn't on your account";
|
||||
$errors[] = 'Player with selected ID ' . $char_id . ' doesn\'t exist or isn\'t on your account';
|
||||
}
|
||||
}
|
||||
|
||||
if(count($errors) == 0) {
|
||||
$last_post = 0;
|
||||
$query = $db->query('SELECT post_date FROM ' . FORUM_TABLE_PREFIX . 'forum ORDER BY post_date DESC LIMIT 1');
|
||||
if($query->rowCount() > 0) {
|
||||
if($query->rowCount() > 0)
|
||||
{
|
||||
$query = $query->fetch();
|
||||
$last_post = $query['post_date'];
|
||||
}
|
||||
|
||||
@@ -28,8 +28,6 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
if(Forum::canPost($account_logged)) {
|
||||
$players_from_account = $db->query('SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = '.(int) $account_logged->getId())->fetchAll();
|
||||
$section_id = $_REQUEST['section_id'] ?? null;
|
||||
@@ -40,18 +38,19 @@ if(Forum::canPost($account_logged)) {
|
||||
if ($sections[$section_id]['closed'] && !Forum::isModerator())
|
||||
$errors[] = 'You cannot create topic on this board.';
|
||||
|
||||
$text = isset($_POST['text']) ? stripslashes($_POST['text']) : '';
|
||||
$char_id = (int)(isset($_POST['char_id']) ? $_POST['char_id'] : 0);
|
||||
$post_topic = isset($_POST['topic']) ? stripslashes($_POST['topic']) : '';
|
||||
$smile = (isset($_POST['smile']) ? (int)$_POST['smile'] : 0);
|
||||
$html = (isset($_POST['html']) ? (int)$_POST['html'] : 0);
|
||||
$quote = (int)(isset($_REQUEST['quote']) ? $_REQUEST['quote'] : 0);
|
||||
$text = isset($_REQUEST['text']) ? stripslashes($_REQUEST['text']) : '';
|
||||
$char_id = (int)(isset($_REQUEST['char_id']) ? $_REQUEST['char_id'] : 0);
|
||||
$post_topic = isset($_REQUEST['topic']) ? stripslashes($_REQUEST['topic']) : '';
|
||||
$smile = (isset($_REQUEST['smile']) ? (int)$_REQUEST['smile'] : 0);
|
||||
$html = (isset($_REQUEST['html']) ? (int)$_REQUEST['html'] : 0);
|
||||
|
||||
if (!superAdmin()) {
|
||||
$html = 0;
|
||||
}
|
||||
|
||||
$saved = false;
|
||||
if (isset($_POST['save'])) {
|
||||
if (isset($_REQUEST['save'])) {
|
||||
$length = strlen($post_topic);
|
||||
if ($length < 1 || $length > 60) {
|
||||
$errors[] = "Too short or too long topic (Length: $length letters). Minimum 1 letter, maximum 60 letters.";
|
||||
|
||||
@@ -23,13 +23,11 @@ if(!$logged) {
|
||||
return;
|
||||
}
|
||||
|
||||
csrfProtect();
|
||||
|
||||
if(Forum::isModerator()) {
|
||||
$id = (int) ($_POST['id'] ?? 0);
|
||||
$id = (int) $_REQUEST['id'];
|
||||
$post = $db->query("SELECT `id`, `first_post`, `section` FROM `" . FORUM_TABLE_PREFIX . "forum` WHERE `id` = ".$id." LIMIT 1")->fetch();
|
||||
|
||||
if($post && $post['id'] == $id && Forum::hasAccess($post['section'])) {
|
||||
if($post['id'] == $id && Forum::hasAccess($post['section'])) {
|
||||
if($post['id'] == $post['first_post']) {
|
||||
$db->query("DELETE FROM `" . FORUM_TABLE_PREFIX . "forum` WHERE `first_post` = ".$post['id']);
|
||||
header('Location: ' . getForumBoardLink($post['section']));
|
||||
@@ -38,7 +36,7 @@ if(Forum::isModerator()) {
|
||||
$post_page = $db->query("SELECT COUNT(`" . FORUM_TABLE_PREFIX . "forum`.`id`) AS posts_count FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`id` < ".$id." AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".(int) $post['first_post'])->fetch();
|
||||
$_page = (int) ceil($post_page['posts_count'] / setting('core.forum_threads_per_page')) - 1;
|
||||
$db->query("DELETE FROM `" . FORUM_TABLE_PREFIX . "forum` WHERE `id` = ".$post['id']);
|
||||
header('Location: ' . getForumThreadLink($post['first_post'], $_page));
|
||||
header('Location: ' . getForumThreadLink($post['first_post'], (int) $_page));
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -33,7 +33,7 @@ if(!Forum::hasAccess($section_id)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$_page = (int) ($_REQUEST['page'] ?? 0);
|
||||
$_page = (int) (isset($_REQUEST['page']) ? $_REQUEST['page'] : 0);
|
||||
$threads_count = $db->query("SELECT COUNT(`" . FORUM_TABLE_PREFIX . "forum`.`id`) AS threads_count FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`section` = ".(int) $section_id." AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = `" . FORUM_TABLE_PREFIX . "forum`.`id`")->fetch();
|
||||
for($i = 0; $i < $threads_count['threads_count'] / setting('core.forum_threads_per_page'); $i++) {
|
||||
if($i != $_page)
|
||||
@@ -50,7 +50,7 @@ if($logged && (!$sections[$section_id]['closed'] || Forum::isModerator())) {
|
||||
}
|
||||
|
||||
echo '<br /><br />Page: '.$links_to_pages.'<br />';
|
||||
$last_threads = $db->query("SELECT `players`.`id` as `player_id`, `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`first_post`, `" . FORUM_TABLE_PREFIX . "forum`.`post_text`, `" . FORUM_TABLE_PREFIX . "forum`.`post_topic`, `" . FORUM_TABLE_PREFIX . "forum`.`id`, `" . FORUM_TABLE_PREFIX . "forum`.`last_post`, `" . FORUM_TABLE_PREFIX . "forum`.`replies`, `" . FORUM_TABLE_PREFIX . "forum`.`views`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`section` = ".$section_id." AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = `" . FORUM_TABLE_PREFIX . "forum`.`id` ORDER BY `" . FORUM_TABLE_PREFIX . "forum`.`last_post` DESC LIMIT ".setting('core.forum_threads_per_page')." OFFSET ".($_page * setting('core.forum_threads_per_page')))->fetchAll(PDO::FETCH_ASSOC);
|
||||
$last_threads = $db->query("SELECT `players`.`id` as `player_id`, `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`post_text`, `" . FORUM_TABLE_PREFIX . "forum`.`post_topic`, `" . FORUM_TABLE_PREFIX . "forum`.`id`, `" . FORUM_TABLE_PREFIX . "forum`.`last_post`, `" . FORUM_TABLE_PREFIX . "forum`.`replies`, `" . FORUM_TABLE_PREFIX . "forum`.`views`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`section` = ".$section_id." AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = `" . FORUM_TABLE_PREFIX . "forum`.`id` ORDER BY `" . FORUM_TABLE_PREFIX . "forum`.`last_post` DESC LIMIT ".setting('core.forum_threads_per_page')." OFFSET ".($_page * setting('core.forum_threads_per_page')))->fetchAll();
|
||||
|
||||
if(isset($last_threads[0])) {
|
||||
echo '<table width="100%">
|
||||
@@ -67,8 +67,8 @@ if(isset($last_threads[0])) {
|
||||
foreach($last_threads as $thread) {
|
||||
echo '<tr bgcolor="' . getStyle($number_of_rows++) . '"><td>';
|
||||
if(Forum::isModerator()) {
|
||||
echo '<a href="' . getLink('forum') . '?action=move_thread&id=' . $thread['id'] . '" title="Move Thread"><img src="images/icons/arrow_right.gif"/></a>';
|
||||
$twig->display('forum.remove_post.html.twig', ['post' => $thread]);
|
||||
echo '<a href="' . getLink('forum') . '?action=move_thread&id='.$thread['id'].'"\')"><span style="color:darkgreen">[MOVE]</span></a>';
|
||||
echo '<a href="' . getLink('forum') . '?action=remove_post&id='.$thread['id'].'" onclick="return confirm(\'Are you sure you want remove thread > '.htmlspecialchars($thread['post_topic']).' <?\')"><span style="color: red">[REMOVE]</span></a> ';
|
||||
}
|
||||
|
||||
$player->load($thread['player_id']);
|
||||
@@ -82,14 +82,11 @@ if(isset($last_threads[0])) {
|
||||
echo '<a href="' . getForumThreadLink($thread['id']) . '">'.htmlspecialchars($thread['post_topic']). '</a><br /><small>'.($canEditForum ? substr(strip_tags($thread['post_text']), 0, 50) : htmlspecialchars(substr($thread['post_text'], 0, 50))).'...</small></td><td>' . getPlayerLink($thread['name']) . '</td><td>'.(int) $thread['replies'].'</td><td>'.(int) $thread['views'].'</td><td>';
|
||||
if($thread['last_post'] > 0) {
|
||||
$last_post = $db->query("SELECT `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".(int) $thread['id']." AND `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` ORDER BY `post_date` DESC LIMIT 1")->fetch();
|
||||
|
||||
if(isset($last_post['name'])) {
|
||||
echo date('d.m.y H:i:s', $last_post['post_date']) . '<br />by ' . getPlayerLink($last_post['name']);
|
||||
}
|
||||
else {
|
||||
if(isset($last_post['name']))
|
||||
echo date('d.m.y H:i:s', $last_post['post_date']).'<br />by ' . getPlayerLink($last_post['name']);
|
||||
else
|
||||
echo 'No posts.';
|
||||
}
|
||||
}
|
||||
else {
|
||||
echo date('d.m.y H:i:s', $thread['post_date']) . '<br />by ' . getPlayerLink($thread['name']);
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ if(!Forum::hasAccess($thread_starter['section'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
$posts_count = $db->query("SELECT COUNT(`" . FORUM_TABLE_PREFIX . "forum`.`id`) AS posts_count FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".$thread_id)->fetch();
|
||||
$posts_count = $db->query("SELECT COUNT(`" . FORUM_TABLE_PREFIX . "forum`.`id`) AS posts_count FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".(int) $thread_id)->fetch();
|
||||
for($i = 0; $i < $posts_count['posts_count'] / setting('core.forum_threads_per_page'); $i++) {
|
||||
if($i != $_page)
|
||||
$links_to_pages .= '<a href="' . getForumThreadLink($thread_id, $i) . '">'.($i + 1).'</a> ';
|
||||
@@ -46,7 +46,7 @@ for($i = 0; $i < $posts_count['posts_count'] / setting('core.forum_threads_per_p
|
||||
$posts = $db->query("SELECT `players`.`id` as `player_id`, `" . FORUM_TABLE_PREFIX . "forum`.`id`,`" . FORUM_TABLE_PREFIX . "forum`.`first_post`, `" . FORUM_TABLE_PREFIX . "forum`.`section`,`" . FORUM_TABLE_PREFIX . "forum`.`post_text`, `" . FORUM_TABLE_PREFIX . "forum`.`post_topic`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` AS `date`, `" . FORUM_TABLE_PREFIX . "forum`.`post_smile`, `" . FORUM_TABLE_PREFIX . "forum`.`post_html`, `" . FORUM_TABLE_PREFIX . "forum`.`author_aid`, `" . FORUM_TABLE_PREFIX . "forum`.`author_guid`, `" . FORUM_TABLE_PREFIX . "forum`.`last_edit_aid`, `" . FORUM_TABLE_PREFIX . "forum`.`edit_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".$thread_id." ORDER BY `" . FORUM_TABLE_PREFIX . "forum`.`post_date` LIMIT " . setting('core.forum_posts_per_page') . " OFFSET ".($_page * setting('core.forum_posts_per_page')))->fetchAll();
|
||||
|
||||
if(isset($posts[0]['player_id'])) {
|
||||
$db->query("UPDATE `" . FORUM_TABLE_PREFIX . "forum` SET `views`=`views`+1 WHERE `id` = " . $thread_id);
|
||||
$db->query("UPDATE `" . FORUM_TABLE_PREFIX . "forum` SET `views`=`views`+1 WHERE `id` = ".(int) $thread_id);
|
||||
}
|
||||
|
||||
$lookaddons = $db->hasColumn('players', 'lookaddons');
|
||||
|
||||
@@ -12,11 +12,11 @@ defined('MYAAC') or die('Direct access not allowed!');
|
||||
|
||||
require __DIR__ . '/base.php';
|
||||
|
||||
// set rights in guild
|
||||
//set rights in guild
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
|
||||
$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null;
|
||||
if(!$logged) {
|
||||
$errors[] = "You are not logged in. You can't accept invitations.";
|
||||
$errors[] = 'You are not logged in. You can\'t accept invitations.';
|
||||
}
|
||||
|
||||
if(!Validator::guildName($guild_name)) {
|
||||
@@ -27,11 +27,11 @@ if(empty($errors)) {
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
if(!$guild->isLoaded()) {
|
||||
$errors[] = "Guild with name <b>$guild_name</b> doesn't exist.";
|
||||
$errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
if(!Validator::characterName($name)) {
|
||||
$errors[] = 'Invalid name format.';
|
||||
}
|
||||
@@ -51,7 +51,7 @@ if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
if(empty($errors)) {
|
||||
$is_invited = false;
|
||||
include(SYSTEM . 'libs/pot/InvitesDriver.php');
|
||||
@@ -104,7 +104,7 @@ if(!empty($errors)) {
|
||||
));
|
||||
}
|
||||
else {
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
$guild->acceptInvite($player);
|
||||
$twig->display('success.html.twig', array(
|
||||
'title' => 'Accept invitation',
|
||||
|
||||
@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
|
||||
require __DIR__ . '/base.php';
|
||||
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
|
||||
$rank_name = $_POST['rank_name'] ?? null;
|
||||
$rank_name = isset($_REQUEST['rank_name']) ? $_REQUEST['rank_name'] : null;
|
||||
if(!Validator::guildName($guild_name)) {
|
||||
$errors[] = Validator::getLastError();
|
||||
}
|
||||
@@ -35,7 +35,7 @@ if(empty($errors)) {
|
||||
$rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player) {
|
||||
if($guild_leader_char->getId() == $player->getId()) {
|
||||
$guild_vice = true;
|
||||
|
||||
@@ -15,5 +15,3 @@ else
|
||||
define('GUILD_MEMBERS_TABLE', 'guild_membership');
|
||||
|
||||
define('MOTD_EXISTS', $db->hasColumn('guilds', 'motd'));
|
||||
|
||||
csrfProtect();
|
||||
|
||||
@@ -31,7 +31,7 @@ if(empty($errors)) {
|
||||
$rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player) {
|
||||
if($guild->getOwner()->getId() == $player->getId()) {
|
||||
$guild_vice = true;
|
||||
@@ -42,8 +42,8 @@ if(empty($errors)) {
|
||||
|
||||
$saved = false;
|
||||
if($guild_leader) {
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
$description = htmlspecialchars(stripslashes(substr(trim($_POST['description']),0, setting('core.guild_description_chars_limit'))));
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
$description = htmlspecialchars(stripslashes(substr(trim($_REQUEST['description']),0, setting('core.guild_description_chars_limit'))));
|
||||
$guild->setCustomField('description', $description);
|
||||
$saved = true;
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ if(empty($errors)) {
|
||||
if($logged) {
|
||||
$guild_leader_char = $guild->getOwner();
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
|
||||
foreach($account_players as $player) {
|
||||
if($guild_leader_char->getId() == $player->getId()) {
|
||||
@@ -40,13 +40,14 @@ if(empty($errors)) {
|
||||
}
|
||||
}
|
||||
|
||||
if($guild_leader) {
|
||||
if($guild_leader)
|
||||
{
|
||||
$max_image_size_b = setting('core.guild_image_size_kb') * 1024;
|
||||
$allowed_ext = array('image/gif', 'image/jpg', 'image/pjpeg', 'image/jpeg', 'image/bmp', 'image/png', 'image/x-png');
|
||||
$ext_name = array('image/gif' => 'gif', 'image/jpg' => 'jpg', 'image/jpeg' => 'jpg', 'image/pjpeg' => 'jpg', 'image/bmp' => 'bmp', 'image/png' => 'png', 'image/x-png' => 'png');
|
||||
$save_file_name = str_replace(' ', '_', strtolower($guild->getName()));
|
||||
$save_path = GUILD_IMAGES_DIR . $save_file_name;
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save')
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save')
|
||||
{
|
||||
$file = $_FILES['newlogo'];
|
||||
if(is_uploaded_file($file['tmp_name']))
|
||||
@@ -96,13 +97,13 @@ if(empty($errors)) {
|
||||
|
||||
$guild_logo = $guild->getCustomField('logo_name');
|
||||
if(empty($guild_logo) || !file_exists(GUILD_IMAGES_DIR . $guild_logo)) {
|
||||
$guild_logo = 'default.gif';
|
||||
$guild_logo = "default.gif";
|
||||
}
|
||||
|
||||
$twig->display('guilds.change_logo.html.twig', array(
|
||||
'guild_logo' => $guild_logo,
|
||||
'guild' => $guild,
|
||||
//'max_image_size_b' => $max_image_size_b
|
||||
'max_image_size_b' => $max_image_size_b
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ if(empty($errors)) {
|
||||
$rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player) {
|
||||
if($guild->getOwner()->getId() == $player->getId()) {
|
||||
$guild_vice = true;
|
||||
@@ -45,8 +45,8 @@ if(empty($errors)) {
|
||||
|
||||
$saved = false;
|
||||
if($guild_leader) {
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
$motd = htmlspecialchars(stripslashes(substr($_POST['motd'],0, setting('core.guild_motd_chars_limit'))));
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
$motd = htmlspecialchars(stripslashes(substr($_REQUEST['motd'],0, setting('core.guild_motd_chars_limit'))));
|
||||
$guild->setCustomField('motd', $motd);
|
||||
$saved = true;
|
||||
}
|
||||
|
||||
@@ -20,15 +20,17 @@ if(!$logged) {
|
||||
}
|
||||
|
||||
$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null;
|
||||
$new_nick = isset($_POST['nick']) ? stripslashes($_POST['nick']) : null;
|
||||
$new_nick = isset($_REQUEST['nick']) ? stripslashes($_REQUEST['nick']) : null;
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
|
||||
|
||||
if(!$name) {
|
||||
$errors[] = 'Please enter new name.';
|
||||
return;
|
||||
}
|
||||
|
||||
if(!$new_nick) {
|
||||
$errors[] = 'Please enter new nick.';
|
||||
return;
|
||||
}
|
||||
|
||||
if(empty($errors))
|
||||
|
||||
@@ -17,9 +17,8 @@ if(!$logged) {
|
||||
}
|
||||
else {
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
|
||||
if(!Validator::guildName($guild_name)) {
|
||||
if(!Validator::guildName($guild_name))
|
||||
$errors[] = Validator::getLastError();
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors))
|
||||
@@ -43,7 +42,7 @@ $rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$guild_vice = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player)
|
||||
{
|
||||
$player_rank = $player->getRank();
|
||||
@@ -66,23 +65,22 @@ foreach($account_players as $player)
|
||||
}
|
||||
}
|
||||
|
||||
if($guild_vice) {
|
||||
if(isset($_POST['todo']) && $_POST['todo'] === 'save') {
|
||||
if($guild_vice)
|
||||
{
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] === 'save')
|
||||
{
|
||||
$player_name = stripslashes($_REQUEST['name']);
|
||||
$new_rank = (int) $_POST['rankid'];
|
||||
|
||||
if(!Validator::characterName($player_name)) {
|
||||
$new_rank = (int) $_REQUEST['rankid'];
|
||||
if(!Validator::characterName($player_name))
|
||||
$errors[] = 'Invalid player name format.';
|
||||
}
|
||||
|
||||
$rank = new OTS_GuildRank();
|
||||
$rank->load($new_rank);
|
||||
if(!$rank->isLoaded())
|
||||
$errors[] = "Rank with this ID doesn't exist.";
|
||||
if($level_in_guild <= $rank->getLevel() && !$guild_leader)
|
||||
$errors[] = "You can't set ranks with equal or higher level than your.";
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($errors))
|
||||
{
|
||||
$player_to_change = new OTS_Player();
|
||||
$player_to_change->find($player_name);
|
||||
if(!$player_to_change->isLoaded())
|
||||
@@ -110,7 +108,8 @@ if($guild_vice) {
|
||||
$errors[] = 'This player has higher rank in guild than you. You can\'t change his/her rank.';
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($errors))
|
||||
{
|
||||
$player_to_change->setRank($rank);
|
||||
$twig->display('success.html.twig', array(
|
||||
'title' => 'Rank Changed',
|
||||
@@ -126,7 +125,7 @@ if($guild_vice) {
|
||||
$result = getPlayersWithLowerRank($rank_list, $guild_leader, $db, $level_in_guild, $guild);
|
||||
|
||||
$twig->display('guilds.change_rank.html.twig', array(
|
||||
'players' => $result['players'] ?? [],
|
||||
'players' => isset($result['players']) ? $result['players'] : array(),
|
||||
'guild_name' => $guild->getName(),
|
||||
'ranks' => $result['ranks']
|
||||
));
|
||||
|
||||
@@ -12,27 +12,33 @@ defined('MYAAC') or die('Direct access not allowed!');
|
||||
|
||||
require __DIR__ . '/base.php';
|
||||
|
||||
if(!$logged) {
|
||||
if(!$logged)
|
||||
{
|
||||
echo "You are not logged in.";
|
||||
$twig->display('guilds.back_button.html.twig');
|
||||
return;
|
||||
}
|
||||
|
||||
if(admin()) {
|
||||
if(admin())
|
||||
{
|
||||
$players_list = new OTS_Players_List();
|
||||
$players_list->init();
|
||||
}
|
||||
else {
|
||||
else
|
||||
$players_list = $account_logged->getPlayersList();
|
||||
}
|
||||
|
||||
if(count($players_list) > 0) {
|
||||
foreach($players_list as $player) {
|
||||
if(count($players_list) > 0)
|
||||
{
|
||||
foreach($players_list as $player)
|
||||
{
|
||||
$player_rank = $player->getRank();
|
||||
if($player_rank->isLoaded()) {
|
||||
if($player_rank->isLoaded()) {
|
||||
if($player_rank->isLoaded())
|
||||
{
|
||||
if($player_rank->isLoaded())
|
||||
{
|
||||
$rank_guild = $player_rank->getGuild();
|
||||
if(!$rank_guild->isLoaded()) {
|
||||
if(!$rank_guild->isLoaded())
|
||||
{
|
||||
$player->setRank();
|
||||
$player->setGuildNick('');
|
||||
$changed_ranks_of[] = $player->getName();
|
||||
@@ -40,7 +46,8 @@ if(count($players_list) > 0) {
|
||||
$player_rank->delete();
|
||||
}
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
$player->setRank();
|
||||
$player->setGuildNick('');
|
||||
$changed_ranks_of[] = $player->getName();
|
||||
@@ -48,20 +55,14 @@ if(count($players_list) > 0) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
echo "<b>Deleted ranks (this ranks guilds doesn't exist [bug fix]):</b>";
|
||||
if(!empty($deleted_ranks)) {
|
||||
foreach ($deleted_ranks as $rank) {
|
||||
echo "<li>" . $rank;
|
||||
}
|
||||
}
|
||||
if(!empty($deleted_ranks))
|
||||
foreach($deleted_ranks as $rank)
|
||||
echo "<li>".$rank;
|
||||
echo "<BR /><BR /><b>Changed ranks of players (rank or guild of rank doesn't exist [bug fix]):</b>";
|
||||
|
||||
if(!empty($changed_ranks_of)) {
|
||||
foreach ($changed_ranks_of as $name) {
|
||||
echo "<li>" . $name;
|
||||
}
|
||||
}
|
||||
if(!empty($changed_ranks_of))
|
||||
foreach($changed_ranks_of as $name)
|
||||
echo "<li>".$name;
|
||||
}
|
||||
else
|
||||
echo "0 players found.";
|
||||
|
||||
@@ -14,15 +14,15 @@ use MyAAC\Models\GuildRank;
|
||||
|
||||
require __DIR__ . '/base.php';
|
||||
|
||||
$guild_name = isset($_POST['guild']) ? urldecode($_POST['guild']) : NULL;
|
||||
$name = isset($_POST['name']) ? stripslashes($_POST['name']) : NULL;
|
||||
$todo = isset($_POST['todo']) ? $_POST['todo'] : NULL;
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL;
|
||||
$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : NULL;
|
||||
$todo = isset($_REQUEST['todo']) ? $_REQUEST['todo'] : NULL;
|
||||
if(!$logged) {
|
||||
$errors[] = 'You are not logged in. You can\'t create guild.';
|
||||
$guild_errors[] = 'You are not logged in. You can\'t create guild.';
|
||||
}
|
||||
|
||||
$array_of_player_nig = array();
|
||||
if(empty($errors))
|
||||
if(empty($guild_errors))
|
||||
{
|
||||
$account_players = $account_logged->getPlayersList(false);
|
||||
foreach($account_players as $player)
|
||||
@@ -41,44 +41,45 @@ if(empty($errors))
|
||||
|
||||
if(empty($todo)) {
|
||||
if(count($array_of_player_nig) == 0) {
|
||||
$errors[] = 'On your account all characters are in guilds, have too low level to create new guild' . (setting('core.guild_need_premium') ? ' or you don\' have a premium account' : '') . '.';
|
||||
$guild_errors[] = 'On your account all characters are in guilds, have too low level to create new guild' . (setting('core.guild_need_premium') ? ' or you don\' have a premium account' : '') . '.';
|
||||
}
|
||||
}
|
||||
|
||||
if($todo == 'save')
|
||||
{
|
||||
if(!Validator::guildName($guild_name)) {
|
||||
$errors[] = Validator::getLastError();
|
||||
$guild_errors[] = Validator::getLastError();
|
||||
$guild_name = '';
|
||||
}
|
||||
|
||||
if(!Validator::characterName($name)) {
|
||||
$errors[] = 'Invalid character name format.';
|
||||
$guild_errors[] = 'Invalid character name format.';
|
||||
$name = '';
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($guild_errors)) {
|
||||
$player = new OTS_Player();
|
||||
$player->find($name);
|
||||
if(!$player->isLoaded()) {
|
||||
$errors[] = 'Character <b>'.$name.'</b> doesn\'t exist.';
|
||||
$guild_errors[] = 'Character <b>'.$name.'</b> doesn\'t exist.';
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors))
|
||||
|
||||
if(empty($guild_errors))
|
||||
{
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
if($guild->isLoaded()) {
|
||||
$errors[] = 'Guild <b>'.$guild_name.'</b> already exist. Select other name.';
|
||||
$guild_errors[] = 'Guild <b>'.$guild_name.'</b> already exist. Select other name.';
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors) && $player->isDeleted()) {
|
||||
$errors[] = "Character <b>$name</b> has been deleted.";
|
||||
if(empty($guild_errors) && $player->isDeleted()) {
|
||||
$guild_errors[] = "Character <b>$name</b> has been deleted.";
|
||||
}
|
||||
|
||||
if(empty($errors))
|
||||
if(empty($guild_errors))
|
||||
{
|
||||
$bad_char = true;
|
||||
foreach($array_of_player_nig as $nick_from_list) {
|
||||
@@ -87,22 +88,22 @@ if($todo == 'save')
|
||||
}
|
||||
}
|
||||
if($bad_char) {
|
||||
$errors[] = 'Character <b>'.$name.'</b> isn\'t on your account or is already in guild.';
|
||||
$guild_errors[] = 'Character <b>'.$name.'</b> isn\'t on your account or is already in guild.';
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($guild_errors)) {
|
||||
if($player->getLevel() < setting('core.guild_need_level')) {
|
||||
$errors[] = 'Character <b>'.$name.'</b> has too low level. To create guild you need character with level <b>' . setting('core.guild_need_level') . '</b>.';
|
||||
$guild_errors[] = 'Character <b>'.$name.'</b> has too low level. To create guild you need character with level <b>' . setting('core.guild_need_level') . '</b>.';
|
||||
}
|
||||
if(setting('core.guild_need_premium') && !$account_logged->isPremium()) {
|
||||
$errors[] = 'Character <b>'.$name.'</b> is on FREE account. To create guild you need PREMIUM account.';
|
||||
$guild_errors[] = 'Character <b>'.$name.'</b> is on FREE account. To create guild you need PREMIUM account.';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!empty($errors)) {
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
if(!empty($guild_errors)) {
|
||||
$twig->display('error_box.html.twig', array('errors' => $guild_errors));
|
||||
unset($todo);
|
||||
}
|
||||
|
||||
|
||||
@@ -45,10 +45,7 @@ if(empty($errors)) {
|
||||
$twig->display('success.html.twig', array(
|
||||
'title' => 'Delete Guild',
|
||||
'description' => 'Are you sure you want delete guild <b>' . $guild_name . '</b>?<br/>
|
||||
<form action="' . getLink('guilds') . '?guild=' . $guild->getName() . '&action=delete_by_admin" METHOD="post">
|
||||
' . csrf(true) . '
|
||||
<input type="hidden" name="todo" value="save"><input type="submit" value="Yes, delete">
|
||||
</form>',
|
||||
<form action="' . getLink('guilds') . '?guild=' . $guild->getName() . '&action=delete_by_admin" METHOD="post"><input type="hidden" name="todo" value="save"><input type="submit" value="Yes, delete"></form>',
|
||||
'custom_buttons' => $twig->render('guilds.back_button.html.twig')
|
||||
));
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ if(empty($errors)) {
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
if(!$guild->isLoaded()) {
|
||||
$errors[] = "Guild with name <b>$guild_name</b> doesn't exist.";
|
||||
$errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ if(empty($errors)) {
|
||||
$rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
|
||||
foreach($account_players as $player) {
|
||||
if($guild->getOwner()->getId() == $player->getId()) {
|
||||
|
||||
@@ -15,43 +15,47 @@ require __DIR__ . '/base.php';
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
|
||||
$name = stripslashes($_REQUEST['name']);
|
||||
|
||||
if(!$logged) {
|
||||
if(!$logged)
|
||||
$errors[] = 'You are not logged in. You can\'t delete invitations.';
|
||||
}
|
||||
|
||||
if(!Validator::guildName($guild_name)) {
|
||||
if(!Validator::guildName($guild_name))
|
||||
$errors[] = Validator::getLastError();
|
||||
}
|
||||
|
||||
if(!Validator::characterName($name)) {
|
||||
if(!Validator::characterName($name))
|
||||
$errors[] = 'Invalid name format.';
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($errors))
|
||||
{
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
if(!$guild->isLoaded())
|
||||
$errors[] = "Guild with name <b>" . $guild_name . "</b> doesn't exist.";
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($errors))
|
||||
{
|
||||
$rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$guild_vice = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
foreach($account_players as $player) {
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player)
|
||||
{
|
||||
$player_rank = $player->getRank();
|
||||
if($player_rank->isLoaded()) {
|
||||
foreach($rank_list as $rank_in_guild) {
|
||||
if($rank_in_guild->getId() == $player_rank->getId()) {
|
||||
if($player_rank->isLoaded())
|
||||
{
|
||||
foreach($rank_list as $rank_in_guild)
|
||||
{
|
||||
if($rank_in_guild->getId() == $player_rank->getId())
|
||||
{
|
||||
$players_from_account_in_guild[] = $player->getName();
|
||||
if($player_rank->getLevel() > 1) {
|
||||
if($player_rank->getLevel() > 1)
|
||||
{
|
||||
$guild_vice = true;
|
||||
$level_in_guild = $player_rank->getLevel();
|
||||
}
|
||||
|
||||
if($guild->getOwner()->getId() == $player->getId()) {
|
||||
if($guild->getOwner()->getId() == $player->getId())
|
||||
{
|
||||
$guild_vice = true;
|
||||
$guild_leader = true;
|
||||
}
|
||||
@@ -60,46 +64,44 @@ if(empty($errors)) {
|
||||
}
|
||||
}
|
||||
|
||||
if(!$guild_vice) {
|
||||
if(!$guild_vice)
|
||||
$errors[] = 'You are not a leader or vice leader of guild <b>' . $guild_name . '</b>.';
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($errors))
|
||||
{
|
||||
$player = new OTS_Player();
|
||||
$player->find($name);
|
||||
if(!$player->isLoaded()) {
|
||||
$errors[] = "Player with name <b>$name</b> doesn't exist.";
|
||||
}
|
||||
if(!$player->isLoaded())
|
||||
$errors[] = 'Player with name <b>' . $name . '</b> doesn\'t exist.';
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($errors))
|
||||
{
|
||||
include(SYSTEM . 'libs/pot/InvitesDriver.php');
|
||||
new InvitesDriver($guild);
|
||||
$invited_list = $guild->listInvites();
|
||||
if(count($invited_list) > 0) {
|
||||
if(count($invited_list) > 0)
|
||||
{
|
||||
$is_invited = false;
|
||||
foreach($invited_list as $invited) {
|
||||
if ($invited->getName() == $player->getName()) {
|
||||
foreach($invited_list as $invited)
|
||||
if($invited->getName() == $player->getName())
|
||||
$is_invited = true;
|
||||
if(!$is_invited)
|
||||
$errors[] = '<b>'.$player->getName().'</b> isn\'t invited to your guild.';
|
||||
}
|
||||
}
|
||||
if(!$is_invited) {
|
||||
$errors[] = '<b>' . $player->getName() . '</b> isn\'t invited to your guild.';
|
||||
}
|
||||
}
|
||||
else {
|
||||
else
|
||||
$errors[] = 'No one is invited to your guild.';
|
||||
}
|
||||
}
|
||||
|
||||
if(!empty($errors)) {
|
||||
if(!empty($errors))
|
||||
{
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
|
||||
$twig->display('guilds.back_button.html.twig', array('action' => getLink('guilds') . '?action=show&guild=' . $guild_name));
|
||||
}
|
||||
else {
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
else
|
||||
{
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save')
|
||||
{
|
||||
$guild->deleteInvite($player);
|
||||
$twig->display('success.html.twig', array(
|
||||
'title' => 'Deleted player invitation',
|
||||
|
||||
@@ -13,27 +13,25 @@ defined('MYAAC') or die('Direct access not allowed!');
|
||||
require __DIR__ . '/base.php';
|
||||
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
|
||||
$rank_to_delete = isset($_POST['rankid']) ? (int) $_POST['rankid'] : null;
|
||||
$rank_to_delete = isset($_REQUEST['rankid']) ? (int) $_REQUEST['rankid'] : null;
|
||||
|
||||
if(!Validator::guildName($guild_name)) {
|
||||
$errors[] = Validator::getLastError();
|
||||
$guild_errors[] = Validator::getLastError();
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($guild_errors)) {
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
if(!$guild->isLoaded()) {
|
||||
$errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
|
||||
$guild_errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($guild_errors)) {
|
||||
if($logged) {
|
||||
$guild_leader_char = $guild->getOwner();
|
||||
$rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player) {
|
||||
if($guild->getOwner()->getId() == $player->getId()) {
|
||||
$guild_vice = true;
|
||||
@@ -41,21 +39,21 @@ if(empty($errors)) {
|
||||
$level_in_guild = 3;
|
||||
}
|
||||
}
|
||||
|
||||
if($guild_leader) {
|
||||
$rank = new OTS_GuildRank();
|
||||
$rank->load($rank_to_delete);
|
||||
if(!$rank->isLoaded()) {
|
||||
$errors2[] = 'Rank with ID '.$rank_to_delete.' doesn\'t exist.';
|
||||
$guild_errors2[] = 'Rank with ID '.$rank_to_delete.' doesn\'t exist.';
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
if($rank->getGuild()->getId() != $guild->getId()) {
|
||||
$errors2[] = 'Rank with ID '.$rank_to_delete.' isn\'t from your guild.';
|
||||
$guild_errors2[] = 'Rank with ID '.$rank_to_delete.' isn\'t from your guild.';
|
||||
}
|
||||
else
|
||||
{
|
||||
if(count($rank_list) < 2) {
|
||||
$errors2[] = 'You have only 1 rank in your guild. You can\'t delete this rank.';
|
||||
$guild_errors2[] = 'You have only 1 rank in your guild. You can\'t delete this rank.';
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -89,21 +87,19 @@ if(empty($errors)) {
|
||||
$player->setRank($new_rank);
|
||||
}
|
||||
}
|
||||
|
||||
$rank->delete();
|
||||
$saved = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($saved) && $saved) {
|
||||
if($saved) {
|
||||
$twig->display('success.html.twig', array(
|
||||
'title' => 'Rank Deleted',
|
||||
'description' => 'Rank <b>'.$rank->getName().'</b> has been deleted. Players with this rank has now other rank.',
|
||||
'custom_buttons' => ''
|
||||
));
|
||||
} else {
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors2));
|
||||
$twig->display('error_box.html.twig', array('errors' => $guild_errors2));
|
||||
}
|
||||
|
||||
$twig->display('guilds.back_button.html.twig', array(
|
||||
@@ -111,16 +107,18 @@ if(empty($errors)) {
|
||||
'action' => getLink('guilds') . '?guild='.$guild->getName().'&action=manager'
|
||||
));
|
||||
}
|
||||
else {
|
||||
$errors[] = 'You are not a leader of guild!';
|
||||
else
|
||||
{
|
||||
$guild_errors[] = 'You are not a leader of guild!';
|
||||
}
|
||||
}
|
||||
else {
|
||||
$errors[] = 'You are not logged. You can\'t manage guild.';
|
||||
else
|
||||
{
|
||||
$guild_errors[] = 'You are not logged. You can\'t manage guild.';
|
||||
}
|
||||
}
|
||||
if(!empty($errors)) {
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
if(!empty($guild_errors)) {
|
||||
$twig->display('error_box.html.twig', array('errors' => $guild_errors));
|
||||
|
||||
$twig->display('guilds.back_button.html.twig', array(
|
||||
'new_line' => true,
|
||||
|
||||
@@ -23,12 +23,6 @@ if(!Validator::guildName($guild_name)) {
|
||||
$errors[] = Validator::getLastError();
|
||||
}
|
||||
|
||||
if (!$db->hasTableAndColumns('guild_invites', ['player_id'])) {
|
||||
$errors[] = "Guild invite is not possible on this website.";
|
||||
$twig->display('error_box.html.twig', ['errors' => $errors]);
|
||||
return;
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
@@ -42,7 +36,7 @@ if(empty($errors)) {
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$guild_vice = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player) {
|
||||
$player_rank = $player->getRank();
|
||||
if($player_rank->isLoaded()) {
|
||||
@@ -64,11 +58,11 @@ if(empty($errors)) {
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors) && !$guild_vice) {
|
||||
if(!$guild_vice) {
|
||||
$errors[] = 'You are not a leader or vice leader of guild <b>'.$guild_name.'</b>.'.$level_in_guild;
|
||||
}
|
||||
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
if(!Validator::characterName($name)) {
|
||||
$errors[] = 'Invalid name format.';
|
||||
}
|
||||
@@ -77,7 +71,7 @@ if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
$player = new OTS_Player();
|
||||
$player->find($name);
|
||||
if(!$player->isLoaded()) {
|
||||
$errors[] = "Player with name <b>$name</b> doesn't exist.";
|
||||
$errors[] = 'Player with name <b>' . $name . '</b> doesn\'t exist.';
|
||||
} else if ($player->isDeleted()) {
|
||||
$errors[] = "Character with name <b>$name</b> has been deleted.";
|
||||
}
|
||||
@@ -90,7 +84,6 @@ if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
include(SYSTEM . 'libs/pot/InvitesDriver.php');
|
||||
new InvitesDriver($guild);
|
||||
@@ -109,9 +102,8 @@ if(!empty($errors)) {
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
}
|
||||
else {
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
$guild->invite($player);
|
||||
|
||||
$twig->display('success.html.twig', array(
|
||||
'title' => 'Invite player',
|
||||
'description' => 'Player with name <b>' . $player->getName() . '</b> has been invited to your guild.',
|
||||
|
||||
@@ -41,7 +41,7 @@ if(empty($errors)) {
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$guild_vice = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player) {
|
||||
$player_rank = $player->getRank();
|
||||
if($player_rank->isLoaded()) {
|
||||
@@ -102,7 +102,7 @@ if(!empty($errors)) {
|
||||
}
|
||||
else
|
||||
{
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
$player->setRank();
|
||||
|
||||
$twig->display('success.html.twig', array(
|
||||
|
||||
@@ -34,7 +34,7 @@ if(empty($errors)) {
|
||||
$array_of_player_ig = array();
|
||||
if(empty($errors)) {
|
||||
$guild_owner_name = $guild->getOwner()->getName();
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
if(!Validator::characterName($name)) {
|
||||
$errors[] = 'Invalid name format.';
|
||||
}
|
||||
@@ -72,7 +72,7 @@ if(empty($errors)) {
|
||||
}
|
||||
else
|
||||
{
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player_fac) {
|
||||
$player_rank = $player_fac->getRank();
|
||||
if($player_rank->isLoaded()) {
|
||||
@@ -94,7 +94,7 @@ if(!empty($errors)) {
|
||||
}
|
||||
else
|
||||
{
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
|
||||
$player->setRank();
|
||||
$twig->display('success.html.twig', array(
|
||||
'title' => 'Leave guild',
|
||||
|
||||
@@ -14,31 +14,31 @@ defined('MYAAC') or die('Direct access not allowed!');
|
||||
require __DIR__ . '/base.php';
|
||||
|
||||
$guilds_list = new OTS_Guilds_List();
|
||||
$guilds_list->orderBy('name');
|
||||
$guilds_list->orderBy("name");
|
||||
|
||||
$guilds = array();
|
||||
if(count($guilds_list) > 0) {
|
||||
if(count($guilds_list) > 0)
|
||||
{
|
||||
/**
|
||||
* @var OTS_Guild $guild
|
||||
*/
|
||||
foreach ($guilds_list as $guild) {
|
||||
$guild_logo = $guild->getCustomField('logo_name');
|
||||
if (empty($guild_logo) || !file_exists(GUILD_IMAGES_DIR . $guild_logo)) {
|
||||
$guild_logo = 'default.gif';
|
||||
}
|
||||
if (empty($guild_logo) || !file_exists(GUILD_IMAGES_DIR . $guild_logo))
|
||||
$guild_logo = "default.gif";
|
||||
|
||||
$description = $guild->getCustomField('description');
|
||||
$description_with_lines = str_replace(array("\r\n", "\n", "\r"), '<br />', $description, $count);
|
||||
if ($count < setting('core.guild_description_lines_limit')) {
|
||||
if ($count < setting('core.guild_description_lines_limit'))
|
||||
$description = nl2br($description);
|
||||
}
|
||||
|
||||
$guildName = $guild->getName();
|
||||
$guilds[] = array('name' => $guildName, 'logo' => $guild_logo, 'link' => getGuildLink($guildName, false), 'description' => $description);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
$twig->display('guilds.list.html.twig', array(
|
||||
'guilds' => $guilds,
|
||||
'logged' => isset($logged) ? $logged : false,
|
||||
'isAdmin' => admin(),
|
||||
));
|
||||
|
||||
@@ -21,7 +21,7 @@ if(empty($errors)) {
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
if(!$guild->isLoaded()) {
|
||||
$errors[] = "Guild with name <b>$guild_name</b> doesn't exist.";
|
||||
$errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ if(empty($errors)) {
|
||||
$rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player) {
|
||||
if($guild_leader_char->getId() == $player->getId()) {
|
||||
$guild_vice = true;
|
||||
@@ -39,22 +39,22 @@ if(empty($errors)) {
|
||||
$level_in_guild = 3;
|
||||
}
|
||||
}
|
||||
|
||||
if($guild_leader) {
|
||||
$twig->display('guilds.manager.html.twig', array(
|
||||
'guild' => $guild,
|
||||
'rank_list' => $rank_list
|
||||
));
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
$errors[] = 'You are not a leader of guild!';
|
||||
}
|
||||
}
|
||||
else {
|
||||
$errors[] = "You are not logged. You can't manage guild.";
|
||||
else
|
||||
{
|
||||
$errors[] = 'You are not logged. You can\'t manage guild.';
|
||||
}
|
||||
}
|
||||
|
||||
if(!empty($errors)) {
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
}
|
||||
|
||||
@@ -15,52 +15,51 @@ require __DIR__ . '/base.php';
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL;
|
||||
$pass_to = isset($_REQUEST['player']) ? stripslashes($_REQUEST['player']) : NULL;
|
||||
if(!Validator::guildName($guild_name)) {
|
||||
$errors[] = Validator::getLastError();
|
||||
$guild_errors[] = Validator::getLastError();
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($guild_errors)) {
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
if(!$guild->isLoaded()) {
|
||||
$errors[] = "Guild with name <b>" . $guild_name . "</b> doesn't exist.";
|
||||
$guild_errors[] = "Guild with name <b>" . $guild_name . "</b> doesn't exist.";
|
||||
}
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($guild_errors)) {
|
||||
if(isset($_POST['todo']) && $_POST['todo'] == 'save') {
|
||||
if(!Validator::characterName($pass_to)) {
|
||||
$errors2[] = 'Invalid player name format.';
|
||||
$guild_errors2[] = 'Invalid player name format.';
|
||||
}
|
||||
|
||||
if(empty($errors2)) {
|
||||
if(empty($guild_errors2)) {
|
||||
$to_player = new OTS_Player();
|
||||
$to_player->find($pass_to);
|
||||
if(!$to_player->isLoaded()) {
|
||||
$errors2[] = 'Player with name <b>'.$pass_to.'</b> doesn\'t exist.';
|
||||
$guild_errors2[] = 'Player with name <b>'.$pass_to.'</b> doesn\'t exist.';
|
||||
} else if ($to_player->isDeleted()) {
|
||||
$errors2[] = "Character with name <b>$pass_to</b> has been deleted.";
|
||||
$guild_errors2[] = "Character with name <b>$pass_to</b> has been deleted.";
|
||||
}
|
||||
|
||||
if(empty($errors2)) {
|
||||
if(empty($guild_errors2)) {
|
||||
$to_player_rank = $to_player->getRank();
|
||||
if($to_player_rank->isLoaded()) {
|
||||
$to_player_guild = $to_player_rank->getGuild();
|
||||
if($to_player_guild->getId() != $guild->getId()) {
|
||||
$errors2[] = 'Player with name <b>'.$to_player->getName().'</b> isn\'t from your guild.';
|
||||
$guild_errors2[] = 'Player with name <b>'.$to_player->getName().'</b> isn\'t from your guild.';
|
||||
}
|
||||
}
|
||||
else {
|
||||
$errors2[] = 'Player with name <b>'.$to_player->getName().'</b> isn\'t from your guild.';
|
||||
$guild_errors2[] = 'Player with name <b>'.$to_player->getName().'</b> isn\'t from your guild.';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(empty($errors) && empty($errors2)) {
|
||||
if(empty($guild_errors) && empty($guild_errors2)) {
|
||||
if($logged) {
|
||||
$guild_leader_char = $guild->getOwner();
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player) {
|
||||
if($guild_leader_char->getId() == $player->getId()) {
|
||||
$guild_vice = true;
|
||||
@@ -100,23 +99,23 @@ if(empty($errors) && empty($errors2)) {
|
||||
}
|
||||
}
|
||||
else {
|
||||
$errors[] = 'You are not a leader of guild!';
|
||||
$guild_errors[] = 'You are not a leader of guild!';
|
||||
}
|
||||
}
|
||||
else {
|
||||
$errors[] = "You are not logged. You can't manage guild.";
|
||||
$guild_errors[] = "You are not logged. You can't manage guild.";
|
||||
}
|
||||
}
|
||||
if(empty($errors) && !empty($errors2)) {
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors2));
|
||||
if(empty($guild_errors) && !empty($guild_errors2)) {
|
||||
$twig->display('error_box.html.twig', array('errors' => $guild_errors2));
|
||||
|
||||
echo '<br/><div style="text-align:center"><form action="' . getLink('guilds') . '?guild='.$guild->getName().'&action=pass_leadership" method="post">' . $twig->render('buttons.back.html.twig') . '</form></div>';
|
||||
}
|
||||
if(!empty($errors)) {
|
||||
if(!empty($errors2)) {
|
||||
$errors = array_merge($errors, $errors2);
|
||||
if(!empty($guild_errors)) {
|
||||
if(!empty($guild_errors2)) {
|
||||
$guild_errors = array_merge($guild_errors, $guild_errors2);
|
||||
}
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
$twig->display('error_box.html.twig', array('errors' => $guild_errors));
|
||||
|
||||
echo '<br/><div style="text-align:center"><form action="' . getLink('guilds') . '" method="post">' . $twig->render('buttons.back.html.twig') . '</form></div>';
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ if(empty($errors)) {
|
||||
$rank_list = $guild->getGuildRanksList();
|
||||
$rank_list->orderBy('level', POT::ORDER_DESC);
|
||||
$guild_leader = false;
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
$account_players = $account_logged->getPlayers();
|
||||
|
||||
foreach($account_players as $player) {
|
||||
if($guild_leader_char->getId() == $player->getId()) {
|
||||
@@ -61,7 +61,6 @@ if(empty($errors)) {
|
||||
|
||||
$rank->save();
|
||||
}
|
||||
|
||||
//show errors or redirect
|
||||
if(empty($errors)) {
|
||||
header("Location: " . getLink('guilds') . "?action=manager&guild=".$guild->getName());
|
||||
@@ -74,10 +73,10 @@ if(empty($errors)) {
|
||||
}
|
||||
else
|
||||
{
|
||||
$errors[] = "You are not logged. You can't manage guild.";
|
||||
$errors[] = 'You are not logged. You can\'t manage guild.';
|
||||
}
|
||||
}
|
||||
|
||||
if(!empty($errors)) {
|
||||
$twig->display('error_box.html.twig', ['errors' => $errors]);
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
}
|
||||
|
||||
@@ -16,18 +16,19 @@ $title = 'Guilds';
|
||||
require __DIR__ . '/base.php';
|
||||
|
||||
$guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
|
||||
if(!Validator::guildName($guild_name)) {
|
||||
if(!Validator::guildName($guild_name))
|
||||
$errors[] = Validator::getLastError();
|
||||
}
|
||||
|
||||
if(empty($errors)) {
|
||||
if(empty($errors))
|
||||
{
|
||||
$guild = new OTS_Guild();
|
||||
$guild->find($guild_name);
|
||||
if(!$guild->isLoaded())
|
||||
$errors[] = 'Guild with name <b>'.$guild_name.'</b> doesn\'t exist.';
|
||||
}
|
||||
|
||||
if(!empty($errors)) {
|
||||
if(!empty($errors))
|
||||
{
|
||||
$twig->display('error_box.html.twig', array('errors' => $errors));
|
||||
$twig->display('guilds.back_button.html.twig');
|
||||
return;
|
||||
@@ -46,8 +47,9 @@ $level_in_guild = 0;
|
||||
|
||||
$players_from_account_in_guild = array();
|
||||
$players_from_account_ids = array();
|
||||
if($logged) {
|
||||
$account_players = $account_logged->getPlayersList();
|
||||
if($logged)
|
||||
{
|
||||
$account_players = $account_logged->getPlayers();
|
||||
foreach($account_players as $player)
|
||||
{
|
||||
$players_from_account_ids[] = $player->getId();
|
||||
@@ -121,28 +123,25 @@ foreach($rank_list as $rank)
|
||||
}
|
||||
}
|
||||
|
||||
$invited_list = [];
|
||||
include(SYSTEM . 'libs/pot/InvitesDriver.php');
|
||||
new InvitesDriver($guild);
|
||||
$invited_list = $guild->listInvites();
|
||||
$show_accept_invite = 0;
|
||||
|
||||
if ($db->hasTableAndColumns('guild_invites', ['player_id'])) {
|
||||
include(SYSTEM . 'libs/pot/InvitesDriver.php');
|
||||
new InvitesDriver($guild);
|
||||
$invited_list = $guild->listInvites();
|
||||
|
||||
if($logged && count($invited_list) > 0) {
|
||||
foreach($invited_list as $invited_player) {
|
||||
if(count($account_players) > 0) {
|
||||
foreach($account_players as $player_from_acc) {
|
||||
if($player_from_acc->isLoaded() && $invited_player->isLoaded() && $player_from_acc->getName() == $invited_player->getName()) {
|
||||
if($logged && count($invited_list) > 0)
|
||||
{
|
||||
foreach($invited_list as $invited_player)
|
||||
{
|
||||
if(count($account_players) > 0)
|
||||
{
|
||||
foreach($account_players as $player_from_acc)
|
||||
{
|
||||
if($player_from_acc->isLoaded() && $invited_player->isLoaded() && $player_from_acc->getName() == $invited_player->getName())
|
||||
$show_accept_invite++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$useGuildNick = $db->hasTable('guild_members') || $db->hasTable('guild_membership') || $db->hasColumn('players', 'guildnick');
|
||||
|
||||
$twig->display('guilds.view.html.twig', array(
|
||||
|
||||
@@ -58,64 +58,57 @@ if($vocation !== 'all') {
|
||||
}
|
||||
}
|
||||
|
||||
$skill = POT::SKILL__LEVEL;
|
||||
if(is_numeric($list))
|
||||
{
|
||||
$list = (int) $list;
|
||||
if($list >= POT::SKILL_FIRST && $list <= POT::SKILL__LAST)
|
||||
$skill = $list;
|
||||
$categories = [
|
||||
'experience' => 'Experience',
|
||||
'magic' => 'Magic',
|
||||
'shield' => 'Shielding',
|
||||
'distance' => 'Distance',
|
||||
'club' => 'Club',
|
||||
'sword' => 'Sword',
|
||||
'axe' => 'Axe',
|
||||
'fist' => 'Fist',
|
||||
'fishing' => 'Fishing',
|
||||
];
|
||||
|
||||
if(setting('core.highscores_frags')) {
|
||||
$categories['frags'] = 'Frags';
|
||||
}
|
||||
else
|
||||
{
|
||||
switch($list)
|
||||
{
|
||||
case 'fist':
|
||||
$skill = POT::SKILL_FIST;
|
||||
break;
|
||||
|
||||
case 'club':
|
||||
$skill = POT::SKILL_CLUB;
|
||||
break;
|
||||
if(setting('core.highscores_balance'))
|
||||
$categories['balance'] = 'Balance';
|
||||
|
||||
case 'sword':
|
||||
$skill = POT::SKILL_SWORD;
|
||||
break;
|
||||
$skill = POT::SKILL__LEVEL;
|
||||
|
||||
case 'axe':
|
||||
$skill = POT::SKILL_AXE;
|
||||
break;
|
||||
$skillNameToId = [
|
||||
'fist' => POT::SKILL_FIST,
|
||||
'club' => POT::SKILL_CLUB,
|
||||
'sword' => POT::SKILL_SWORD,
|
||||
'axe' => POT::SKILL_AXE,
|
||||
'distance' => POT::SKILL_DIST,
|
||||
'shield' => POT::SKILL_SHIELD,
|
||||
'fishing' => POT::SKILL_FISH,
|
||||
'magic' => POT::SKILL__MAGLEVEL,
|
||||
];
|
||||
|
||||
case 'distance':
|
||||
$skill = POT::SKILL_DIST;
|
||||
break;
|
||||
if(setting('core.highscores_frags')) {
|
||||
$skillNameToId['frags'] = SKILL_FRAGS;
|
||||
}
|
||||
|
||||
case 'shield':
|
||||
$skill = POT::SKILL_SHIELD;
|
||||
break;
|
||||
if(setting('core.highscores_balance')) {
|
||||
$skillNameToId['balance'] = SKILL_BALANCE;
|
||||
}
|
||||
|
||||
case 'fishing':
|
||||
$skill = POT::SKILL_FISH;
|
||||
break;
|
||||
$skill = $skillNameToId[$list];
|
||||
|
||||
case 'level':
|
||||
case 'experience':
|
||||
$skill = POT::SKILL_LEVEL;
|
||||
break;
|
||||
$args = ['list' => $list, 'skill' => $skill, 'categories' => $categories];
|
||||
$hooks->triggerFilter(HOOK_FILTER_HIGHSCORES_LIST, $args);
|
||||
|
||||
case 'magic':
|
||||
$skill = POT::SKILL__MAGLEVEL;
|
||||
break;
|
||||
$list = $args['list'];
|
||||
$skill = $args['skill'];
|
||||
$categories = $args['categories'];
|
||||
|
||||
case 'frags':
|
||||
if(setting('core.highscores_frags'))
|
||||
$skill = SKILL_FRAGS;
|
||||
break;
|
||||
|
||||
case 'balance':
|
||||
if(setting('core.highscores_balance'))
|
||||
$skill = SKILL_BALANCE;
|
||||
break;
|
||||
}
|
||||
if (!isset($categories[$list])) {
|
||||
$skill = null;
|
||||
}
|
||||
|
||||
$promotion = '';
|
||||
@@ -123,10 +116,16 @@ if($db->hasColumn('players', 'promotion'))
|
||||
$promotion = ',players.promotion';
|
||||
|
||||
$outfit_addons = false;
|
||||
$outfit = ', lookbody, lookfeet, lookhead, looklegs, looktype';
|
||||
if($db->hasColumn('players', 'lookaddons')) {
|
||||
$outfit = '';
|
||||
|
||||
$settingHighscoresOutfit = setting('core.highscores_outfit');
|
||||
|
||||
if($settingHighscoresOutfit) {
|
||||
$outfit = ', lookbody, lookfeet, lookhead, looklegs, looktype';
|
||||
if($db->hasColumn('players', 'lookaddons')) {
|
||||
$outfit .= ', lookaddons';
|
||||
$outfit_addons = true;
|
||||
}
|
||||
}
|
||||
|
||||
$configHighscoresPerPage = setting('core.highscores_per_page');
|
||||
@@ -140,31 +139,34 @@ $cache = Cache::getInstance();
|
||||
if ($cache->enabled() && $highscoresTTL > 0) {
|
||||
$tmp = '';
|
||||
if ($cache->fetch($cacheKey, $tmp)) {
|
||||
$data = unserialize($tmp);
|
||||
$totalResults = $data['totalResults'];
|
||||
$highscores = $data['highscores'];
|
||||
$updatedAt = $data['updatedAt'];
|
||||
$highscores = unserialize($tmp);
|
||||
$needReCache = false;
|
||||
}
|
||||
}
|
||||
|
||||
$offset = ($page - 1) * $configHighscoresPerPage;
|
||||
$query->withOnlineStatus()
|
||||
$query->join('accounts', 'accounts.id', '=', 'players.account_id')
|
||||
->withOnlineStatus()
|
||||
->whereNotIn('players.id', setting('core.highscores_ids_hidden'))
|
||||
->notDeleted()
|
||||
->where('players.group_id', '<', setting('core.highscores_groups_hidden'));
|
||||
|
||||
$totalResultsQuery = clone $query;
|
||||
|
||||
$query
|
||||
->join('accounts', 'accounts.id', '=', 'players.account_id')
|
||||
->where('players.group_id', '<', setting('core.highscores_groups_hidden'))
|
||||
->limit($limit)
|
||||
->offset($offset)
|
||||
->selectRaw('accounts.country, players.id, players.name, players.account_id, players.level, players.vocation' . $outfit . $promotion)
|
||||
->orderByDesc('value');
|
||||
|
||||
if ($skill == SKILL_FRAGS) {
|
||||
$skillName = 'Frags';
|
||||
}
|
||||
else if($skill == SKILL_BALANCE) {
|
||||
$skillName = 'Balance';
|
||||
}
|
||||
else {
|
||||
$skillName = getSkillName($skill);
|
||||
}
|
||||
|
||||
if (empty($highscores)) {
|
||||
if ($skill >= POT::SKILL_FIRST && $skill <= POT::SKILL_LAST) { // skills
|
||||
if ($skill && $skill >= POT::SKILL_FIRST && $skill <= POT::SKILL_LAST) { // skills
|
||||
if ($db->hasColumn('players', 'skill_fist')) {// tfs 1.0
|
||||
$skill_ids = array(
|
||||
POT::SKILL_FIST => 'skill_fist',
|
||||
@@ -194,20 +196,37 @@ if (empty($highscores)) {
|
||||
{
|
||||
$query
|
||||
->addSelect('players.balance as value');
|
||||
} else {
|
||||
if ($skill == POT::SKILL__MAGLEVEL) {
|
||||
}
|
||||
else if ($skill == POT::SKILL__MAGLEVEL) {
|
||||
$query
|
||||
->addSelect('players.maglevel as value', 'players.maglevel')
|
||||
->orderBy('manaspent');
|
||||
} else { // level
|
||||
} else if ($skill == POT::SKILL__LEVEL) {
|
||||
$query
|
||||
->addSelect('players.level as value', 'players.experience')
|
||||
->orderBy('experience');
|
||||
->orderBy('experience', 'desc');
|
||||
$list = 'experience';
|
||||
}
|
||||
else if ($skill) {
|
||||
$args = [
|
||||
'list' => $list,
|
||||
'skill' => $skill,
|
||||
'skillName' => $skillName,
|
||||
'query' => $query
|
||||
];
|
||||
|
||||
$hooks->triggerFilter(HOOK_FILTER_HIGHSCORES, $args);
|
||||
|
||||
$list = $args['list'];
|
||||
$skill = $args['skill'];
|
||||
$skillName = $args['skillName'];
|
||||
$query = $args['query'];
|
||||
}
|
||||
else {
|
||||
$query = null;
|
||||
}
|
||||
|
||||
$highscores = $query->get()->map(function($row) {
|
||||
$highscores = ($query ? $query->get()->map(function($row) {
|
||||
$tmp = $row->toArray();
|
||||
$tmp['online'] = $row->online_status;
|
||||
$tmp['vocation'] = $row->vocation_name;
|
||||
@@ -215,25 +234,18 @@ if (empty($highscores)) {
|
||||
unset($tmp['online_table']);
|
||||
|
||||
return $tmp;
|
||||
})->toArray();
|
||||
|
||||
$updatedAt = time();
|
||||
$totalResults = $totalResultsQuery->count();
|
||||
})->toArray() : []);
|
||||
}
|
||||
|
||||
if ($highscoresTTL > 0 && $cache->enabled() && $needReCache) {
|
||||
$cache->set($cacheKey, serialize(
|
||||
[
|
||||
'totalResults' => $totalResults,
|
||||
'highscores' => $highscores,
|
||||
'updatedAt' => $updatedAt,
|
||||
]
|
||||
), $highscoresTTL * 60);
|
||||
$cache->set($cacheKey, serialize($highscores), $highscoresTTL * 60);
|
||||
}
|
||||
|
||||
$show_link_to_next_page = false;
|
||||
$i = 0;
|
||||
|
||||
$settingHighscoresVocation = setting('core.highscores_vocation');
|
||||
|
||||
foreach($highscores as $id => &$player)
|
||||
{
|
||||
if(++$i <= $configHighscoresPerPage)
|
||||
@@ -247,23 +259,13 @@ foreach($highscores as $id => &$player)
|
||||
|
||||
$player['link'] = getPlayerLink($player['name'], false);
|
||||
$player['flag'] = getFlagImage($player['country']);
|
||||
|
||||
if($settingHighscoresOutfit) {
|
||||
$player['outfit'] = '<img style="position:absolute;margin-top:' . (in_array($player['looktype'], setting('core.outfit_images_wrong_looktypes')) ? '-15px;margin-left:5px' : '-45px;margin-left:-25px') . ';" src="' . $player['outfit_url'] . '" alt="" />';
|
||||
|
||||
if ($skill != POT::SKILL__LEVEL) {
|
||||
if (isset($lastValue) && $lastValue == $player['value']) {
|
||||
$player['rank'] = $lastRank;
|
||||
}
|
||||
else {
|
||||
$player['rank'] = $offset + $i;
|
||||
}
|
||||
|
||||
$lastRank = $player['rank'] ;
|
||||
$lastValue = $player['value'];
|
||||
}
|
||||
else {
|
||||
$player['rank'] = $offset + $i;
|
||||
}
|
||||
}
|
||||
else {
|
||||
unset($highscores[$id]);
|
||||
$show_link_to_next_page = true;
|
||||
@@ -283,26 +285,6 @@ if($show_link_to_next_page) {
|
||||
$linkNextPage = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/' . ($page + 1);
|
||||
}
|
||||
|
||||
$baseLink = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/';
|
||||
|
||||
$types = array(
|
||||
'experience' => 'Experience',
|
||||
'magic' => 'Magic',
|
||||
'shield' => 'Shielding',
|
||||
'distance' => 'Distance',
|
||||
'club' => 'Club',
|
||||
'sword' => 'Sword',
|
||||
'axe' => 'Axe',
|
||||
'fist' => 'Fist',
|
||||
'fishing' => 'Fishing',
|
||||
);
|
||||
|
||||
if(setting('core.highscores_frags')) {
|
||||
$types['frags'] = 'Frags';
|
||||
}
|
||||
if(setting('core.highscores_balance'))
|
||||
$types['balance'] = 'Balance';
|
||||
|
||||
if ($highscoresTTL > 0 && $cache->enabled()) {
|
||||
echo '<small>*Note: Highscores are updated every' . ($highscoresTTL > 1 ? ' ' . $highscoresTTL : '') . ' minute' . ($highscoresTTL > 1 ? 's' : '') . '.</small><br/><br/>';
|
||||
}
|
||||
@@ -312,15 +294,12 @@ $twig->display('highscores.html.twig', [
|
||||
'highscores' => $highscores,
|
||||
'list' => $list,
|
||||
'skill' => $skill,
|
||||
'skillName' => ($skill == SKILL_FRAGS ? 'Frags' : ($skill == SKILL_BALANCE ? 'Balance' : getSkillName($skill))),
|
||||
'skillName' => $skillName,
|
||||
'levelName' => ($skill != SKILL_FRAGS && $skill != SKILL_BALANCE ? 'Level' : ($skill == SKILL_BALANCE ? 'Balance' : 'Frags')),
|
||||
'vocation' => $vocation !== 'all' ? $vocation : null,
|
||||
'vocationId' => $vocationId,
|
||||
'types' => $types,
|
||||
'categories' => $categories,
|
||||
'types' => $categories, // leave for compatibility with outdated twigs
|
||||
'linkPreviousPage' => $linkPreviousPage,
|
||||
'linkNextPage' => $linkNextPage,
|
||||
'totalResults' => $totalResults,
|
||||
'page' => $page,
|
||||
'baseLink' => $baseLink,
|
||||
'updatedAt' => $updatedAt,
|
||||
]);
|
||||
|
||||
@@ -9,113 +9,104 @@
|
||||
* @link https://my-aac.org
|
||||
*/
|
||||
|
||||
use MyAAC\Cache\Cache;
|
||||
use MyAAC\Models\ServerConfig;
|
||||
use MyAAC\Models\ServerRecord;
|
||||
|
||||
defined('MYAAC') or die('Direct access not allowed!');
|
||||
$title = 'Who is online?';
|
||||
|
||||
if (setting('core.account_country')) {
|
||||
if (setting('core.account_country'))
|
||||
require SYSTEM . 'countries.conf.php';
|
||||
}
|
||||
|
||||
$promotion = '';
|
||||
if($db->hasColumn('players', 'promotion')) {
|
||||
if($db->hasColumn('players', 'promotion'))
|
||||
$promotion = '`promotion`,';
|
||||
}
|
||||
|
||||
$order = $_GET['order'] ?? 'name_asc';
|
||||
if(!in_array($order, ['country_asc', 'country_desc', 'name_asc', 'name_desc', 'level_asc', 'level_desc', 'vocation_asc', 'vocation_desc'])) {
|
||||
$order = 'name_asc';
|
||||
}
|
||||
else if($order == 'vocation_asc' || $order == 'vocation_desc') {
|
||||
$order = $promotion . 'vocation_' . (str_contains($order, 'asc') ? 'asc' : 'desc');
|
||||
}
|
||||
$order = $_GET['order'] ?? 'name';
|
||||
if(!in_array($order, array('country', 'name', 'level', 'vocation')))
|
||||
$order = $db->fieldName('name');
|
||||
else if($order == 'country')
|
||||
$order = $db->tableName('accounts') . '.' . $db->fieldName('country');
|
||||
else if($order == 'vocation')
|
||||
$order = $promotion . 'vocation ASC';
|
||||
|
||||
$cached = Cache::remember("online_$order", setting('core.online_cache_ttl') * 60, function() use($db, $promotion, $order) {
|
||||
$orderExplode = explode('_', $order);
|
||||
$orderSql = $orderExplode[0] . ' ' . $orderExplode[1];
|
||||
|
||||
$skull_type = 'skull';
|
||||
if($db->hasColumn('players', 'skull_type')) {
|
||||
$skull_type = 'skull';
|
||||
if($db->hasColumn('players', 'skull_type')) {
|
||||
$skull_type = 'skull_type';
|
||||
}
|
||||
}
|
||||
|
||||
$skull_time = 'skulltime';
|
||||
if($db->hasColumn('players', 'skull_time')) {
|
||||
$skull_time = 'skulltime';
|
||||
if($db->hasColumn('players', 'skull_time')) {
|
||||
$skull_time = 'skull_time';
|
||||
}
|
||||
}
|
||||
|
||||
$outfit_addons = false;
|
||||
$outfit_addons = false;
|
||||
$outfit = '';
|
||||
if (setting('core.online_outfit')) {
|
||||
$outfit = ', lookbody, lookfeet, lookhead, looklegs, looktype';
|
||||
if($db->hasColumn('players', 'lookaddons')) {
|
||||
$outfit .= ', lookaddons';
|
||||
$outfit_addons = true;
|
||||
}
|
||||
}
|
||||
|
||||
$vocations = array_map(function ($name) {
|
||||
return 0;
|
||||
}, setting('core.vocations'));
|
||||
$vocs = [];
|
||||
if (setting('core.online_vocations')) {
|
||||
foreach($config['vocations'] as $id => $name) {
|
||||
$vocs[$id] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if($db->hasTable('players_online')) // tfs 1.0
|
||||
$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players`, `players_online` WHERE `players`.`id` = `players_online`.`player_id` AND `accounts`.`id` = `players`.`account_id` ORDER BY ' . $orderSql);
|
||||
else
|
||||
$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', ' . $promotion . ' `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players` WHERE `players`.`online` > 0 AND `accounts`.`id` = `players`.`account_id` ORDER BY ' . $orderSql);
|
||||
if($db->hasTable('players_online')) // tfs 1.0
|
||||
$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players`, `players_online` WHERE `players`.`id` = `players_online`.`player_id` AND `accounts`.`id` = `players`.`account_id` ORDER BY ' . $order);
|
||||
else
|
||||
$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', ' . $promotion . ' `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players` WHERE `players`.`online` > 0 AND `accounts`.`id` = `players`.`account_id` ORDER BY ' . $order);
|
||||
|
||||
$settingVocations = setting('core.vocations');
|
||||
$settingVocationsAmount = setting('core.vocations_amount');
|
||||
|
||||
$players = [];
|
||||
foreach($playersOnline as $player) {
|
||||
$players_data = array();
|
||||
$players = 0;
|
||||
$data = '';
|
||||
foreach($playersOnline as $player) {
|
||||
$skull = '';
|
||||
if($player['skulltime'] > 0) {
|
||||
if($player['skull'] == 3) {
|
||||
if (setting('core.online_skulls'))
|
||||
{
|
||||
if($player['skulltime'] > 0)
|
||||
{
|
||||
if($player['skull'] == 3)
|
||||
$skull = ' <img style="border: 0;" src="images/white_skull.gif"/>';
|
||||
}
|
||||
elseif($player['skull'] == 4) {
|
||||
elseif($player['skull'] == 4)
|
||||
$skull = ' <img style="border: 0;" src="images/red_skull.gif"/>';
|
||||
}
|
||||
elseif($player['skull'] == 5) {
|
||||
elseif($player['skull'] == 5)
|
||||
$skull = ' <img style="border: 0;" src="images/black_skull.gif"/>';
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($player['promotion'])) {
|
||||
if((int)$player['promotion'] > 0)
|
||||
$player['vocation'] += ($player['promotion'] * $settingVocationsAmount);
|
||||
$player['vocation'] += ($player['promotion'] * $config['vocations_amount']);
|
||||
}
|
||||
|
||||
$players[] = array(
|
||||
$players_data[] = array(
|
||||
'name' => getPlayerLink($player['name']),
|
||||
'player' => $player,
|
||||
'level' => $player['level'],
|
||||
'vocation' => $settingVocations[$player['vocation']],
|
||||
'skull' => $skull,
|
||||
'country_image' => getFlagImage($player['country']),
|
||||
'outfit' => setting('core.outfit_images_url') . '?id=' . $player['looktype'] . ($outfit_addons ? '&addons=' . $player['lookaddons'] : '') . '&head=' . $player['lookhead'] . '&body=' . $player['lookbody'] . '&legs=' . $player['looklegs'] . '&feet=' . $player['lookfeet'],
|
||||
'vocation' => $config['vocations'][$player['vocation']],
|
||||
'country_image' => setting('core.account_country') ? getFlagImage($player['country']) : null,
|
||||
'outfit' => setting('core.online_outfit') ? setting('core.outfit_images_url') . '?id=' . $player['looktype'] . ($outfit_addons ? '&addons=' . $player['lookaddons'] : '') . '&head=' . $player['lookhead'] . '&body=' . $player['lookbody'] . '&legs=' . $player['looklegs'] . '&feet=' . $player['lookfeet'] : null
|
||||
);
|
||||
|
||||
$vocations[($player['vocation'] > $settingVocationsAmount ? $player['vocation'] - $settingVocationsAmount : $player['vocation'])]++;
|
||||
if (setting('core.online_vocations')) {
|
||||
$vocs[($player['vocation'] > $config['vocations_amount'] ? $player['vocation'] - $config['vocations_amount'] : $player['vocation'])]++;
|
||||
}
|
||||
}
|
||||
|
||||
$record = '';
|
||||
if(count($players) > 0) {
|
||||
$record = '';
|
||||
if(count($players_data) > 0) {
|
||||
if( setting('core.online_record')) {
|
||||
$result = null;
|
||||
$timestamp = false;
|
||||
if($db->hasTable('server_record')) {
|
||||
$timestamp = $db->hasColumn('server_record', 'timestamp');
|
||||
$serverRecordQuery = ServerRecord::query();
|
||||
|
||||
if ($db->hasColumn('server_record', 'world_id')) {
|
||||
$serverRecordQuery->where('world_id', configLua('worldId'));
|
||||
}
|
||||
|
||||
$result = $serverRecordQuery->orderByDesc('record')->first();
|
||||
if ($result) {
|
||||
$result = $result->toArray();
|
||||
}
|
||||
$timestamp = true;
|
||||
$result = ServerRecord::where('world_id', $config['lua']['worldId'])->orderByDesc('record')->first()->toArray();
|
||||
} else if($db->hasTable('server_config')) { // tfs 1.0
|
||||
$row = ServerConfig::where('config', 'players_record')->first();
|
||||
if ($row) {
|
||||
@@ -124,25 +115,17 @@ $cached = Cache::remember("online_$order", setting('core.online_cache_ttl') * 60
|
||||
}
|
||||
|
||||
if($result) {
|
||||
$record = $result['record'] . ' player' . ($result['record'] > 1 ? 's' : '') . ($timestamp ? ' (on ' . date("M d Y, H:i:s", $result['timestamp']) . ')' : '');
|
||||
$record = 'The maximum on this game world was ' . $result['record'] . ' players' . ($timestamp ? ' on ' . date("M d Y, H:i:s", $result['timestamp']) . '.' : '.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'players' => $players,
|
||||
'record' => $record,
|
||||
'vocations' => $vocations,
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
$twig->display('online.html.twig', array(
|
||||
'players' => $cached['players'],
|
||||
'record' => $cached['record'],
|
||||
'vocations' => $cached['vocations'],
|
||||
'vocs' => $cached['vocations'], // deprecated, to be removed
|
||||
'order' => $order,
|
||||
'players' => $players_data,
|
||||
'record' => $record,
|
||||
'vocs' => $vocs,
|
||||
));
|
||||
|
||||
// search bar
|
||||
$twig->display('characters.form.html.twig');
|
||||
//search bar
|
||||
$twig->display('online.form.html.twig');
|
||||
?>
|
||||
|
||||
@@ -129,14 +129,14 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
|
||||
return ($a[3] < $b[3]) ? -1 : 1;
|
||||
});
|
||||
|
||||
// remove duplicates
|
||||
// if same route pattern, but different priority
|
||||
$routesFinal = array_filter($routesFinal, function ($a) {
|
||||
$aliases = [
|
||||
[':int', ':string', ':alphanum'],
|
||||
[':\d+', ':[A-Za-z0-9-_%+\' ]+', ':[A-Za-z0-9]+'],
|
||||
];
|
||||
|
||||
// remove duplicates
|
||||
// if same route pattern, but different priority
|
||||
$routesFinal = array_filter($routesFinal, function ($a) use ($aliases) {
|
||||
// apply aliases
|
||||
$a[1] = str_replace($aliases[0], $aliases[1], $a[1]);
|
||||
|
||||
@@ -171,16 +171,16 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
|
||||
$route[0] = array_map($toUpperCase, $route[0]);
|
||||
}
|
||||
|
||||
$aliases = [
|
||||
[':int', ':string', ':alphanum'],
|
||||
[':\d+', ':[A-Za-z0-9-_%+\' ]+', ':[A-Za-z0-9]+'],
|
||||
];
|
||||
|
||||
// apply aliases
|
||||
$route[1] = str_replace($aliases[0], $aliases[1], $route[1]);
|
||||
|
||||
try {
|
||||
$r->addRoute($route[0], $route[1], $route[2]);
|
||||
}
|
||||
catch (\Exception $e) {
|
||||
// duplicated route, just ignore
|
||||
}
|
||||
}
|
||||
|
||||
if (config('env') === 'dev') {
|
||||
foreach(Plugins::getWarnings() as $warning) {
|
||||
@@ -252,7 +252,7 @@ else {
|
||||
|
||||
$success = false;
|
||||
$tmp_content = getCustomPage($pageName, $success);
|
||||
if ($success && $hooks->trigger(HOOK_BEFORE_PAGE_CUSTOM)) {
|
||||
if ($success) {
|
||||
$content .= $tmp_content;
|
||||
if (hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) {
|
||||
$pageInfo = getCustomPageInfo($pageName);
|
||||
@@ -260,8 +260,6 @@ else {
|
||||
) . $content;
|
||||
}
|
||||
|
||||
$hooks->trigger(HOOK_AFTER_PAGE_CUSTOM);
|
||||
|
||||
$page = $pageName;
|
||||
$file = false;
|
||||
}
|
||||
@@ -326,9 +324,7 @@ if (isset($_REQUEST['_page_only'])) {
|
||||
|
||||
if(!isset($title)) {
|
||||
$title = str_replace('index.php/', '', $page);
|
||||
$title = str_replace(['_', '-', '/'], ' ', $page);
|
||||
|
||||
$title = ucwords($title);
|
||||
$title = ucfirst($title);
|
||||
}
|
||||
|
||||
if(setting('core.backward_support')) {
|
||||
|
||||
@@ -22,11 +22,11 @@ return [
|
||||
['GET', 'account/confirm-email/{hash:alphanum}', 'account/confirm-email.php'],
|
||||
|
||||
['GET', 'bans/{page:int}', 'bans.php'],
|
||||
[['GET', 'POST'], 'characters/{name:[A-Za-z0-9-_%+\' \[\]]+}', 'characters.php'],
|
||||
['GET', 'changelog/{page:int}', 'changelog.php'],
|
||||
[['GET', 'POST'], 'monsters/{name:string}', 'monsters.php'],
|
||||
[['GET', 'POST'], 'characters[/{name:string}]', 'characters.php'],
|
||||
['GET', 'changelog[/{page:int}]', 'changelog.php'],
|
||||
[['GET', 'POST'], 'monsters[/{name:string}]', 'monsters.php'],
|
||||
|
||||
[['GET', 'POST'], 'faq/{action:string}', 'faq.php'],
|
||||
[['GET', 'POST'], 'faq[/{action:string}]', 'faq.php'],
|
||||
|
||||
[['GET', 'POST'], 'forum/{action:string}', 'forum.php'],
|
||||
['GET', 'forum/board/{id:int}', 'forum/show_board.php'],
|
||||
|
||||
@@ -19,24 +19,6 @@ $templates = Cache::remember('templates', 5 * 60, function () {
|
||||
});
|
||||
$defaultTemplate = in_array('kathrine', $templates) ? 'kathrine' : $templates[0];
|
||||
|
||||
global $db;
|
||||
|
||||
if (!IS_CLI) {
|
||||
require SYSTEM . 'base.php';
|
||||
|
||||
$serverUrl = 'http' . (isHttps() ? 's' : '') . '://' . $baseHost;
|
||||
$siteURL = $serverUrl . $baseDir;
|
||||
}
|
||||
|
||||
$donateColumnOptions = [
|
||||
'premium_points' => 'Premium Points',
|
||||
'coins' => 'Coins',
|
||||
];
|
||||
|
||||
if (defined('HAS_ACCOUNT_COINS_TRANSFERABLE') && (HAS_ACCOUNT_COINS_TRANSFERABLE || HAS_ACCOUNT_TRANSFERABLE_COINS)) {
|
||||
$donateColumnOptions[ACCOUNT_COINS_TRANSFERABLE_COLUMN] = 'Coins Transferable';
|
||||
}
|
||||
|
||||
return [
|
||||
'name' => 'MyAAC',
|
||||
'settings' => [
|
||||
@@ -48,13 +30,6 @@ return [
|
||||
'type' => 'section',
|
||||
'title' => 'General'
|
||||
],
|
||||
'site_url' => [
|
||||
'name' => 'Website URL',
|
||||
'type' => 'text',
|
||||
'desc' => 'Website address of this MyAAC instance',
|
||||
'default' => IS_CLI ? '' : $siteURL,
|
||||
'is_config' => true,
|
||||
],
|
||||
'env' => [
|
||||
'name' => 'App Environment',
|
||||
'type' => 'options',
|
||||
@@ -699,20 +674,6 @@ Sent by MyAAC,<br/>
|
||||
'desc' => 'Default premium points on new account',
|
||||
'default' => 0,
|
||||
],
|
||||
'account_coins' => [
|
||||
'name' => 'Default Account Coins',
|
||||
'type' => 'number',
|
||||
'desc' => 'Default coins on new account',
|
||||
'hidden' => ($db && !HAS_ACCOUNT_COINS),
|
||||
'default' => 0,
|
||||
],
|
||||
'account_coins_transferable' => [
|
||||
'name' => 'Default Account Transferable Coins',
|
||||
'type' => 'number',
|
||||
'desc' => 'Default transferable coins on new account',
|
||||
'hidden' => ($db && !HAS_ACCOUNT_COINS_TRANSFERABLE && !HAS_ACCOUNT_TRANSFERABLE_COINS),
|
||||
'default' => 0,
|
||||
],
|
||||
'account_mail_change' => [
|
||||
'name' => 'Account Mail Change Days',
|
||||
'type' => 'number',
|
||||
@@ -1078,12 +1039,6 @@ Sent by MyAAC,<br/>
|
||||
'desc' => 'How often to update highscores from database in minutes. Too low may slow down your website.<br/>0 to disable.',
|
||||
'default' => 15,
|
||||
],
|
||||
'highscores_skills_box' => [
|
||||
'name' => 'Display Skills Box',
|
||||
'type' => 'boolean',
|
||||
'desc' => 'show "Choose a skill" box on the highscores (allowing peoples to sort highscores by skill)?',
|
||||
'default' => true,
|
||||
],
|
||||
'highscores_vocation_box' => [
|
||||
'name' => 'Display Vocation Box',
|
||||
'type' => 'boolean',
|
||||
@@ -1096,12 +1051,6 @@ Sent by MyAAC,<br/>
|
||||
'desc' => 'Show player vocation under his nickname?',
|
||||
'default' => true,
|
||||
],
|
||||
'highscores_online_status' => [
|
||||
'name' => 'Display Online Status',
|
||||
'type' => 'boolean',
|
||||
'desc' => 'Show player status as red (offline) or green (online)',
|
||||
'default' => false,
|
||||
],
|
||||
'highscores_frags' => [
|
||||
'name' => 'Display Top Frags',
|
||||
'type' => 'boolean',
|
||||
@@ -1256,14 +1205,6 @@ Sent by MyAAC,<br/>
|
||||
'type' => 'section',
|
||||
'title' => 'Online Page'
|
||||
],
|
||||
'online_cache_ttl' => [
|
||||
'name' => 'Online Cache TTL (in minutes)',
|
||||
'type' => 'number',
|
||||
'min' => 0,
|
||||
'desc' => 'How often to update online list from database in minutes. Too low may slow down your website.' . PHP_EOL .
|
||||
'0 to disable.',
|
||||
'default' => 15,
|
||||
],
|
||||
'online_record' => [
|
||||
'name' => 'Display Players Record',
|
||||
'type' => 'boolean',
|
||||
@@ -1300,12 +1241,6 @@ Sent by MyAAC,<br/>
|
||||
'desc' => '',
|
||||
'default' => false,
|
||||
],
|
||||
'online_datacenter' => [
|
||||
'name' => 'Data Center',
|
||||
'type' => 'text',
|
||||
'desc' => 'Server Location, will be shown on online page',
|
||||
'default' => 'Poland - Warsaw',
|
||||
],
|
||||
[
|
||||
'type' => 'section',
|
||||
'title' => 'Team Page'
|
||||
@@ -1607,14 +1542,13 @@ Sent by MyAAC,<br/>
|
||||
'name' => 'Donate Column',
|
||||
'type' => 'options',
|
||||
'desc' => 'What to give to player after donation - what column in accounts table to use.',
|
||||
'options' => $donateColumnOptions,
|
||||
'options' => ['premium_points' => 'Premium Points', 'coins' => 'Coins'],
|
||||
'default' => 'premium_points',
|
||||
'callbacks' => [
|
||||
'beforeSave' => function($key, $value, &$errorMessage) {
|
||||
global $db;
|
||||
|
||||
if (!$db->hasColumn('accounts', $value)) {
|
||||
$errorMessage = "Shop: Donate Column: Cannot set column to $value, because it doesn't exist in database.";
|
||||
if ($value == 'coins' && !$db->hasColumn('accounts', 'coins')) {
|
||||
$errorMessage = "Shop: Donate Column: Cannot set column to coins, because it doesn't exist in database.";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace MyAAC\Admin;
|
||||
|
||||
use GuzzleHttp\Client;
|
||||
|
||||
class Plugins
|
||||
{
|
||||
private string $api_base_uri = 'https://plugins.my-aac.org/api/';
|
||||
|
||||
public function getLatestVersions(): array
|
||||
{
|
||||
$client = new Client([
|
||||
// Base URI is used with relative requests
|
||||
'base_uri' => $this->api_base_uri,
|
||||
// You can set any number of default request options.
|
||||
'timeout' => 3.0,
|
||||
]);
|
||||
|
||||
$plugins = get_plugins(true);
|
||||
foreach ($plugins as &$plugin) {
|
||||
if (str_contains($plugin, 'disabled.')) {
|
||||
$plugin = str_replace('disabled.', '', $plugin);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
$response = $client->get('get-latest-versions', [
|
||||
'json' => ['plugins' => $plugins],
|
||||
]);
|
||||
}
|
||||
catch (\Exception $e) {
|
||||
error('API Error. Please try again later.');
|
||||
return [];
|
||||
}
|
||||
|
||||
$statusCode = $response->getStatusCode();
|
||||
if ($statusCode != 200) {
|
||||
throw new \Exception('Error getting info from plugins repository. Please try again later.');
|
||||
}
|
||||
|
||||
$data = $response->getBody();
|
||||
return json_decode($data, true);
|
||||
}
|
||||
|
||||
public function setApiBaseUri(string $uri): void {
|
||||
$this->api_base_uri = $uri;
|
||||
}
|
||||
}
|
||||
@@ -106,7 +106,7 @@ class Cache
|
||||
public static function remember($key, $ttl, $callback)
|
||||
{
|
||||
$cache = self::getInstance();
|
||||
if (!$cache->enabled() || $ttl == 0) {
|
||||
if (!$cache->enabled()) {
|
||||
return $callback();
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace MyAAC\Commands;
|
||||
|
||||
use MyAAC\Cache\Cache;
|
||||
use MyAAC\Hooks;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
@@ -18,7 +17,10 @@ class CacheClearCommand extends Command
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
require SYSTEM . 'init.php';
|
||||
global $hooks;
|
||||
$hooks = new Hooks();
|
||||
$hooks->load();
|
||||
$hooks->trigger(HOOK_INIT);
|
||||
|
||||
$io = new SymfonyStyle($input, $output);
|
||||
|
||||
@@ -27,13 +29,6 @@ class CacheClearCommand extends Command
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$cacheEngine = config('cache_engine') == 'auto' ?
|
||||
Cache::detect() : config('cache_engine');
|
||||
|
||||
if (config('env') !== 'dev' && $cacheEngine == 'apcu') {
|
||||
$io->warning('APCu cache cannot be cleared in CLI. Please visit the Admin Panel and clear there.');
|
||||
}
|
||||
|
||||
$io->success('Cache cleared');
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
|
||||
@@ -12,10 +12,9 @@ class MailSendCommand extends Command
|
||||
{
|
||||
protected function configure(): void
|
||||
{
|
||||
$this->setName('email:send')
|
||||
->setAliases(['mail:send'])
|
||||
$this->setName('mail:send')
|
||||
->setDescription('This command sends E-Mail to single user. Message can be provided as follows: ' . PHP_EOL
|
||||
. ' echo "Hello World" | php aac email:send --subject="This is the subject" test@test.com')
|
||||
. ' echo "Hello World" | php sa email:send --subject="This is the subject" test@test.com')
|
||||
->addArgument('recipient', InputArgument::REQUIRED, 'Email, Account Name, Account id or Player Name')
|
||||
->addOption('subject', 's', InputOption::VALUE_REQUIRED, 'Subject');
|
||||
}
|
||||
|
||||
@@ -45,22 +45,6 @@ class MigrateRunCommand extends Command
|
||||
|
||||
$down = $input->getOption('down') ?? false;
|
||||
|
||||
/**
|
||||
* Sort according to $down option.
|
||||
* Do we really want it?
|
||||
* Or should we use order provided by user,
|
||||
* even when it's not sorted correctly?
|
||||
* Leaving it for consideration.
|
||||
*/
|
||||
/*
|
||||
if ($down) {
|
||||
rsort($ids);
|
||||
}
|
||||
else {
|
||||
sort($ids);
|
||||
}
|
||||
*/
|
||||
|
||||
foreach ($ids as $id) {
|
||||
$this->executeMigration($id, $io, !$down);
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace MyAAC\Commands;
|
||||
|
||||
use MyAAC\Plugins;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||
|
||||
class PluginDisableCommand extends Command
|
||||
{
|
||||
protected function configure(): void
|
||||
{
|
||||
$this->setName('plugin:disable')
|
||||
->setDescription('This command disables plugin')
|
||||
->addArgument('plugin-name', InputArgument::REQUIRED, 'Plugin that you want to disable');
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
require SYSTEM . 'init.php';
|
||||
|
||||
$io = new SymfonyStyle($input, $output);
|
||||
|
||||
$pluginName = $input->getArgument('plugin-name');
|
||||
|
||||
if (!Plugins::disable($pluginName)) {
|
||||
$io->error('Error while disabling plugin ' . $pluginName . ': ' . Plugins::getError());
|
||||
return 2;
|
||||
}
|
||||
|
||||
$io->success('Successfully disabled plugin ' . $pluginName);
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace MyAAC\Commands;
|
||||
|
||||
use MyAAC\Plugins;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||
|
||||
class PluginEnableCommand extends Command
|
||||
{
|
||||
protected function configure(): void
|
||||
{
|
||||
$this->setName('plugin:enable')
|
||||
->setDescription('This command enables plugin')
|
||||
->addArgument('plugin-name', InputArgument::REQUIRED, 'Plugin that you want to enable');
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
require SYSTEM . 'init.php';
|
||||
|
||||
$io = new SymfonyStyle($input, $output);
|
||||
|
||||
$pluginName = $input->getArgument('plugin-name');
|
||||
|
||||
if (!Plugins::enable($pluginName)) {
|
||||
$io->error('Error while enabling plugin ' . $pluginName . ': ' . Plugins::getError());
|
||||
return 2;
|
||||
}
|
||||
|
||||
$io->success('Successfully enabled plugin ' . $pluginName);
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user