Merge branch 'develop' into feature/settings

Remove config.php completely
Add new settings category: Game
Fix account_login_by_email
Min textarea size = 2 + adjusted automatically

.editorconfig

@@ -15,5 +15,5 @@ trim_trailing_whitespace = false
 [{composer.json,package.json}]
 indent_style = space
 
-[{package.json, *.yml}]
+[package.json]
 indent_size = 2

.gitattributes

@@ -9,5 +9,6 @@ release.sh export-ignore
 # cypress
 cypress export-ignore
 cypress.config.js export-ignore
+cypress.env.json
 
 *.sh text eol=lf

.github/workflows/cypress.yml

@@ -1,9 +1,9 @@
 name: Cypress
 on:
   pull_request:
-    branches: [main]
+    branches: [develop]
   push:
-    branches: [main]
+    branches: [develop]
 
 jobs:
   cypress:
@@ -22,9 +22,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-versions: [ '7.4', '8.0', '8.1' ]
-        ots: ['tfs-1.4', 'canary-3.1.2'] # TODO: add 'tfs-master' (actually doesn't work cause AAC doesn't support reading .env configuration)
+    name: MyAAC on PHP ${{ matrix.php-versions }}
-    name: Cypress (PHP ${{ matrix.php-versions }}, ${{ matrix.ots }})
     steps:
         - name: 📌 MySQL Start & init & show db
           run: |
@@ -33,81 +32,47 @@ jobs:
             mysql -e "SHOW DATABASES" -uroot -proot
 
         - name: Checkout MyAAC
-          uses: actions/checkout@v4
+          uses: actions/checkout@v3
           with:
-            ref: main
+            ref: 0.9
-
-        - uses: actions/setup-node@v4
-          with:
-            node-version: 18
-        - run: npm ci
 
         - name: Checkout TFS
-          uses: actions/checkout@v4
+          uses: actions/checkout@v3
-          if: matrix.ots == 'tfs-1.4'
           with:
             repository: otland/forgottenserver
             ref: 1.4
-            path: ots
+            path: tfs
 
-        - name: Checkout TFS
+        - name: Import TFS Schema
-          uses: actions/checkout@v4
-          if: matrix.ots == 'tfs-master'
-          with:
-            repository: otland/forgottenserver
-            ref: master
-            path: ots
-
-        - name: Checkout Canary
-          uses: actions/checkout@v4
-          if: matrix.ots == 'canary-3.1.2'
-          with:
-            repository: opentibiabr/canary
-            ref: v3.1.2
-            path: ots
-
-        - name: Import OTS Schema
           run: |
-              mysql -uroot -proot myaac < ots/schema.sql
+              mysql -uroot -proot myaac < tfs/schema.sql
 
         - name: Rename config.lua
-          run: mv ots/config.lua.dist ots/config.lua
+          run: mv tfs/config.lua.dist tfs/config.lua
 
-        - name: Replace mysqlUser (TFS 1.4)
+        - name: Replace mysqlUser
-          uses: jacobtomlinson/gha-find-replace@v3
+          uses: jacobtomlinson/gha-find-replace@v2
-          if: matrix.ots == 'tfs-1.4'
           with:
             find: 'mysqlUser = "forgottenserver"'
             replace: 'mysqlUser = "root"'
             regex: false
-            include: 'ots/config.lua'
+            include: 'tfs/config.lua'
 
-        - name: Replace mysqlPass (TFS 1.4)
+        - name: Replace mysqlPass
-          uses: jacobtomlinson/gha-find-replace@v3
+          uses: jacobtomlinson/gha-find-replace@v2
-          if: matrix.ots == 'tfs-1.4'
           with:
               find: 'mysqlPass = ""'
               replace: 'mysqlPass = "root"'
               regex: false
-              include: 'ots/config.lua'
+              include: 'tfs/config.lua'
 
-        - name: Replace mysqlDatabase (TFS 1.4)
+        - name: Replace mysqlDatabase
-          uses: jacobtomlinson/gha-find-replace@v3
+          uses: jacobtomlinson/gha-find-replace@v2
-          if: matrix.ots == 'tfs-1.4'
           with:
               find: 'mysqlDatabase = "forgottenserver"'
               replace: 'mysqlDatabase = "myaac"'
               regex: false
-              include: 'ots/config.lua'
+              include: 'tfs/config.lua'
-
-        - name: Replace mysqlDatabase (Canary)
-          uses: jacobtomlinson/gha-find-replace@v3
-          if: matrix.ots == 'canary-3.1.2'
-          with:
-              find: 'mysqlDatabase = "otservbr-global"'
-              replace: 'mysqlDatabase = "myaac"'
-              regex: false
-              include: 'ots/config.lua'
 
         - name: Setup PHP
           uses: shivammathur/setup-php@v2
@@ -120,13 +85,13 @@ jobs:
           run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
         - name: Cache composer dependencies
-          uses: actions/cache@v4
+          uses: actions/cache@v3
           with:
             path: ${{ steps.composer-cache.outputs.dir }}
             # Use composer.json for key, if composer.lock is not committed.
-            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+            # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-            #key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-            restore-keys: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+            restore-keys: ${{ runner.os }}-composer-
 
         - name: Install Composer dependencies
           run: composer install --no-progress --prefer-dist --optimize-autoloader
@@ -135,30 +100,21 @@ jobs:
           run: nohup php -S localhost:8080 > php.log 2>&1 &
 
         - name: Cypress Run
-          uses: cypress-io/github-action@v6
+          uses: cypress-io/github-action@v5
           env:
             CYPRESS_URL: http://localhost:8080
-            CYPRESS_SERVER_PATH: /home/runner/work/myaac/myaac/ots
+            CYPRESS_SERVER_PATH: /home/runner/work/myaac/myaac/tfs
 
         - name: Save screenshots
-          uses: actions/upload-artifact@v4
+          uses: actions/upload-artifact@v3
           if: always()
           with:
-            name: cypress-screenshots-${{ matrix.php-versions }}-${{ matrix.ots }}
+            name: cypress-screenshots
             path: cypress/screenshots
-            if-no-files-found: ignore
 
         - name: Upload Cypress Videos
-          uses: actions/upload-artifact@v4
+          uses: actions/upload-artifact@v3
           if: always()
           with:
-            name: cypress-videos-${{ matrix.php-versions }}-${{ matrix.ots }}
+            name: cypress-videos
             path: cypress/videos
-            if-no-files-found: ignore
-
-        - name: Upload PHP Logs
-          uses: actions/upload-artifact@v4
-          if: always()
-          with:
-            name: php-log-${{ matrix.php-versions }}-${{ matrix.ots }}
-            path: php.log

.github/workflows/phplint.yml

@@ -1,9 +1,9 @@
 name: PHP Linting
 on:
   pull_request:
-    branches: [main]
+    branches: [develop]
   push:
-    branches: [main]
+    branches: [develop]
 
 jobs:
   phplint:

.github/workflows/phpstan.yml

@@ -1,46 +0,0 @@
-name: "PHPStan"
-
-on:
-  pull_request:
-    branches: [main]
-  push:
-    branches: [main]
-
-jobs:
-  tests:
-    name: PhpStan on PHP ${{ matrix.php-versions }}
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v4"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          extensions: "intl, zip"
-          ini-values: "memory_limit=-1"
-          php-version: "${{ matrix.php-version }}"
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          # Use composer.json for key, if composer.lock is not committed.
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-
-      - name: "Install composer dependencies"
-        run: "composer install"
-
-      - name: "Run PHPStan"
-        run: "/usr/bin/php vendor/bin/phpstan analyse"

.gitignore

@@ -4,20 +4,17 @@ Thumbs.db
 
 #
 /.htaccess
-lua
 
 # composer
-composer.phar
+composer.lock
 vendor
 
 # npm
 node_modules
-tools/ext
 
 # cypress
 cypress.env.json
 cypress/e2e/2-advanced-examples
-cypress/screenshots
 
 # created by release.sh
 releases
@@ -38,19 +35,12 @@ images/guilds/*
 images/editor/*
 !images/editor/index.html
 
-# gallery images
-images/gallery/*
-!images/gallery/index.html
-!images/gallery/demon.jpg
-!images/gallery/demon_thumb.gif
-
 # cache
 system/cache/*
 !system/cache/index.html
 !system/cache/twig/index.html
 !system/cache/signatures/index.html
 !system/cache/plugins/index.html
-!system/cache/persistent/index.html
 
 # logs
 system/logs/*
@@ -76,3 +66,6 @@ landing
 
 # system
 system/functions_custom.php
+
+# others/rest
+system/pages/downloads.php

.htaccess.dist

@@ -6,7 +6,7 @@
 	Options -MultiViews
 </IfModule>
 
-<FilesMatch "^(.*\.md|.*\.json|.*\.dist|.*\.sql|CHANGELOG|README|composer\.lock)$">
+<FilesMatch "^(CHANGELOG\.md|README\.md|composer\.json|composer\.lock|package\.json|package-lock\.json|cypress\.env\.json)$">
 	Require all denied
 </FilesMatch>
 

CHANGELOG-1.x.md

@@ -1,328 +0,0 @@
-# Changelog
-
-## [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
-* Feature/twig hooks filters (#258)
-* Add latest client versions (14.00 - 15.01) (https://github.com/slawkens/myaac/commit/5367df23812c6182863353c9a39fd7fb0b743f4b)
-* db variable to twig (https://github.com/slawkens/myaac/commit/5ed1aec28e146b871a75597411d12e42a067f4e6)
-* New filter: HOOK_FILTER_ROUTES (https://github.com/slawkens/myaac/commit/9b75011224f385db8b27e109bfeb28e75b9d779c)
-* Allow optionally separate folder for views (thanks @Scrollog for idea) (https://github.com/slawkens/myaac/commit/03e275213901a89edb0ebb8974b776a992ab391f)
-* Add float & double types to the Settings (https://github.com/slawkens/myaac/commit/67ab425bb9796d9d123296e3fda542fa8f7f05ee)
-* Add optional param _page_only for single-page apps etc. (https://github.com/slawkens/myaac/commit/113473f2560aab6d364c301cc14a8b5ba8f309f4)
-
-### Changed
-* Change OTS_Account->getPremDays to not return -1 in case of freePremium (https://github.com/slawkens/myaac/commit/3befde2a1e4d24a011311e785f15185db57e19b8)
-* Add note about highscores being updated x minutes + allow ttl 0 to disable cache (https://github.com/slawkens/myaac/commit/a161cff00329da6f970f3a70967fe8346fe92bbc)
-* Better monster images (no image not found anymore) + use cache (https://github.com/slawkens/myaac/commit/73a5829974ceca3f02d7925d5cfbd5fa50b1bbd2)
-* Rename server-info -> ots-info, changelog -> change-log (Due to conflict with apache2 server-info mod) (https://github.com/slawkens/myaac/commit/3949d84e5d7631f332111b6d00278bddbd0ad10a)
-* Move rules page to admin panel (https://github.com/slawkens/myaac/commit/3949d84e5d7631f332111b6d00278bddbd0ad10a)
-
-### Fixed
-* php 8.4 warnings
-* Visitors counter not working properly on dev mode (https://github.com/slawkens/myaac/commit/da151051186c913dd0dd091aabe893649c2b9ee7)
-* Fix login.php boosted creature & boss (not sure exact version, but should be 14.12 or around) (https://github.com/slawkens/myaac/commit/c48b8006319f6c3b5f082befd16785420bb98110)
-* Fix installMenus when theme/template was removed from disc (https://github.com/slawkens/myaac/commit/c24c580796bccd54bf9e95b864763f4642684d55)
-* Fix if user removes the menu category (https://github.com/slawkens/myaac/commit/dbea69f31478391dacfbbc02c8353c39b4245daf)
-
-### Updated:
-* Update cypress from version ^13.17.0 to ^14.3.3 (https://github.com/slawkens/myaac/commit/629fd18ea166860d5898a822f44f9277da6ce43d)
-
-## [1.4 - 22.04.2025]
-
-### Added
-* feat: admin-pages (can add admin pages through plugins) (https://github.com/slawkens/myaac/commit/ceaa0639e66d31e8177ff90791463470367aa45d)
-	* just place the page in admin-pages folder in the plugin
-	* Also, possibility to overwrite default myaac admin pages
-* Add db->hasTableAndColumns(table, columns), credits to @opentibiabr Team (https://github.com/slawkens/myaac/commit/82a533d88c8a342076891d132b4b409ed9a1fe72)
-* Add noSubmit option to buttons.base (https://github.com/slawkens/myaac/commit/64f6d3abcada3bf9fd7599f50d2fac0a1367f383)
-
-### Fixed
-* Fix: display 404 error instead of 500 when page has been removed from filesystem (https://github.com/slawkens/myaac/commit/c2bf94fb2370d2009a2eb907f818955132cf8611)
-* Fix headline.php: change image format to .png cause of black background (https://github.com/slawkens/myaac/commit/b618084d50918539d9a70abd97e764137b966067)
-* Clear cache on plugin enable/disable, fixes some issues with plugin pages being cached (https://github.com/slawkens/myaac/commit/1d0c173e7d000aecbd432800941fc3e38a0e50f2)
-* Do not autoload sub-folders if autoload pages is disabled (https://github.com/slawkens/myaac/commit/d47195a7878095336f9c9edc6f96244257f67eec)
-
-### Changed
-* SQL Syntax Standardization (by @JoaozinhoBrasil, #298)
-* Pages in theme/template folder will now have precedence over normal pages (https://github.com/slawkens/myaac/commit/6d8f4718a1d349fba8f0ebc39cfd3a1a84d104b0)
-* Small changes in account.login.html.twig (https://github.com/slawkens/myaac/commit/f40b986b59d4c8fa89ab4745731bf366f8619976)
-* Plugin name is required, version is optional (https://github.com/slawkens/myaac/commit/e6f05a2731c61d931be49e121c068e49c0ad5e01)
-
-## [1.3.3 - 04.04.2025]
-
-### Fixed
-* Fix uninstall plugin when plugin is disabled (https://github.com/slawkens/myaac/commit/6c568fd36a271270684fc412ccd556b230273a6d)
-
-### Changed
-* Display more useful info when error parsing config.lua (https://github.com/slawkens/myaac/commit/fa6b6aa153ffc131e0d1631a4dcd9012a5850c2e)
-
-### Other
-* Small adjustments (https://github.com/slawkens/myaac/commit/35e2483de86e295bdf089cceffa25842eeb2e34c, https://github.com/slawkens/myaac/commit/ae639d65b0bfa491e747e907e2ebc77f83f47981)
-
-## [1.3.2 - 01.04.2025]
-
-### Fixed
-* Fix debugBar/admin panel menu when using custom base_dir (https://github.com/slawkens/myaac/commit/65696f63e3aac02ff952ea81279e7cb2fa7570fb)
-
-### Changed
-* Settings: Show/hide IP Ban Protection options depending on the value (enabled/disabled) (https://github.com/slawkens/myaac/commit/dbf73d0b61b45601ae95e51b23c051c2704169c5)
-* Do not require init.php in cache:clear command (https://github.com/slawkens/myaac/commit/d25c71857f767834239bbffacd00fdc671adb157)
-
-## [1.3.1 - 19.03.2025]
-
-### Fixed
-* Fixed migrate:run command (https://github.com/slawkens/myaac/commit/1a5771ad51e595fe13368a0721b059c4ecefb17d)
-
-### Changed
-* Small adjustments (https://github.com/slawkens/myaac/commit/6fac883659f581baac1361826d046410156f1e58, https://github.com/slawkens/myaac/commit/4a6896b4469968b9904292734cf6c14ba5eeef14)
-
-## [1.3 - 10.03.2025]
-
-### Changed
-* Use latest outfit-images host from @gesior (https://github.com/slawkens/myaac/commit/529bdcf016dd0f9dffbc34d81f99a046a9ddb70d)
-* Change monster link to $_GET ?name= (https://github.com/slawkens/myaac/commit/4c5cc8b573b2b3e7ec00a22b7ede30a68083a924)
-
-### Fixed
-* Fixed house links (https://github.com/slawkens/myaac/commit/887b5068ad11c4cdab614afd34525caba785ce13)
-* Fixed long title on headline.php (https://github.com/slawkens/myaac/commit/3e3f4bb5a514158ec8777684ca6c7f1c2a37bed5)
-* Fixed menu colors once again, plus add !important tag (https://github.com/slawkens/myaac/commit/aa52df6e2ec92cafc25b655ae907bf2e1746d9cc)
-* Fix: add possibility to remove all menu items in admin panel (https://github.com/slawkens/myaac/commit/00fe1adc15ea7646596d755f6e6e1f7854ffc1d5, https://github.com/slawkens/myaac/commit/9239a4f4198c3ad260802ac3b47e9c41b80b754e)
-
-## [1.2 - 09.02.2025]
-
-### Added
-* Twig session(key) function + reworked session functions to accept multi-array like in Laravel (https://github.com/slawkens/myaac/commit/b46ddb43d03ef7e5fc34e555e92e856bdc905691)
-* add template_name to twig variables (https://github.com/slawkens/myaac/commit/ae1161d77050bda181802b4496c9de920a7bb1bc)
-* add HOOK_INIT, executed just after $hooks are loaded (https://github.com/slawkens/myaac/commit/19686725dc810f63a07f049f82c66cf336d90ca6)
-
-### Changed
-* settings: password input hide/show, enable Save button only if changes has been made, save settings in transaction (https://github.com/slawkens/myaac/commit/4fda4f643b60a151179e5dd4f04912fb2618d98f, https://github.com/slawkens/myaac/commit/28fef952f857b79d64bc7495ffa5e1999e68e192, https://github.com/slawkens/myaac/commit/4b6024dc451accadb6c469fa282a9a764c1c0a81)
-* rework menus: Different categories can have different colors + Option to reset menus (https://github.com/slawkens/myaac/commit/73de93a561f6b13111e019075724357d8a617249, https://github.com/slawkens/myaac/commit/3da3e62c5b12390d75de9b3320729bcca6e0b458)
-
-### Fixed
-* highscores: Fix online status + vocation for TFS 0.x (https://github.com/slawkens/myaac/commit/ea51ad27c38be88d86514cb979bb394fcfbef1f0)
-* clear cache button in admin bar needed to be clicked twice until it worked (https://github.com/slawkens/myaac/commit/ea51ad27c38be88d86514cb979bb394fcfbef1f0)
-* HOOK_STARTUP location (https://github.com/slawkens/myaac/commit/a73fb1003ee3f812cf182d1834d65f08e6f60d1f)
-* if vocation name has more words (https://github.com/slawkens/myaac/commit/9d7fc98e1e0a96b59ecc1a7c39800a64445db364)
-
-### Updated
-* Bump twig/twig from 3.18.0 to 3.19.0 (#284)
-
-## [1.1 - 27.01.2025]
-
-### Changed
-* adjust mailer settings descriptions to latest gmail (https://github.com/slawkens/myaac/commit/c5d5bb80671db135e6b503f53684771c7272e05d)
-* optimize $player->isOnline() function, thanks @gesior (https://github.com/slawkens/myaac/commit/10dd818b139d5e1bb1ca9ec81edfb083ba9316b4)
-* make players.comment and guilds.description VARCHAR (https://github.com/slawkens/myaac/commit/a45ceab83a74bee2b89cdb72baceda75e577e3cf)
-* add lua/ folder to .gitignore (https://github.com/slawkens/myaac/commit/07012f786b1114cb6ab2f064f82c645b136a375a)
-
-### Fixed
-* general fixes in the tibiacom template menus, better support for custom menus
-* make functions_custom.php optional (https://github.com/slawkens/myaac/commit/dc2b5afd9980984e2b259c9fc99f2ade46f70a5a)
-* error in CLI, where BASE_URL is not defined (https://github.com/slawkens/myaac/commit/4d749b881582f64b5a46196dbbb5ee8097127f03)
-* hook ACCOUNT_LOGIN_BEFORE_ACCOUNT location (https://github.com/slawkens/myaac/commit/669c447fca8643ce56d9ef8c1374ec647c780998)
-
-## [1.0.1 - 14.01.2025]
-
-### Fixed
-* tibiacom account & news menu links not auto expanding
-
-### Updated (Thanks dependabot)
-* twig from ^2.0 to ^3.11
-* tinymce from ^6.8.3 to ^7.2.0
-* cypress from ^12.12.0 to ^13.17.0
-* nesbot/carbon from 2.72.5 to 2.72.6
-
-## [1.0 - 12.01.2025]
-
-First stable release in the v1.0 series.
-
-Minimum PHP 8.1 is required.
-
-Changes since RC.2:
-
-### Added
-* feature: migrations up/down. Allows to downgrade/upgrade database to specified version (https://github.com/slawkens/myaac/commit/3f6ff3a3326b0475d28d11ffd7fff51f362d799f)
-* new hooks for news management (https://github.com/slawkens/myaac/commit/011a85d8ae34283ded6999882833f9d4797028ec, https://github.com/slawkens/myaac/commit/36bd3eb846e829b45313e10f7568dc4e95841143)
-* None Vocation to highscores (can be changed to RookStayer in Admin Panel) (https://github.com/slawkens/myaac/commit/a4a248099521bb5b8b2aa5bd592138debd2f19d5)
-* support for button_color (green, red, blue) (https://github.com/slawkens/myaac/commit/d8b6b749ee62e88b6af4a05d3d7557f90b94d94e)
-* add $whoopsHandler as variable, can be used by plugins (https://github.com/slawkens/myaac/commit/b0c8cf2ecda23045d725aaf43cfb3852ed766a4b)
-* PlayerModel->outfit_url attribute (https://github.com/slawkens/myaac/commit/3b5be1a8db5dceecaa388e2925a5536d13b38881)
-* support for selecting plugin themes in Admin menus.php (https://github.com/slawkens/myaac/commit/77a2c1cec343ffe4be5c2c2503ee81bc32a14ca1)
-
-### Changed
-* schema: Change character set to utf8mb4 (support for Emojis in Menus/Pages/News/Forum etc.) (https://github.com/slawkens/myaac/commit/27c44f1bdfb6234cf0c9d5b4b491123bb205b08f)
-* prefer get_browser_real_ip() over REMOTE_ADDR (https://github.com/slawkens/myaac/commit/941846605c00cee83168d2f916410b8ba8d4b7b9)
-* automatically set selected current one on highscores filters (https://github.com/slawkens/myaac/commit/e96227fbe41ae281783b2d49edb169a603601813)
-* rewrite towns loading code, removed OTBM loader (was too slow) (https://github.com/slawkens/myaac/commit/c980a0914632e7b27f718464f669a200707d217e)
-* allow OTS_Player to be passed as object to getPlayerLink (https://github.com/slawkens/myaac/commit/84d37c5a8f2c4535a41c8aa8264752969d3f3a3d)
-* do not clear menus by default on install (https://github.com/slawkens/myaac/commit/12d8faa3eda5e798f97b71e941c035187daad96e)
-* display warning in admin panel - plugins - if zip extension is not installed (https://github.com/slawkens/myaac/commit/e3ffe5d9e11d78ab064a370d8541bac351c9bcd9)
-* set default_socket_timeout for ipinfo.io checkup to 5 seconds (https://github.com/slawkens/myaac/commit/783d96fc6568a607d3198b832fed3a0dd06c4ebb)
-* refactor getTopPlayers function (support for balance) (https://github.com/slawkens/myaac/commit/c769962e39fe8dfb72ecd5be1864e145696be794)
-
-### Fixed
-* XSS in forum (https://github.com/slawkens/myaac/commit/c2b7286d20d4b579171540f7a774e8a0995d5e8f, https://github.com/slawkens/myaac/commit/8fb643596f9586005976e7bdb484a541a9d8715e)
-* price deducted when changing sex (https://github.com/slawkens/myaac/commit/16671ea40b72dcf74037c359ad572f9eb825edf9)
-* move_thread by unauthorized user (https://github.com/slawkens/myaac/commit/d6c40c836a53cb1710f911f77f45f28b54ea1b54, thanks @anyeor)
-* TFS 1.4.2 where conditions is NULL (https://github.com/slawkens/myaac/commit/b8396d4c8482e951da538b13f2296123732c4545)
-* do not show forum new thread show button if not logged in (https://github.com/slawkens/myaac/commit/507402171ba3b6e7ee184bd7fa73e0d55e0cad7a, @anyeor)
-* login if limiter is disabled (https://github.com/slawkens/myaac/commit/a0f1971583f0f790013e2145fb5ac573c59fbdef)
-* fixes to installMenus function (https://github.com/slawkens/myaac/commit/a2fadc5945fe0a5e39f740827f6ffbda1bb501e2)
-* many PHP exceptions in different places
-* fixes to tibiacom menus ActiveSubmenuItem
-
-### Removed
-* bugtracker SQL table code as the page has been removed/moved to plugins (https://github.com/slawkens/myaac/commit/5782772b901b05fb814bc718d062f6e2cd71df8c)
-
-## [1.0-RC.2 - 25.10.2024]
-
-Still waiting for your reports about bugs found in this release. We are very close to stable release.
-
-### Added
-* feat: rate limit settings for blocking accounts login attempts (@gpedro, #266)
-* search by email in accounts editor (https://github.com/slawkens/myaac/commit/c2ec46824621468f2a1cb4046805c485ed13fea5)
-* New hooks in account manage + create (https://github.com/slawkens/myaac/commit/93641fc68ac9a5f1479329e2bd41380c19534d5d)
-
-### Changed
-* chore: drop raw queries + accounts - search by email + accounts - required min size for search by account number (@gpedro, #266)
-* Use https for outfit & item images (https://github.com/slawkens/myaac/commit/71c00aa5e01fbdfd88802912e200dd1025976231)
-* Do not require players & guilds tables on install (https://github.com/slawkens/myaac/commit/779aa152fa940261c9b161533946f44e288597a2)
-* Do not create player if there is no players table in db (https://github.com/slawkens/myaac/commit/201f95caa8b70e88fa651eac8c3c3aa7cd765bd0)
-
-### Fixed
-* Highscore frags fixed for TFS 0.3 (@Scrollog, #263)
-* Missing groups variable #262. thanks, @Scrollog for reporting (https://github.com/slawkens/myaac/commit/8d8bdb6dac6df21672ac77288fff2f2f8d6eb665)
-* Verified email for login.php (@gpedro, #265)
-* Warning if core.account_country is disabled (https://github.com/slawkens/myaac/commit/ab73d60c61e14a1cacdb6cfbf7f89f4bf3be0833)
-
-
-## [1.0-RC.1 - 23.07.2024]
-
-Changes since 1.0-beta:
-
-### Added
-* Feat: Hooks priority (https://github.com/slawkens/myaac/commit/dc17b701da053e04bfa64e21be9247a4f07505e1)
-* Make autoload of pages, commands and themes configurable (https://github.com/slawkens/myaac/commit/c1d4b4f80cd6bb85507ee9471e47013955a26a91)
-* Fraggers in characters page for TFS 1.x and canary (https://github.com/slawkens/myaac/commit/42f99c3edc8de39cccc5632cb42e88b24579c5a6)
-* New hooks: HOOK_INSTALL_FINISH, HOOK_ACCOUNT_CREATE_CHARACTER_* (https://github.com/slawkens/myaac/commit/08ac8ebade106521a5c7396faa5ce7006e629f7c, https://github.com/slawkens/myaac/commit/45dda5e834ff2059faea6ef9be2efa76f1723cbd)
-
-### Changed
-* Allow account_create_character_create even if account_mail_verify is activated (https://github.com/slawkens/myaac/commit/203e411b626fe62401a4b74a48420769e512aa39)
-* Create guild_rank entries, in case MySQL trigger not loaded (https://github.com/slawkens/myaac/commit/d9c1b2507c81f306970642b35e4bf5f7cc04a6f2, https://github.com/slawkens/myaac/commit/47a19e85dd84e9f3b39a1b29cfc2c04b004832b9)
-* Set Admin Account verified by default (https://github.com/slawkens/myaac/commit/cd49dfc79942f3301ce9c0b8d899b9f39bda9a41)
-* Refactor account routes into sub folders (https://github.com/slawkens/myaac/commit/bdc0c43d3fd3a51030c3e916bdb9f008468f5ecd)
-* Order towns by id (https://github.com/slawkens/myaac/commit/9ea2a5067fc4b75de395f381577b18914132ad84)
-* Do not create news about myaac, if any news already exist (on installation (https://github.com/slawkens/myaac/commit/504242fb846b73b56b87bc1e39d070687ad7f5b4)
-
-### Fixed
-* Not working google recaptcha plugin (https://github.com/slawkens/myaac/commit/a1bcb217ecf4e21fd58da4ba491da1852029898a)
-* Not working account create if account_country is disabled (https://github.com/slawkens/myaac/commit/933b681a9fcdbb6283e0469b3806d2ded492d232)
-* Account verify - do not allow login without verified email (Thanks @anyeor, https://github.com/slawkens/myaac/commit/fcb13f3c0fb8ceafda0bd614a229a26a269432bd)
-* Detect tools/ext exists on install to prevent broken installs (https://github.com/slawkens/myaac/commit/10a739773c4f2911876bc802a0ee0537c3e00a92)
-* Cache reloading each time page refreshes (https://github.com/slawkens/myaac/commit/ec96985872057340112f65073efc0c4bf86dddb0)
-* Highscores frags for TFS 1.x and canary (https://github.com/slawkens/myaac/commit/a04d186c22912915f0a7873dfe677ef3b5a23c79)
-* Monsters page: monster not found exception (https://github.com/slawkens/myaac/commit/ef79b99b8acc179f14b8475547347d9daca27512)
-* Fixed bug if \<flags\> are not present in monster.xml (https://github.com/slawkens/myaac/commit/57b47ab7983f625c7c0ef4f5303a4d07ef172786)
-* fastRoute duplicate errors (https://github.com/slawkens/myaac/commit/4c0739d3e93812dff0c33849ea3f38e4e49113ac)
-* useGuildNick displaying (https://github.com/slawkens/myaac/commit/0db0ec1aa47e044c26bc403ff5078a2115d086f8)
-
-## [1.0-beta - 18.05.2024]
-
-Minimum PHP version for this release is 8.1.
-
-### Added
-* reworked Admin Panel (@Leesneaks, @gpedro, @slawkens)
-  * updated to Bootstrap v4
-  * new Menu
-  * new Dashboard: statistics, server status
-  * new Admin Bar showed on top when admin logged in
-  * new page: Server Data, to reload server data
-    * Towns, NPCs & Items are stored in permanent cache
-  * new pages: mass account & teleport tools
-  * changelogs editor
-  * revised Accounts & Players editors
-  * option to add/modify admin menus with plugins
-  * option to enable/disable plugins
-  * better, updated TinyMCE editor (v6.x)
-    * with option to upload images
-  * list of open source libraries used in project page
-* auto-loading of themes, commands & pages from plugins/ folder. You need just to place them in correct folder and they will be loaded automatically - this allows better customization, without interfering with core AAC folders. This will allow in the future automatic updates for plugins as well the AAC as whole.
-* config.php moved to Admin Panel -> Settings page
-* new console script: aac - using symfony/console
-  * usage: `php aac` (will list all commands by default)
-  * example: `php aac cache:clear`
-  * example: `php aac plugin:install theme-example.zip`
-* replace POT Query Builder to Eloquent ORM. Not 100% yet - in some places there is still old $db approach used (@gpedro) (https://github.com/slawkens/myaac/pull/230)
-* brand new charming installation page (by @fernandomatos)
-  * using Bootstrap
-* new pages router: nikic/fast-route, allowing for better customisation
-* Plugin cronjobs: central control of the cronjobs
-* Guild Wars support (available as plugin)
-* support for login and create account only by email (configurable)
-  * with no need for account name
-* Google ReCAPTCHA v3 support (available as plugin)
-* support for Account Number
-  * suggest account number option
-* many new functions, hooks and configurables
-* better Exception Handler (Whoops - https://github.com/filp/whoops)
-* automated website tests (using Cypress)
-* csrf protection (https://github.com/slawkens/myaac/pull/235)
-* option to restrict Page view to specified group of users (Not-Logged in, logged-in players, tutors, gamemasters etc.)
-* phpdebug bar (http://phpdebugbar.com/). Activated if env == 'dev', can be also activated in production by enabling "enable_debugbar" in local config
-
-### Changed
-* Composer and NPM is now used for external libraries like: Twig, PHPMailer, fast-route, jQuery, Bootstrap etc.
-* mail support is disabled on fresh install, can be manually enabled by user
-* disable add php pages in admin panel for security. Option to disable plugins upload
-* visitors counter shows now user browser, and also if its bot
-* changes in required and optional PHP extensions
-* reworked Pages:
-	* Bans
-		* works now for TFS 1.x
-	* Highscores
-		* frags works for TFS 1.x
-		* cached
-	* Monsters
-* moved pages to Twig:
-  * experience stages
-* update player_deaths entries on name change
-* change_password email to be more informal
-
-### Fixed
-* hundreds of bug fixes, mostly patched from 0.8, so it makes no sense writing them again here

CHANGELOG.md

@@ -0,0 +1,55 @@
+# Changelog
+
+## [0.9.0-alpha - 02.06.2023]
+
+Minimum PHP version for this release is 7.2.5.
+
+### Added
+* reworked Admin Panel (@Leesneaks, @gpedro, @slawkens)
+  * updated to Bootstrap v4
+  * new Menu
+  * new Dashboard: statistics, server status
+  * new Admin Bar showed on top when admin logged in
+  * new page: Server Data, to reload server data
+  * new pages: mass account & teleport tools
+  * changelogs editor
+  * revised Accounts & Players editors
+  * option to add/modify menus with plugins
+  * option to enable/disable plugins
+  * better, updated TinyMCE editor (v6.x)
+    * with option to upload images
+  * list of open source libraries used in project
+* brand new charming installation page (by @fernandomatos)
+  * using Bootstrap
+* new pages router: nikic/fast-route, allowing for better customisation
+* Guild Wars support (available as plugin)
+* support for login and create account only by email (configurable)
+  * with no need for account name
+* Google ReCAPTCHA v3 support (available as plugin)
+* automatically load towns names from .OTBM file
+* support for Account Number
+  * suggest account number option
+* many new functions, hooks and configurables
+* better Exception Handler (Whoops - https://github.com/filp/whoops)
+* add Cypress testing
+
+### Changed
+* Composer is now used for external libraries like: Twig, PHPMailer, fast-route etc.
+* mail support is disabled on fresh install, can be manually enabled by user
+* disable add php pages in admin panel for security. Option to disable plugins upload
+* visitors counter shows now user browser, and also if its bot
+* changes in required and optional PHP extensions
+* reworked Pages:
+	* Bans
+		* works now for TFS 1.x
+	* Highscores
+		* frags works for TFS 1.x
+		* cached
+	* creatures
+* moved pages to Twig:
+  * experience stages
+* update player_deaths entries on name change
+* change_password email to be more informal
+
+### Fixed
+* hundrets of bug fixes, mostly patched from 0.8, so it makes no sense writing them again here

CONTRIBUTORS.txt

@@ -8,11 +8,7 @@ Fernando Matos <fernando@pixele.com.br>
 Lee <42119604+Leesneaks@users.noreply.github.com>
 caio <caio.zucoli@gmail.com>
 slawkens <slawkens@gmail.com>
-tobi132 <tobi132@gmx.net>
+tobi132 <52947952+tobi132@users.noreply.github.com>
 vankk <nwtr.otland@hotmail.com>
 whiteblXK <krzys16001@gmail.com>
 xitobuh <jonas.hockert92@gmail.com>
-Danilo Pucci <dnlps@hotmail.com>
-gpedro <gpedro831@gmail.com>
-Matheus Collier <matheuscollier@gmail.com>
-SRNT-GG <95472530+SRNT-GG@users.noreply.github.com>

CREDITS

@@ -1,3 +1,3 @@
 * Gesior.pl (2007 - 2008)
-* Slawkens (2009 - 2025)
+* Slawkens (2009 - 2023)
 * Contributors listed in CONTRIBUTORS.txt

README.md

@@ -1,36 +1,24 @@
 # [MyAAC](https://my-aac.org)
 
-MyAAC is a free and open-source Automatic Account Creator (AAC) for Open Tibia Servers written in PHP. It is a fork of the [Gesior](https://github.com/gesior/Gesior2012) project. It supports only MySQL databases.
+[![Build Status Master](https://img.shields.io/travis/slawkens/myaac/master)](https://travis-ci.org/github/slawkens/myaac)
-
-Official website: https://my-aac.org
-
-[![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/slawkens/myaac/cypress.yml)](https://github.com/slawkens/myaac/actions)
 [![License: GPL-3.0](https://img.shields.io/github/license/slawkens/myaac)](https://opensource.org/licenses/gpl-license)
 [![Downloads Count](https://img.shields.io/github/downloads/slawkens/myaac/total)](https://github.com/slawkens/myaac/releases)
+[![PHP Versions](https://img.shields.io/travis/php-v/slawkens/myaac/master)](https://github.com/slawkens/myaac/blob/d8b3b4135827ee17e3c6d41f08a925e718c587ed/.travis.yml#L3)
 [![OpenTibia Discord](https://img.shields.io/discord/288399552581468162)](https://discord.gg/2J39Wus)
 [![Closed Issues](https://img.shields.io/github/issues-closed-raw/slawkens/myaac)](https://github.com/slawkens/myaac/issues?q=is%3Aissue+is%3Aclosed)
 
-| Version | Status                 | Branch  | Requirements   |
+MyAAC is a free and open-source Automatic Account Creator (AAC) written in PHP. It is a fork of the [Gesior](https://github.com/gesior/Gesior2012) project. It supports only MySQL databases.
-|:--------|:-----------------------|:--------|:---------------|
-| 2.x     | Experimental features  | develop | PHP >= 8.1     |
-| **1.x** | **Active development** | main    | **PHP >= 8.1** |
-| 0.9.x   | Not developed anymore  | 0.9     | PHP >= 7.2.5   |
-| 0.8.x   | Active support         | 0.8     | PHP >= 7.2.5   |
-| 0.7.x   | End Of Life            | 0.7     | PHP >= 5.3.3   |
 
-The recommended version to install is 1.x, which can be found at releases page - [https://github.com/slawkens/myaac/releases](https://github.com/slawkens/myaac/releases).
+Official website: https://my-aac.org
-
-### Documentation
-* [docs.my-aac.org](https://docs.my-aac.org)
-* [my-aac.org - FAQ](https://my-aac.org/faqs/)
 
 ### Requirements
 
+	- PHP 5.6 or later
 	- MySQL database
-	- PHP Extensions: pdo, xml, json
+	- PDO PHP Extension
-	- (optional) apache2 mod_rewrite (to use friendly_urls)
+	- XML PHP Extension
-	- (optional) zip PHP Extension (to install plugins)
+	- ZIP PHP Extension
-	- (optional) gd PHP Extension (for generating signature images)
+	- (optional) mod_rewrite to use friendly_urls
 
 ### Installation
 
@@ -54,23 +42,22 @@ The recommended version to install is 1.x, which can be found at releases page -
 
 ### Configuration
 
-Check *config.php* to get more information. (Notice: MyAAC 1.0+ doesn't use config.php anymore, it has been moved to Admin Panel - Settings page).
+Check *config.php* to get more informations.
-
 Use *config.local.php* for your local configuration changes.
 
 ### Branches
 
 This repository follows the Git Flow Workflow.
-Cheatsheet: [Git-Flow-Cheatsheet](https://danielkummer.github.io/git-flow-cheatsheet)
+Cheatsheet: [Git-Flow-Cheetsheet](https://danielkummer.github.io/git-flow-cheatsheet)
 
 That means, we use:
-* main branch, for current stable release
+* master branch, for current stable release
 * develop branch, for development version (next release)
 * feature branches, for features etc.
 
 ### Known Problems
 
-- Some compatibility issues with some exotic distributions.
+- Some compatibility issues with some exotical distibutions.
 
 ### Contributing
 
@@ -80,19 +67,13 @@ 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
 
-If you have a great idea or want to contribute to the project - visit our website at https://www.my-aac.org
+	If you have a great idea or want contribute to the project - visit our website at https://www.my-aac.org
-
-## Project supported by JetBrains
-
-Many thanks to Jetbrains for kindly providing a license for me to work on this and other open-source projects.
-
-[![JetBrains](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/?from=https://github.com/slawkens)
 
 ### 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.

aac

@@ -1,36 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-require_once __DIR__ . '/common.php';
-
-if(!IS_CLI) {
-	echo 'This script can be run only in command line mode.';
-	exit(1);
-}
-
-require_once SYSTEM . 'functions.php';
-
-define('SELF_NAME', basename(__FILE__));
-
-use MyAAC\Plugins;
-use Symfony\Component\Console\Application;
-
-$application = new Application('MyAAC', MYAAC_VERSION);
-
-$commandsGlob = glob(SYSTEM . 'src/Commands/*.php');
-foreach ($commandsGlob as $item) {
-	$name = pathinfo($item, PATHINFO_FILENAME);
-	if ($name == 'Command') { // ignore base Command class
-		continue;
-	}
-
-	$commandPre = '\\MyAAC\Commands\\';
-	$application->add(new ($commandPre . $name));
-}
-
-$pluginCommands = Plugins::getCommands();
-foreach ($pluginCommands as $item) {
-	$application->add(require $item);
-}
-
-$application->run();

admin/includes/debugbar.php

@@ -1,22 +0,0 @@
-<?php
-
-$hooks->register('debugbar_admin_head_end', HOOK_ADMIN_HEAD_END, function ($params) {
-	global $debugBar;
-
-	if (!isset($debugBar)) {
-		return;
-	}
-
-	$debugBarRenderer = $debugBar->getJavascriptRenderer(BASE_URL . 'vendor/maximebf/debugbar/src/DebugBar/Resources/');
-	echo $debugBarRenderer->renderHead();
-});
-$hooks->register('debugbar_admin_body_end', HOOK_ADMIN_BODY_END, function ($params) {
-	global $debugBar;
-
-	if (!isset($debugBar)) {
-		return;
-	}
-
-	$debugBarRenderer = $debugBar->getJavascriptRenderer(BASE_URL . 'vendor/maximebf/debugbar/src/DebugBar/Resources/');
-	echo $debugBarRenderer->render();
-});

admin/includes/settings_menus.php

@@ -1,7 +1,5 @@
 <?php
 
-use MyAAC\Plugins;
-
 $order = 10;
 
 $settingsMenu = [];

admin/index.php

@@ -1,8 +1,6 @@
 <?php
 
 // few things we'll need
-use MyAAC\Plugins;
-
 require '../common.php';
 
 const ADMIN_PANEL = true;
@@ -27,7 +25,16 @@ define('PAGE', $page);
 require SYSTEM . 'functions.php';
 require SYSTEM . 'init.php';
 
-require __DIR__ . '/includes/debugbar.php';
+// verify myaac tables exists in database
+if(!$db->hasTable('myaac_account_actions')) {
+	throw new RuntimeException('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
+}
+
+// event system
+require_once SYSTEM . 'hooks.php';
+$hooks = new Hooks();
+$hooks->load();
+
 require SYSTEM . 'status.php';
 require SYSTEM . 'login.php';
 require __DIR__ . '/includes/functions.php';
@@ -44,21 +51,15 @@ if(!$logged || !admin()) {
 	$page = 'login';
 }
 
-$pluginsAdminPages = Plugins::getAdminPages();
+// include our page
-if(isset($pluginsAdminPages[$page]) && file_exists(BASE . $pluginsAdminPages[$page])) {
+$file = __DIR__ . '/pages/' . $page . '.php';
-	$file = BASE . $pluginsAdminPages[$page];
+if(!@file_exists($file)) {
-}
+	if (strpos($page, 'plugins/') !== false) {
-else {
+		$file = BASE . $page;
-	// include our page
+	}
-	$file = __DIR__ . '/pages/' . $page . '.php';
+	else {
-	if(!@file_exists($file)) {
+		$page = '404';
-		if (str_contains($page, 'plugins/')) {
+		$file = SYSTEM . 'pages/404.php';
-			$file = BASE . $page;
-		}
-		else {
-			$page = '404';
-			$file = SYSTEM . 'pages/404.php';
-		}
 	}
 }
 

admin/pages/accounts.php

@@ -7,23 +7,19 @@
  * @copyright 2020 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Models\Account as AccountModel;
-use MyAAC\Models\Player;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Account editor';
-
-csrfProtect();
-
 $admin_base = ADMIN_URL . '?p=accounts';
 $use_datatable = true;
 
-if (setting('core.account_country'))
+if ($config['account_country'])
 	require SYSTEM . 'countries.conf.php';
 
-$nameOrNumberColumn = getAccountIdentityColumn();
+$nameOrNumberColumn = 'name';
+if (USE_ACCOUNT_NUMBER) {
+	$nameOrNumberColumn = 'number';
+}
 
 $hasSecretColumn = $db->hasColumn('accounts', 'secret');
 $hasCoinsColumn = $db->hasColumn('accounts', 'coins');
@@ -31,7 +27,7 @@ $hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
 $hasTypeColumn = $db->hasColumn('accounts', 'type');
 $hasGroupColumn = $db->hasColumn('accounts', 'group_id');
 
-if (setting('core.account_country')) {
+if ($config['account_country']) {
 	$countries = array();
 	foreach (array('pl', 'se', 'br', 'us', 'gb') as $c)
 		$countries[$c] = $config['countries'][$c];
@@ -49,56 +45,41 @@ $acc_type = setting('core.account_types');
 
 <?php
 $id = 0;
-$search_account = $search_account_email = '';
+$search_account = '';
 if (isset($_REQUEST['id']))
 	$id = (int)$_REQUEST['id'];
-else if (isset($_REQUEST['search_email'])) {
-	$search_account_email = $_REQUEST['search_email'];
-	$accountModel = AccountModel::where('email', $search_account_email)->limit(11)->get(['email', 'id']);
-	if (count($accountModel) == 0) {
-		echo_error('No entries found.');
-	} else if (count($accountModel) == 1) {
-		$id = $accountModel->first()->getKey();
-	} else if (count($accountModel) > 10) {
-		echo_error('Specified e-mail resulted with too many accounts.');
-	}
-}
 else if (isset($_REQUEST['search'])) {
 	$search_account = $_REQUEST['search'];
-	$min_size = 3;
+	if (strlen($search_account) < 3 && !Validator::number($search_account)) {
-	if (in_array($nameOrNumberColumn, ['id', 'number'])) {
+		echo_error('Player name is too short.');
-		$min_size = 1;
-	}
-
-	if (strlen($search_account) < $min_size && !Validator::number($search_account)) {
-		echo_error('Account ' . $nameOrNumberColumn . ' is too short.');
 	} else {
-		$query = AccountModel::where($nameOrNumberColumn, '=', $search_account)->limit(11)->get(['id', $nameOrNumberColumn]);
+		$query = $db->query('SELECT `id` FROM `accounts` WHERE `' . $nameOrNumberColumn . '` = ' . $db->quote($search_account));
-		if (count($query) == 0) {
+		if ($query->rowCount() == 1) {
-			echo_error('No entries found.');
+			$query = $query->fetch();
-		} else if (count($query) == 1) {
+			$id = (int)$query['id'];
-			$id = $query->first()->getKey();
-		} else if (count($query) > 10) {
-			echo_error('Specified name resulted with too many accounts.');
 		} else {
-			$str_construct = 'Do you mean?<ul class="mb-0">';
+			$query = $db->query('SELECT `id`, `' . $nameOrNumberColumn . '` FROM `accounts` WHERE `' . $nameOrNumberColumn . '` LIKE ' . $db->quote('%' . $search_account . '%'));
-			foreach ($query as $row) {
+			if ($query->rowCount() > 0 && $query->rowCount() <= 10) {
-				$str_construct .= '<li><a href="' . $admin_base . '&id=' . $row->getKey() . '">' . $row->attributes[$nameOrNumberColumn] . '</a></li>';
+				$str_construct = 'Do you mean?<ul class="mb-0">';
-			}
+				foreach ($query as $row)
-			$str_construct .= '</ul>';
+					$str_construct .= '<li><a href="' . $admin_base . '&id=' . $row['id'] . '">' . $row[$nameOrNumberColumn] . '</a></li>';
-			echo_error($str_construct);
+				$str_construct .= '</ul>';
+				echo_error($str_construct);
+			} else if ($query->rowCount() > 10)
+				echo_error('Specified name resulted with too many accounts.');
+			else
+				echo_error('No entries found.');
 		}
 	}
 }
 ?>
 <div class="row">
 	<?php
-	$groups = new OTS_Groups_List();
 	if ($id > 0) {
 		$account = new OTS_Account();
 		$account->load($id);
 
-		if (isset($_POST['save']) && $account->isLoaded()) {
+		if (isset($account, $_POST['save']) && $account->isLoaded()) {
 			$error = false;
 
 			$_error = '';
@@ -156,9 +137,7 @@ else if (isset($_REQUEST['search'])) {
 			$rl_loca = $_POST['rl_loca'];
 
 			//country
-			if(setting('core.account_country')) {
+			$rl_country = $_POST['rl_country'];
-				$rl_country = $_POST['rl_country'];
-			}
 
 			$web_flags = $_POST['web_flags'];
 			verify_number($web_flags, 'Web Flags', 1);
@@ -205,11 +184,7 @@ else if (isset($_REQUEST['search'])) {
 				}
 				$account->setRLName($rl_name);
 				$account->setLocation($rl_loca);
-
+				$account->setCountry($rl_country);
-				if(setting('core.account_country')) {
-					$account->setCountry($rl_country);
-				}
-
 				$account->setCustomField('created', $created);
 				$account->setWebFlags($web_flags);
 				$account->setCustomField('web_lastlogin', $web_lastlogin);
@@ -233,7 +208,7 @@ else if (isset($_REQUEST['search'])) {
 			}
 		}
 	} else if ($id == 0) {
-		$accounts_db = $db->query('SELECT `id`, `' . $nameOrNumberColumn . '`' . ($hasTypeColumn ? ',type' : ($hasGroupColumn ? ',group_id' : '')) . ', email FROM `accounts` ORDER BY `id` ASC');
+		$accounts_db = $db->query('SELECT `id`, `' . $nameOrNumberColumn . '`' . ($hasTypeColumn ? ',type' : ($hasGroupColumn ? ',group_id' : '')) . ' FROM `accounts` ORDER BY `id` ASC');
 		?>
 		<div class="col-12 col-sm-12 col-lg-10">
 			<div class="card card-info card-outline">
@@ -245,9 +220,8 @@ else if (isset($_REQUEST['search'])) {
 						<thead>
 						<tr>
 							<th>ID</th>
-							<th><?= ($nameOrNumberColumn == 'name' ? 'Name' : 'Number'); ?></th>
+							<th><?= ($nameOrNumberColumn == 'number' ? 'Number' : 'Name'); ?></th>
 							<?php if($hasTypeColumn || $hasGroupColumn): ?>
-							<th>E-Mail</th>
 							<th>Position</th>
 							<?php endif; ?>
 							<th style="width: 40px">Edit</th>
@@ -258,7 +232,6 @@ else if (isset($_REQUEST['search'])) {
 							<tr>
 								<th><?php echo $account_lst['id']; ?></th>
 								<td><?php echo $account_lst[$nameOrNumberColumn]; ?></a></td>
-								<td><?php echo $account_lst['email']; ?></td>
 								<?php if($hasTypeColumn || $hasGroupColumn): ?>
 								<td>
 									<?php if ($hasTypeColumn) {
@@ -290,9 +263,6 @@ else if (isset($_REQUEST['search'])) {
 						<li class="nav-item">
 							<a class="nav-link active" id="accounts-acc-tab" data-toggle="pill" href="#accounts-acc">Account</a>
 						</li>
-						<li class="nav-item">
-							<a class="nav-link" id="accounts-logs-tab" data-toggle="pill" href="#accounts-logs">Logs</a>
-						</li>
 						<li class="nav-item">
 							<a class="nav-link" id="accounts-chars-tab" data-toggle="pill" href="#accounts-chars">Characters</a>
 						</li>
@@ -302,7 +272,7 @@ else if (isset($_REQUEST['search'])) {
 							</li>
 						<?php endif;
 
-						if ($db->hasTable('store_history') && $db->hasColumn('store_history', 'time')) : ?>
+						if ($db->hasTable('store_history')) : ?>
 							<li class="nav-item">
 								<a class="nav-link" id="accounts-store-tab" data-toggle="pill" href="#accounts-store">Store History</a>
 							</li>
@@ -312,8 +282,7 @@ else if (isset($_REQUEST['search'])) {
 				<div class="card-body">
 					<div class="tab-content" id="accounts-tabContent">
 						<div class="tab-pane fade active show" id="accounts-acc">
-							<form action="<?php echo $admin_base . ($id > 0 ? '&id=' . $id : ''); ?>" method="post">
+							<form action="<?php echo $admin_base . ((isset($id) && $id > 0) ? '&id=' . $id : ''); ?>" method="post">
-								<?php csrf(); ?>
 								<div class="form-group row">
 									<?php if (USE_ACCOUNT_NAME): ?>
 										<div class="col-12 col-sm-12 col-lg-4">
@@ -352,8 +321,8 @@ else if (isset($_REQUEST['search'])) {
 										<div class="col-12 col-sm-12 col-lg-6">
 											<label for="group">Account Type:</label>
 											<select name="group" id="group" class="form-control">
-												<?php foreach ($acc_type as $_id => $a_type): ?>
+												<?php foreach ($acc_type as $id => $a_type): ?>
-													<option value="<?php echo($_id); ?>" <?php echo($acc_group == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
+													<option value="<?php echo($id); ?>" <?php echo($acc_group == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
 												<?php endforeach; ?>
 											</select>
 										</div>
@@ -363,8 +332,8 @@ else if (isset($_REQUEST['search'])) {
 										<div class="col-12 col-sm-12 col-lg-6">
 											<label for="group">Account Type:</label>
 											<select name="group" id="group" class="form-control">
-												<?php foreach ($groups->getGroups() as $_id => $group): ?>
+												<?php foreach ($groups->getGroups() as $id => $group): ?>
-													<option value="<?php echo $_id; ?>" <?php echo($acc_group == $_id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
+													<option value="<?php echo $id; ?>" <?php echo($acc_group == $id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
 												<?php endforeach; ?>
 											</select>
 										</div>
@@ -372,8 +341,8 @@ else if (isset($_REQUEST['search'])) {
 									<div class="col-12 col-sm-12 col-lg-6">
 										<label for="web_flags">Website Access:</label>
 										<select name="web_flags" id="web_flags" class="form-control">
-											<?php foreach ($web_acc as $_id => $a_type): ?>
+											<?php foreach ($web_acc as $id => $a_type): ?>
-												<option value="<?php echo($_id); ?>" <?php echo($account->getWebFlags() == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
+												<option value="<?php echo($id); ?>" <?php echo($account->getWebFlags() == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -425,16 +394,14 @@ else if (isset($_REQUEST['search'])) {
 											   autocomplete="off" maxlength="20"
 											   value="<?php echo $account->getLocation(); ?>"/>
 									</div>
-									<?php if(setting('core.account_country')): ?>
 									<div class="col-12 col-sm-12 col-lg-4">
 										<label for="rl_country">Country:</label>
 										<select name="rl_country" id="rl_country" class="form-control">
-											<?php foreach ($countries as $_id => $a_type): ?>
+											<?php foreach ($countries as $id => $a_type): ?>
-												<option value="<?php echo($_id); ?>" <?php echo($account->getCountry() == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
+												<option value="<?php echo($id); ?>" <?php echo($account->getCountry() == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
-									<?php endif; ?>
 								</div>
 								<div class="form-group row">
 									<div class="col-12 col-sm-12 col-lg-6">
@@ -453,39 +420,12 @@ else if (isset($_REQUEST['search'])) {
 								<a href="<?php echo ADMIN_URL; ?>?p=accounts" class="btn btn-danger float-right"><i class="fas fa-cancel"></i> Cancel</a>
 							</form>
 						</div>
-						<div class="tab-pane fade" id="accounts-logs">
-							<div class="row">
-								<table class="table table-striped table-condensed table-responsive d-md-table">
-									<thead>
-										<tr>
-											<th>#</th>
-											<th>Date</th>
-											<th>Action</th>
-											<th>IP</th>
-										</tr>
-									</thead>
-									<tbody>
-										<?php
-											$accountActions = \MyAAC\Models\AccountAction::where('account_id', $account->getId())->orderByDesc('date')->get();
-											foreach ($accountActions as $i => $log):
-												$log->ip = ($log->ip != 0 ? long2ip($log->ip) : inet_ntop($log->ipv6));
-												?>
-											<tr>
-												<td><?php echo $i + 1; ?></td>
-												<td><?= date("M d Y, H:i:s", $log->date); ?></td>
-												<td><?= $log->action; ?></td>
-												<td><?= $log->ip; ?></td>
-											</tr>
-											<?php endforeach; ?>
-									</tbody>
-								</table>
-							</div>
-						</div>
 						<div class="tab-pane fade" id="accounts-chars">
 							<div class="row">
 								<?php
 								if (isset($account) && $account->isLoaded()) {
-									$account_players = Player::where('account_id', $account->getId())->orderBy('id')->get();
+									$account_players = $account->getPlayersList();
+									$account_players->orderBy('id');
 									if (isset($account_players)) { ?>
 										<table class="table table-striped table-condensed table-responsive d-md-table">
 											<thead>
@@ -498,13 +438,25 @@ else if (isset($_REQUEST['search'])) {
 											</tr>
 											</thead>
 											<tbody>
-											<?php foreach ($account_players as $i => $player): ?>
+											<?php $i= 0;
+											foreach ($account_players as $i => $player):
+												$i++;
+												$player_vocation = $player->getVocation();
+												$player_promotion = $player->getPromotion();
+												if (isset($player_promotion)) {
+													if ((int)$player_promotion > 0)
+														$player_vocation += ($player_promotion * $config['vocations_amount']);
+												}
+
+												if (isset($config['vocations'][$player_vocation])) {
+													$vocation_name = $config['vocations'][$player_vocation];
+												} ?>
 												<tr>
-													<th><?php echo $i + 1; ?></th>
+													<th><?php echo $i; ?></th>
-													<td><?php echo $player->name; ?></td>
+													<td><?php echo $player->getName(); ?></td>
-													<td><?php echo $player->level; ?></td>
+													<td><?php echo $player->getLevel(); ?></td>
-													<td><?php echo $player->vocation_name; ?></td>
+													<td><?php echo $vocation_name; ?></td>
-													<td><a href="?p=players&id=<?php echo $player->getKey() ?>" class=" btn btn-success btn-sm" title="Edit"><i class="fas fa-pencil-alt"></i></a></td>
+													<td><a href="?p=players&id=<?php echo $player->getId() ?>" class=" btn btn-success btn-sm" title="Edit"><i class="fas fa-pencil-alt"></i></a></td>
 												</tr>
 											<?php endforeach ?>
 											</tbody>
@@ -571,7 +523,7 @@ else if (isset($_REQUEST['search'])) {
 								} ?>
 							</div>
 						<?php endif;
-						if ($db->hasTable('store_history') && $db->hasColumn('store_history', 'time')) { ?>
+						if ($db->hasTable('store_history')) { ?>
 							<div class="tab-pane fade" id="accounts-store">
 								<?php $store_history = $db->query('SELECT * FROM `store_history` WHERE `account_id` = "' . $account->getId() . '" ORDER BY `time` DESC')->fetchAll(); ?>
 								<table class="table table-striped table-condensed table-responsive d-md-table">
@@ -608,30 +560,18 @@ else if (isset($_REQUEST['search'])) {
 				<div class="row">
 					<div class="col-6 col-lg-12">
 						<form action="<?php echo $admin_base; ?>" method="post">
-							<?php csrf(); ?>
+							<label for="name">Account Name:</label>
-							<label for="search">Account E-Mail:</label>
 							<div class="input-group input-group-sm">
-								<input type="email" class="form-control" id="search_email" name="search_email" value="<?= escapeHtml($search_account_email); ?>" maxlength="255" size="255">
+								<input type="text" class="form-control" name="search" value="<?php echo $search_account; ?>" maxlength="32" size="32">
 								<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
 							</div>
 						</form>
 					</div>
 					<div class="col-6 col-lg-12">
 						<form action="<?php echo $admin_base; ?>" method="post">
-							<?php csrf(); ?>
+							<label for="name">Account ID:</label>
-							<label for="search">Account Name:</label>
 							<div class="input-group input-group-sm">
-								<input type="text" class="form-control" id="search" name="search" value="<?= escapeHtml($search_account); ?>" maxlength="32" size="32">
+								<input type="text" class="form-control" name="id" value="" maxlength="32" size="32">
-								<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
-							</div>
-						</form>
-					</div>
-					<div class="col-6 col-lg-12">
-						<form action="<?php echo $admin_base; ?>" method="post">
-							<?php csrf(); ?>
-							<label for="id">Account ID:</label>
-							<div class="input-group input-group-sm">
-								<input type="text" class="form-control" id="id" name="id" value="<?= $id; ?>" maxlength="32" size="32">
 								<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
 							</div>
 						</form>

admin/pages/changelog.php

@@ -8,34 +8,32 @@
  * @copyright 2020 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Changelog;
-use MyAAC\Models\Changelog as ModelsChangelog;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
-$title = 'Changelog';
-
-csrfProtect();
-
 if (!hasFlag(FLAG_CONTENT_PAGES) && !superAdmin()) {
 	echo 'Access denied.';
 	return;
 }
 
+$title = 'Changelog';
 $use_datatable = true;
 const CL_LIMIT = 600; // maximum changelog body length
+?>
 
+<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>tools/css/jquery.datetimepicker.css"/ >
+<script src="<?php echo BASE_URL; ?>tools/js/jquery.datetimepicker.js"></script>
+<?php
 $id = $_GET['id'] ?? 0;
+require_once LIBS . 'changelog.php';
 
-if(!empty($action) && isRequestMethod('post'))
+if(!empty($action))
 {
-	$id = $_POST['id'] ?? null;
+	$id = $_REQUEST['id'] ?? null;
-	$body = isset($_POST['body']) ? stripslashes($_POST['body']) : null;
+	$body = isset($_REQUEST['body']) ? stripslashes($_REQUEST['body']) : null;
-	$create_date = isset($_POST['createdate']) ? (int)strtotime($_POST['createdate'] ): null;
+	$create_date = isset($_REQUEST['createdate']) ? (int)strtotime($_REQUEST['createdate'] ): null;
-	$player_id = isset($_POST['player_id']) ? (int)$_POST['player_id'] : null;
+	$player_id = isset($_REQUEST['player_id']) ? (int)$_REQUEST['player_id'] : null;
-	$type = isset($_POST['type']) ? (int)$_POST['type'] : null;
+	$type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : null;
-	$where = isset($_POST['where']) ? (int)$_POST['where'] : null;
+	$where = isset($_REQUEST['where']) ? (int)$_REQUEST['where'] : null;
 
 	$errors = array();
 
@@ -45,13 +43,12 @@ if(!empty($action) && isRequestMethod('post'))
 			$body = '';
 			$type = $where = $player_id = $create_date = 0;
 
-			success('Added successful.');
+			success("Added successful.");
 		}
 	}
 	else if($action == 'delete') {
-		if (Changelog::delete($id, $errors)) {
+		Changelog::delete($id, $errors);
-			success('Deleted successful.');
+		success("Deleted successful.");
-		}
 	}
 	else if($action == 'edit')
 	{
@@ -68,21 +65,20 @@ if(!empty($action) && isRequestMethod('post'))
 				$action = $body = '';
 				$type = $where = $player_id = $create_date = 0;
 
-				success('Updated successful.');
+				success("Updated successful.");
 			}
 		}
 	}
 	else if($action == 'hide') {
-		if (Changelog::toggleHide($id, $errors, $status)) {
+		Changelog::toggleHidden($id, $errors, $status);
-			success(($status == 1 ? 'Hide' : 'Show') . ' successful.');
+		success(($status == 1 ? 'Show' : 'Hide') . " successful.");
-		}
 	}
 
 	if(!empty($errors))
 		error(implode(", ", $errors));
 }
 
-$changelogs = ModelsChangelog::orderBy('id')->get()->toArray();
+$changelogs = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'changelog' . '` ORDER BY `id` DESC')->fetchAll();
 
 $i = 0;
 
@@ -114,7 +110,7 @@ if($action == 'edit' || $action == 'new') {
 	$account_players->orderBy('group_id', POT::ORDER_DESC);
 	$twig->display('admin.changelog.form.html.twig', array(
 		'action' => $action,
-		'cl_link_form' => constant('ADMIN_URL').'?p=changelog',
+		'cl_link_form' => constant('ADMIN_URL').'?p=changelog&action=' . ($action == 'edit' ? 'edit' : 'new'),
 		'cl_id' => $id ?? null,
 		'body' => isset($body) ? escapeHtml($body) : '',
 		'create_date' => $create_date ?? '',
@@ -129,3 +125,15 @@ if($action == 'edit' || $action == 'new') {
 $twig->display('admin.changelog.html.twig', array(
 	'changelogs' => $changelogs,
 ));
+
+?>
+<script>
+	$(document).ready(function () {
+		$('#createdate').datetimepicker({format: "M d Y, H:i:s",});
+
+		$('.tb_datatable').DataTable({
+			"order": [[0, "desc"]],
+			"columnDefs": [{targets: [1, 2,4,5],orderable: false}]
+		});
+	});
+</script>

admin/pages/clmd.php

@@ -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();
 

admin/pages/dashboard.php

@@ -10,9 +10,7 @@
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Dashboard';
 
-csrfProtect();
+if (isset($_GET['clear_cache'])) {
-
-if (isset($_POST['clear_cache'])) {
 	if (clearCache()) {
 		success('Cache cleared.');
 	} else {
@@ -20,7 +18,7 @@ if (isset($_POST['clear_cache'])) {
 	}
 }
 
-if (isset($_POST['maintenance'])) {
+if (isset($_GET['maintenance'])) {
 	$message = (!empty($_POST['message']) ? $_POST['message'] : null);
 	$_status = (isset($_POST['status']) && $_POST['status'] == 'true');
 	$_status = ($_status ? '0' : '1');

admin/pages/login.php

@@ -10,8 +10,6 @@
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Login';
 
-csrfProtect();
-
 require PAGES . 'account/login.php';
 if ($logged) {
 	header('Location: ' . (admin() ? ADMIN_URL : BASE_URL));

admin/pages/mailer.php

@@ -7,14 +7,9 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Models\Account;
-
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Mailer';
 
-csrfProtect();
-
 if (!hasFlag(FLAG_CONTENT_MAILER) && !superAdmin()) {
 	echo 'Access denied.';
 	return;
@@ -25,7 +20,7 @@ if (!setting('core.mail_enabled')) {
 	return;
 }
 
-$mail_to = isset($_POST['mail_to']) ? stripslashes(trim($_POST['mail_to'])) : null;
+$mail_to = isset($_REQUEST['mail_to']) ? stripslashes(trim($_REQUEST['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;
 
@@ -59,20 +54,20 @@ if (!empty($mail_content) && !empty($mail_subject) && empty($mail_to)) {
 	$failed = 0;
 
 	$add = '';
-	if (setting('core.account_mail_verify')) {
+	if (config('account_mail_verify')) {
 		note('Note: Sending only to users with verified E-Mail.');
 		$add = ' AND `email_verified` = 1';
 	}
 
-	$query = Account::where('email', '!=', '')->get(['email']);
+	$query = $db->query('SELECT `email` FROM `accounts` WHERE `email` != ""' . $add);
 	foreach ($query as $email) {
-		if (_mail($email->email, $mail_subject, $mail_content)) {
+		if (_mail($email['email'], $mail_subject, $mail_content)) {
 			$success++;
 		}
 		else {
 			$failed++;
 			echo '<br />';
-			error('An error occorred while sending email to <b>' . $email->email . '</b>. For Admin: More info can be found in system/logs/mailer-error.log');
+			error('An error occorred while sending email to <b>' . $email['email'] . '</b>. For Admin: More info can be found in system/logs/mailer-error.log');
 		}
 	}
 

admin/pages/mass_account.php

@@ -9,29 +9,32 @@
  * @copyright 2020 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Models\Account;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Mass Account Actions';
 
-csrfProtect();
-
 $hasCoinsColumn = $db->hasColumn('accounts', 'coins');
 $hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
 $freePremium = $config['lua']['freePremium'];
 
 function admin_give_points($points)
 {
-	global $hasPointsColumn;
+	global $db, $hasPointsColumn;
 
 	if (!$hasPointsColumn) {
 		displayMessage('Points not supported.');
 		return;
 	}
 
-	if (!Account::query()->increment('premium_points', $points)) {
+	$statement = $db->prepare('UPDATE `accounts` SET `premium_points` = `premium_points` + :points');
+	if (!$statement) {
+		displayMessage('Failed to prepare query statement.');
+		return;
+	}
+
+	if (!$statement->execute([
+		'points' => $points
+	])) {
 		displayMessage('Failed to add points.');
 		return;
 	}
@@ -40,14 +43,22 @@ function admin_give_points($points)
 
 function admin_give_coins($coins)
 {
-	global $hasCoinsColumn;
+	global $db, $hasCoinsColumn;
 
 	if (!$hasCoinsColumn) {
 		displayMessage('Coins not supported.');
 		return;
 	}
 
-	if (!Account::query()->increment('coins', $coins)) {
+	$statement = $db->prepare('UPDATE `accounts` SET `coins` = `coins` + :coins');
+	if (!$statement) {
+		displayMessage('Failed to prepare query statement.');
+		return;
+	}
+
+	if (!$statement->execute([
+		'coins' => $coins
+	])) {
 		displayMessage('Failed to add coins.');
 		return;
 	}
@@ -55,6 +66,24 @@ function admin_give_coins($coins)
 	displayMessage($coins . ' coins added to all accounts.', true);
 }
 
+function query_add_premium($column, $value_query, $condition_query = '1=1', $params = [])
+{
+	global $db;
+
+	$statement = $db->prepare("UPDATE `accounts` SET `{$column}` = $value_query WHERE $condition_query");
+	if (!$statement) {
+		displayMessage('Failed to prepare query statement.');
+		return false;
+	}
+
+	if (!$statement->execute($params)) {
+		displayMessage('Failed to add premium days.');
+		return false;
+	}
+
+	return true;
+}
+
 function admin_give_premdays($days)
 {
 	global $db, $freePremium;
@@ -69,9 +98,9 @@ function admin_give_premdays($days)
 	// othire
 	if ($db->hasColumn('accounts', 'premend')) {
 		// append premend
-		if (Account::where('premend', '>', $now)->increment('premend', $value)) {
+		if (query_add_premium('premend', '`premend` + :value', '`premend` > :now', ['value' => $value, 'now' => $now])) {
 			// set premend
-			if (Account::where('premend', '<=', $now)->update(['premend' => $now + $value])) {
+			if (query_add_premium('premend', ':value', '`premend` <= :now', ['value' => $now + $value, 'now' => $now])) {
 				displayMessage($days . ' premium days added to all accounts.', true);
 				return;
 			} else {
@@ -89,11 +118,11 @@ function admin_give_premdays($days)
 	// tfs 0.x
 	if ($db->hasColumn('accounts', 'premdays')) {
 		// append premdays
-		if (Account::query()->update(['premdays' => $days])) {
+		if (query_add_premium('premdays', '`premdays` + :value', '1=1', ['value' => $days])) {
 			// append lastday
-			if (Account::where('lastday', '>', $now)->increment('lastday', $value)) {
+			if (query_add_premium('lastday', '`lastday` + :value', '`lastday` > :now', ['value' => $value, 'now' => $now])) {
 				// set lastday
-				if (Account::where('lastday', '<=', $now)->update(['lastday' => $now + $value])) {
+				if (query_add_premium('lastday', ':value', '`lastday` <= :now', ['value' => $now + $value, 'now' => $now])) {
 					displayMessage($days . ' premium days added to all accounts.', true);
 					return;
 				} else {
@@ -117,9 +146,9 @@ function admin_give_premdays($days)
 	// tfs 1.x
 	if ($db->hasColumn('accounts', 'premium_ends_at')) {
 		// append premium_ends_at
-		if (Account::where('premium_ends_at', '>', $now)->increment('premium_ends_at', $value)) {
+		if (query_add_premium('premium_ends_at', '`premium_ends_at` + :value', '`premium_ends_at` > :now', ['value' => $value, 'now' => $now])) {
 			// set premium_ends_at
-			if (Account::where('premium_ends_at', '<=', $now)->update(['premium_ends_at' => $now + $value])) {
+			if (query_add_premium('premium_ends_at', ':value', '`premium_ends_at` <= :now', ['value' => $now + $value, 'now' => $now])) {
 				displayMessage($days . ' premium days added to all accounts.', true);
 				return;
 			} else {
@@ -137,9 +166,9 @@ function admin_give_premdays($days)
 	displayMessage('Premium Days not supported.');
 }
 
-if (!empty(ACTION) && isRequestMethod('post')) {
+if (isset($_POST['action']) && $_POST['action']) {
 
-	$action = ACTION;
+	$action = $_POST['action'];
 
 	if (preg_match("/[^A-z0-9_\-]/", $action)) {
 		displayMessage('Invalid action.');

admin/pages/mass_teleport.php

@@ -8,21 +8,22 @@
  * @copyright 2020 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Models\Player;
-use MyAAC\Models\PlayerOnline;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Mass Teleport Actions';
 
-csrfProtect();
-
 function admin_teleport_position($x, $y, $z) {
-	if (!Player::query()->update([
+	global $db;
-		'posx' => $x, 'posy' => $y, 'posz' => $z
+	$statement = $db->prepare('UPDATE `players` SET `posx` = :x, `posy` = :y, `posz` = :z');
+	if (!$statement) {
+		displayMessage('Failed to prepare query statement.');
+		return;
+	}
+
+	if (!$statement->execute([
+		'x' => $x, 'y' => $y, 'z' => $z
 	])) {
-		displayMessage('Failed to execute query. Probably already updated.');
+		displayMessage('Failed to execute query.');
 		return;
 	}
 
@@ -30,19 +31,26 @@ function admin_teleport_position($x, $y, $z) {
 }
 
 function admin_teleport_town($town_id) {
-	if (!Player::query()->update([
+	global $db;
-		'town_id' => $town_id,
+	$statement = $db->prepare('UPDATE `players` SET `town_id` = :town_id');
+	if (!$statement) {
+		displayMessage('Failed to prepare query statement.');
+		return;
+	}
+
+	if (!$statement->execute([
+		'town_id' => $town_id
 	])) {
-		displayMessage('Failed to execute query. Probably already updated.');
+		displayMessage('Failed to execute query.');
 		return;
 	}
 
 	displayMessage('Player\'s town updated.', true);
 }
 
-if (!empty(ACTION) && isRequestMethod('post'))    {
+if (isset($_POST['action']) && $_POST['action'])    {
 
-	$action = ACTION;
+	$action = $_POST['action'];
 
 	if (preg_match("/[^A-z0-9_\-]/", $action)) {
 		displayMessage('Invalid action.');
@@ -50,12 +58,13 @@ if (!empty(ACTION) && isRequestMethod('post'))    {
 
 		$playersOnline = 0;
 		if($db->hasTable('players_online')) {// tfs 1.0
-			$playersOnline = PlayerOnline::count();
+			$query = $db->query('SELECT count(*) AS `count` FROM `players_online`');
 		} else {
-			$playersOnline = Player::online()->count();
+			$query = $db->query('SELECT count(*) AS `count` FROM `players` WHERE `players`.`online` > 0');
 		}
 
-		if ($playersOnline > 0) {
+		$playersOnline = $query->fetch(PDO::FETCH_ASSOC);
+		if ($playersOnline['count'] > 0) {
 			displayMessage('Please, close the server before execute this action otherwise players will not be affected.');
 			return;
 		}

admin/pages/menus.php

@@ -7,72 +7,52 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Cache\Cache;
-use MyAAC\Models\Menu;
-use MyAAC\Plugins;
-
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Menus';
 
-csrfProtect();
-
 if (!hasFlag(FLAG_CONTENT_MENUS) && !superAdmin()) {
 	echo 'Access denied.';
 	return;
 }
 
-$pluginThemes = Plugins::getThemes();
+if (isset($_REQUEST['template'])) {
+	$template = $_REQUEST['template'];
 
-if (isset($_POST['template'])) {
+	if (isset($_REQUEST['menu'])) {
-	$template = $_POST['template'];
+		$post_menu = $_REQUEST['menu'];
-
+		$post_menu_link = $_REQUEST['menu_link'];
-	if (isset($_POST['save'])) {
+		$post_menu_blank = $_REQUEST['menu_blank'];
-		$post_menu = $_POST['menu'] ?? [];
+		$post_menu_color = $_REQUEST['menu_color'];
-		$post_menu_link = $_POST['menu_link'] ?? [];
-		$post_menu_blank = $_POST['menu_blank'] ?? [];
-		$post_menu_color = $_POST['menu_color'] ?? [];
 		if (count($post_menu) != count($post_menu_link)) {
 			echo 'Menu count is not equal menu links. Something went wrong when sending form.';
 			return;
 		}
 
-		Menu::where('template', $template)->delete();
+		$db->query('DELETE FROM `' . TABLE_PREFIX . 'menu` WHERE `template` = ' . $db->quote($template));
 		foreach ($post_menu as $category => $menus) {
 			foreach ($menus as $i => $menu) {
 				if (empty($menu)) // don't save empty menu item
 					continue;
 
 				try {
-					Menu::create([
+					$db->insert(TABLE_PREFIX . 'menu', array('template' => $template, 'name' => $menu, 'link' => $post_menu_link[$category][$i], 'blank' => $post_menu_blank[$category][$i] == 'on' ? 1 : 0, 'color' => str_replace('#', '', $post_menu_color[$category][$i]), 'category' => $category, 'ordering' => $i));
-						'template' => $template,
-						'name' => $menu,
-						'link' => $post_menu_link[$category][$i],
-						'blank' => $post_menu_blank[$category][$i] == 'on' ? 1 : 0,
-						'color' => str_replace('#', '', $post_menu_color[$category][$i]),
-						'category' => $category,
-						'ordering' => $i
-					]);
 				} catch (PDOException $error) {
 					warning('Error while adding menu item (' . $menu . '): ' . $error->getMessage());
 				}
 			}
 		}
 
-		onTemplateMenusChange();
+		$cache = Cache::getInstance();
+		if ($cache->enabled()) {
+			$cache->delete('template_menus');
+		}
+
 		success('Saved at ' . date('H:i'));
 	}
 
-	$path = TEMPLATES . $template;
+	$file = TEMPLATES . $template . '/config.php';
-
+	if (file_exists($file)) {
-	if (isset($pluginThemes[$template])) {
+		require_once $file;
-		$path = BASE . $pluginThemes[$template];
-	}
-
-	$path .= '/config.php';
-
-	if (file_exists($path)) {
-		require_once $path;
 	} else {
 		echo 'Cannot find template config.php file.';
 		return;
@@ -83,59 +63,25 @@ if (isset($_POST['template'])) {
 		return;
 	}
 
-	if (isset($_GET['reset_colors'])) {
-		foreach ($config['menu_categories'] as $id => $options) {
-			$color = $options['default_links_color'] ?? ($config['menu_default_links_color'] ?? ($config['menu_default_color'] ?? '#ffffff'));
-			Menu::where('template', $template)->where('category', $id)->update(['color' => str_replace('#', '', $color)]);
-		}
-
-		onTemplateMenusChange();
-		success('Colors has been reset at ' . date('H:i'));
-	}
-
-	if (isset($_GET['reset_menus'])) {
-		$configMenus = config('menus');
-		if (isset($configMenus)) {
-			Plugins::installMenus($template, config('menus'), true);
-
-			onTemplateMenusChange();
-			success('Menus has been reset at ' . date('H:i'));
-		}
-		else {
-			error("This template don't support reinstalling menus.");
-		}
-	}
-
 	$title = 'Menus - ' . $template;
-
-	$canResetColors = isset($config['menu_default_color']) || isset($config['menu_default_links_color']);
-	foreach ($config['menu_categories'] as $id => $options) {
-		if (isset($options['default_links_color'])) {
-			$canResetColors = true;
-		}
-	}
-
-	$twig->display('admin.menus.header.html.twig', [
-		'template' => $template,
-		'canResetColors' => $canResetColors
-	]);
 	?>
+	<div align="center" class="text-center">
+		<p class="note">You are editing: <?= $template ?><br/><br/>
+			Hint: You can drag menu items.<br/>
+			Hint: Add links to external sites using: <b>http://</b> or <b>https://</b> prefix.<br/>
+			Not all templates support blank and colorful links.
+		</p>
+	</div>
 	<?php
-	$menus = Menu::query()
+	$menus = array();
-		->select('name', 'link', 'blank', 'color', 'category', 'ordering')
+	$menus_db = $db->query('SELECT `name`, `link`, `blank`, `color`, `category`, `ordering` FROM `' . TABLE_PREFIX . 'menu` WHERE `enabled` = 1 AND `template` = ' . $db->quote($template) . ' ORDER BY `ordering` ASC;')->fetchAll();
-		->where('enabled', 1)
+	foreach ($menus_db as $menu) {
-		->where('template', $template)
+		$menus[$menu['category']][] = array('name' => $menu['name'], 'link' => $menu['link'], 'blank' => $menu['blank'], 'color' => $menu['color'], 'ordering' => $menu['ordering']);
-		->orderBy('ordering')
+	}
-		->get()
-		->groupBy('category')
-		->toArray();
-
 	$last_id = array();
 	?>
 	<form method="post" id="menus-form" action="?p=menus">
-		<?php csrf(); ?>
 		<input type="hidden" name="template" value="<?php echo $template ?>"/>
-		<button type="submit" name="save" class="btn btn-info">Save</button><br/><br/>
 		<div class="row">
 			<?php foreach ($config['menu_categories'] as $id => $cat): ?>
 				<div class="col-md-12 col-lg-6">
@@ -149,13 +95,12 @@ if (isset($_POST['template'])) {
 								if (isset($menus[$id])) {
 									$i = 0;
 									foreach ($menus[$id] as $menu):
-										$color = (empty($menu['color']) ? ($cat['default_links_color'] ?? ($config['menu_default_links_color'] ?? ($config['menu_default_color'] ?? '#ffffff'))) : '#' . $menu['color']);
 										?>
 										<li class="ui-state-default" id="list-<?php echo $id ?>-<?php echo $i ?>"><label>Name:</label> <input type="text" name="menu[<?php echo $id ?>][]" value="<?php echo escapeHtml($menu['name']); ?>"/>
 											<label>Link:</label> <input type="text" name="menu_link[<?php echo $id ?>][]" value="<?php echo $menu['link'] ?>"/>
 											<input type="hidden" name="menu_blank[<?php echo $id ?>][]" value="0"/>
 											<label><input class="blank-checkbox" type="checkbox" <?php echo($menu['blank'] == 1 ? 'checked' : '') ?>/><span title="Open in New Window">New Window</span></label>
-											<input class="color-picker" type="text" name="menu_color[<?php echo $id ?>][]" value="<?php echo $color; ?>"/>
+											<input class="color-picker" type="text" name="menu_color[<?php echo $id ?>][]" value="<?php echo (empty($menu['color']) ? ($config['menu_default_color'] ?? '#ffffff') : $menu['color']); ?>"/>
 											<a class="remove-button" id="remove-button-<?php echo $id ?>-<?php echo $i ?>"><i class="fas fa-trash"></a></i></li>
 										<?php $i++; $last_id[$id] = $i;
 									endforeach;
@@ -168,7 +113,7 @@ if (isset($_POST['template'])) {
 		</div>
 		<div class="row pb-2">
 			<div class="col-md-12">
-				<button type="submit" name="save" class="btn btn-info">Save</button>
+				<button type="submit" class="btn btn-info"><i class="fas fa-update"></i> Save</button>
 				<?php
 				echo '<button type="button" class="btn btn-danger float-right" value="Cancel" onclick="window.location = \'' . ADMIN_URL . '?p=menus\';"><i class="fas fa-cancel"></i> Cancel</button>';
 				?>
@@ -179,19 +124,15 @@ if (isset($_POST['template'])) {
 	$twig->display('admin.menus.js.html.twig', array(
 		'menus' => $menus,
 		'last_id' => $last_id,
+		'menu_default_color' => $config['menu_default_color'] ?? '#ffffff'
 	));
 	?>
 	<?php
 } else {
-	$templates = Menu::select('template')->distinct()->get()->toArray();
+	$templates = $db->query('SELECT `template` FROM `' . TABLE_PREFIX . 'menu` GROUP BY `template`;')->fetchAll();
 	foreach ($templates as $key => $value) {
-		$path = TEMPLATES . $value['template'];
+		$file = TEMPLATES . $value['template'] . '/config.php';
-
+		if (!file_exists($file)) {
-		if (isset($pluginThemes[$value['template']])) {
-			$path = BASE . $pluginThemes[$value['template']];
-		}
-
-		if (!file_exists($path . '/config.php')) {
 			unset($templates[$key]);
 		}
 	}
@@ -200,11 +141,3 @@ if (isset($_POST['template'])) {
 		'templates' => $templates
 	));
 }
-
-function onTemplateMenusChange(): void
-{
-	$cache = Cache::getInstance();
-	if ($cache->enabled()) {
-		$cache->delete('template_menus');
-	}
-}

admin/pages/modules/balance.php

@@ -1,14 +1,7 @@
 <?php
-
-use MyAAC\Models\Player;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
-$balance = 0;
+$balance = ($db->hasColumn('players', 'balance') ? $db->query('SELECT `balance`, `id`, `name`,`level` FROM `players` ORDER BY `balance` DESC LIMIT 10;') : 0);
-
-if ($db->hasColumn('players', 'balance')) {
-	$balance = Player::orderByDesc('balance')->limit(10)->get(['id', 'name', 'balance'])->toArray();
-}
 
 $twig->display('balance.html.twig', array(
 	'balance' => $balance

admin/pages/modules/coins.php

@@ -1,19 +1,7 @@
 <?php
-
-use MyAAC\Models\Account;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
-$coins = 0;
+$coins = ($db->hasColumn('accounts', 'coins') ?  $db->query('SELECT `coins`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `coins` DESC LIMIT 10;') : 0);
-
-if ($db->hasColumn('accounts', 'coins')) {
-	$whatToGet = ['id', 'coins'];
-	if (USE_ACCOUNT_NAME) {
-		$whatToGet[] = 'name';
-	}
-
-	$coins = Account::orderByDesc('coins')->limit(10)->get($whatToGet)->toArray();
-}
 
 $twig->display('coins.html.twig', array(
 	'coins' => $coins

admin/pages/modules/created.php

@@ -1,15 +1,8 @@
 <?php
-
-use MyAAC\Models\Account;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
-$accounts = 0;
+$players = ($db->hasColumn('accounts', 'created') ? $db->query('SELECT `created`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `created` DESC LIMIT 10;') : 0);
-
-if ($db->hasColumn('accounts', 'created')) {
-	$accounts = Account::orderByDesc('created')->limit(10)->get(['id', 'created'])->toArray();
-}
 
 $twig->display('created.html.twig', array(
-	'accounts' => $accounts,
+	'players' => $players,
 ));

admin/pages/modules/lastlogin.php

@@ -1,15 +1,7 @@
 <?php
-
-use MyAAC\Models\Player;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
-$players = 0;
+$players = ($db->hasColumn('players', 'lastlogin') ? $db->query('SELECT name, level, lastlogin FROM players ORDER BY lastlogin DESC LIMIT 10;') : 0);
-
-if ($db->hasColumn('players', 'lastlogin')) {
-	$players = Player::orderByDesc('lastlogin')->limit(10)->get(['id', 'name', 'level', 'lastlogin'])->toArray();
-}
-
 $twig->display('lastlogin.html.twig', array(
 	'players' => $players,
 ));

admin/pages/modules/points.php

@@ -1,14 +1,7 @@
 <?php
-
-use MyAAC\Models\Account;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
-$points = 0;
+$points = ($db->hasColumn('accounts', 'premium_points') ? $db->query('SELECT `premium_points`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `premium_points` DESC LIMIT 10;') : 0);
-
-if ($db->hasColumn('accounts', 'premium_points')) {
-	$coins = Account::orderByDesc('premium_points')->limit(10)->get(['premium_points', (USE_ACCOUNT_NAME ? 'name' : 'id')])->toArray();
-}
 
 $twig->display('points.html.twig', array(
 	'points' => $points,

admin/pages/modules/statistics.php

@@ -1,20 +1,11 @@
 <?php
-
-use MyAAC\Models\Account;
-use MyAAC\Models\Guild;
-use MyAAC\Models\House;
-use MyAAC\Models\Monster;
-use MyAAC\Models\Player;
-
 defined('MYAAC') or die('Direct access not allowed!');
-$count = $eloquentConnection->query()
+$count = $db->query('SELECT
-	->select([
+  (SELECT COUNT(*) FROM `accounts`) as total_accounts, 
-		'total_accounts' => Account::selectRaw('COUNT(id)'),
+  (SELECT COUNT(*) FROM `players`) as total_players,
-		'total_players' => Player::selectRaw('COUNT(id)'),
+  (SELECT COUNT(*) FROM `guilds`) as total_guilds,
-		'total_guilds' => Guild::selectRaw('COUNT(id)'),
+  (SELECT COUNT(*) FROM `' . TABLE_PREFIX . 'monsters`) as total_monsters,
-		'total_monsters' => Monster::selectRaw('COUNT(id)'),
+  (SELECT COUNT(*) FROM `houses`) as total_houses;')->fetch();
-		'total_houses' => House::selectRaw('COUNT(id)'),
-	])->first();
 
 $twig->display('statistics.html.twig', array(
 	'count' => $count,

admin/pages/modules/templates/balance.html.twig

@@ -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 %}

admin/pages/modules/templates/coins.html.twig

@@ -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 %}

admin/pages/modules/templates/created.html.twig

@@ -1,4 +1,4 @@
-{% if accounts is iterable %}
+{% if players is iterable %}
 	<div class=" col-md-6 col-lg-3">
 		<div class="card card-info card-outline">
 			<div class="card-header">
@@ -15,11 +15,11 @@
 					</thead>
 					<tbody>
 					{% set i = 0 %}
-					{% for result in accounts %}
+					{% for result in players %}
 						{% set i = i + 1 %}
 						<tr>
 							<th>{{ i }}</th>
-							<td><a href="?p=accounts&id={{ result.id }}">{{ result.id }}</a></td>
+							<td><a href="?p=accounts&search_name={{ result.name }}">{{ result.name }}</a></td>
 							<td>{{ result.created|date("M d Y, H:i:s") }}</td>
 						</tr>
 					{% endfor %}

admin/pages/modules/templates/lastlogin.html.twig

@@ -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 %}

admin/pages/modules/templates/points.html.twig

@@ -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 %}

admin/pages/modules/templates/web_status.twig

@@ -1,32 +1,28 @@
 <div class="col-12 col-md-6">
 	<div class="card card-warning card-outline">
-		<div class="card-header">
+		<form action="?p=dashboard&maintenance" method="post" class="form-horizontal">
-			<span class="m-0">Website Status<span class="float-right">
+			<div class="card-header">
-			<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
+				<span class="m-0">Website Status<span class="float-right">
-				<input form="maintenance-form" type="checkbox" class="custom-control-input" name="status" id="status" value="true" {% if not is_closed %} checked{% endif %}>
+				<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
-				<label id="status-label" class="custom-control-label" for="status"> {% if is_closed %}Closed{% else %}Open{% endif %}</label>
+					<input type="checkbox" class="custom-control-input" name="status" id="status" value="true" {% if not is_closed %} checked{% endif %}>
-			</div></span>
+					<label id="status-label" class="custom-control-label" for="status"> {% if is_closed %}Closed{% else %}Open{% endif %}</label>
-			</span>
+				</div></span>
-		</div>
+				</span>
-		<div class="card-body p-2">
-			<div class="col-sm-12">
-				<label for="message" class="col-form-label">Maintenance Message</label>
-				<textarea form="maintenance-form" name="message" class="form-control" cols="40" rows="3" maxlength="255" placeholder="Enter ...">{{ closed_message }}</textarea>
-				<small>(only visible if closed)</small>
 			</div>
-		</div>
+			<div class="card-body p-2">
-		<div class="card-footer">
+				<div class="col-sm-12">
-			<form id="maintenance-form" method="post" action="?p=dashboard" class="float-left">
+					<label for="message" class="col-form-label">Maintenance Message</label>
-				{{ csrf() }}
+					<textarea name="message" class="form-control" cols="40" rows="3" maxlength="255" placeholder="Enter ...">{{ closed_message }}</textarea>
-				<input type="hidden" name="maintenance" value="1" />
+					<small>(only visible if closed)</small>
+				</div>
+			</div>
+			<div class="card-footer">
 				<button type="submit" class="btn btn-info"><i class="far fa-update"></i> Update</button>
-			</form>
+				<a href="?p=dashboard&clear_cache" onclick="return confirm('Are you sure?');" class="float-right">
-			<form method="post" action="?p=dashboard" class="float-right">
+					<span class="btn btn-danger"><i class="fas fa-clear"></i>Clear cache</span>
-				{{ csrf() }}
+				</a>
-				<input type="hidden" name="clear_cache" value="1" />
+			</div>
-				<button type="submit" onclick="return confirm('Are you sure that you want to clear cache?');" class="btn btn-danger" title="Clear Cache"><i class="fas fa-clear"></i>Clear cache</button>
+		</form>
-			</form>
-		</div>
 	</div>
 </div>
 

admin/pages/news.php

@@ -7,16 +7,12 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Forum;
-use MyAAC\News;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
+require_once LIBS . 'forum.php';
+require_once LIBS . 'news.php';
+
 $title = 'News Panel';
-
-csrfProtect();
-
 $use_datatable = true;
 
 if (!hasFlag(FLAG_CONTENT_PAGES) && !superAdmin()) {
@@ -26,80 +22,81 @@ if (!hasFlag(FLAG_CONTENT_PAGES) && !superAdmin()) {
 
 header('X-XSS-Protection:0');
 
-// some constants, used mainly by database (cannot be modified without schema changes)
+// some constants, used mainly by database (cannot by modified without schema changes)
-const NEWS_TITLE_LIMIT = 100;
+define('NEWS_TITLE_LIMIT', 100);
-const NEWS_BODY_LIMIT = 65535; // maximum news body length
+define('NEWS_BODY_LIMIT', 65535); // maximum news body length
-const ARTICLE_TEXT_LIMIT = 300;
+define('ARTICLE_TEXT_LIMIT', 300);
-const ARTICLE_IMAGE_LIMIT = 100;
+define('ARTICLE_IMAGE_LIMIT', 100);
 
 $name = $p_title = '';
 if(!empty($action))
 {
-	$id = $_POST['id'] ?? null;
+	$id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
-	$p_title = $_POST['title'] ?? null;
+	$p_title = isset($_REQUEST['title']) ? $_REQUEST['title'] : null;
-	$body = isset($_POST['body']) ? stripslashes($_POST['body']) : null;
+	$body = isset($_REQUEST['body']) ? stripslashes($_REQUEST['body']) : null;
-	$comments = $_POST['comments'] ?? null;
+	$comments = isset($_REQUEST['comments']) ? $_REQUEST['comments'] : null;
-	$type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : 1;
+	$type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : null;
-	$category = isset($_POST['category']) ? (int)$_POST['category'] : null;
+	$category = isset($_REQUEST['category']) ? (int)$_REQUEST['category'] : null;
-	$player_id = isset($_POST['player_id']) ? (int)$_POST['player_id'] : null;
+	$player_id = isset($_REQUEST['player_id']) ? (int)$_REQUEST['player_id'] : null;
-	$article_text = $_POST['article_text'] ?? null;
+	$article_text = isset($_REQUEST['article_text']) ? $_REQUEST['article_text'] : null;
-	$article_image = $_POST['article_image'] ?? null;
+	$article_image = isset($_REQUEST['article_image']) ? $_REQUEST['article_image'] : null;
-	$forum_section = $_POST['forum_section'] ?? null;
+	$forum_section = isset($_REQUEST['forum_section']) ? $_REQUEST['forum_section'] : null;
-	$errors = [];
+	$errors = array();
 
-	if (isRequestMethod('post')) {
+	if($action == 'new') {
-		if ($action == 'new') {
+		if(isset($forum_section) && $forum_section != '-1') {
-			if (isset($forum_section) && $forum_section != '-1') {
+			$forum_add = Forum::add_thread($p_title, $body, $forum_section, $player_id, $account_logged->getId(), $errors);
-				$forum_add = Forum::add_thread($p_title, $body, $forum_section, $player_id, $account_logged->getId(), $errors);
+		}
-			}
 
-			if (isset($p_title) && News::add($p_title, $body, $type, $category, $player_id, isset($forum_add) && $forum_add != 0 ? $forum_add : 0, $article_text, $article_image, $errors)) {
+		if(isset($p_title) && News::add($p_title, $body, $type, $category, $player_id, isset($forum_add) && $forum_add != 0 ? $forum_add : 0, $article_text, $article_image, $errors)) {
-				$p_title = $body = $comments = $article_text = $article_image = '';
+			$p_title = $body = $comments = $article_text = $article_image = '';
+			$type = $category = $player_id = 0;
+
+			success("Added successful.");
+		}
+	}
+	else if($action == 'delete') {
+		News::delete($id, $errors);
+		success("Deleted successful.");
+	}
+	else if($action == 'edit')
+	{
+		if(isset($id) && !isset($p_title)) {
+			$news = News::get($id);
+			$p_title = $news['title'];
+			$body = $news['body'];
+			$comments = $news['comments'];
+			$type = $news['type'];
+			$category = $news['category'];
+			$player_id = $news['player_id'];
+			$article_text = $news['article_text'];
+			$article_image = $news['article_image'];
+		}
+		else {
+			if(News::update($id, $p_title, $body, $type, $category, $player_id, $forum_section, $article_text, $article_image, $errors)) {
+				// update forum thread if exists
+				if(isset($forum_section) && Validator::number($forum_section)) {
+					$db->query("UPDATE `" . TABLE_PREFIX . "forum` SET `author_guid` = ".(int) $player_id.", `post_text` = ".$db->quote($body).", `post_topic` = ".$db->quote($p_title).", `edit_date` = " . time() . " WHERE `id` = " . $db->quote($forum_section));
+				}
+
+				$action = $p_title = $body = $comments = $article_text = $article_image = '';
 				$type = $category = $player_id = 0;
 
-				success('Added successful.');
+				success("Updated successful.");
-			}
-		} else if ($action == 'delete') {
-			if (News::delete($id, $errors)) {
-				success('Deleted successful.');
-			}
-		} else if ($action == 'edit') {
-			if (isset($id) && !isset($p_title)) {
-				$news = News::get($id);
-				$p_title = $news['title'];
-				$body = $news['body'];
-				$comments = $news['comments'];
-				$type = $news['type'];
-				$category = $news['category'];
-				$player_id = $news['player_id'];
-				$article_text = $news['article_text'];
-				$article_image = $news['article_image'];
-			} else {
-				if (News::update($id, $p_title, $body, $type, $category, $player_id, $forum_section, $article_text, $article_image, $errors)) {
-					// update forum thread if exists
-					if (isset($forum_section) && Validator::number($forum_section)) {
-						$db->query("UPDATE `" . TABLE_PREFIX . "forum` SET `author_guid` = " . (int)$player_id . ", `post_text` = " . $db->quote($body) . ", `post_topic` = " . $db->quote($p_title) . ", `edit_date` = " . time() . " WHERE `id` = " . $db->quote($forum_section));
-					}
-
-					$action = $p_title = $body = $comments = $article_text = $article_image = '';
-					$type = $category = $player_id = 0;
-
-					success('Updated successful.');
-				}
-			}
-		} else if ($action == 'hide') {
-			if (News::toggleHide($id, $errors, $status)) {
-				success(($status == 1 ? 'Hide' : 'Show') . ' successful.');
 			}
 		}
 	}
+	else if($action == 'hide') {
+		News::toggleHidden($id, $errors, $status);
+		success(($status == 1 ? 'Show' : 'Hide') . " successful.");
+	}
 
 	if(!empty($errors))
 		error(implode(", ", $errors));
 }
 
 $categories = array();
-foreach($db->query('SELECT `id`, `name`, `icon_id` FROM `' . TABLE_PREFIX . 'news_categories` WHERE `hide` != 1') as $cat)
+foreach($db->query('SELECT `id`, `name`, `icon_id` FROM `' . TABLE_PREFIX . 'news_categories` WHERE `hidden` != 1') as $cat)
 {
 	$categories[$cat['id']] = array(
 		'name' => $cat['name'],
@@ -117,10 +114,12 @@ if($action == 'edit' || $action == 'new') {
 	$account_players->orderBy('group_id', POT::ORDER_DESC);
 	$twig->display('admin.news.form.html.twig', array(
 		'action' => $action,
+		'news_link' => getLink(PAGE),
+		'news_link_form' => '?p=news&action=' . ($action == 'edit' ? 'edit' : 'new'),
 		'news_id' => $id ?? null,
 		'title' => $p_title ?? '',
 		'body' => isset($body) ? escapeHtml($body) : '',
-		'type' => $type,
+		'type' => $type ?? null,
 		'player' => isset($player) && $player->isLoaded() ? $player : null,
 		'player_id' => $player_id ?? null,
 		'account_players' => $account_players,
@@ -136,27 +135,18 @@ if($action == 'edit' || $action == 'new') {
 
 $query = $db->query('SELECT * FROM ' . $db->tableName(TABLE_PREFIX . 'news'));
 $newses = array();
-
-$cachePlayers = [];
 foreach ($query as $_news) {
-	$playerId = $_news['player_id'];
+	$_player = new OTS_Player();
-	if (isset($cachePlayers[$playerId])) {
+	$_player->load($_news['player_id']);
-		$_player = $cachePlayers[$playerId];
-	}
-	else {
-		$_player = new OTS_Player();
-		$_player->load($playerId);
-		$cachePlayers[$playerId] = $_player;
-	}
 
 	$newses[$_news['type']][] = array(
 		'id' => $_news['id'],
-		'hide' => $_news['hide'],
+		'hidden' => $_news['hidden'],
 		'archive_link' => getLink('news') . '/archive/' . $_news['id'],
 		'title' => $_news['title'],
 		'date' => $_news['date'],
-		'player_name' => $_player->isLoaded() ? $_player->getName() : '',
+		'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '',
-		'player_link' => $_player->isLoaded() ? getPlayerLink($_player, false) : '',
+		'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '',
 	);
 }
 

admin/pages/notepad.php

@@ -7,35 +7,46 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Models\Notepad as ModelsNotepad;
-
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Notepad';
 
-csrfProtect();
+$notepad_content = Notepad::get($account_logged->getId());
-
-/**
- * @var OTS_Account $account_logged
- */
-$_content = '';
-$notepad = ModelsNotepad::where('account_id', $account_logged->getId())->first();
 if (isset($_POST['content'])) {
 	$_content = html_entity_decode(stripslashes($_POST['content']));
-	if (!$notepad) {
+	if (!$notepad_content)
-		ModelsNotepad::create([
+		Notepad::create($account_logged->getId(), $_content);
-			'account_id' => $account_logged->getId(),
+	else
-			'content' => $_content
+		Notepad::update($account_logged->getId(), $_content);
-		]);
-	}
-	else {
-		ModelsNotepad::where('account_id', $account_logged->getId())->update(['content' => $_content]);
-	}
 
-	success('Saved at ' . date('H:i'));
+	echo '<div class="success" style="text-align: center;">Saved at ' . date('H:i') . '</div>';
 } else {
-	if ($notepad)
+	if ($notepad_content !== false)
-		$_content = $notepad->content;
+		$_content = $notepad_content;
 }
 
-$twig->display('admin.notepad.html.twig', ['content' => $_content]);
+$twig->display('admin.notepad.html.twig', array('content' => isset($_content) ? $_content : null));
+
+class Notepad
+{
+	static public function get($account_id)
+	{
+		global $db;
+		$query = $db->select(TABLE_PREFIX . 'notepad', array('account_id' => $account_id));
+		if ($query !== false)
+			return $query['content'];
+
+		return false;
+	}
+
+	static public function create($account_id, $content = '')
+	{
+		global $db;
+		$db->insert(TABLE_PREFIX . 'notepad', array('account_id' => $account_id, 'content' => $content));
+	}
+
+	static public function update($account_id, $content = '')
+	{
+		global $db;
+		$db->update(TABLE_PREFIX . 'notepad', array('content' => $content), array('account_id' => $account_id));
+	}
+}

admin/pages/pages.php

@@ -7,16 +7,10 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Models\Pages as ModelsPages;
-use MyAAC\Admin\Pages;
-
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Pages';
 $use_datatable = true;
 
-csrfProtect();
-
 if (!hasFlag(FLAG_CONTENT_PAGES) && !superAdmin()) {
 	echo 'Access denied.';
 	return;
@@ -32,36 +26,31 @@ $enable_tinymce = true;
 $access = 0;
 
 // some constants, used mainly by database (cannot by modified without schema changes)
-const PAGE_TITLE_LIMIT = 30;
+define('PAGE_TITLE_LIMIT', 30);
-const PAGE_NAME_LIMIT = 30;
+define('PAGE_NAME_LIMIT', 30);
-const PAGE_BODY_LIMIT = 65535; // maximum page body length
+define('PAGE_BODY_LIMIT', 65535); // maximum page body length
 
-if (!empty($action) && isRequestMethod('post')) {
+if (!empty($action)) {
-	if ($action == 'delete' || $action == 'edit' || $action == 'hide') {
+	if ($action == 'delete' || $action == 'edit' || $action == 'hide')
-		$id = $_POST['id'];
+		$id = $_REQUEST['id'];
+
+	if (isset($_REQUEST['name']))
+		$name = $_REQUEST['name'];
+
+	if (isset($_REQUEST['title']))
+		$p_title = $_REQUEST['title'];
+
+	$php = isset($_REQUEST['php']) && $_REQUEST['php'] == 1;
+	$enable_tinymce = isset($_REQUEST['enable_tinymce']) && $_REQUEST['enable_tinymce'] == 1;
+	if ($php)
+		$body = $_REQUEST['body'];
+	else if (isset($_REQUEST['body'])) {
+		//$body = $_REQUEST['body'];
+		$body = html_entity_decode(stripslashes($_REQUEST['body']));
 	}
 
-	if (isset($_POST['name'])) {
+	if (isset($_REQUEST['access']))
-		$name = $_POST['name'];
+		$access = $_REQUEST['access'];
-	}
-
-	if (isset($_POST['title'])) {
-		$p_title = $_POST['title'];
-	}
-
-	$php = isset($_POST['php']) && $_POST['php'] == 1;
-	$enable_tinymce = (isset($_POST['enable_tinymce']) && $_POST['enable_tinymce'] == 1) ?: $enable_tinymce;
-	if ($php) {
-		$body = $_POST['body'];
-	}
-	else if (isset($_POST['body'])) {
-		//$body = $_POST['body'];
-		$body = html_entity_decode(stripslashes($_POST['body']));
-	}
-
-	if (isset($_POST['access'])) {
-		$access = $_POST['access'];
-	}
 
 	$errors = array();
 	$player_id = 1;
@@ -78,7 +67,7 @@ if (!empty($action) && isRequestMethod('post')) {
 		if (Pages::delete($id, $errors))
 			success('Page with id ' . $id . ' has been deleted');
 	} else if ($action == 'edit') {
-		if (isset($id) && !isset($_POST['name'])) {
+		if (isset($id) && !isset($_REQUEST['name'])) {
 			$_page = Pages::get($id);
 			$name = $_page['name'];
 			$p_title = $_page['title'];
@@ -97,26 +86,29 @@ if (!empty($action) && isRequestMethod('post')) {
 			}
 		}
 	} else if ($action == 'hide') {
-		if (Pages::toggleHide($id, $errors, $status)) {
+		Pages::toggleHidden($id, $errors, $status);
-			success(($status == 0 ? 'Show' : 'Hide') . ' successful.');
+		success(($status == 1 ? 'Show' : 'Hide') . ' successful.');
-		}
 	}
 
 	if (!empty($errors))
 		error(implode(", ", $errors));
 }
 
-$pages = ModelsPages::all()->map(function ($e) {
+$query =
-	return [
+	$db->query('SELECT * FROM ' . $db->tableName(TABLE_PREFIX . 'pages'));
-		'link' => getFullLink($e->name, $e->name, true),
-		'title' => substr($e->title, 0, 20),
-		'php' => $e->php == '1',
-		'id' => $e->id,
-		'hide' => $e->hide
-	];
-})->toArray();
 
-$twig->display('admin.pages.form.html.twig', [
+$pages = array();
+foreach ($query as $_page) {
+	$pages[] = array(
+		'link' => getFullLink($_page['name'], $_page['name'], true),
+		'title' => substr($_page['title'], 0, 20),
+		'php' => $_page['php'] == '1',
+		'id' => $_page['id'],
+		'hidden' => $_page['hidden']
+	);
+}
+
+$twig->display('admin.pages.form.html.twig', array(
 	'action' => $action,
 	'id' => $action == 'edit' ? $id : null,
 	'name' => $name,
@@ -126,8 +118,143 @@ $twig->display('admin.pages.form.html.twig', [
 	'body' => isset($body) ? escapeHtml($body) : '',
 	'groups' => $groups->getGroups(),
 	'access' => $access
-]);
+));
 
-$twig->display('admin.pages.html.twig', [
+$twig->display('admin.pages.html.twig', array(
 	'pages' => $pages
-]);
+));
+
+class Pages
+{
+	static public function verify($name, $title, $body, $player_id, $php, $enable_tinymce, $access, &$errors)
+	{
+		if(!isset($title[0]) || !isset($body[0])) {
+			$errors[] = 'Please fill all inputs.';
+			return false;
+		}
+		if(strlen($name) > PAGE_NAME_LIMIT) {
+			$errors[] = 'Page name cannot be longer than ' . PAGE_NAME_LIMIT . ' characters.';
+			return false;
+		}
+		if(strlen($title) > PAGE_TITLE_LIMIT) {
+			$errors[] = 'Page title cannot be longer than ' . PAGE_TITLE_LIMIT . ' characters.';
+			return false;
+		}
+		if(strlen($body) > PAGE_BODY_LIMIT) {
+			$errors[] = 'Page content cannot be longer than ' . PAGE_BODY_LIMIT . ' characters.';
+			return false;
+		}
+		if(!isset($player_id) || $player_id == 0) {
+			$errors[] = 'Player ID is wrong.';
+			return false;
+		}
+		if(!isset($php) || ($php != 0 && $php != 1)) {
+			$errors[] = 'Enable PHP is wrong.';
+			return false;
+		}
+		if ($php == 1 && !getBoolean(setting('core.admin_pages_php_enable'))) {
+			$errors[] = 'PHP pages disabled on this server. To enable go to Settings in Admin Panel and enable <strong>Enable PHP Pages</strong>.';
+			return false;
+		}
+		if(!isset($enable_tinymce) || ($enable_tinymce != 0 && $enable_tinymce != 1)) {
+			$errors[] = 'Enable TinyMCE is wrong.';
+			return false;
+		}
+		if(!isset($access) || $access < 0 || $access > PHP_INT_MAX) {
+			$errors[] = 'Access is wrong.';
+			return false;
+		}
+
+		return true;
+	}
+
+	static public function get($id)
+	{
+		global $db;
+		$query = $db->select(TABLE_PREFIX . 'pages', array('id' => $id));
+		if ($query !== false)
+			return $query;
+
+		return false;
+	}
+
+	static public function add($name, $title, $body, $player_id, $php, $enable_tinymce, $access, &$errors)
+	{
+		if(!self::verify($name, $title, $body, $player_id, $php, $enable_tinymce, $access, $errors)) {
+			return false;
+		}
+
+		global $db;
+		$query = $db->select(TABLE_PREFIX . 'pages', array('name' => $name));
+		if ($query === false)
+			$db->insert(TABLE_PREFIX . 'pages',
+				array(
+					'name' => $name,
+					'title' => $title,
+					'body' => $body,
+					'player_id' => $player_id,
+					'php' => $php ? '1' : '0',
+					'enable_tinymce' => $enable_tinymce ? '1' : '0',
+					'access' => $access
+				)
+			);
+		else
+			$errors[] = 'Page with this link already exists.';
+
+		return !count($errors);
+	}
+
+	static public function update($id, $name, $title, $body, $player_id, $php, $enable_tinymce, $access, &$errors)
+	{
+		if(!self::verify($name, $title, $body, $player_id, $php, $enable_tinymce, $access, $errors)) {
+			return false;
+		}
+
+		global $db;
+		$db->update(TABLE_PREFIX . 'pages',
+			array(
+				'name' => $name,
+				'title' => $title,
+				'body' => $body,
+				'player_id' => $player_id,
+				'php' => $php ? '1' : '0',
+				'enable_tinymce' => $enable_tinymce ? '1' : '0',
+				'access' => $access
+			),
+			array('id' => $id));
+
+		return true;
+	}
+
+	static public function delete($id, &$errors)
+	{
+		global $db;
+		if (isset($id)) {
+			if ($db->select(TABLE_PREFIX . 'pages', array('id' => $id)) !== false)
+				$db->delete(TABLE_PREFIX . 'pages', array('id' => $id));
+			else
+				$errors[] = 'Page with id ' . $id . ' does not exists.';
+		} else
+			$errors[] = 'id not set';
+
+		return !count($errors);
+	}
+
+	static public function toggleHidden($id, &$errors, &$status)
+	{
+		global $db;
+		if (isset($id)) {
+			$query = $db->select(TABLE_PREFIX . 'pages', array('id' => $id));
+			if ($query !== false) {
+				$db->update(TABLE_PREFIX . 'pages', array('hidden' => ($query['hidden'] == 1 ? 0 : 1)), array('id' => $id));
+				$status = $query['hidden'];
+			}
+			else {
+				$errors[] = 'Page with id ' . $id . ' does not exists.';
+			}
+		} else
+			$errors[] = 'id not set';
+
+		return !count($errors);
+	}
+}

admin/pages/players.php

@@ -7,19 +7,13 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Forum;
-use MyAAC\Models\Player;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Player editor';
-
-csrfProtect();
-
 $player_base = ADMIN_URL . '?p=players';
 
 $use_datatable = true;
+require_once LIBS . 'forum.php';
 
 $skills = array(
 	POT::SKILL_FIST => array('Fist fighting', 'fist'),
@@ -51,20 +45,22 @@ else if (isset($_REQUEST['search'])) {
 	if (strlen($search_player) < 3 && !Validator::number($search_player)) {
 		echo_error('Player name is too short.');
 	} else {
-		$query = Player::where('name', 'like', '%' . $search_player . '%')->orderBy('name')->limit(11)->get(['id', 'name']);
+		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote($search_player));
-		if (count($query) == 0) {
+		if ($query->rowCount() == 1) {
-			echo_error('No entries found.');
+			$query = $query->fetch();
-		} else if (count($query) == 1) {
+			$id = (int)$query['id'];
-			$id = $query->first()->getKey();
-		} else if (count($query) > 10) {
-			echo_error('Specified name resulted with too many players.');
 		} else {
-			$str_construct = 'Do you mean?<ul>';
+			$query = $db->query('SELECT `id`, `name` FROM `players` WHERE `name` LIKE ' . $db->quote('%' . $search_player . '%'));
-			foreach ($query as $row) {
+			if ($query->rowCount() > 0 && $query->rowCount() <= 10) {
-				$str_construct .= '<li><a href="' . $player_base . '&id=' . $row->getKey() . '">' . $row->name . '</a></li>';
+				$str_construct = 'Do you mean?<ul>';
-			}
+				foreach ($query as $row)
-			$str_construct .= '</ul>';
+					$str_construct .= '<li><a href="' . $player_base . '&id=' . $row['id'] . '">' . $row['name'] . '</a></li>';
-			echo_error($str_construct);
+				$str_construct .= '</ul>';
+				echo_error($str_construct);
+			} else if ($query->rowCount() > 10)
+				echo_error('Specified name resulted with too many players.');
+			else
+				echo_error('No entries found.');
 		}
 	}
 }
@@ -76,7 +72,7 @@ else if (isset($_REQUEST['search'])) {
 		$player = new OTS_Player();
 		$player->load($id);
 
-		if ($player->isLoaded() && isset($_POST['save'])) {// we want to save
+		if (isset($player) && $player->isLoaded() && isset($_POST['save'])) {// we want to save
 			$error = false;
 
 			if ($player->isOnline())
@@ -200,7 +196,7 @@ else if (isset($_REQUEST['search'])) {
 
 			if ($hasBlessingsColumn) {
 				$blessings = $_POST['blessings'];
-				verify_number($blessings, 'Blessings', 3);
+				verify_number($blessings, 'Blessings', 2);
 			}
 
 			$balance = $_POST['balance'];
@@ -211,7 +207,7 @@ else if (isset($_REQUEST['search'])) {
 			}
 
 			$deleted = (isset($_POST['deleted']) && $_POST['deleted'] == 'true');
-			$hide = (isset($_POST['hide']) && $_POST['hide'] == 'true');
+			$hidden = (isset($_POST['hidden']) && $_POST['hidden'] == 'true');
 
 			$created = strtotime($_POST['created']);
 			verify_number($created, 'Created', 11);
@@ -272,7 +268,7 @@ else if (isset($_REQUEST['search'])) {
 					$player->setLossContainers($loss_containers);
 					$player->setLossItems($loss_items);
 				}
-				if ($hasBlessingsColumn)
+				if ($db->hasColumn('players', 'blessings'))
 					$player->setBlessings($blessings);
 
 				if ($hasBlessingColumn) {
@@ -288,7 +284,7 @@ else if (isset($_REQUEST['search'])) {
 					$player->setCustomField('deletion', $deleted ? '1' : '0');
 				else
 					$player->setCustomField('deleted', $deleted ? '1' : '0');
-				$player->setCustomField('hide', $hide ? '1' : '0');
+				$player->setCustomField('hidden', $hidden ? '1' : '0');
 				$player->setCustomField('created', $created);
 				if (isset($comment))
 					$player->setCustomField('comment', $comment);
@@ -305,7 +301,7 @@ else if (isset($_REQUEST['search'])) {
 			}
 		}
 	} else if ($id == 0) {
-		$players_db = Player::orderBy('id')->get(['id','name', 'level']);
+		$players_db = $db->query('SELECT `id`, `name`, `level` FROM `players` ORDER BY `id` asc');
 		?>
 		<div class="col-12 col-sm-12 col-lg-10">
 			<div class="card card-info card-outline">
@@ -325,11 +321,11 @@ else if (isset($_REQUEST['search'])) {
 						<tbody>
 						<?php foreach ($players_db as $player_db): ?>
 							<tr>
-								<th><?php echo $player_db->id; ?></th>
+								<th><?php echo $player_db['id']; ?></th>
-								<td><?php echo $player_db->name; ?></a></td>
+								<td><?php echo $player_db['name']; ?></a></td>
-								<td><?php echo $player_db->level; ?></a></td>
+								<td><?php echo $player_db['level']; ?></a></td>
 
-								<td><a href="?p=players&id=<?php echo $player_db->id; ?>" class="btn btn-success btn-sm" title="Edit">
+								<td><a href="?p=players&id=<?php echo $player_db['id']; ?>" class="btn btn-success btn-sm" title="Edit">
 										<i class="fas fa-pencil-alt"></i>
 									</a>
 								</td>
@@ -373,8 +369,7 @@ else if (isset($_REQUEST['search'])) {
 						</li>
 					</ul>
 				</div>
-				<form action="<?php echo $player_base . ($id > 0 ? '&id=' . $id : ''); ?>" method="post">
+				<form action="<?php echo $player_base . ((isset($id) && $id > 0) ? '&id=' . $id : ''); ?>" method="post">
-					<?php csrf(); ?>
 					<div class="card-body">
 						<div class="tab-content" id="tabs-tabContent">
 							<div class="tab-pane fade active show" id="tabs-home">
@@ -392,8 +387,8 @@ else if (isset($_REQUEST['search'])) {
 									<div class="col-12 col-sm-12 col-lg-6">
 										<label for="group">Group:</label>
 										<select name="group" id="group" class="form-control custom-select">
-											<?php foreach ($groups->getGroups() as $_id => $group): ?>
+											<?php foreach ($groups->getGroups() as $id => $group): ?>
-												<option value="<?php echo $_id; ?>" <?php echo($player->getGroup()->getId() == $_id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
+												<option value="<?php echo $id; ?>" <?php echo($player->getGroup()->getId() == $id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -401,8 +396,8 @@ else if (isset($_REQUEST['search'])) {
 										<label for="vocation">Vocation</label>
 										<select name="vocation" id="vocation" class="form-control custom-select">
 											<?php
-											foreach ($config['vocations'] as $_id => $name) {
+											foreach ($config['vocations'] as $id => $name) {
-												echo '<option value=' . $_id . ($_id == $player->getVocation() ? ' selected' : '') . '>' . $name . '</option>';
+												echo '<option value=' . $id . ($id == $player->getVocation() ? ' selected' : '') . '>' . $name . '</option>';
 											}
 											?>
 										</select>
@@ -412,8 +407,8 @@ else if (isset($_REQUEST['search'])) {
 									<div class="col-12 col-sm-12 col-lg-6">
 										<label for="sex">Sex:</label>
 										<select name="sex" id="sex" class="form-control custom-select">>
-											<?php foreach ($config['genders'] as $_id => $sex): ?>
+											<?php foreach ($config['genders'] as $id => $sex): ?>
-												<option value="<?php echo $_id; ?>" <?php echo($player->getSex() == $_id ? 'selected' : ''); ?>><?php echo strtolower($sex); ?></option>
+												<option value="<?php echo $id; ?>" <?php echo($player->getSex() == $id ? 'selected' : ''); ?>><?php echo strtolower($sex); ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -426,8 +421,8 @@ else if (isset($_REQUEST['search'])) {
 												$configTowns[$player->getTownId()] = 'Unknown Town';
 											}
 
-											foreach ($configTowns as $_id => $town): ?>
+											foreach ($configTowns as $id => $town): ?>
-												<option value="<?php echo $_id; ?>" <?php echo($player->getTownId() == $_id ? 'selected' : ''); ?>><?php echo $town; ?></option>
+												<option value="<?php echo $id; ?>" <?php echo($player->getTownId() == $id ? 'selected' : ''); ?>><?php echo $town; ?></option>
 											<?php endforeach; ?>
 										</select>
 									</div>
@@ -438,8 +433,8 @@ else if (isset($_REQUEST['search'])) {
 										<select name="skull" id="skull" class="form-control custom-select">
 											<?php
 
-											foreach ($skull_type as $_id => $s_name) {
+											foreach ($skull_type as $id => $s_name) {
-												echo '<option value=' . $_id . ($_id == $player->getSkull() ? ' selected' : '') . '>' . $s_name . '</option>';
+												echo '<option value=' . $id . ($id == $player->getSkull() ? ' selected' : '') . '>' . $s_name . '</option>';
 											}
 											?>
 										</select>
@@ -483,8 +478,8 @@ else if (isset($_REQUEST['search'])) {
 									</div>
 									<div class="col-12 col-sm-12 col-lg-6">
 										<div class="custom-control custom-switch custom-switch-on-success">
-											<input type="checkbox" class="custom-control-input" name="hide" id="hide" value="true" <?php echo($player->isHidden() ? ' checked' : ''); ?>>
+											<input type="checkbox" class="custom-control-input" name="hidden" id="hidden" value="true" <?php echo($player->isHidden() ? ' checked' : ''); ?>>
-											<label class="custom-control-label" for="hide">Hidden</label>
+											<label class="custom-control-label" for="hidden">Hidden</label>
 										</div>
 									</div>
 								</div>
@@ -556,22 +551,22 @@ else if (isset($_REQUEST['search'])) {
 							</div>
 							<div class="tab-pane fade" id="tabs-skills">
 								<?php
-								foreach ($skills as $_id => $info) {
+								foreach ($skills as $id => $info) {
 									?>
 									<div class="form-group row">
 										<div class="col-12 col-sm-12 col-lg-6">
-											<?php echo '<label for="skills[' . $_id . ']" class="control-label">' . $info[0] . '</label>
+											<?php echo '<label for="skills[' . $id . ']" class="control-label">' . $info[0] . '</label>
-									<input type="text" class="form-control" id="skills[' . $_id . ']" name="skills[' . $_id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkill($_id) . '"/>'; ?>
+									<input type="text" class="form-control" id="skills[' . $id . ']" name="skills[' . $id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkill($id) . '"/>'; ?>
 										</div>
 										<div class="col-12 col-sm-12 col-lg-6">
-											<?php echo '<label for="skills_tries[' . $_id . ']" class="control-label">' . $info[0] . ' tries</label>
+											<?php echo '<label for="skills_tries[' . $id . ']" class="control-label">' . $info[0] . ' tries</label>
-									<input type="text" class="form-control" id="skills_tries[' . $_id . ']" name="skills_tries[' . $_id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkillTries($_id) . '"/>'; ?>
+									<input type="text" class="form-control" id="skills_tries[' . $id . ']" name="skills_tries[' . $id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkillTries($id) . '"/>'; ?>
 										</div>
 									</div>
 								<?php } ?>
 							</div>
 							<div class="tab-pane fade" id="tabs-pos">
-								<?php $outfit = setting('core.outfit_images_url') . '?id=' . $player->getLookType() . ($hasLookAddons ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet(); ?>
+								<?php $outfit = $config['outfit_images_url'] . '?id=' . $player->getLookType() . ($hasLookAddons ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet(); ?>
 								<div id="imgchar" style="width:64px;height:64px;position:absolute; top:30px; right:30px">
 									<img id="player_outfit" style="margin-left:0;margin-top:0;width:64px;height:64px;" src="<?php echo $outfit; ?>" alt="player outfit"/>
 								</div>
@@ -624,7 +619,7 @@ else if (isset($_REQUEST['search'])) {
 										if ($outfitlist) { ?>
 											<select name="look_type" id="look_type" class="form-control custom-select">
 												<?php
-												foreach ($outfitlist as $_id => $outfit) {
+												foreach ($outfitlist as $id => $outfit) {
 													if ($outfit['enabled'] == 'yes') ;
 													echo '<option value=' . $outfit['id'] . ($outfit['id'] == $player->getLookType() ? ' selected' : '') . '>' . $outfit['name'] . ' - ' . ($outfit['type'] == 1 ? 'Male' : 'Female') . '</option>';
 												}
@@ -640,8 +635,8 @@ else if (isset($_REQUEST['search'])) {
 											<select name="look_addons" id="look_addons" class="form-control custom-select">
 												<?php
 												$addon_type = array("None", "First", "Second", "Both");
-												foreach ($addon_type as $_id => $s_name) {
+												foreach ($addon_type as $id => $s_name) {
-													echo '<option value=' . $_id . ($_id == $player->getLookAddons() ? ' selected' : '') . '>' . $s_name . '</option>';
+													echo '<option value=' . $id . ($id == $player->getLookAddons() ? ' selected' : '') . '>' . $s_name . '</option>';
 												}
 												?>
 											</select>
@@ -706,7 +701,7 @@ else if (isset($_REQUEST['search'])) {
 								<div class="form-group row">
 									<div class="col-12">
 										<label for="comment" class="control-label">Comment:</label>
-										<textarea class="form-control" id="comment" name="comment" rows="10" cols="50" wrap="virtual"><?php echo $player->getCustomField("comment"); ?></textarea>
+										<textarea class="form-control" name="comment" rows="10" cols="50" wrap="virtual"><?php echo $player->getCustomField("comment"); ?></textarea>
 										<small>[max. length: 2000 chars, 50 lines (ENTERs)]</small>
 									</div>
 								</div>
@@ -749,7 +744,8 @@ else if (isset($_REQUEST['search'])) {
 								<div class="row">
 									<?php
 									if (isset($account) && $account->isLoaded()) {
-										$account_players = Player::where('account_id', $account->getId())->orderBy('id')->get();
+										$account_players = $account->getPlayersList();
+										$account_players->orderBy('id');
 										if (isset($account_players)) { ?>
 											<table class="table table-striped table-condensed table-responsive d-md-table">
 												<thead>
@@ -762,13 +758,23 @@ else if (isset($_REQUEST['search'])) {
 												</tr>
 												</thead>
 												<tbody>
-												<?php foreach ($account_players as $i => $player): ?>
+												<?php foreach ($account_players as $i => $player):
+													$player_vocation = $player->getVocation();
+													$player_promotion = $player->getPromotion();
+													if (isset($player_promotion)) {
+														if ((int)$player_promotion > 0)
+															$player_vocation += ($player_promotion * $config['vocations_amount']);
+													}
+
+													if (isset($config['vocations'][$player_vocation])) {
+														$vocation_name = $config['vocations'][$player_vocation];
+													} ?>
 													<tr>
-														<th><?php echo $i + 1; ?></th>
+														<th><?php echo $i; ?></th>
-														<td><?php echo $player->name; ?></td>
+														<td><?php echo $player->getName(); ?></td>
-														<td><?php echo $player->level; ?></td>
+														<td><?php echo $player->getLevel(); ?></td>
-														<td><?php echo $player->vocation_name; ?></td>
+														<td><?php echo $vocation_name; ?></td>
-														<td><a href="?p=players&id=<?php echo $player->getKey() ?>" class=" btn btn-success btn-sm" title="Edit"><i class="fas fa-pencil-alt"></i></a></td>
+														<td><a href="?p=players&id=<?php echo $player->getId() ?>" class=" btn btn-success btn-sm" title="Edit"><i class="fas fa-pencil-alt"></i></a></td>
 													</tr>
 												<?php endforeach ?>
 												</tbody>
@@ -843,7 +849,7 @@ else if (isset($_REQUEST['search'])) {
 
 				<?php if($hasLookAddons): ?>
 				const $addonvalue = $('#look_addons');
-				$addonvalue.on('change', () => {
+				$('#look_addons').on('change', () => {
 					updateOutfit();
 				});
 				<?php endif; ?>
@@ -860,7 +866,7 @@ else if (isset($_REQUEST['search'])) {
 				<?php if($hasLookAddons): ?>
 				look_addons = '&addons=' + $('#look_addons').val();
 				<?php endif; ?>
-				$("#player_outfit").attr("src", '<?= setting('core.outfit_images_url'); ?>?id=' + look_type + look_addons + '&head=' + look_head + '&body=' + look_body + '&legs=' + look_legs + '&feet=' + look_feet);
+				$("#player_outfit").attr("src", '<?= $config['outfit_images_url']; ?>?id=' + look_type + look_addons + '&head=' + look_head + '&body=' + look_body + '&legs=' + look_legs + '&feet=' + look_feet);
 			}
 		</script>
 	<?php } ?>
@@ -872,20 +878,18 @@ else if (isset($_REQUEST['search'])) {
 			<div class="card-body row">
 				<div class="col-6 col-lg-12">
 					<form action="<?php echo $player_base; ?>" method="post">
-						<?php csrf(); ?>
+						<label for="name">Player Name:</label>
-						<label for="search">Player Name:</label>
 						<div class="input-group input-group-sm">
-							<input type="text" class="form-control" id="search" name="search" value="<?= escapeHtml($search_player); ?>" maxlength="32" size="32">
+							<input type="text" class="form-control" name="search" value="<?php echo $search_player; ?>" maxlength="32" size="32">
 							<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
 						</div>
 					</form>
 				</div>
 				<div class="col-6 col-lg-12">
 					<form action="<?php echo $player_base; ?>" method="post">
-						<?php csrf(); ?>
+						<label for="name">Player ID:</label>
-						<label for="id">Player ID:</label>
 						<div class="input-group input-group-sm">
-							<input type="text" class="form-control" id="id" name="id" value="<?= $id; ?>" maxlength="32" size="32">
+							<input type="text" class="form-control" name="id" value="" maxlength="32" size="32">
 							<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
 						</div>
 					</form>
@@ -896,7 +900,7 @@ else if (isset($_REQUEST['search'])) {
 </div>
 
 <script>
-	$(function () {
+	$(document).ready(function () {
 		$('.player_datatable').DataTable({
 			"order": [[0, "asc"]]
 		});

admin/pages/plugins.php

@@ -7,100 +7,40 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Plugins;
-
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Plugin manager';
-
-csrfProtect();
-
 $use_datatable = true;
 
-if (!setting('core.admin_plugins_manage_enable')) {
+require_once LIBS . 'plugins.php';
+
+if (!getBoolean(setting('core.admin_plugins_manage_enable'))) {
 	warning('Plugin installation and management is disabled in Settings.<br/>If you wish to enable, go to Settings and enable <strong>Enable Plugins Manage</strong>.');
 }
 else {
-	$pluginUploadEnabled = true;
+	$twig->display('admin.plugins.form.html.twig');
-	if(!\class_exists('\ZipArchive')) {
-		error('Please install PHP zip extension. Plugins upload disabled until then.');
-		$pluginUploadEnabled = false;
-	}
 
-	$twig->display('admin.plugins.form.html.twig', ['pluginUploadEnabled' => $pluginUploadEnabled]);
+	if (isset($_REQUEST['uninstall'])) {
-
+		$uninstall = $_REQUEST['uninstall'];
-	if (isset($_POST['uninstall'])) {
-		$uninstall = $_POST['uninstall'];
 
 		if (Plugins::uninstall($uninstall)) {
 			success('Successfully uninstalled plugin ' . $uninstall);
 		} else {
 			error('Error while uninstalling plugin ' . $uninstall . ': ' . Plugins::getError());
 		}
-	} else if (isset($_POST['enable'])) {
+	} else if (isset($_REQUEST['enable'])) {
-		$enable = $_POST['enable'];
+		$enable = $_REQUEST['enable'];
 		if (Plugins::enable($enable)) {
 			success('Successfully enabled plugin ' . $enable);
 		} else {
 			error('Error while enabling plugin ' . $enable . ': ' . Plugins::getError());
 		}
-	} else if (isset($_POST['disable'])) {
+	} else if (isset($_REQUEST['disable'])) {
-		$disable = $_POST['disable'];
+		$disable = $_REQUEST['disable'];
 		if (Plugins::disable($disable)) {
 			success('Successfully disabled plugin ' . $disable);
 		} 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'];
@@ -176,7 +116,7 @@ foreach (get_plugins(true) as $plugin) {
 	if (!$plugin_info) {
 		warning('Cannot load plugin info ' . $plugin . '.json');
 	} else {
-		$disabled = (str_contains($plugin, 'disabled.'));
+		$disabled = (strpos($plugin, 'disabled.') !== false);
 		$pluginOriginal = ($disabled ? str_replace('disabled.', '', $plugin) : $plugin);
 		$plugins[] = array(
 			'name' => $plugin_info['name'] ?? '',

admin/pages/settings.php

@@ -7,10 +7,6 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Plugins;
-use MyAAC\Settings;
-
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Settings';
 
@@ -48,7 +44,7 @@ if (!is_array($settingsFile)) {
 
 $settingsKeyName = ($plugin == 'core' ? $plugin : $settingsFile['key']);
 
-$title = ($plugin == 'core' ? 'Settings' : 'Plugin Settings - ' . $settingsFile['name']);
+$title = ($plugin == 'core' ? 'Settings' : 'Plugin Settings - ' . $plugin);
 
 $settingsParsed = Settings::display($settingsKeyName, $settingsFile['settings']);
 

admin/pages/statistics.php

@@ -7,25 +7,26 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Models\Account;
-use MyAAC\Models\Guild;
-use MyAAC\Models\House;
-use MyAAC\Models\Player;
-
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Statistics';
 
-$total_accounts = Account::count();
+$query = $db->query('SELECT count(*) as `how_much` FROM `accounts`;');
-$total_players = Player::count();
+$query = $query->fetch();
-$total_guilds = Guild::count();
+$total_accounts = $query['how_much'];
-$total_houses = House::count();
 
-$points = Account::select(['premium_points', (USE_ACCOUNT_NAME ? 'name' : 'id')])
+$query = $db->query('SELECT count(*) as `how_much` FROM `players`;');
-	->orderByDesc('premium_points')
+$query = $query->fetch();
-	->limit(10)
+$total_players = $query['how_much'];
-	->get()
+
-	->toArray();
+$query = $db->query('SELECT count(*) as `how_much` FROM `guilds`;');
+$query = $query->fetch();
+$total_guilds = $query['how_much'];
+
+$query = $db->query('SELECT count(*) as `how_much` FROM `houses`;');
+$query = $query->fetch();
+$total_houses = $query['how_much'];
+
+$points = $db->query('SELECT `premium_points`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `premium_points` DESC LIMIT 10;');
 
 $twig->display('admin.statistics.html.twig', array(
 	'total_accounts' => $total_accounts,

admin/pages/visitors.php

@@ -12,18 +12,19 @@ defined('MYAAC') or die('Direct access not allowed!');
 use DeviceDetector\DeviceDetector;
 use DeviceDetector\Parser\Client\Browser;
 use DeviceDetector\Parser\OperatingSystem;
-use MyAAC\Visitors;
 
 $title = 'Visitors';
 $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;
 
+require SYSTEM . 'libs/visitors.php';
 $visitors = new Visitors(setting('core.visitors_counter_ttl'));
 
 function compare($a, $b): int {
@@ -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'));

admin/template/menus.php

@@ -1,6 +1,6 @@
 <?php
 
-$menus = [
+return [
 	['name' => 'Dashboard', 'icon' => 'tachometer-alt', 'order' => 10, 'link' => 'dashboard'],
 	['name' => 'Settings', 'icon' => 'edit', 'order' => 19, 'link' =>
 		require ADMIN . 'includes/settings_menus.php'

admin/template/style.css

@@ -7,9 +7,4 @@
 
 .sidebar-mini.sidebar-collapse .menu-text {
 	display: none;
-}
+}
-
-.myaac-table tbody tr:nth-child(even) {background: #FFF} /* light border */
-.myaac-table tbody tr:nth-child(odd) {background: #CCC} /* dark border */
-.myaac-table thead td {background: #000000; color: #ffffff !important;} /* vdark border */
-.myaac-table tfoot td {background: #000000; color: #ffffff !important;} /* vdark border */

admin/template/template.php

@@ -191,8 +191,8 @@ if ($logged && admin()) {
 	]);
 }
 ?>
-<script src="<?php echo BASE_URL; ?>tools/ext/bootstrap/js/bootstrap.min.js"></script>
+<script src="<?php echo BASE_URL; ?>tools/js/bootstrap.min.js"></script>
-<script src="<?php echo BASE_URL; ?>tools/ext/jquery-ui/jquery-ui.min.js"></script>
+<script src="<?php echo BASE_URL; ?>tools/js/jquery-ui.min.js"></script>
 <?php if (isset($use_datatable))  { ?>
 <script src="<?php echo BASE_URL; ?>tools/js/datatables.min.js"></script>
 <script src="<?php echo BASE_URL; ?>tools/js/datatables.bs.min.js"></script>

admin/tools/reload_data.php

@@ -22,10 +22,7 @@
  * @copyright 2020 MyAAC
  * @link      https://my-aac.org
  */
-
+define('MYAAC_ADMIN', true);
-use MyAAC\DataLoader;
-
-const MYAAC_ADMIN = true;
 
 require '../../common.php';
 require SYSTEM . 'functions.php';
@@ -37,9 +34,11 @@ if (!admin())
 
 ini_set('max_execution_time', 300);
 ob_implicit_flush();
-@ob_end_flush();
+ob_end_flush();
 header('X-Accel-Buffering: no');
 
+require LIBS . 'DataLoader.php';
+
 require LOCALE . 'en/main.php';
 require LOCALE . 'en/install.php';
 

admin/tools/settings_save.php

@@ -1,7 +1,4 @@
 <?php
-
-use MyAAC\Settings;
-
 const MYAAC_ADMIN = true;
 
 require '../../common.php';
@@ -14,8 +11,6 @@ if(!admin()) {
 	die('Access denied.');
 }
 
-csrfProtect();
-
 if (!isset($_REQUEST['plugin'])) {
 	http_response_code(500);
 	die('Please enter plugin name.');
@@ -28,7 +23,7 @@ if (!isset($_POST['settings'])) {
 
 $settings = Settings::getInstance();
 
-$success = $settings->save($_REQUEST['plugin'], $_POST['settings']);
+$settings->save($_REQUEST['plugin'], $_POST['settings']);
 
 $errors = $settings->getErrors();
 if (count($errors) > 0) {
@@ -36,6 +31,4 @@ if (count($errors) > 0) {
 	die(implode('<br/>', $errors));
 }
 
-if ($success) {
+echo 'Saved at ' . date('H:i');
-	echo 'Saved at ' . date('H:i');
-}

common.php

@@ -20,14 +20,14 @@
  *
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2024 MyAAC
+ * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.');
+if (version_compare(phpversion(), '7.2.5', '<')) die('PHP version 7.2.5 or higher is required.');
 
 const MYAAC = true;
-const MYAAC_VERSION = '1.6.1';
+const MYAAC_VERSION = '0.10.0-dev';
-const DATABASE_VERSION = 45;
+const DATABASE_VERSION = 36;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));
 define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX'));
@@ -108,13 +108,6 @@ const TFS_FIRST = TFS_02;
 const TFS_LAST = TFS_03;
 
 // other definitions
-const MAIL_MAIL = 0;
-const MAIL_SMTP = 1;
-
-const SMTP_SECURITY_NONE = 0;
-const SMTP_SECURITY_SSL = 1;
-const SMTP_SECURITY_TLS = 2;
-
 const ACCOUNT_NUMBER_LENGTH = 8;
 
 if (!IS_CLI) {
@@ -122,33 +115,40 @@ if (!IS_CLI) {
 	session_start();
 }
 
+// basedir
+$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);
+define('BASE_DIR', $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'];
+		}
+	}
+
+	define('SERVER_URL', 'http' . (isset($_SERVER['HTTPS'][0]) && strtolower($_SERVER['HTTPS']) === 'on' ? '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';
 }
 
-require SYSTEM . 'base.php';
-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 . '/');
-	}
-	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']);
-	}
-}
-
-/** @var array $config */
 ini_set('log_errors', 1);
-if(@$config['env'] === 'dev' || defined('MYAAC_INSTALL')) {
+if(@$config['env'] === 'dev') {
 	ini_set('display_errors', 1);
 	ini_set('display_startup_errors', 1);
 	error_reporting(E_ALL);
@@ -165,11 +165,3 @@ if (!is_file($autoloadFile)) {
 }
 
 require $autoloadFile;
-
-function isHttps(): bool
-{
-	return
-		(!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https')
-		|| (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')
-		|| (isset($_SERVER['SERVER_PORT']) && (int) $_SERVER['SERVER_PORT'] === 443);
-}

composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "php": "^8.1",
+        "php": "^7.2.5 || ^8.0",
         "ext-pdo": "*",
         "ext-pdo_mysql": "*",
         "ext-json": "*",
@@ -8,26 +8,12 @@
         "ext-dom": "*",
         "phpmailer/phpmailer": "^6.1",
         "composer/semver": "^3.2",
-        "twig/twig": "^3.11",
+        "twig/twig": "^2.0",
         "erusev/parsedown": "^1.7",
         "nikic/fast-route": "^1.3",
-        "matomo/device-detector": "^6.0",
+        "matomo/device-detector": "^6.0"
-        "illuminate/database": "^10.18",
-        "peppeocchi/php-cron-scheduler": "4.*",
-        "symfony/console": "^6.4",
-        "symfony/string": "^6.4",
-        "symfony/var-dumper": "^6.4",
-        "filp/whoops": "^2.15",
-        "maximebf/debugbar": "1.*",
-        "guzzlehttp/guzzle": "7.9.3"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.10"
+        "filp/whoops": "^2.15"
-    },
-    "autoload": {
-        "psr-4": {
-            "MyAAC\\": "system/src"
-        },
-        "files": ["system/src/global.php"]
     }
 }

cypress/e2e/1-install.cy.js

@@ -38,6 +38,7 @@ describe('Install MyAAC', () => {
 		cy.contains('Basic configuration');
 
 		cy.get('#vars_server_path').click().clear().type(Cypress.env('SERVER_PATH'))
+		cy.get('#vars_mail_admin').click().clear().type('noone@example.net')
 
 		cy.get('[type="checkbox"]').uncheck() // usage statistics uncheck
 
@@ -67,9 +68,7 @@ describe('Install MyAAC', () => {
 
 		cy.get('form').submit()
 
-		cy.contains('[class="alert alert-success"]', 'Congratulations', { timeout: 60000 }).should('be.visible')
+		cy.contains('[class="alert alert-success"]', 'Congratulations', { timeout: 30000 }).should('be.visible')
-
-		cy.wait(2000);
 
 		cy.screenshot('install-finish')
 	})

cypress/e2e/2-create-account.cy.js

@@ -14,7 +14,7 @@ describe('Create Account Page', () => {
 		cy.get('#email').type('tester@example.com')
 
 		cy.get('#password').type('test1234')
-		cy.get('#password_confirm').type('test1234')
+		cy.get('#password2').type('test1234')
 
 		cy.get('#character_name').type('Slaw')
 

cypress/e2e/3-check-public-pages.cy.js

@@ -1,174 +0,0 @@
-describe('Check Public Pages', () => {
-
-	/// news
-	it('Go to news page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/news',
-			method: 'GET',
-		})
-	})
-
-	it('Go to news archive page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/news/archive',
-			method: 'GET',
-		})
-	})
-
-	it('Go to changelog page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/change-log',
-			method: 'GET',
-		})
-	})
-
-	/// account management
-	it('Go to account manage page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/manage',
-			method: 'GET',
-		})
-	})
-
-	it('Go to account create page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/create',
-			method: 'GET',
-		})
-	})
-
-	it('Go to account lost page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/lost',
-			method: 'GET',
-		})
-	})
-
-	it('Go to rules page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/rules',
-			method: 'GET',
-		})
-	})
-
-	// community
-	it('Go to online page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/online',
-			method: 'GET',
-		})
-	})
-
-	it('Go to characters list page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/characters',
-			method: 'GET',
-		})
-	})
-
-	it('Go to guilds page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/guilds',
-			method: 'GET',
-		})
-	})
-
-	it('Go to highscores page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/highscores',
-			method: 'GET',
-		})
-	})
-
-	it('Go to last kills page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/last-kills',
-			method: 'GET',
-		})
-	})
-
-	it('Go to houses page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/houses',
-			method: 'GET',
-		})
-	})
-
-	it('Go to bans page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/bans',
-			method: 'GET',
-		})
-	})
-
-	it('Go to forum page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/forum',
-			method: 'GET',
-		})
-	})
-
-	it('Go to team page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/team',
-			method: 'GET',
-		})
-	})
-
-	// library
-	it('Go to monsters page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/monsters',
-			method: 'GET',
-		})
-	})
-
-	it('Go to spells page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/spells',
-			method: 'GET',
-		})
-	})
-
-	it('Go to server info page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/ots-info',
-			method: 'GET',
-		})
-	})
-
-	it('Go to commands page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/commands',
-			method: 'GET',
-		})
-	})
-
-	it('Go to downloads page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/downloads',
-			method: 'GET',
-		})
-	})
-
-	it('Go to gallery page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/gallery',
-			method: 'GET',
-		})
-	})
-
-	it('Go to experience table page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/exp-table',
-			method: 'GET',
-		})
-	})
-
-	it('Go to faq page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/faq',
-			method: 'GET',
-		})
-	})
-})

cypress/e2e/4-check-protected-pages.cy.js

@@ -1,81 +0,0 @@
-const REQUIRED_LOGIN_MESSAGE = 'Please enter your account name and your password.';
-const YOU_ARE_NOT_LOGGEDIN = 'You are not logged in.';
-
-describe('Check Protected Pages', () => {
-
-	// character actions
-	it('Go to account character creation page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/character/create',
-			method: 'GET',
-		})
-		cy.contains(REQUIRED_LOGIN_MESSAGE)
-	})
-
-	it('Go to account character deletion page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/character/delete',
-			method: 'GET',
-		})
-		cy.contains(REQUIRED_LOGIN_MESSAGE)
-	})
-
-	// account actions
-	it('Go to account email change page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/email',
-			method: 'GET',
-		})
-		cy.contains(REQUIRED_LOGIN_MESSAGE)
-	})
-
-	it('Go to account password change page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/password',
-			method: 'GET',
-		})
-		cy.contains(REQUIRED_LOGIN_MESSAGE)
-	})
-
-	it('Go to account info change page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/info',
-			method: 'GET',
-		})
-		cy.contains(REQUIRED_LOGIN_MESSAGE)
-	})
-
-	it('Go to account logout change page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/account/logout',
-			method: 'GET',
-		})
-		cy.contains(REQUIRED_LOGIN_MESSAGE)
-	})
-
-	// guild actions
-	it('Go to guild creation page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/?subtopic=guilds&action=create',
-			method: 'GET',
-		})
-		cy.contains(YOU_ARE_NOT_LOGGEDIN)
-	})
-
-	it('Go to guilds cleanup players action page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/?subtopic=guilds&action=cleanup_players',
-			method: 'GET',
-		})
-		cy.contains(YOU_ARE_NOT_LOGGEDIN)
-	})
-
-	it('Go to guilds cleanup guilds action page', () => {
-		cy.visit({
-			url: Cypress.env('URL') + '/?subtopic=guilds&action=cleanup_guilds',
-			method: 'GET',
-		})
-		cy.contains(YOU_ARE_NOT_LOGGEDIN)
-	})
-
-})

index.php

@@ -24,18 +24,15 @@
  * @link      https://my-aac.org
  */
 
-use MyAAC\UsageStatistics;
-use MyAAC\Visitors;
-
 require_once 'common.php';
 require_once SYSTEM . 'functions.php';
 
 $uri = $_SERVER['REQUEST_URI'];
-if(str_contains($uri, 'index.php')) {
+if(false !== strpos($uri, 'index.php')) {
 	$uri = str_replace_first('/index.php', '', $uri);
 }
 
-if(str_starts_with($uri, '/')) {
+if(0 === strpos($uri, '/')) {
 	$uri = str_replace_first('/', '', $uri);
 }
 
@@ -62,13 +59,22 @@ if(preg_match("/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|zip|rar|g
 if((!isset($config['installed']) || !$config['installed']) && file_exists(BASE . 'install'))
 {
 	header('Location: ' . BASE_URL . 'install/');
-	exit();
+	throw new RuntimeException('Setup detected that <b>install/</b> directory exists. Please visit <a href="' . BASE_URL . 'install">this</a> url to start MyAAC Installation.<br/>Delete <b>install/</b> directory if you already installed MyAAC.<br/>Remember to REFRESH this page when you\'re done!');
 }
 
 $template_place_holders = array();
 
 require_once SYSTEM . 'init.php';
 
+// verify myaac tables exists in database
+if(!$db->hasTable('myaac_account_actions')) {
+	throw new RuntimeException('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
+}
+
+// event system
+require_once SYSTEM . 'hooks.php';
+$hooks = new Hooks();
+$hooks->load();
 require_once SYSTEM . 'template.php';
 require_once SYSTEM . 'login.php';
 require_once SYSTEM . 'status.php';
@@ -76,8 +82,53 @@ require_once SYSTEM . 'status.php';
 $twig->addGlobal('config', $config);
 $twig->addGlobal('status', $status);
 
+require_once SYSTEM . 'router.php';
+
 $hooks->trigger(HOOK_STARTUP);
 
+// anonymous usage statistics
+// sent only when user agrees
+if(setting('core.anonymous_usage_statistics')) {
+	$report_time = 30 * 24 * 60 * 60; // report one time per 30 days
+	$should_report = true;
+
+	$value = '';
+	if($cache->enabled() && $cache->fetch('last_usage_report', $value)) {
+		$should_report = time() > (int)$value + $report_time;
+	}
+	else {
+		$value = '';
+		if(fetchDatabaseConfig('last_usage_report', $value)) {
+			$should_report = time() > (int)$value + $report_time;
+			if($cache->enabled()) {
+				$cache->set('last_usage_report', $value);
+			}
+		}
+		else {
+			registerDatabaseConfig('last_usage_report', time() - ($report_time - (7 * 24 * 60 * 60))); // first report after a week
+			$should_report = false;
+		}
+	}
+
+	if($should_report) {
+		require_once LIBS . 'usage_statistics.php';
+		Usage_Statistics::report();
+
+		updateDatabaseConfig('last_usage_report', time());
+		if($cache->enabled()) {
+			$cache->set('last_usage_report', time());
+		}
+	}
+}
+
+if(setting('core.views_counter'))
+	require_once SYSTEM . 'counter.php';
+
+if(setting('core.visitors_counter')) {
+	require_once SYSTEM . 'libs/visitors.php';
+	$visitors = new Visitors(setting('core.visitors_counter_ttl'));
+}
+
 // backward support for gesior
 if(setting('core.backward_support')) {
 	define('INITIALIZED', true);
@@ -93,7 +144,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,50 +168,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
-// sent only when user agrees
-if(setting('core.anonymous_usage_statistics')) {
-	$report_time = 30 * 24 * 60 * 60; // report one time per 30 days
-	$should_report = true;
-
-	$value = '';
-	if($cache->enabled() && $cache->fetch('last_usage_report', $value)) {
-		$should_report = time() > (int)$value + $report_time;
-	}
-	else {
-		$value = '';
-		if(fetchDatabaseConfig('last_usage_report', $value)) {
-			$should_report = time() > (int)$value + $report_time;
-			if($cache->enabled()) {
-				$cache->set('last_usage_report', $value, 60 * 60);
-			}
-		}
-		else {
-			registerDatabaseConfig('last_usage_report', time() - ($report_time - (7 * 24 * 60 * 60))); // first report after a week
-			$should_report = false;
-		}
-	}
-
-	if($should_report) {
-		UsageStatistics::report();
-
-		updateDatabaseConfig('last_usage_report', time());
-		if($cache->enabled()) {
-			$cache->set('last_usage_report', time(), 60 * 60);
-		}
-	}
-}
-
 /**
  * @var OTS_Account $account_logged
  */
@@ -170,7 +176,6 @@ if ($logged && admin()) {
 		'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
 	]);
 }
-
 $title_full =  (isset($title) ? $title . ' - ' : '') . $config['lua']['serverName'];
 require $template_path . '/' . $template_index;
 

install/includes/config.php

@@ -26,9 +26,6 @@ if(!isset($error) || !$error) {
 		$config['database_type'] = $config['lua']['database_type'];
 	else if(isset($config['lua']['sql_type'])) // otserv
 		$config['database_type'] = $config['lua']['sql_type'];
-	else {
-		$config['database_type'] = '';
-	}
 
 	$config['database_type'] = strtolower($config['database_type']);
 	if(empty($config['database_type'])) {

install/includes/functions.php

@@ -11,13 +11,13 @@ function query($query)
 		error($error_);
 		$error = true;
 	}
-
+	
 	return !$error;
 }
 
 // define php version id if its not already
 if(!defined('PHP_VERSION_ID')) {
-	$version = array_map('intval', explode('.', PHP_VERSION));
+	$version = explode('.', PHP_VERSION);
 
 	define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2]));
 }
@@ -97,4 +97,4 @@ function win_is_writable($path) {
 		unlink($path);
 
 	return true;
-}
+}

install/includes/schema.sql

@@ -1,73 +1,88 @@
-SET @myaac_database_version = 45;
+SET @myaac_database_version = 36;
 
 CREATE TABLE `myaac_account_actions`
 (
-	`account_id` int NOT NULL,
+	`account_id` INT(11) NOT NULL,
-	`ip` int unsigned NOT NULL DEFAULT 0,
+	`ip` INT(10) UNSIGNED NOT NULL DEFAULT 0,
-	`ipv6` binary(16) NOT NULL DEFAULT 0,
+	`ipv6` BINARY(16) NOT NULL DEFAULT 0,
-	`date` int NOT NULL DEFAULT 0,
+	`date` INT(11) NOT NULL DEFAULT 0,
-	`action` varchar(255) NOT NULL DEFAULT '',
+	`action` VARCHAR(255) NOT NULL DEFAULT '',
 	KEY (`account_id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_admin_menu`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` varchar(255) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`page` varchar(255) NOT NULL DEFAULT '',
+	`page` VARCHAR(255) NOT NULL DEFAULT '',
-	`ordering` int NOT NULL DEFAULT 0,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`flags` int NOT NULL DEFAULT 0,
+	`flags` INT(11) NOT NULL DEFAULT 0,
-	`enabled` int NOT NULL DEFAULT 1,
+	`enabled` INT(1) NOT NULL DEFAULT 1,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
+
+CREATE TABLE `myaac_bugtracker`
+(
+	`account` VARCHAR(255) NOT NULL,
+	`type` INT(11) NOT NULL DEFAULT 0,
+	`status` INT(11) NOT NULL DEFAULT 0,
+	`text` text NOT NULL,
+	`id` INT(11) NOT NULL DEFAULT 0,
+	`subject` VARCHAR(255) NOT NULL DEFAULT '',
+	`reply` INT(11) NOT NULL DEFAULT 0,
+	`who` INT(11) NOT NULL DEFAULT 0,
+	`uid` INT(11) NOT NULL AUTO_INCREMENT,
+	`tag` INT(11) NOT NULL DEFAULT 0,
+	PRIMARY KEY (`uid`)
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_changelog`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`body` varchar(500) NOT NULL DEFAULT '',
+	`body` VARCHAR(500) NOT NULL DEFAULT '',
-	`type` tinyint NOT NULL DEFAULT 0 COMMENT '1 - added, 2 - removed, 3 - changed, 4 - fixed',
+	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - added, 2 - removed, 3 - changed, 4 - fixed',
-	`where` tinyint NOT NULL DEFAULT 0 COMMENT '1 - server, 2 - site',
+	`where` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - server, 2 - site',
-	`date` int NOT NULL DEFAULT 0,
+	`date` INT(11) NOT NULL DEFAULT 0,
-	`player_id` int NOT NULL DEFAULT 0,
+	`player_id` INT(11) NOT NULL DEFAULT 0,
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
-INSERT INTO `myaac_changelog` (`id`, `type`, `where`, `date`, `body`, `hide`) VALUES (1, 3, 2, UNIX_TIMESTAMP(), 'MyAAC installed. (:', 0);
+INSERT INTO `myaac_changelog` (`id`, `type`, `where`, `date`, `body`, `hidden`) VALUES (1, 3, 2, UNIX_TIMESTAMP(), 'MyAAC installed. (:', 0);
 
 CREATE TABLE `myaac_config`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` varchar(30) NOT NULL,
+	`name` VARCHAR(30) NOT NULL,
-	`value` varchar(1000) NOT NULL,
+	`value` VARCHAR(1000) NOT NULL,
 	PRIMARY KEY (`id`),
 	UNIQUE (`name`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 INSERT INTO `myaac_config` (`name`, `value`) VALUES ('database_version', @myaac_database_version);
 
 CREATE TABLE `myaac_faq`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`question` varchar(255) NOT NULL DEFAULT '',
+	`question` VARCHAR(255) NOT NULL DEFAULT '',
-	`answer` varchar(1020) NOT NULL DEFAULT '',
+	`answer` VARCHAR(1020) NOT NULL DEFAULT '',
-	`ordering` int NOT NULL DEFAULT 0,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_forum_boards`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` varchar(32) NOT NULL,
+	`name` VARCHAR(32) NOT NULL,
-	`description` varchar(255) NOT NULL DEFAULT '',
+	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`ordering` int NOT NULL DEFAULT 0,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`guild` int NOT NULL DEFAULT 0,
+	`guild` INT(11) NOT NULL DEFAULT 0,
-	`access` int NOT NULL DEFAULT 0,
+	`access` INT(11) NOT NULL DEFAULT 0,
-	`closed` tinyint NOT NULL DEFAULT 0,
+	`closed` TINYINT(1) NOT NULL DEFAULT 0,
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`, `closed`) VALUES (NULL, 'News', 'News commenting', 0, 1);
 INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Trade', 'Trade offers.', 1);
 INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Quests', 'Quest making.', 2);
@@ -76,102 +91,171 @@ INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUE
 
 CREATE TABLE `myaac_forum`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`first_post` int NOT NULL DEFAULT 0,
+	`first_post` int(11) NOT NULL default '0',
-	`last_post` int NOT NULL DEFAULT 0,
+	`last_post` int(11) NOT NULL default '0',
-	`section` int NOT NULL DEFAULT 0,
+	`section` int(3) NOT NULL default '0',
-	`replies` int NOT NULL DEFAULT 0,
+	`replies` int(20) NOT NULL default '0',
-	`views` int NOT NULL DEFAULT 0,
+	`views` int(20) NOT NULL default '0',
-	`author_aid` int NOT NULL DEFAULT 0,
+	`author_aid` int(20) NOT NULL default '0',
-	`author_guid` int NOT NULL DEFAULT 0,
+	`author_guid` int(20) NOT NULL default '0',
 	`post_text` text NOT NULL,
 	`post_topic` varchar(255) NOT NULL DEFAULT '',
-	`post_smile` tinyint NOT NULL DEFAULT 0,
+	`post_smile` tinyint(1) NOT NULL default '0',
-	`post_html` tinyint NOT NULL DEFAULT 0,
+	`post_html` tinyint(1) NOT NULL default '0',
-	`post_date` int NOT NULL DEFAULT 0,
+	`post_date` int(20) NOT NULL default '0',
-	`last_edit_aid` int NOT NULL DEFAULT 0,
+	`last_edit_aid` int(20) NOT NULL default '0',
-	`edit_date` int NOT NULL DEFAULT 0,
+	`edit_date` int(20) NOT NULL default '0',
-	`post_ip` varchar(45) NOT NULL DEFAULT '0.0.0.0',
+	`post_ip` varchar(32) NOT NULL default '0.0.0.0',
-	`sticked` tinyint NOT NULL DEFAULT 0,
+	`sticked` tinyint(1) NOT NULL DEFAULT '0',
-	`closed` tinyint NOT NULL DEFAULT 0,
+	`closed` tinyint(1) NOT NULL DEFAULT '0',
 	PRIMARY KEY (`id`),
 	KEY `section` (`section`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_menu`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`template` varchar(255) NOT NULL,
+	`template` VARCHAR(255) NOT NULL,
-	`name` varchar(255) NOT NULL,
+	`name` VARCHAR(255) NOT NULL,
-	`link` varchar(255) NOT NULL,
+	`link` VARCHAR(255) NOT NULL,
-	`blank` tinyint NOT NULL DEFAULT 0,
+	`blank` TINYINT(1) NOT NULL DEFAULT 0,
-	`color` varchar(6) NOT NULL DEFAULT '',
+	`color` VARCHAR(6) NOT NULL DEFAULT '',
-	`category` int NOT NULL DEFAULT 1,
+	`category` INT(11) NOT NULL DEFAULT 1,
-	`ordering` int NOT NULL DEFAULT 0,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`enabled` int NOT NULL DEFAULT 1,
+	`enabled` INT(1) NOT NULL DEFAULT 1,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
+
+/* MENU_CATEGORY_NEWS kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Latest News', 'news', 1, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'News Archive', 'news/archive', 1, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Changelog', 'changelog', 1, 2);
+/* MENU_CATEGORY_ACCOUNT kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Account Management', 'account/manage', 2, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Create Account', 'account/create', 2, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Lost Account?', 'account/lost', 2, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Server Rules', 'rules', 2, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Downloads', 'downloads', 5, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Report Bug', 'bugtracker', 2, 5);
+/* MENU_CATEGORY_COMMUNITY kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Who is Online?', 'online', 3, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Characters', 'characters', 3, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Guilds', 'guilds', 3, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Highscores', 'highscores', 3, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Last Deaths', 'lastkills', 3, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Houses', 'houses', 3, 5);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Bans', 'bans', 3, 6);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Forum', 'forum', 3, 7);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Team', 'team', 3, 8);
+/* MENU_CATEGORY_LIBRARY kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Monsters', 'creatures', 5, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Spells', 'spells', 5, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Server Info', 'serverInfo', 5, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Commands', 'commands', 5, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Gallery', 'gallery', 5, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Experience Table', 'experienceTable', 5, 5);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'FAQ', 'faq', 5, 6);
+/* MENU_CATEGORY_SHOP kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Buy Points', 'points', 6, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Shop Offer', 'gifts', 6, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Shop History', 'gifts/history', 6, 2);
+/* MENU_CATEGORY_NEWS tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Latest News', 'news', 1, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'News Archive', 'news/archive', 1, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Changelog', 'changelog', 1, 2);
+/* MENU_CATEGORY_ACCOUNT tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Account Management', 'account/manage', 2, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Create Account', 'account/create', 2, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Lost Account?', 'account/lost', 2, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Server Rules', 'rules', 2, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Downloads', 'downloads', 2, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Report Bug', 'bugtracker', 2, 5);
+/* MENU_CATEGORY_COMMUNITY tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Characters', 'characters', 3, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Who Is Online?', 'online', 3, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Highscores', 'highscores', 3, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Last Kills', 'lastkills', 3, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Houses', 'houses', 3, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Guilds', 'guilds', 3, 5);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Polls', 'polls', 3, 6);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Bans', 'bans', 3, 7);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Support List', 'team', 3, 8);
+/* MENU_CATEGORY_FORUM tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Forum', 'forum', 4, 0);
+/* MENU_CATEGORY_LIBRARY tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Creatures', 'creatures', 5, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Spells', 'spells', 5, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Commands', 'commands', 5, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Exp Stages', 'experienceStages', 5, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Gallery', 'gallery', 5, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Server Info', 'serverInfo', 5, 5);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Experience Table', 'experienceTable', 5, 6);
+/* MENU_CATEGORY_SHOP tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Buy Points', 'points', 6, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Shop Offer', 'gifts', 6, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Shop History', 'gifts/history', 6, 2);
 
 CREATE TABLE `myaac_monsters` (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` tinyint(1) NOT NULL default 0,
 	`name` varchar(255) NOT NULL,
-	`mana` int NOT NULL DEFAULT 0,
+	`mana` int(11) NOT NULL DEFAULT 0,
-	`exp` int NOT NULL,
+	`exp` int(11) NOT NULL,
-	`health` int NOT NULL,
+	`health` int(11) NOT NULL,
-	`look` varchar(255) NOT NULL DEFAULT '',
+	`look` VARCHAR(255) NOT NULL DEFAULT '',
-	`speed_lvl` int NOT NULL DEFAULT 1,
+	`speed_lvl` int(11) NOT NULL default 1,
-	`use_haste` tinyint NOT NULL,
+	`use_haste` tinyint(1) NOT NULL,
 	`voices` text NOT NULL,
 	`immunities` varchar(255) NOT NULL,
-	`elements` text NOT NULL,
+	`elements` TEXT NOT NULL,
-	`summonable` tinyint NOT NULL,
+	`summonable` tinyint(1) NOT NULL,
-	`convinceable` tinyint NOT NULL,
+	`convinceable` tinyint(1) NOT NULL,
-	`pushable` tinyint NOT NULL DEFAULT 0,
+	`pushable` TINYINT(1) NOT NULL DEFAULT '0',
-	`canpushitems` tinyint NOT NULL DEFAULT 0,
+	`canpushitems` TINYINT(1) NOT NULL DEFAULT '0',
-	`canwalkonenergy` tinyint NOT NULL DEFAULT 0,
+	`canwalkonenergy` TINYINT(1) NOT NULL DEFAULT '0',
-	`canwalkonpoison` tinyint NOT NULL DEFAULT 0,
+	`canwalkonpoison` TINYINT(1) NOT NULL DEFAULT '0',
-	`canwalkonfire` tinyint NOT NULL DEFAULT 0,
+	`canwalkonfire` TINYINT(1) NOT NULL DEFAULT '0',
-	`runonhealth` tinyint NOT NULL DEFAULT 0,
+	`runonhealth` TINYINT(1) NOT NULL DEFAULT '0',
-	`hostile` tinyint NOT NULL DEFAULT 0,
+	`hostile` TINYINT(1) NOT NULL DEFAULT '0',
-	`attackable` tinyint NOT NULL DEFAULT 0,
+	`attackable` TINYINT(1) NOT NULL DEFAULT '0',
-	`rewardboss` tinyint NOT NULL DEFAULT 0,
+	`rewardboss` TINYINT(1) NOT NULL DEFAULT '0',
-	`defense` int NOT NULL DEFAULT 0,
+	`defense` INT(11) NOT NULL DEFAULT '0',
-	`armor` int NOT NULL DEFAULT 0,
+	`armor` INT(11) NOT NULL DEFAULT '0',
-	`canpushcreatures` tinyint NOT NULL DEFAULT 0,
+	`canpushcreatures` TINYINT(1) NOT NULL DEFAULT '0',
 	`race` varchar(255) NOT NULL,
 	`loot` text NOT NULL,
-	`summons` text NOT NULL,
+	`summons` TEXT NOT NULL,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_news`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`title` varchar(100) NOT NULL,
+	`title` VARCHAR(100) NOT NULL,
-	`body` text NOT NULL,
+	`body` TEXT NOT NULL,
-	`type` tinyint NOT NULL DEFAULT 0 COMMENT '1 - news, 2 - ticker, 3 - article',
+	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - news, 2 - ticker, 3 - article',
-	`date` int NOT NULL DEFAULT 0,
+	`date` INT(11) NOT NULL DEFAULT 0,
-	`category` tinyint NOT NULL DEFAULT 0,
+	`category` TINYINT(1) NOT NULL DEFAULT 0,
-	`player_id` int NOT NULL DEFAULT 0,
+	`player_id` INT(11) NOT NULL DEFAULT 0,
-	`last_modified_by` int NOT NULL DEFAULT 0,
+	`last_modified_by` INT(11) NOT NULL DEFAULT 0,
-	`last_modified_date` int NOT NULL DEFAULT 0,
+	`last_modified_date` INT(11) NOT NULL DEFAULT 0,
-	`comments` varchar(50) NOT NULL DEFAULT '',
+	`comments` VARCHAR(50) NOT NULL DEFAULT '',
-	`article_text` varchar(300) NOT NULL DEFAULT '',
+	`article_text` VARCHAR(300) NOT NULL DEFAULT '',
-	`article_image` varchar(100) NOT NULL DEFAULT '',
+	`article_image` VARCHAR(100) NOT NULL DEFAULT '',
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_news_categories`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` varchar(50) NOT NULL DEFAULT "",
+	`name` VARCHAR(50) NOT NULL DEFAULT "",
-	`description` varchar(50) NOT NULL DEFAULT "",
+	`description` VARCHAR(50) NOT NULL DEFAULT "",
-	`icon_id` int NOT NULL DEFAULT 0,
+	`icon_id` INT(2) NOT NULL DEFAULT 0,
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 0);
 INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 1);
@@ -181,91 +265,91 @@ INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 4);
 
 CREATE TABLE `myaac_notepad`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`account_id` int NOT NULL,
+	`account_id` INT(11) NOT NULL,
-	/*`name` varchar(30) NOT NULL,*/
+	/*`name` VARCHAR(30) NOT NULL,*/
-	`content` text NOT NULL,
+	`content` TEXT NOT NULL,
-	/*`public` tinyint NOT NULL DEFAULT 0*/
+	/*`public` TINYINT(1) NOT NULL DEFAULT 0*/
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_pages`
 (
 	`id` INT NOT NULL AUTO_INCREMENT,
-	`name` varchar(30) NOT NULL,
+	`name` VARCHAR(30) NOT NULL,
-	`title` varchar(30) NOT NULL,
+	`title` VARCHAR(30) NOT NULL,
-	`body` text NOT NULL,
+	`body` TEXT NOT NULL,
-	`date` int NOT NULL DEFAULT 0,
+	`date` INT(11) NOT NULL DEFAULT 0,
-	`player_id` int NOT NULL DEFAULT 0,
+	`player_id` INT(11) NOT NULL DEFAULT 0,
-	`php` tinyint NOT NULL DEFAULT 0 COMMENT '0 - plain html, 1 - php',
+	`php` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '0 - plain html, 1 - php',
-	`enable_tinymce` tinyint NOT NULL DEFAULT 1 COMMENT '1 - enabled, 0 - disabled',
+	`enable_tinymce` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '1 - enabled, 0 - disabled',
-	`access` tinyint NOT NULL DEFAULT 0,
+	`access` TINYINT(2) NOT NULL DEFAULT 0,
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`),
 	UNIQUE (`name`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_gallery`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`comment` varchar(255) NOT NULL DEFAULT '',
+	`comment` VARCHAR(255) NOT NULL DEFAULT '',
-	`image` varchar(255) NOT NULL,
+	`image` VARCHAR(255) NOT NULL,
-	`thumb` varchar(255) NOT NULL,
+	`thumb` VARCHAR(255) NOT NULL,
-	`author` varchar(50) NOT NULL DEFAULT '',
+	`author` VARCHAR(50) NOT NULL DEFAULT '',
-	`ordering` int NOT NULL DEFAULT 0,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 INSERT INTO `myaac_gallery` (`id`, `ordering`, `comment`, `image`, `thumb`, `author`) VALUES (NULL, 1, 'Demon', 'images/gallery/demon.jpg', 'images/gallery/demon_thumb.gif', 'MyAAC');
 
 CREATE TABLE `myaac_settings`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`name` varchar(255) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`key` varchar(255) NOT NULL DEFAULT '',
+	`key` VARCHAR(255) NOT NULL DEFAULT '',
-	`value` text NOT NULL,
+	`value` TEXT NOT NULL,
 	PRIMARY KEY (`id`),
 	KEY `key` (`key`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_spells`
 (
-	`id` int NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`spell` varchar(255) NOT NULL DEFAULT '',
+	`spell` VARCHAR(255) NOT NULL DEFAULT '',
-	`name` varchar(255) NOT NULL,
+	`name` VARCHAR(255) NOT NULL,
-	`words` varchar(255) NOT NULL DEFAULT '',
+	`words` VARCHAR(255) NOT NULL DEFAULT '',
-	`category` tinyint NOT NULL DEFAULT 0 COMMENT '1 - attack, 2 - healing, 3 - summon, 4 - supply, 5 - support',
+	`category` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - attack, 2 - healing, 3 - summon, 4 - supply, 5 - support',
-	`type` tinyint NOT NULL DEFAULT 0 COMMENT '1 - instant, 2 - conjure, 3 - rune',
+	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - instant, 2 - conjure, 3 - rune',
-	`level` int NOT NULL DEFAULT 0,
+	`level` INT(11) NOT NULL DEFAULT 0,
-	`maglevel` int NOT NULL DEFAULT 0,
+	`maglevel` INT(11) NOT NULL DEFAULT 0,
-	`mana` int NOT NULL DEFAULT 0,
+	`mana` INT(11) NOT NULL DEFAULT 0,
-	`soul` tinyint NOT NULL DEFAULT 0,
+	`soul` TINYINT(3) NOT NULL DEFAULT 0,
-	`conjure_id` int NOT NULL DEFAULT 0,
+	`conjure_id` INT(11) NOT NULL DEFAULT 0,
-	`conjure_count` tinyint NOT NULL DEFAULT 0,
+	`conjure_count` TINYINT(3) NOT NULL DEFAULT 0,
-	`reagent` int NOT NULL DEFAULT 0,
+	`reagent` INT(11) NOT NULL DEFAULT 0,
-	`item_id` int NOT NULL DEFAULT 0,
+	`item_id` INT(11) NOT NULL DEFAULT 0,
-	`premium` tinyint NOT NULL DEFAULT 0,
+	`premium` TINYINT(1) NOT NULL DEFAULT 0,
-	`vocations` varchar(100) NOT NULL DEFAULT '',
+	`vocations` VARCHAR(100) NOT NULL DEFAULT '',
-	`hide` tinyint NOT NULL DEFAULT 0,
+	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`),
 	UNIQUE (`name`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_visitors`
 (
-	`ip` varchar(45) NOT NULL,
+	`ip` VARCHAR(45) NOT NULL,
-	`lastvisit` int NOT NULL DEFAULT 0,
+	`lastvisit` INT(11) NOT NULL DEFAULT 0,
-	`page` varchar(2048) NOT NULL,
+	`page` VARCHAR(2048) NOT NULL,
-	`user_agent` varchar(255) NOT NULL DEFAULT '',
+	`user_agent` VARCHAR(255) NOT NULL DEFAULT '',
 	UNIQUE (`ip`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
 CREATE TABLE `myaac_weapons`
 (
-	`id` int NOT NULL,
+	`id` INT(11) NOT NULL,
-	`level` int NOT NULL DEFAULT 0,
+	`level` INT(11) NOT NULL DEFAULT 0,
-	`maglevel` int NOT NULL DEFAULT 0,
+	`maglevel` INT(11) NOT NULL DEFAULT 0,
-	`vocations` varchar(100) NOT NULL DEFAULT '',
+	`vocations` VARCHAR(100) NOT NULL DEFAULT '',
 	PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;

install/index.php

@@ -3,15 +3,16 @@
 use Twig\Environment as Twig_Environment;
 use Twig\Loader\FilesystemLoader as Twig_FilesystemLoader;
 
-const MYAAC_INSTALL = true;
-
 require '../common.php';
 
+define('MYAAC_INSTALL', true);
+
 // includes
 require SYSTEM . 'functions.php';
 require BASE . 'install/includes/functions.php';
 require BASE . 'install/includes/locale.php';
 require SYSTEM . 'clients.conf.php';
+require LIBS . 'settings.php';
 
 // ignore undefined index from Twig autoloader
 $config['env'] = 'prod';
@@ -114,7 +115,7 @@ else if($step == 'finish') {
 	$email = $_SESSION['var_email'];
 	$password = $_SESSION['var_password'];
 	$password_confirm = $_SESSION['var_password_confirm'];
-	$player_name = $_SESSION['var_player_name'] ?? null;
+	$player_name = $_SESSION['var_player_name'];
 
 	// email check
 	if(empty($email)) {
@@ -125,18 +126,7 @@ else if($step == 'finish') {
 	}
 
 	// account check
-	if(isset($_SESSION['var_account_id'])) {
+	if(isset($_SESSION['var_account'])) {
-		if(empty($_SESSION['var_account_id'])) {
-			$errors[] = $locale['step_admin_account_id_error_empty'];
-		}
-		else if(!Validator::accountId($_SESSION['var_account_id'])) {
-			$errors[] = $locale['step_admin_account_id_error_format'];
-		}
-		else if($_SESSION['var_account_id'] == $password) {
-			$errors[] = $locale['step_admin_account_id_error_same'];
-		}
-	}
-	else if(isset($_SESSION['var_account'])) {
 		if(empty($_SESSION['var_account'])) {
 			$errors[] = $locale['step_admin_account_error_empty'];
 		}
@@ -147,6 +137,17 @@ else if($step == 'finish') {
 			$errors[] = $locale['step_admin_account_error_same'];
 		}
 	}
+	else if(isset($_SESSION['var_account_id'])) {
+		if(empty($_SESSION['var_account_id'])) {
+			$errors[] = $locale['step_admin_account_id_error_empty'];
+		}
+		else if(!Validator::accountId($_SESSION['var_account_id'])) {
+			$errors[] = $locale['step_admin_account_id_error_format'];
+		}
+		else if($_SESSION['var_account_id'] == $password) {
+			$errors[] = $locale['step_admin_account_id_error_same'];
+		}
+	}
 
 	// password check
 	if(empty($password)) {
@@ -159,13 +160,12 @@ else if($step == 'finish') {
 		$errors[] = $locale['step_admin_password_confirm_error_not_same'];
 	}
 
-	if (isset($player_name)) {
+	// player name check
-		// player name check
+	if(empty($player_name)) {
-		if (empty($player_name)) {
+		$errors[] = $locale['step_admin_player_name_error_empty'];
-			$errors[] = $locale['step_admin_player_name_error_empty'];
+	}
-		} else if (!Validator::characterName($player_name)) {
+	else if(!Validator::characterName($player_name)) {
-			$errors[] = $locale['step_admin_player_name_error_format'];
+		$errors[] = $locale['step_admin_player_name_error_format'];
-		}
 	}
 
 	if(!empty($errors)) {
@@ -183,14 +183,14 @@ clearstatcache();
 if(is_writable(CACHE) && (MYAAC_OS != 'WINDOWS' || win_is_writable(CACHE))) {
 	if(!file_exists(BASE . 'install/ip.txt')) {
 		$content = warning('AAC installation is disabled. To enable it make file <b>ip.txt</b> in install/ directory and put there your IP.<br/>
-		Your IP is:<br /><b>' . get_browser_real_ip() . '</b>', true);
+		Your IP is:<br /><b>' . $_SERVER['REMOTE_ADDR'] . '</b>', true);
 	}
 	else {
 		$file_content = trim(file_get_contents(BASE . 'install/ip.txt'));
 		$allow = false;
 		$listIP = preg_split('/\s+/', $file_content);
 		foreach($listIP as $ip) {
-			if(get_browser_real_ip() == $ip) {
+			if($_SERVER['REMOTE_ADDR'] == $ip) {
 				$allow = true;
 			}
 		}
@@ -199,7 +199,7 @@ if(is_writable(CACHE) && (MYAAC_OS != 'WINDOWS' || win_is_writable(CACHE))) {
 		{
 			$content = warning('In file <b>install/ip.txt</b> must be your IP!<br/>
 			In file is:<br /><b>' . nl2br($file_content) . '</b><br/>
-			Your IP is:<br /><b>' . get_browser_real_ip() . '</b>', true);
+			Your IP is:<br /><b>' . $_SERVER['REMOTE_ADDR'] . '</b>', true);
 		}
 		else {
 			ob_start();

install/steps/3-requirements.php

@@ -2,15 +2,10 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 // configuration
-$dirs_required_writable = [
+$dirs_required = [
 	'system/logs',
 	'system/cache',
 ];
-
-$dirs_required = [
-	'tools/ext' => $locale['step_requirements_folder_not_exists_tools_ext'],
-];
-
 $dirs_optional = [
 	GUILD_IMAGES_DIR => $locale['step_requirements_warning_images_guilds'],
 	GALLERY_DIR => $locale['step_requirements_warning_images_gallery'],
@@ -23,7 +18,6 @@ $extensions_optional = [
 	'gd' => $locale['step_requirements_warning_player_signatures'],
 	'zip' => $locale['step_requirements_warning_install_plugins'],
 ];
-
 /*
  *
  * @param string $name
@@ -47,7 +41,7 @@ $failed = false;
 // start validating
 version_check($locale['step_requirements_php_version'], (PHP_VERSION_ID >= 50500), PHP_VERSION);
 
-foreach ($dirs_required_writable as $value)
+foreach ($dirs_required as $value)
 {
 	$is_writable = is_writable(BASE . $value) && (MYAAC_OS != 'WINDOWS' || win_is_writable(BASE . $value));
 	version_check($locale['step_requirements_write_perms'] . ': ' . $value, $is_writable);
@@ -58,12 +52,6 @@ foreach ($dirs_optional as $dir => $errorMsg) {
 	version_check($locale['step_requirements_write_perms'] . ': ' . $dir, $is_writable, $is_writable ? '' : $errorMsg, true);
 }
 
-foreach ($dirs_required as $dir => $errorMsg)
-{
-	$exists = is_dir(BASE . $dir);
-	version_check($locale['step_requirements_folder_exists'] . ': ' . $dir, $exists, $exists ? '' : $errorMsg);
-}
-
 $ini_register_globals = ini_get_bool('register_globals');
 version_check('register_long_arrays', !$ini_register_globals, $ini_register_globals ? $locale['on'] : $locale['off']);
 
@@ -90,3 +78,4 @@ if($failed) {
 }
 
 echo '</div>';
+?>

install/steps/4-config.php

@@ -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(),

install/steps/5-database.php

@@ -1,7 +1,4 @@
 <?php
-
-use MyAAC\Settings;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
 //ini_set('display_errors', false);
@@ -37,49 +34,59 @@ if(!$error) {
 		}
 	}
 
-	$configToSave['gzip_output'] = false;
-	$configToSave['cache_engine'] = 'auto';
 	$configToSave['cache_prefix'] = 'myaac_' . generateRandomString(8, true, false, true);
-	$configToSave['database_auto_migrate'] = true;
+
+	require BASE . 'install/includes/config.php';
 
 	if(!$error) {
-		$content = '';
+		require BASE . 'install/includes/database.php';
-		$saved = Settings::saveConfig($configToSave, BASE . 'config.local.php', $content);
-		if ($saved) {
-			success($locale['step_database_config_saved']);
-			$_SESSION['saved'] = true;
 
-			require BASE . 'config.local.php';
+		$locale['step_database_importing'] = str_replace('$DATABASE_NAME$', config('database_name'), $locale['step_database_importing']);
-			require BASE . 'install/includes/config.php';
+		success($locale['step_database_importing']);
 
-			if (!$error) {
+		if(isset($database_error)) { // we failed connect to the database
-				require BASE . 'install/includes/database.php';
+			error($database_error);
+		}
+		else {
+			if(!$db->hasTable('accounts')) {
+				$tmp = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
+				error($tmp);
+				$error = true;
+			}
 
-				if (isset($database_error)) { // we failed connect to the database
+			if(!$db->hasTable('players')) {
-					error($database_error);
+				$tmp = str_replace('$TABLE$', 'players', $locale['step_database_error_table']);
+				error($tmp);
+				$error = true;
+			}
+
+			if(!$db->hasTable('guilds')) {
+				$tmp = str_replace('$TABLE$', 'guilds', $locale['step_database_error_table']);
+				error($tmp);
+				$error = true;
+			}
+
+			if(!$error) {
+				$twig->display('install.installer.html.twig', array(
+					'url' => 'tools/5-database.php',
+					'message' => $locale['loading_spinner']
+				));
+
+				$content = '';
+				$saved = Settings::saveConfig($configToSave, BASE . 'config.local.php', $content);
+				if($saved) {
+					success($locale['step_database_config_saved']);
+					$_SESSION['saved'] = true;
 				}
 				else {
-					if (!$db->hasTable('accounts')) {
+					$_SESSION['config_content'] = $content;
-						$tmp = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
+					unset($_SESSION['saved']);
-						error($tmp);
-						$error = true;
-					}
 
-					if (!$error) {
+					$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.php</b>', $locale['step_database_error_file']);
-						$twig->display('install.installer.html.twig', array(
+					error($locale['step_database_error_file'] . '<br/>
-							'url' => 'tools/5-database.php',
+						<textarea cols="70" rows="10">' . $content . '</textarea>');
-							'message' => $locale['loading_spinner']
-						));
-					}
 				}
 			}
-		} else {
-			$_SESSION['config_content'] = $content;
-			unset($_SESSION['saved']);
-
-			$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.php</b>', $locale['step_database_error_file']);
-			error($locale['step_database_error_file'] . '<br/>
-				<textarea cols="70" rows="10">' . $content . '</textarea>');
 		}
 	}
 }

install/steps/6-admin.php

@@ -18,7 +18,6 @@ if(!$error) {
 		'locale' => $locale,
 		'session' => $_SESSION,
 		'account' => $account,
-		'hasTablePlayers' => $db->hasTable('players'),
 		'errors' => isset($errors) ? $errors : null,
 		'buttons' => next_buttons(true, $error ? false : true)
 	));

install/steps/7-finish.php

@@ -1,198 +1,169 @@
 <?php
-
-use MyAAC\Cache\Cache;
-use MyAAC\Models\News;
-use MyAAC\Settings;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
 ini_set('max_execution_time', 300);
 if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
 	warning($locale['already_installed']);
-	return;
-}
-
-$cache = Cache::getInstance();
-if ($cache->enabled()) {
-	// clear plugin_hooks to have fresh hooks
-	$cache->delete('plugins_hooks');
-}
-
-require SYSTEM . 'init.php';
-if($error) {
-	return;
-}
-
-if(USE_ACCOUNT_NAME || USE_ACCOUNT_NUMBER)
-	$account = $_SESSION['var_account'] ?? null;
-else
-	$account_id = $_SESSION['var_account_id'] ?? null;
-
-$password = $_SESSION['var_password'];
-
-if(USE_ACCOUNT_SALT)
-{
-	$salt = generateRandomString(10, false, true, true);
-	$password = $salt . $password;
-}
-
-$account_db = new OTS_Account();
-if(isset($account))
-	$account_db->find($account);
-else
-	$account_db->load($account_id);
-
-if ($db->hasTable('players')) {
-	$player_name = $_SESSION['var_player_name'];
-	$player_db = new OTS_Player();
-	$player_db->find($player_name);
-
-	if(!$player_db->isLoaded())
-	{
-		$player = new OTS_Player();
-		$player->setName($player_name);
-
-		$player_used = &$player;
-	}
-	else {
-		$player_used = &$player_db;
-	}
-
-	$groups = new OTS_Groups_List();
-	$player_used->setGroupId($groups->getHighestId());
-}
-
-$email = $_SESSION['var_email'];
-if($account_db->isLoaded()) {
-	$account_db->setPassword(encrypt($password));
-	$account_db->setEMail($email);
-	$account_db->save();
-
-	$account_used = &$account_db;
 }
 else {
-	$new_account = new OTS_Account();
+	require SYSTEM . 'init.php';
-	if(USE_ACCOUNT_NAME) {
+	if(!$error) {
-		$new_account->create($account);
+		if(USE_ACCOUNT_NAME || USE_ACCOUNT_NUMBER)
-	}
+			$account = isset($_SESSION['var_account']) ? $_SESSION['var_account'] : null;
-	else {
+		else
-		$new_account->create(null, $account_id);
+			$account_id = isset($_SESSION['var_account_id']) ? $_SESSION['var_account_id'] : null;
-	}
 
-	$new_account->setPassword(encrypt($password));
+		$password = $_SESSION['var_password'];
-	$new_account->setEMail($email);
 
-	$new_account->save();
+		if(USE_ACCOUNT_SALT)
-
-	$new_account->setCustomField('created', time());
-	$new_account->logAction('Account created.');
-
-	$account_used = &$new_account;
-}
-
-if(USE_ACCOUNT_SALT)
-	$account_used->setCustomField('salt', $salt);
-
-$account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN);
-$account_used->setCustomField('country', 'us');
-$account_used->setCustomField('email_verified', 1);
-
-if($db->hasColumn('accounts', 'group_id'))
-	$account_used->setCustomField('group_id', $groups->getHighestId());
-if($db->hasColumn('accounts', 'type'))
-	$account_used->setCustomField('type', 6);
-
-if ($db->hasTable('players')) {
-	if(!$player_db->isLoaded()) {
-		$player->setAccountId($account_used->getId());
-		$player->save();
-	}
-	else {
-		$player_db->setAccountId($account_used->getId());
-		$player_db->save();
-	}
-}
-
-success($locale['step_database_created_account']);
-
-setSession('account', $account_used->getId());
-setSession('password', encrypt($password));
-setSession('remember_me', true);
-
-if(!News::all()->count()) {
-	$player_id = 0;
-
-	if ($db->hasTable('players')) {
-		$tmpNewsPlayer = \MyAAC\Models\Player::where('name', $player_name)->first();
-		if($tmpNewsPlayer) {
-			$player_id = $tmpNewsPlayer->id;
-		}
-	}
-
-	News::create([
-		'type' => 1,
-		'date' => time(),
-		'category' => 2,
-		'title' => 'Hello!',
-		'body' => 'MyAAC is just READY to use!',
-		'player_id' => $player_id,
-		'comments' => 'https://my-aac.org',
-		'hide' => 0,
-	]);
-
-	News::create([
-		'type' => 2,
-		'date' => time(),
-		'category' => 4,
-		'title' => 'Hello tickers!',
-		'body' => 'https://my-aac.org',
-		'player_id' => $player_id,
-		'comments' => '',
-		'hide' => 0,
-	]);
-
-	success($locale['step_database_created_news']);
-}
-
-$settings = Settings::getInstance();
-foreach($_SESSION as $key => $value) {
-	if (in_array($key, ['var_usage', 'var_date_timezone', 'var_client'])) {
-		if ($key == 'var_usage') {
-			$key = 'anonymous_usage_statistics';
-			$value = ((int)$value == 1 ? 'true' : 'false');
-		} elseif ($key == 'var_date_timezone') {
-			$key = 'date_timezone';
-		} elseif ($key == 'var_client') {
-			$key = 'client';
-		}
-
-		$settings->updateInDatabase('core', $key, $value);
-	}
-}
-success('Settings saved.');
-
-$twig->display('install.installer.html.twig', array(
-	'url' => 'tools/7-finish.php',
-	'message' => $locale['importing_spinner']
-));
-
-if(!isset($_SESSION['installed'])) {
-	if (!array_key_exists('CI', getenv())) {
-		$report_url = 'https://my-aac.org/report_install.php?v=' . MYAAC_VERSION . '&b=' . urlencode(BASE_URL);
-		if (function_exists('curl_version'))
 		{
-			$curl = curl_init();
+			$salt = generateRandomString(10, false, true, true);
-			curl_setopt($curl, CURLOPT_URL, $report_url);
+			$password = $salt . $password;
-			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-			curl_exec($curl);
-			curl_close($curl);
 		}
-		else if (ini_get('allow_url_fopen') ) {
+
-			file_get_contents($report_url);
+		$account_db = new OTS_Account();
+		if(isset($account))
+			$account_db->find($account);
+		else
+			$account_db->load($account_id);
+
+		$player_name = $_SESSION['var_player_name'];
+		$player_db = new OTS_Player();
+		$player_db->find($player_name);
+
+		if(!$player_db->isLoaded())
+		{
+			$player = new OTS_Player();
+			$player->setName($player_name);
+
+			$player_used = &$player;
+		}
+		else {
+			$player_used = &$player_db;
+		}
+
+		$groups = new OTS_Groups_List();
+		$player_used->setGroupId($groups->getHighestId());
+
+		$email = $_SESSION['var_email'];
+		if($account_db->isLoaded()) {
+			$account_db->setPassword(encrypt($password));
+			$account_db->setEMail($email);
+			$account_db->save();
+
+			$account_used = &$account_db;
+		}
+		else {
+			$new_account = new OTS_Account();
+			if(USE_ACCOUNT_NAME) {
+				$new_account->create($account);
+			}
+			else {
+				$new_account->create(null, $account_id);
+			}
+
+			$new_account->setPassword(encrypt($password));
+			$new_account->setEMail($email);
+
+			$new_account->save();
+
+			$new_account->setCustomField('created', time());
+			$new_account->logAction('Account created.');
+
+			$account_used = &$new_account;
+		}
+
+		if(USE_ACCOUNT_SALT)
+			$account_used->setCustomField('salt', $salt);
+
+		$account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN);
+		$account_used->setCustomField('country', 'us');
+		if($db->hasColumn('accounts', 'group_id'))
+			$account_used->setCustomField('group_id', $groups->getHighestId());
+		if($db->hasColumn('accounts', 'type'))
+			$account_used->setCustomField('type', 6);
+
+		if(!$player_db->isLoaded())
+			$player->setAccountId($account_used->getId());
+		else
+			$player_db->setAccountId($account_used->getId());
+
+		success($locale['step_database_created_account']);
+
+		setSession('account', $account_used->getId());
+		setSession('password', encrypt($password));
+		setSession('remember_me', true);
+
+		if($player_db->isLoaded()) {
+			$player_db->save();
+		}
+		else {
+			$player->save();
+		}
+
+		$player_id = 0;
+		$query = $db->query("SELECT `id` FROM `players` WHERE `name` = " . $db->quote($player_name) . ";");
+		if($query->rowCount() == 1) {
+			$query = $query->fetch();
+			$player_id = $query['id'];
+		}
+
+		$query = $db->query("SELECT `id` FROM `" . TABLE_PREFIX ."news` WHERE `title` LIKE 'Hello!';");
+		if($query->rowCount() == 0) {
+			if(query("INSERT INTO `" . TABLE_PREFIX ."news` (`id`, `type`, `date`, `category`, `title`, `body`, `player_id`, `comments`, `hidden`) VALUES (NULL, '1', UNIX_TIMESTAMP(), '2', 'Hello!', 'MyAAC is just READY to use!', " . $player_id . ", 'https://my-aac.org', '0');
+	INSERT INTO `myaac_news` (`id`, `type`, `date`, `category`, `title`, `body`, `player_id`, `comments`, `hidden`) VALUES (NULL, '2', UNIX_TIMESTAMP(), '4', 'Hello tickets!', 'https://my-aac.org', " . $player_id . ", '', '0');")) {
+				success($locale['step_database_created_news']);
+			}
+		}
+
+		$settings = Settings::getInstance();
+		foreach($_SESSION as $key => $value) {
+			if (in_array($key, ['var_usage', 'var_date_timezone', 'var_client'])) {
+				if ($key == 'var_usage') {
+					$key = 'anonymous_usage_statistics';
+					$value = ((int)$value == 1 ? 'true' : 'false');
+				} elseif ($key == 'var_date_timezone') {
+					$key = 'date_timezone';
+				} elseif ($key == 'var_client') {
+					$key = 'client';
+				}
+
+				$settings->updateInDatabase('core', $key, $value);
+			}
+		}
+		success('Settings saved.');
+
+		$twig->display('install.installer.html.twig', array(
+			'url' => 'tools/7-finish.php',
+			'message' => $locale['importing_spinner']
+		));
+
+		if(!isset($_SESSION['installed'])) {
+			if (!array_key_exists('CI', getenv())) {
+				$report_url = 'https://my-aac.org/report_install.php?v=' . MYAAC_VERSION . '&b=' . urlencode(BASE_URL);
+				if (function_exists('curl_version'))
+				{
+					$curl = curl_init();
+					curl_setopt($curl, CURLOPT_URL, $report_url);
+					curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+					curl_exec($curl);
+					curl_close($curl);
+				}
+				else if (ini_get('allow_url_fopen') ) {
+					file_get_contents($report_url);
+				}
+			}
+
+			$_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');
 		}
 	}
-
-	$_SESSION['installed'] = true;
 }
-
-$hooks->trigger(HOOK_INSTALL_FINISH_END);

install/template/template.php

@@ -1,4 +1,3 @@
-<?php defined('MYAAC') or die('Direct access not allowed!'); ?>
 <!DOCTYPE html>
 <html dir="<?php echo $locale['direction']; ?>" lang="<?php echo $locale['lang']; ?>" xml:lang="<?php echo $locale['lang']; ?>">
 <head>
@@ -7,7 +6,7 @@
 	<title>MyAAC - <?php echo $locale['installation']; ?></title>
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
 	<link rel="stylesheet" type="text/css" href="template/style.css" />
-	<script type="text/javascript" src="<?php echo BASE_URL; ?>tools/ext/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="<?php echo BASE_URL; ?>tools/js/jquery.min.js"></script>
 </head>
 <body>
 

install/tools/5-database.php

@@ -7,19 +7,12 @@ 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';
 
 ini_set('max_execution_time', 300);
-
-@ob_end_flush();
 ob_implicit_flush();
-
+ob_end_flush();
 header('X-Accel-Buffering: no');
 
 if(!$error) {
@@ -37,9 +30,6 @@ if($db->hasTable(TABLE_PREFIX . 'account_actions')) {
 else {
 	// import schema
 	try {
-		$locale['step_database_importing'] = str_replace('$DATABASE_NAME$', config('database_name'), $locale['step_database_importing']);
-		success($locale['step_database_importing']);
-
 		$db->query(file_get_contents(BASE . 'install/includes/schema.sql'));
 
 		$locale['step_database_success_schema'] = str_replace('$PREFIX$', TABLE_PREFIX, $locale['step_database_success_schema']);
@@ -146,84 +136,73 @@ if(!$db->hasColumn('accounts', 'premium_points')) {
 		success($locale['step_database_adding_field'] . ' accounts.premium_points...');
 }
 
-if ($db->hasTable('guilds')) {
+if($db->hasColumn('guilds', 'checkdata')) {
-	if ($db->hasColumn('guilds', 'checkdata')) {
+	if(query("ALTER TABLE `guilds` MODIFY `checkdata` INT NOT NULL DEFAULT 0;"))
-		if (query("ALTER TABLE `guilds` MODIFY `checkdata` INT NOT NULL DEFAULT 0;"))
+		success($locale['step_database_modifying_field'] . ' guilds.checkdata...');
-			success($locale['step_database_modifying_field'] . ' guilds.checkdata...');
-	}
-
-	if (!$db->hasColumn('guilds', 'motd')) {
-		if (query("ALTER TABLE `guilds` ADD `motd` VARCHAR(255) NOT NULL DEFAULT '';"))
-			success($locale['step_database_adding_field'] . ' guilds.motd...');
-	} else {
-		if (query("ALTER TABLE `guilds` MODIFY `motd` VARCHAR(255) NOT NULL DEFAULT '';"))
-			success($locale['step_database_modifying_field'] . ' guilds.motd...');
-	}
-
-	if (!$db->hasColumn('guilds', 'description')) {
-		if (query("ALTER TABLE `guilds` ADD `description` VARCHAR(5000) NOT NULL DEFAULT '';"))
-			success($locale['step_database_adding_field'] . ' guilds.description...');
-	}
-	else {
-		if (query("ALTER TABLE `guilds` MODIFY `description` VARCHAR(5000) NOT NULL DEFAULT '';")) {
-			success($locale['step_database_modifying_field'] . ' guilds.description...');
-		}
-	}
-
-	if ($db->hasColumn('guilds', 'logo_gfx_name')) {
-		if (query("ALTER TABLE `guilds` CHANGE `logo_gfx_name` `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';")) {
-			$tmp = str_replace('$FIELD$', 'guilds.logo_gfx_name', $locale['step_database_changing_field']);
-			$tmp = str_replace('$FIELD_NEW$', 'guilds.logo_name', $tmp);
-			success($tmp);
-		}
-	} else if (!$db->hasColumn('guilds', 'logo_name')) {
-		if (query("ALTER TABLE `guilds` ADD `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';"))
-			success($locale['step_database_adding_field'] . ' guilds.logo_name...');
-	}
 }
 
-if ($db->hasTable('players')) {
+if(!$db->hasColumn('guilds', 'motd')) {
-	if (!$db->hasColumn('players', 'created')) {
+	if(query("ALTER TABLE `guilds` ADD `motd` VARCHAR(255) NOT NULL DEFAULT '';"))
-		if (query("ALTER TABLE `players` ADD `created` INT(11) NOT NULL DEFAULT 0;"))
+		success($locale['step_database_adding_field'] . ' guilds.motd...');
-			success($locale['step_database_adding_field'] . ' players.created...');
+}
-	}
+else {
+	if(query("ALTER TABLE `guilds` MODIFY `motd` VARCHAR(255) NOT NULL DEFAULT '';"))
+		success($locale['step_database_modifying_field'] . ' guilds.motd...');
+}
 
-	if (!$db->hasColumn('players', 'deleted') && !$db->hasColumn('players', 'deletion')) {
+if(!$db->hasColumn('guilds', 'description')) {
-		if (query("ALTER TABLE `players` ADD `deleted` TINYINT(1) NOT NULL DEFAULT 0;"))
+	if(query("ALTER TABLE `guilds` ADD `description` TEXT NOT NULL;"))
-			success($locale['step_database_adding_field'] . ' players.deleted...');
+		success($locale['step_database_adding_field'] . ' guilds.description...');
-	}
+}
 
-	if ($db->hasColumn('players', 'hide_char')) {
+if($db->hasColumn('guilds', 'logo_gfx_name')) {
-		if (!$db->hasColumn('players', 'hide')) {
+	if(query("ALTER TABLE `guilds` CHANGE `logo_gfx_name` `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';")) {
-			if (query("ALTER TABLE `players` CHANGE `hide_char` `hide` TINYINT(1) NOT NULL DEFAULT 0;")) {
+		$tmp = str_replace('$FIELD$', 'guilds.logo_gfx_name', $locale['step_database_changing_field']);
-				$tmp = str_replace('$FIELD$', 'players.hide_char', $locale['step_database_changing_field']);
+		$tmp = str_replace('$FIELD_NEW$', 'guilds.logo_name', $tmp);
-				$tmp = str_replace('$FIELD_NEW$', 'players.hide', $tmp);
+		success($tmp);
-				success($tmp);
-			}
-		}
-	} else if (!$db->hasColumn('players', 'hide')) {
-		if (query("ALTER TABLE `players` ADD `hide` TINYINT(1) NOT NULL DEFAULT 0;"))
-			success($locale['step_database_adding_field'] . ' players.hide...');
 	}
+}
+else if(!$db->hasColumn('guilds', 'logo_name')) {
+	if(query("ALTER TABLE `guilds` ADD `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';"))
+		success($locale['step_database_adding_field'] . ' guilds.logo_name...');
+}
 
-	if (!$db->hasColumn('players', 'comment')) {
+if(!$db->hasColumn('players', 'created')) {
-		if (query("ALTER TABLE `players` ADD `comment` VARCHAR(5000) NOT NULL DEFAULT '';"))
+	if(query("ALTER TABLE `players` ADD `created` INT(11) NOT NULL DEFAULT 0;"))
-			success($locale['step_database_adding_field'] . ' players.comment...');
+		success($locale['step_database_adding_field'] . ' players.created...');
-	}
+}
-	else {
+
-		if (query("ALTER TABLE `players` MODIFY `comment` VARCHAR(5000) NOT NULL DEFAULT '';")) {
+if(!$db->hasColumn('players', 'deleted') && !$db->hasColumn('players', 'deletion')) {
-			success($locale['step_database_modifying_field'] . ' players.comment...');
+	if(query("ALTER TABLE `players` ADD `deleted` TINYINT(1) NOT NULL DEFAULT 0;"))
+		success($locale['step_database_adding_field'] . ' players.deleted...');
+}
+
+if($db->hasColumn('players', 'hide_char')) {
+	if(!$db->hasColumn('players', 'hidden')) {
+		if(query("ALTER TABLE `players` CHANGE `hide_char` `hidden` TINYINT(1) NOT NULL DEFAULT 0;")) {
+			$tmp = str_replace('$FIELD$', 'players.hide_char', $locale['step_database_changing_field']);
+			$tmp = str_replace('$FIELD_NEW$', 'players.hidden', $tmp);
+			success($tmp);
 		}
 	}
+}
+else if(!$db->hasColumn('players', 'hidden')) {
+	if(query("ALTER TABLE `players` ADD `hidden` TINYINT(1) NOT NULL DEFAULT 0;"))
+		success($locale['step_database_adding_field'] . ' players.hidden...');
+}
 
-	if ($db->hasColumn('players', 'rank_id')) {
+if(!$db->hasColumn('players', 'comment')) {
-		if (query("ALTER TABLE players MODIFY `rank_id` INT(11) NOT NULL DEFAULT 0;"))
+	if(query("ALTER TABLE `players` ADD `comment` TEXT NOT NULL;"))
-			success($locale['step_database_modifying_field'] . ' players.rank_id...');
+		success($locale['step_database_adding_field'] . ' players.comment...');
+}
 
-		if ($db->hasColumn('players', 'guildnick')) {
+if($db->hasColumn('players', 'rank_id')) {
-			if (query("ALTER TABLE players MODIFY `guildnick` VARCHAR(255) NOT NULL DEFAULT '';")) {
+	if(query("ALTER TABLE players MODIFY `rank_id` INT(11) NOT NULL DEFAULT 0;"))
-				success($locale['step_database_modifying_field'] . ' players.guildnick...');
+		success($locale['step_database_modifying_field'] . ' players.rank_id...');
-			}
+
+	if($db->hasColumn('players', 'guildnick')) {
+		if(query("ALTER TABLE players MODIFY `guildnick` VARCHAR(255) NOT NULL DEFAULT '';")) {
+			success($locale['step_database_modifying_field'] . ' players.guildnick...');
 		}
 	}
 }

install/tools/7-finish.php

@@ -1,10 +1,6 @@
 <?php
 define('MYAAC_INSTALL', true);
 
-use MyAAC\DataLoader;
-use MyAAC\Models\FAQ as ModelsFAQ;
-use MyAAC\Plugins;
-
 require_once '../../common.php';
 
 require SYSTEM . 'functions.php';
@@ -12,98 +8,56 @@ require BASE . 'install/includes/functions.php';
 require BASE . 'install/includes/locale.php';
 
 ini_set('max_execution_time', 300);
-
-@ob_end_flush();
 ob_implicit_flush();
-
+ob_end_flush();
 header('X-Accel-Buffering: no');
-
+/*
 if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
 	warning($locale['already_installed']);
 	return;
-}
+}*/
 
 require SYSTEM . 'init.php';
 
-if ($db->hasTable('players')) {
+$deleted = 'deleted';
-	$deleted = 'deleted';
+if($db->hasColumn('players', 'deletion'))
-	if ($db->hasColumn('players', 'deletion'))
+	$deleted = 'deletion';
-		$deleted = 'deletion';
 
-	$time = time();
+$time = time();
-	function insert_sample_if_not_exist($p)
+function insert_sample_if_not_exist($p) {
-	{
+	global $db, $success, $deleted, $time;
-		global $db, $success, $deleted, $time;
 
-		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote($p['name']));
+	$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote($p['name']));
-		if ($query->rowCount() == 0) {
+	if($query->rowCount() == 0) {
-			if (!query("INSERT INTO `players` (`id`, `name`, `group_id`, `account_id`, `level`, `vocation`, `health`, `healthmax`, `experience`, `lookbody`, `lookfeet`, `lookhead`, `looklegs`, `looktype`, `maglevel`, `mana`, `manamax`, `manaspent`, `soul`, `town_id`, `posx`, `posy`, `posz`, `conditions`, `cap`, `sex`, `lastlogin`, `lastip`, `save`, `lastlogout`, `balance`, `$deleted`, `created`, `hide`, `comment`) VALUES (null, " . $db->quote($p['name']) . ", 1, " . getSession('account') . ", " . $p['level'] . ", " . $p['vocation_id'] . ", " . $p['health'] . ", " . $p['healthmax'] . ", " . $p['experience'] . ", 118, 114, 38, 57, " . $p['looktype'] . ", 0, " . $p['mana'] . ", " . $p['manamax'] . ", 0, " . $p['soul'] . ", 1, 1000, 1000, 7, '', " . $p['cap'] . ", 1, " . $time . ", 2130706433, 1, " . $time . ", 0, 0, " . $time . ", 1, '');"))
+		if(!query("INSERT INTO `players` (`id`, `name`, `group_id`, `account_id`, `level`, `vocation`, `health`, `healthmax`, `experience`, `lookbody`, `lookfeet`, `lookhead`, `looklegs`, `looktype`, `maglevel`, `mana`, `manamax`, `manaspent`, `soul`, `town_id`, `posx`, `posy`, `posz`, `conditions`, `cap`, `sex`, `lastlogin`, `lastip`, `save`, `lastlogout`, `balance`, `$deleted`, `created`, `hidden`, `comment`) VALUES (null, " . $db->quote($p['name']) . ", 1, " . getSession('account') . ", " . $p['level'] . ", " . $p['vocation_id'] . ", " . $p['health'] . ", " . $p['healthmax'] . ", " . $p['experience'] . ", 118, 114, 38, 57, " . $p['looktype'] . ", 0, " . $p['mana'] . ", " . $p['manamax'] . ", 0, " . $p['soul'] . ", 1, 1000, 1000, 7, '', " . $p['cap'] . ", 1, " . $time . ", 2130706433, 1, " . $time . ", 0, 0, " . $time . ", 1, '');"))
-				$success = false;
+			$success = false;
-		}
-	}
-
-	$success = true;
-	insert_sample_if_not_exist(array('name' => 'Rook Sample', 'level' => 1, 'vocation_id' => 0, 'health' => 150, 'healthmax' => 150, 'experience' => 0, 'looktype' => 130, 'mana' => 0, 'manamax' => 0, 'soul' => 100, 'cap' => 400));
-	insert_sample_if_not_exist(array('name' => 'Sorcerer Sample', 'level' => 8, 'vocation_id' => 1, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 130, 'mana' => 90, 'manamax' => 90, 'soul' => 100, 'cap' => 470));
-	insert_sample_if_not_exist(array('name' => 'Druid Sample', 'level' => 8, 'vocation_id' => 2, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 130, 'mana' => 90, 'manamax' => 90, 'soul' => 100, 'cap' => 470));
-	insert_sample_if_not_exist(array('name' => 'Paladin Sample', 'level' => 8, 'vocation_id' => 3, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 129, 'mana' => 90, 'manamax' => 90, 'soul' => 100, 'cap' => 470));
-	insert_sample_if_not_exist(array('name' => 'Knight Sample', 'level' => 8, 'vocation_id' => 4, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 131, 'mana' => 90, 'manamax' => 90, 'soul' => 100, 'cap' => 470));
-
-	if ($success) {
-		success($locale['step_database_imported_players']);
 	}
 }
 
+$success = true;
+insert_sample_if_not_exist(array('name' => 'Rook Sample', 'level' => 1, 'vocation_id' => 0, 'health' => 150, 'healthmax' => 150, 'experience' => 0, 'looktype' => 130, 'mana' => 0, 'manamax' => 0, 'soul' => 100, 'cap' => 400));
+insert_sample_if_not_exist(array('name' => 'Sorcerer Sample', 'level' => 8, 'vocation_id' => 1, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 130, 'mana' => 90, 'manamax' => 90, 'soul' => 100, 'cap' => 470));
+insert_sample_if_not_exist(array('name' => 'Druid Sample', 'level' => 8, 'vocation_id' => 2, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 130, 'mana' => 90, 'manamax' => 90, 'soul' => 100, 'cap' => 470));
+insert_sample_if_not_exist(array('name' => 'Paladin Sample', 'level' => 8, 'vocation_id' => 3, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 129, 'mana' => 90, 'manamax' => 90, 'soul' => 100, 'cap' => 470));
+insert_sample_if_not_exist(array('name' => 'Knight Sample', 'level' => 8, 'vocation_id' => 4, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 131, 'mana' => 90, 'manamax' => 90, 'soul' => 100, 'cap' => 470));
+
+if($success) {
+	success($locale['step_database_imported_players']);
+}
+
+require LIBS . 'DataLoader.php';
 DataLoader::setLocale($locale);
 DataLoader::load();
 
-// add menus entries
-require_once SYSTEM . 'migrations/17.php';
-$up();
-
 // update config.highscores_ids_hidden
 require_once SYSTEM . 'migrations/20.php';
-$up();
 
 // add z_polls tables
 require_once SYSTEM . 'migrations/22.php';
-$up();
 
 // add myaac_pages pages
 require_once SYSTEM . 'migrations/27.php';
-$up();
 require_once SYSTEM . 'migrations/30.php';
-$up();
-
-// new monster columns
-require_once SYSTEM . 'migrations/31.php';
-$up();
-
-// rules page
-require_once SYSTEM . 'migrations/45.php';
-$up();
-
-if(ModelsFAQ::count() == 0) {
-	ModelsFAQ::create([
-		'question' => 'What is this?',
-		'answer' => 'This is website for OTS powered by MyAAC.',
-	]);
-}
-
-$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']);

login.php

@@ -1,11 +1,4 @@
 <?php
-
-use MyAAC\Models\BoostedCreature;
-use MyAAC\Models\PlayerOnline;
-use MyAAC\Models\Account;
-use MyAAC\Models\Player;
-use MyAAC\RateLimit;
-
 require_once 'common.php';
 require_once SYSTEM . 'functions.php';
 require_once SYSTEM . 'init.php';
@@ -50,9 +43,9 @@ $action = $request->type ?? '';
 
 switch ($action) {
 	case 'cacheinfo':
-		$playersonline = PlayerOnline::count();
+		$playersonline = $db->query("select count(*) from `players_online`")->fetchAll();
 		die(json_encode([
-			'playersonline' => $playersonline,
+			'playersonline' => (intval($playersonline[0][0])),
 			'twitchstreams' => 0,
 			'twitchviewer' => 0,
 			'gamingyoutubestreams' => 0,
@@ -86,25 +79,14 @@ switch ($action) {
 		die(json_encode(['eventlist' => $eventlist, 'lastupdatetimestamp' => time()]));
 
 	case 'boostedcreature':
-		$clientVersion = (int)setting('core.client');
+		$boostDB = $db->query("select * from " . $db->tableName('boosted_creature'))->fetchAll();
-
+		foreach ($boostDB as $Tableboost) {
-		// 13.40 and up
-		if ($clientVersion >= 1340) {
-			$creatureBoost = $db->query("SELECT * FROM " . $db->tableName('boosted_creature'))->fetchAll();
-			$bossBoost     = $db->query("SELECT * FROM " . $db->tableName('boosted_boss'))->fetchAll();
-			die(json_encode([
-				'boostedcreature' => true,
-				'creatureraceid'  => intval($creatureBoost[0]['raceid']),
-				'bossraceid'      => intval($bossBoost[0]['raceid'])
-			]));
-		}
-
-		// lower clients
-		$boostedCreature = BoostedCreature::first();
 		die(json_encode([
 			'boostedcreature' => true,
-			'raceid' => $boostedCreature->raceid
+			'raceid' => intval($Tableboost['raceid'])
 		]));
+		}
+	break;
 
 	case 'login':
 
@@ -130,76 +112,42 @@ switch ($action) {
 		];
 
 		$characters = [];
+		$account = new OTS_Account();
 
 		$inputEmail = $request->email ?? false;
 		$inputAccountName = $request->accountname ?? false;
 		$inputToken = $request->token ?? false;
 
-		$account = Account::query();
 		if ($inputEmail != false) { // login by email
-			$account->where('email', $inputEmail);
+			$account->findByEmail($request->email);
 		}
 		else if($inputAccountName != false) { // login by account name
-			$account->where('name', $inputAccountName);
+			$account->find($inputAccountName);
 		}
 
-		$account = $account->first();
+		$current_password = encrypt((USE_ACCOUNT_SALT ? $account->getCustomField('salt') : '') . $request->password);
-
-		$ip = get_browser_real_ip();
-		$limiter = new RateLimit('failed_logins', setting('core.account_login_attempts_limit'), setting('core.account_login_ban_time'));
-		$limiter->enabled = setting('core.account_login_ipban_protection');
-		$limiter->load();
-
-		$ban_msg = 'A wrong account, password or secret has been entered ' . setting('core.account_login_attempts_limit') . ' times in a row. You are unable to log into your account for the next ' . setting('core.account_login_ban_time') . ' minutes. Please wait.';
-		if (!$account) {
-			$limiter->increment($ip);
-			if ($limiter->exceeded($ip)) {
-				sendError($ban_msg);
-			}
-
-			sendError(($inputEmail != false ? 'Email' : 'Account name') . ' or password is not correct.');
-		}
-
-		$current_password = encrypt((USE_ACCOUNT_SALT ? $account->salt : '') . $request->password);
-		if (!$account || $account->password != $current_password) {
-			$limiter->increment($ip);
-			if ($limiter->exceeded($ip)) {
-				sendError($ban_msg);
-			}
 
+		if (!$account->isLoaded() || $account->getPassword() != $current_password) {
 			sendError(($inputEmail != false ? 'Email' : 'Account name') . ' or password is not correct.');
 		}
 
+		//log_append('test.log', var_export($account->getCustomField('secret'), true));
 		$accountHasSecret = false;
 		if (fieldExist('secret', 'accounts')) {
-			$accountSecret = $account->secret;
+			$accountSecret = $account->getCustomField('secret');
 			if ($accountSecret != null && $accountSecret != '') {
 				$accountHasSecret = true;
 				if ($inputToken === false) {
-					$limiter->increment($ip);
-					if ($limiter->exceeded($ip)) {
-						sendError($ban_msg);
-					}
 					sendError('Submit a valid two-factor authentication token.', 6);
 				} else {
 					require_once LIBS . 'rfc6238.php';
 					if (TokenAuth6238::verify($accountSecret, $inputToken) !== true) {
-						$limiter->increment($ip);
-						if ($limiter->exceeded($ip)) {
-							sendError($ban_msg);
-						}
-
 						sendError('Two-factor authentication failed, token is wrong.', 6);
 					}
 				}
 			}
 		}
 
-		$limiter->reset($ip);
-		if (setting('core.account_mail_verify') && $account->email_verified !== 1) {
-			sendError('You need to verify your account, enter in our site and resend verify e-mail!');
-		}
-
 		// common columns
 		$columns = 'id, name, level, sex, vocation, looktype, lookhead, lookbody, looklegs, lookfeet, lookaddons';
 
@@ -211,9 +159,18 @@ switch ($action) {
 			$columns .= ', istutorial';
 		}
 
-		$players = Player::where('account_id', $account->id)->notDeleted()->selectRaw($columns)->get();
+		$players = $db->query("select {$columns} from players where account_id = " . $account->getId() . " AND deletion = 0");
-		if($players && $players->count()) {
+		if($players && $players->rowCount() > 0) {
-			$highestLevelId = $players->sortByDesc('experience')->first()->getKey();
+			$players = $players->fetchAll();
+
+			$highestLevelId = 0;
+			$highestLevel = 0;
+			foreach ($players as $player) {
+				if ($player['level'] >= $highestLevel) {
+					$highestLevel = $player['level'];
+					$highestLevelId = $player['id'];
+				}
+			}
 
 			foreach ($players as $player) {
 				$characters[] = create_char($player, $highestLevelId);
@@ -223,10 +180,15 @@ switch ($action) {
 		if (fieldExist('premdays', 'accounts') && fieldExist('lastday', 'accounts')) {
 			$save = false;
 			$timeNow = time();
-			$premDays = $account->premdays;
+			$query = $db->query("select `premdays`, `lastday` from `accounts` where `id` = " . $account->getId());
-			$lastDay = $account->lastday;
+			if ($query->rowCount() > 0) {
-			$lastLogin = $lastDay;
+				$query = $query->fetch();
-
+				$premDays = (int)$query['premdays'];
+				$lastDay = (int)$query['lastday'];
+				$lastLogin = $lastDay;
+			} else {
+				sendError("Error while fetching your account data. Please contact admin.");
+			}
 			if ($premDays != 0 && $premDays != PHP_INT_MAX) {
 				if ($lastDay == 0) {
 					$lastDay = $timeNow;
@@ -251,9 +213,7 @@ switch ($action) {
 				$save = true;
 			}
 			if ($save) {
-				$account->premdays = $premDays;
+				$db->query("update `accounts` set `premdays` = " . $premDays . ", `lastday` = " . $lastDay . " where `id` = " . $account->getId());
-				$account->lastday = $lastDay;
-				$account->save();
 			}
 		}
 
@@ -275,11 +235,13 @@ switch ($action) {
 			$sessionKey .= "\n".floor(time() / 30);
 		}
 
+		//log_append('slaw.log', $sessionKey);
+
 		$session = [
 			'sessionkey' => $sessionKey,
 			'lastlogintime' => 0,
-			'ispremium' => $account->is_premium,
+			'ispremium' => $config['lua']['freePremium'] || $account->isPremium(),
-			'premiumuntil' => ($account->premium_days) > 0 ? (time() + ($account->premium_days * 86400)) : 0,
+			'premiumuntil' => ($account->getPremDays()) > 0 ? (time() + ($account->getPremDays() * 86400)) : 0,
 			'status' => 'active', // active, frozen or suspended
 			'returnernotification' => false,
 			'showrewardnews' => true,
@@ -297,23 +259,24 @@ switch ($action) {
 }
 
 function create_char($player, $highestLevelId) {
+	global $config;
 	return [
 		'worldid' => 0,
-		'name' => $player->name,
+		'name' => $player['name'],
-		'ismale' => $player->sex === 1,
+		'ismale' => intval($player['sex']) === 1,
-		'tutorial' => isset($player->istutorial) && $player->istutorial,
+		'tutorial' => isset($player['istutorial']) && $player['istutorial'],
-		'level' => $player->level,
+		'level' => intval($player['level']),
-		'vocation' => $player->vocation_name,
+		'vocation' => $config['vocations'][$player['vocation']],
-		'outfitid' => $player->looktype,
+		'outfitid' => intval($player['looktype']),
-		'headcolor' => $player->lookhead,
+		'headcolor' => intval($player['lookhead']),
-		'torsocolor' => $player->lookbody,
+		'torsocolor' => intval($player['lookbody']),
-		'legscolor' => $player->looklegs,
+		'legscolor' => intval($player['looklegs']),
-		'detailcolor' => $player->lookfeet,
+		'detailcolor' => intval($player['lookfeet']),
-		'addonsflags' => $player->lookaddons,
+		'addonsflags' => intval($player['lookaddons']),
-		'ishidden' => $player->is_deleted,
+		'ishidden' => isset($player['deletion']) && (int)$player['deletion'] === 1,
 		'istournamentparticipant' => false,
-		'ismaincharacter' => $highestLevelId === $player->getKey(),
+		'ismaincharacter' => $highestLevelId == $player['id'],
-		'dailyrewardstate' => $player->isreward ?? 0,
+		'dailyrewardstate' => isset($player['isreward']) ? intval($player['isreward']) : 0,
 		'remainingdailytournamentplaytime' => 0
 	];
 }

nginx-sample.conf

@@ -1,6 +1,6 @@
 server {
 	listen 80;
-	root /var/www/html;
+	root /home/otserv/www/public;
 	index index.php;
 	server_name your-domain.com;
 
@@ -10,21 +10,22 @@ server {
 	# this is very important, be sure its in your nginx conf - it prevents access to logs etc.
 	location ~ /system {
 		deny all;
+		return 404;
 	}
 
-	# block .htaccess, CHANGELOG.md, composer.json etc.
+	# block .htaccess
-	# this is to prevent finding software versions
+	location ~ /\.ht {
-	location ~\.(ht|md|json|dist|sql)$ {
 		deny all;
 	}
 
 	# block git files and folders
 	location ~ /\.git {
+		return 404;
 		deny all;
 	}
 
 	location / {
-		try_files $uri $uri/ /index.php?$query_string;
+		try_files $uri $uri/ /index.php;
 	}
 
 	location ~ \.php$ {

npm-post-install.js

@@ -1,16 +0,0 @@
-const fse = require('fs-extra');
-const path = require('path');
-
-const nodeModulesDir = path.join(__dirname, 'node_modules');
-const publicDir = path.join(__dirname, 'tools/ext');
-
-fse.emptyDirSync(path.join(publicDir, 'jquery'));
-fse.emptyDirSync(path.join(publicDir, 'jquery-ui'));
-fse.emptyDirSync(path.join(publicDir, 'bootstrap'));
-fse.emptyDirSync(path.join(publicDir, 'tinymce'));
-fse.emptyDirSync(path.join(publicDir, 'tinymce-jquery'));
-fse.copySync(path.join(nodeModulesDir, 'jquery', 'dist'), path.join(publicDir, 'jquery'), { overwrite: true });
-fse.copySync(path.join(nodeModulesDir, 'jquery-ui', 'dist'), path.join(publicDir, 'jquery-ui'), { overwrite: true });
-fse.copySync(path.join(nodeModulesDir, 'bootstrap', 'dist'), path.join(publicDir, 'bootstrap'), { overwrite: true });
-fse.copySync(path.join(nodeModulesDir, 'tinymce'), path.join(publicDir, 'tinymce'), { overwrite: true });
-fse.copySync(path.join(nodeModulesDir, '@tinymce', 'tinymce-jquery', 'dist'), path.join(publicDir, 'tinymce-jquery'), { overwrite: true });

package.json

@@ -1,17 +1,5 @@
 {
-  "scripts": {
-    "cypress:open": "cypress open",
-    "postinstall": "node ./npm-post-install.js"
-  },
   "devDependencies": {
-    "cypress": "^14.3.3"
+    "cypress": "^12.12.0"
-  },
-  "dependencies": {
-    "@tinymce/tinymce-jquery": "^2.1.0",
-    "bootstrap": "^4.6.2",
-    "fs-extra": "^11.2.0",
-    "jquery": "^3.7.1",
-    "jquery-ui": "^1.13.2",
-    "tinymce": "^7.2.0"
   }
 }

phpstan-bootstrap.php

@@ -1,13 +0,0 @@
-<?php
-
-require __DIR__ . '/system/libs/pot/OTS.php';
-$ots = POT::getInstance();
-
-require __DIR__ . '/system/libs/pot/InvitesDriver.php';
-require __DIR__ . '/system/libs/rfc6238.php';
-require __DIR__ . '/common.php';
-
-const ACTION = '';
-const PAGE = '';
-const URI = '';
-define('SELF_NAME', basename(__FILE__));

phpstan.neon

@@ -1,39 +0,0 @@
-parameters:
-	level: 3
-	paths:
-		- .
-		- templates/tibiacom
-		- templates/kathrine
-	excludePaths:
-		- system/cache/*
-		- vendor/*
-		- plugins/*
-		- system/libs
-		- tools/signature/mango.php
-		- tools/signature/gd.class.php
-	bootstrapFiles:
-		- phpstan-bootstrap.php
-	ignoreErrors:
-		- '#Variable \$db might not be defined#'
-		- '#Variable \$twig might not be defined#'
-		- '#Variable \$hooks might not be defined#'
-		- '#Variable \$account_logged might not be defined#'
-		- '#Variable \$logged might not be defined#'
-		- '#Variable \$config might not be defined#'
-		- '#Variable \$action might not be defined#'
-		- '#Variable \$errors might not be defined#'
-		- '#Variable \$cache might not be defined#'
-		- '#Variable \$status might not be defined#'
-		- '#Variable \$player might not be defined#'
-		- '#Variable \$guild might not be defined#'
-		- '#Variable \$[a-zA-Z0-9\\_]+ might not be defined#'
-		# Eloquent models
-		- '#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#'
-		-
-			message: '#Variable \$tmp in empty\(\) always exists and is always falsy#'
-			path: templates\kathrine\javascript.php

plugins/account-create-hint.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-account-hint",
-	"description": "This plugin display text 'To play on Forgotten you need an account.  All you have to do to create your new account is to enter an account name, password, country and your email address. Also you have to agree to the terms presented below. If you have done so, your account name will be shown on the following page and your account password will be sent to your email address along with further instructions. If you do not receive the email with your password, please check your spam filter.' on the create account page.",
+	"description": "This plugin display text 'To play on Forgotten you need an account.  All you have to do to create your new account is to enter an account name, password, country and your email address. Also you have to agree to the terms presented below. If you have done so, your account name will be shown on the following page and your account password will be sent to your email address along with further instructions. If you do not receive the email with your password, please check your spam filter.' on the create account page. <strong>Be careful when uninstalling this!</strong>",
 	"version": "1.0",
 	"author": "slawkens",
 	"contact": "slawkens@gmail.com",

plugins/account-create-hint/hint.html.twig

@@ -1,3 +1,3 @@
 To play on {{ config.lua.serverName }} you need an account.
-All you have to do to create your new account is to enter an account {% if constant('USE_ACCOUNT_NAME') %}name{% else %}number{% endif %}, password{% if setting('core.account_country') %}, country{% endif %} and your email address.
+All you have to do to create your new account is to enter an account {% if constant('USE_ACCOUNT_NAME') %}name{% else %}number{% endif %}, password{% if config.account_country %}, country{% endif %} and your email address.
 Also you have to agree to the terms presented below. If you have done so, your account {% if constant('USE_ACCOUNT_NAME') %}name{% else %}number{% endif %} will be shown on the following page and your account password will be sent to your email address along with further instructions. If you do not receive the email with your password, please check your spam filter.<br/><br/>

plugins/account-create-hint/hint.php

@@ -9,4 +9,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-$twig->display('account-create-hint/hint.html.twig');
+global $twig_loader;
+$twig_loader->prependPath(BASE . 'plugins/account-create-hint');
+
+$twig->display('hint.html.twig');

plugins/email-confirmed-reward/reward.php

@@ -1,35 +1,33 @@
 <?php
 defined('MYAAC') or die('Direct access not allowed!');
 
+$reward = config('account_mail_confirmed_reward');
+
 $hasCoinsColumn = $db->hasColumn('accounts', 'coins');
-$rewardCoins = setting('core.account_mail_confirmed_reward_coins');
+if ($reward['coins'] > 0 && $hasCoinsColumn) {
-if ($rewardCoins > 0 && !$hasCoinsColumn) {
+	log_append('email_confirm_error.log', 'accounts.coins column does not exist.');
-	log_append('error.log', 'email_confirm: accounts.coins column does not exist.');
 }
 
 if (!isset($account) || !$account->isLoaded()) {
+	log_append('email_confirm_error.log', 'Account not loaded.');
 	return;
 }
 
-$rewardMessage = 'You received %d %s for confirming your E-Mail address.';
+if ($reward['premium_points'] > 0) {
+	$account->setCustomField('premium_points', (int)$account->getCustomField('premium_points') + $reward['premium_points']);
 
-$rewardPremiumPoints = setting('core.account_mail_confirmed_reward_premium_points');
+	success(sprintf($reward['message'], $reward['premium_points'], 'premium points'));
-if ($rewardPremiumPoints > 0) {
-	$account->setCustomField('premium_points', (int)$account->getCustomField('premium_points') + $rewardPremiumPoints);
-
-	success(sprintf($rewardMessage, $rewardPremiumPoints, 'premium points'));
 }
 
-if ($rewardCoins > 0 && $hasCoinsColumn) {
+if ($reward['coins'] > 0 && $hasCoinsColumn) {
-	$account->setCustomField('coins', (int)$account->getCustomField('coins') + $rewardCoins);
+	$account->setCustomField('coins', (int)$account->getCustomField('coins') + $reward['coins']);
 
-	success(sprintf($rewardMessage, $rewardCoins, 'coins'));
+	success(sprintf($reward['message'], $reward['coins'], 'coins'));
 }
 
-$rewardPremiumDays = setting('core.account_mail_confirmed_reward_premium_days');
+if ($reward['premium_days'] > 0) {
-if ($rewardPremiumDays > 0) {
+	$account->setPremDays($account->getPremDays() + $reward['premium_days']);
-	$account->setPremDays($account->getPremDays() + $rewardPremiumDays);
 	$account->save();
 
-	success(sprintf($rewardMessage, $rewardPremiumDays, 'premium days'));
+	success(sprintf($reward['message'], $reward['premium_days'], 'premium days'));
 }

plugins/example.json

@@ -25,8 +25,7 @@
 	"hooks": {
 		"Example Hook": {
 			"type": "BEFORE_PAGE",
-			"file": "plugins/example/before.php",
+			"file": "plugins/example/before.php"
-			"priority": 1000
 		}
 	},
 	"routes": {
@@ -34,25 +33,12 @@
 			"pattern": "/YourAwesomePage/{name:string}/{page:int}",
 			"file": "plugins/your-plugin/your-awesome-page.php",
 			"method": "GET",
-			"priority": 130
+			"priority": "130"
 		},
 		"Redirect Example": {
 			"redirect_from": "/redirectExample",
 			"redirect_to": "account/manage"
 		}
 	},
-	"routes-default-priority": 1000,
+	"settings": "plugins/your-plugin-folder/settings.php"
-	"pages-default-priority": 1000,
-	"settings": "plugins/your-plugin-folder/settings.php",
-	"autoload": {
-		"pages": true,
-		"pages-sub-folders": false,
-		"commands": true,
-		"themes": true,
-		"admin-pages": true,
-		"admin-pages-sub-folders": true,
-		"settings": true,
-		"install": true,
-		"init": false
-	}
  }

release.sh

@@ -22,7 +22,7 @@ if [ $1 = "prepare" ]; then
 	mkdir -p tmp
 
 	# get myaac from git archive
-	git archive --format zip --output tmp/myaac.zip main
+	git archive --format zip --output tmp/myaac.zip develop
 
 	cd tmp/ || exit
 
@@ -38,11 +38,7 @@ if [ $1 = "prepare" ]; then
 	cd $dir || exit
 
 	# dependencies
-	composer install --no-dev --prefer-dist --optimize-autoloader
+	composer install --no-dev
-	npm install
-
-	# node_modules is useless, we already have copy in tools/ext
-	rm -R node_modules
 
 	echo "Now you can make changes to $dir. When you are ready, type 'release.sh pack'"
 	exit

system/base.php

@@ -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'];
-		}
-	}
-}

system/bin/clear_cache.php

@@ -0,0 +1,18 @@
+<?php
+
+if(PHP_SAPI !== 'cli') {
+	echo 'This script can be run only in command line mode.';
+	exit(1);
+}
+
+require_once __DIR__ . '/../../common.php';
+require_once SYSTEM . 'functions.php';
+require_once SYSTEM . 'init.php';
+
+if(clearCache()) {
+	echo 'Cache cleared.' . PHP_EOL;
+}
+else {
+	echo 'Unexpected error.' . PHP_EOL;
+	exit(2);
+}

system/bin/install_plugin.php

@@ -0,0 +1,42 @@
+<?php
+
+if(PHP_SAPI !== 'cli') {
+	echo 'This script can be run only in command line mode.';
+	exit(1);
+}
+
+require_once __DIR__ . '/../../common.php';
+require_once SYSTEM . 'functions.php';
+require_once SYSTEM . 'init.php';
+require_once SYSTEM . 'hooks.php';
+require_once LIBS . 'plugins.php';
+
+if($argc !== 2) {
+	echo 'This command expects one parameter: zip file name (plugin)' . PHP_EOL;
+	exit(2);
+}
+
+$path_to_file = $argv[1];
+$ext = strtolower(pathinfo($path_to_file, PATHINFO_EXTENSION));
+if($ext !== 'zip') {// check if it is zipped/compressed file
+	echo 'Please install only .zip files.' . PHP_EOL;
+	exit(3);
+}
+
+if(!file_exists($path_to_file)) {
+	echo 'ERROR: File ' . $path_to_file . ' does not exist' . PHP_EOL;
+	exit(4);
+}
+
+if(Plugins::install($path_to_file)) {
+	foreach(Plugins::getWarnings() as $warning) {
+		echo 'WARNING: ' . $warning;
+	}
+
+	$info = Plugins::getPluginJson();
+	echo (isset($info['name']) ? $info['name'] . ' p' : 'P') . 'lugin has been successfully installed.' . PHP_EOL;
+}
+else {
+	echo 'ERROR: ' . Plugins::getError() . PHP_EOL;
+	exit(5);
+}

system/bin/send_email.php

@@ -0,0 +1,61 @@
+<?php
+
+if(PHP_SAPI !== 'cli') {
+	echo 'This script can be run only in command line mode.';
+	exit(1);
+}
+
+require_once __DIR__ . '/../../common.php';
+require_once SYSTEM . 'functions.php';
+require_once SYSTEM . 'init.php';
+
+if($argc !== 3) {
+	echo 'This command expects two parameters: account_name_or_id|player_name|email address, subject.' . PHP_EOL;
+	exit(2);
+}
+
+$email_account_name = $argv[1];
+$subject = $argv[2];
+$message = file_get_contents('php://stdin');
+
+if(strpos($email_account_name, '@') === false) {
+	$account = new OTS_Account();
+	if(USE_ACCOUNT_NAME) {
+		$account->find($email_account_name);
+	}
+	else {
+		$account->load($email_account_name);
+	}
+
+	if($account->isLoaded()) {
+		$email_account_name = $account->getEMail();
+	}
+	else {
+		$player = new OTS_Player();
+		$player->find($email_account_name);
+		if($player->isLoaded()) {
+			$email_account_name = $player->getAccount()->getEMail();
+		}
+		else {
+			echo 'Cannot find player or account with name: ' . $email_account_name . '.' . PHP_EOL;
+			exit(3);
+		}
+	}
+}
+
+if(!Validator::email($email_account_name)) {
+	echo 'Invalid E-Mail format.' . PHP_EOL;
+	exit(4);
+}
+
+if(strlen($subject) > 255) {
+	echo 'Subject max length is 255 characters.' . PHP_EOL;
+	exit(5);
+}
+
+if(!_mail($email_account_name, $subject, $message)) {
+	echo 'An error occurred while sending email. More info can be found in system/logs/mailer-error.log';
+	exit(6);
+}
+
+echo 'Mail sent to ' . $email_account_name . '.' . PHP_EOL;

system/clients.conf.php

@@ -99,22 +99,4 @@ $config['clients'] = [
 	1291,
 
 	1300,
-	1310,
-	1311,
-	1312,
-	1316,
-	1320,
-	1321,
-	1322,
-	1330,
-	1332,
-	1340,
-
-	1400,
-	1405,
-	1410,
-	1411,
-	1412,
-	1500,
-	1501,
 ];

system/compat/base.php

@@ -9,12 +9,10 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-class Validator extends \MyAAC\Validator {}
-
 function check_name($name, &$errors = '') {
 	if(Validator::characterName($name))
 		return true;
-
+	
 	$errors = Validator::getLastError();
 	return false;
 }
@@ -22,7 +20,7 @@ function check_name($name, &$errors = '') {
 function check_account_id($id, &$errors = '') {
 	if(Validator::accountId($id))
 		return true;
-
+	
 	$errors = Validator::getLastError();
 	return false;
 }
@@ -30,7 +28,7 @@ function check_account_id($id, &$errors = '') {
 function check_account_name($name, &$errors = '') {
 	if(Validator::accountName($name))
 		return true;
-
+	
 	$errors = Validator::getLastError();
 	return false;
 }
@@ -38,7 +36,7 @@ function check_account_name($name, &$errors = '') {
 function check_name_new_char($name, &$errors = '') {
 	if(Validator::newCharacterName($name))
 		return true;
-
+	
 	$errors = Validator::getLastError();
 	return false;
 }
@@ -46,7 +44,7 @@ function check_name_new_char($name, &$errors = '') {
 function check_rank_name($name, &$errors = '') {
 	if(Validator::rankName($name))
 		return true;
-
+	
 	$errors = Validator::getLastError();
 	return false;
 }
@@ -54,7 +52,7 @@ function check_rank_name($name, &$errors = '') {
 function check_guild_name($name, &$errors = '') {
 	if(Validator::guildName($name))
 		return true;
-
+	
 	$errors = Validator::getLastError();
 	return false;
 }
@@ -74,3 +72,4 @@ function fieldExist($field, $table)
 	global $db;
 	return $db->hasColumn($table, $field);
 }
+?>

system/compat/classes.php

@@ -36,5 +36,3 @@ class Guild extends OTS_Guild {
 }
 class GuildRank extends OTS_GuildRank {}
 class House extends OTS_House {}
-
-class Cache extends \MyAAC\Cache\Cache {}

system/compat/config.php

@@ -34,18 +34,8 @@ $deprecatedConfig = [
 	'news_limit',
 	'news_ticker_limit',
 	'news_date_format',
-	'guild_management',
-	'guild_need_level',
-	'guild_need_premium',
-	'guild_image_size_kb',
-	'guild_description_default',
-	'guild_description_chars_limit',
-	'guild_motd_chars_limit',
 	'highscores_groups_hidden',
 	'highscores_ids_hidden',
-	'highscores_vocation_box',
-	'highscores_vocation',
-	'highscores_outfit',
 	'online_record',
 	'online_vocations',
 	'online_vocations_images',
@@ -68,14 +58,9 @@ $deprecatedConfig = [
 	'status_ip',
 	'status_port',
 	'mail_enabled',
-	'mail_address',
 	'account_login_by_email',
 	'account_login_by_email_fallback',
 	'account_mail_verify',
-	'account_mail_unique',
-	'account_mail_change',
-	'account_premium_days',
-	'account_premium_points',
 	'account_create_character_create',
 	'account_change_character_name',
 	'account_change_character_name_points' => 'account_change_character_name_price',

system/compat/pages.php

@@ -44,7 +44,7 @@ switch($page)
 		break;
 
 	case 'killstatistics':
-		$page = 'last-kills';
+		$page = 'lastkills';
 		break;
 
 	case 'buypoints':

system/counter.php

@@ -7,9 +7,6 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use MyAAC\Cache\Cache;
-
 defined('MYAAC') or die('Direct access not allowed!');
 define('COUNTER_SYNC', 10); // how often counter is synchronized with database (each x site refreshes)
 

system/database.php

@@ -7,9 +7,6 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
-
-use Illuminate\Database\Capsule\Manager as Capsule;
-
 defined('MYAAC') or die('Direct access not allowed!');
 
 if (!isset($config['database_overwrite'])) {
@@ -94,45 +91,26 @@ if(!isset($config['database_socket'])) {
 	$config['database_socket'] = '';
 }
 
-
 try {
 	$ots->connect(array(
-		'host' => $config['database_host'],
+			'host' => $config['database_host'],
-		'user' => $config['database_user'],
+			'user' => $config['database_user'],
-		'password' => $config['database_password'],
+			'password' => $config['database_password'],
-		'database' => $config['database_name'],
+			'database' => $config['database_name'],
-		'log' => $config['database_log'],
+			'log' => $config['database_log'],
-		'socket' => @$config['database_socket'],
+			'socket' => @$config['database_socket'],
-		'persistent' => @$config['database_persistent']
+			'persistent' => @$config['database_persistent']
-	));
+		)
+	);
 
-	global $db;
 	$db = POT::getInstance()->getDBHandle();
-	$capsule = new Capsule;
+}
-	$capsule->addConnection([
+catch(PDOException $error) {
-		'driver' => 'mysql',
-		'database' => $config['database_name'],
-	]);
-
-	$capsule->getConnection()->setPdo($db);
-	$capsule->getConnection()->setReadPdo($db);
-
-	$capsule->setAsGlobal();
-	$capsule->bootEloquent();
-
-	$eloquentConnection = $capsule->getConnection();
-
-	if (isset($twig)) {
-		$twig->addGlobal('db', $db);
-	}
-
-} catch (Exception $e) {
 	if(isset($cache) && $cache->enabled()) {
 		$cache->delete('config_lua');
 	}
 
 	if(defined('MYAAC_INSTALL')) {
-		$error = $e->getMessage();
 		return; // installer will take care of this
 	}
 
@@ -141,5 +119,5 @@ try {
 		'<ul>' .
 			'<li>MySQL is not configured propertly in <i>config.lua</i>.</li>' .
 			'<li>MySQL server is not running.</li>' .
-		'</ul>' . $e->getMessage());
+		'</ul>' . $error->getMessage());
 }

system/exception.php

@@ -8,21 +8,21 @@
  * @link      https://my-aac.org
  */
 
-use MyAAC\Exceptions\SensitiveException;
+if (class_exists(\Whoops\Run::class)) {
-use Whoops\Handler\PlainTextHandler;
+	$whoops = new \Whoops\Run;
-use Whoops\Handler\PrettyPageHandler;
+	if(IS_CLI) {
-use Whoops\Run;
+		$whoops->pushHandler(new \Whoops\Handler\PlainTextHandler);
+	}
+	else {
+		$whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler);
+	}
 
-if (class_exists(Run::class)) {
-	$whoops = new Run;
-
-	$whoopsHandler = IS_CLI ? (new PlainTextHandler()) : (new PrettyPageHandler());
-
-	$whoops->pushHandler($whoopsHandler);
 	$whoops->register();
 	return;
 }
 
+require LIBS . 'SensitiveException.php';
+
 /**
  * @param Exception $exception
  */