diff --git a/package-lock.json b/package-lock.json index eb9808193..41def4c6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,12 @@ { - "name": "myaac_fork", + "name": "myaac", "lockfileVersion": 3, "requires": true, "packages": { "": { "devDependencies": { "@prettier/plugin-php": "^0.22.2", - "husky": "^9.0.11", - "lint-staged": "^15.2.2", - "prettier": "3.2.5", + "prettier": "^3.2.5", "stylelint-config-prettier": "^9.0.5" } }, @@ -259,45 +257,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ansi-escapes": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz", - "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==", - "dev": true, - "dependencies": { - "type-fest": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", @@ -358,6 +317,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, + "peer": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -403,49 +363,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "dependencies": { - "restore-cursor": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", - "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", - "dev": true, - "dependencies": { - "slice-ansi": "^5.0.0", - "string-width": "^7.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -470,21 +387,6 @@ "dev": true, "peer": true }, - "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true - }, - "node_modules/commander": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", - "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", - "dev": true, - "engines": { - "node": ">=16" - } - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -519,20 +421,6 @@ "node": ">= 6" } }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/css-functions-list": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", @@ -561,6 +449,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, + "peer": true, "dependencies": { "ms": "2.1.2" }, @@ -623,12 +512,6 @@ "node": ">=8" } }, - "node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", - "dev": true - }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -649,35 +532,6 @@ "node": ">=0.8.0" } }, - "node_modules/eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", - "dev": true - }, - "node_modules/execa": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", - "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^8.0.1", - "human-signals": "^5.0.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^4.1.0", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": ">=16.17" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -740,6 +594,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, + "peer": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -800,30 +655,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-east-asian-width": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", - "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", - "dev": true, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-stream": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", - "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", - "dev": true, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -986,30 +817,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/human-signals": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", - "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", - "dev": true, - "engines": { - "node": ">=16.17.0" - } - }, - "node_modules/husky": { - "version": "9.0.11", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", - "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", - "dev": true, - "bin": { - "husky": "bin.mjs" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/typicode" - } - }, "node_modules/ignore": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", @@ -1132,18 +939,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -1162,6 +957,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "peer": true, "engines": { "node": ">=0.12.0" } @@ -1186,23 +982,12 @@ "node": ">=0.10.0" } }, - "node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "dev": true, + "peer": true }, "node_modules/js-tokens": { "version": "4.0.0", @@ -1259,15 +1044,6 @@ "dev": true, "peer": true }, - "node_modules/lilconfig": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", - "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", - "dev": true, - "engines": { - "node": ">=14" - } - }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -1281,50 +1057,6 @@ "integrity": "sha512-Wzx/22c5Jsv2ag+uKy+ITanGA5hzvBZngrNGDXLTC7ZjGM6FLCYGgomauTkxNJeP9of353OM0pWqngYA180xgw==", "dev": true }, - "node_modules/lint-staged": { - "version": "15.2.2", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.2.tgz", - "integrity": "sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==", - "dev": true, - "dependencies": { - "chalk": "5.3.0", - "commander": "11.1.0", - "debug": "4.3.4", - "execa": "8.0.1", - "lilconfig": "3.0.0", - "listr2": "8.0.1", - "micromatch": "4.0.5", - "pidtree": "0.6.0", - "string-argv": "0.3.2", - "yaml": "2.3.4" - }, - "bin": { - "lint-staged": "bin/lint-staged.js" - }, - "engines": { - "node": ">=18.12.0" - }, - "funding": { - "url": "https://opencollective.com/lint-staged" - } - }, - "node_modules/listr2": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.1.tgz", - "integrity": "sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==", - "dev": true, - "dependencies": { - "cli-truncate": "^4.0.0", - "colorette": "^2.0.20", - "eventemitter3": "^5.0.1", - "log-update": "^6.0.0", - "rfdc": "^1.3.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=18.0.0" - } - }, "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -1345,56 +1077,6 @@ "dev": true, "peer": true }, - "node_modules/log-update": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz", - "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==", - "dev": true, - "dependencies": { - "ansi-escapes": "^6.2.0", - "cli-cursor": "^4.0.0", - "slice-ansi": "^7.0.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/is-fullwidth-code-point": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", - "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", - "dev": true, - "dependencies": { - "get-east-asian-width": "^1.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/log-update/node_modules/slice-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", - "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.2.1", - "is-fullwidth-code-point": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -1472,12 +1154,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -1493,6 +1169,7 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, + "peer": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -1501,18 +1178,6 @@ "node": ">=8.6" } }, - "node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -1555,7 +1220,8 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "peer": true }, "node_modules/nanoid": { "version": "3.3.7", @@ -1602,33 +1268,6 @@ "node": ">=0.10.0" } }, - "node_modules/npm-run-path": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", - "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", - "dev": true, - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1639,21 +1278,6 @@ "wrappy": "1" } }, - "node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -1745,15 +1369,6 @@ "node": ">=0.10.0" } }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", @@ -1789,6 +1404,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "peer": true, "engines": { "node": ">=8.6" }, @@ -1796,18 +1412,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pidtree": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", - "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", - "dev": true, - "bin": { - "pidtree": "bin/pidtree.js" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/postcss": { "version": "8.4.35", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", @@ -2081,52 +1685,6 @@ "node": ">=8" } }, - "node_modules/restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/restore-cursor/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/restore-cursor/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/restore-cursor/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -2138,12 +1696,6 @@ "node": ">=0.10.0" } }, - "node_modules/rfdc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", - "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", - "dev": true - }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -2200,39 +1752,6 @@ "node": ">=10" } }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -2243,22 +1762,6 @@ "node": ">=8" } }, - "node_modules/slice-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", - "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.0.0", - "is-fullwidth-code-point": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", @@ -2305,59 +1808,6 @@ "dev": true, "peer": true }, - "node_modules/string-argv": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", - "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", - "dev": true, - "engines": { - "node": ">=0.6.19" - } - }, - "node_modules/string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", - "dev": true, - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/strip-indent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", @@ -2684,6 +2134,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "peer": true, "dependencies": { "is-number": "^7.0.0" }, @@ -2701,18 +2152,6 @@ "node": ">=8" } }, - "node_modules/type-fest": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", - "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -2748,38 +2187,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -2815,15 +2222,6 @@ "dev": true, "peer": true }, - "node_modules/yaml": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", - "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", - "dev": true, - "engines": { - "node": ">= 14" - } - }, "node_modules/yargs-parser": { "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", diff --git a/workflow_test/check_name.js b/workflow_test/check_name.js index c0e0fd189..fff28602a 100644 --- a/workflow_test/check_name.js +++ b/workflow_test/check_name.js @@ -1,56 +1,59 @@ -$(function() { - $('#character_name').blur(function() { - checkName(); - }); +$(function () { + $('#character_name').blur(function () { + checkName(); + }); }); var eventId = 0; var lastSend = 0; -function checkName() -{ - if(eventId != 0) - { - clearInterval(eventId) - eventId = 0; - } +function checkName() { + if (eventId != 0) { + clearInterval(eventId); + eventId = 0; + } - if(document.getElementById("character_name").value=="") - { - $('#character_error').html('Please enter new character name.'); - var $characterIndicator = $('#character_indicator'); - $characterIndicator.attr('src', 'images/global/general/nok.gif'); - $characterIndicator.show(); - return; - } + if (document.getElementById('character_name').value == '') { + $('#character_error').html( + 'Please enter new character name.', + ); + var $characterIndicator = $('#character_indicator'); + $characterIndicator.attr('src', 'images/global/general/nok.gif'); + $characterIndicator.show(); + return; + } - //anti flood - var date = new Date; - var timeNow = parseInt(date.getTime()); + //anti flood + var date = new Date(); + var timeNow = parseInt(date.getTime()); - if(lastSend != 0) - { - if(timeNow - lastSend < 1100) - { - eventId = setInterval('checkName()', 1100) - return; - } - } + if (lastSend != 0) { + if (timeNow - lastSend < 1100) { + eventId = setInterval('checkName()', 1100); + return; + } + } - var name = document.getElementById("character_name").value; - $.getJSON("tools/validate.php", { name: name, uid: Math.random() }, - function(data) { - var $characterIndicator = $('#character_indicator'); - if(data.hasOwnProperty('success')) { - $('#character_error').html ('' + data.success + ''); - $characterIndicator.attr('src', 'images/global/general/ok.gif'); - } - else if(data.hasOwnProperty('error')) { - $('#character_error').html('' + data.error + ''); - $characterIndicator.attr('src', 'images/global/general/nok.gif'); - } + var name = document.getElementById('character_name').value; + $.getJSON( + 'tools/validate.php', + { name: name, uid: Math.random() }, + function (data) { + var $characterIndicator = $('#character_indicator'); + if (data.hasOwnProperty('success')) { + $('#character_error').html( + '' + data.success + '', + ); + $characterIndicator.attr('src', 'images/global/general/ok.gif'); + } else if (data.hasOwnProperty('error')) { + $('#character_error').html( + '' + data.error + '', + ); + $characterIndicator.attr('src', 'images/global/general/nok.gif'); + } - $characterIndicator.show(); - lastSend = timeNow; - }); -} \ No newline at end of file + $characterIndicator.show(); + lastSend = timeNow; + }, + ); +} diff --git a/workflow_test/common.php b/workflow_test/common.php index e99e07ce7..d73388411 100644 --- a/workflow_test/common.php +++ b/workflow_test/common.php @@ -25,17 +25,21 @@ * @copyright 2023 MyAAC * @link https://github.com/opentibiabr/myaac */ -if (version_compare(phpversion(), '7.4', '<')) die('PHP version 7.4 or higher is required.'); +if (version_compare(phpversion(), '7.4', '<')) { + die('PHP version 7.4 or higher is required.'); +} define('MYAAC', true); define('MYAAC_VERSION', '0.8.16'); define('DATABASE_VERSION', 34); define('TABLE_PREFIX', 'myaac_'); define('START_TIME', microtime(true)); -define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX')); +define( + 'MYAAC_OS', + stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX') +); define('IS_CLI', in_array(php_sapi_name(), ['cli', 'phpdb'])); - // account flags define('FLAG_ADMIN', 1); define('FLAG_SUPER_ADMIN', 2); @@ -90,46 +94,53 @@ define('TFS_LAST', TFS_03); if (!IS_CLI) { - session_save_path(SYSTEM . 'php_sessions'); - session_set_cookie_params([ - "httponly" => true - ]); - session_start(); + session_save_path(SYSTEM . 'php_sessions'); + session_set_cookie_params([ + 'httponly' => true, + ]); + session_start(); } // basedir $basedir = ''; $tmp = explode('/', $_SERVER['SCRIPT_NAME']); $size = count($tmp) - 1; -for ($i = 1; $i < $size; $i++) - $basedir .= '/' . $tmp[$i]; +for ($i = 1; $i < $size; $i++) { + $basedir .= '/' . $tmp[$i]; +} -$basedir = str_replace(array('/admin', '/install', '/tools'), '', $basedir); +$basedir = str_replace(['/admin', '/install', '/tools'], '', $basedir); define('BASE_DIR', $basedir); if (file_exists(BASE . 'config.local.php') && !defined('MYAAC_INSTALL')) { - require BASE . 'config.local.php'; + require BASE . 'config.local.php'; } if (!IS_CLI) { - if (isset($_SERVER['HTTP_HOST'][0])) { - $baseHost = $_SERVER['HTTP_HOST']; + if (isset($_SERVER['HTTP_HOST'][0])) { + $baseHost = $_SERVER['HTTP_HOST']; + } else { + if (isset($_SERVER['SERVER_NAME'][0])) { + $baseHost = $_SERVER['SERVER_NAME']; } else { - if (isset($_SERVER['SERVER_NAME'][0])) { - $baseHost = $_SERVER['SERVER_NAME']; - } else { - $baseHost = $_SERVER['SERVER_ADDR']; - } + $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/'); + 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/'); - //define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']); + //define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']); - if (@$config['env'] === 'dev') { - require SYSTEM . 'exception.php'; - } + if (@$config['env'] === 'dev') { + require SYSTEM . 'exception.php'; + } } require SYSTEM . 'autoload.php'; diff --git a/workflow_test/index.php b/workflow_test/index.php index ff88b33c5..5dedfac46 100644 --- a/workflow_test/index.php +++ b/workflow_test/index.php @@ -31,151 +31,236 @@ $uri = $_SERVER['REQUEST_URI']; $tmp = BASE_DIR; -if (!empty($tmp)) - $uri = str_replace(BASE_DIR . '/', '', $uri); -else - $uri = str_replace_first('/', '', $uri); +if (!empty($tmp)) { + $uri = str_replace(BASE_DIR . '/', '', $uri); +} else { + $uri = str_replace_first('/', '', $uri); +} -$uri = str_replace(array('index.php/', '?'), '', $uri); +$uri = str_replace(['index.php/', '?'], '', $uri); define('URI', $uri); if (preg_match("/^[A-Za-z0-9-_%'+]+\.png$/i", $uri)) { - $tmp = explode('.', $uri); - $_REQUEST['name'] = urldecode($tmp[0]); + $tmp = explode('.', $uri); + $_REQUEST['name'] = urldecode($tmp[0]); - chdir(TOOLS . 'signature'); - include TOOLS . 'signature/index.php'; - exit(); + chdir(TOOLS . 'signature'); + include TOOLS . 'signature/index.php'; + exit(); } -if (preg_match("/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|php|zip|rar|gz|ttf|woff|ico)$/i", $_SERVER['REQUEST_URI'])) { - http_response_code(404); - exit; +if ( + preg_match( + "/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|php|zip|rar|gz|ttf|woff|ico)$/i", + $_SERVER['REQUEST_URI'] + ) +) { + http_response_code(404); + exit(); } if (file_exists(BASE . 'config.local.php')) { - require_once BASE . 'config.local.php'; + require_once BASE . 'config.local.php'; } ini_set('log_errors', 1); if (config('env') === 'dev') { - ini_set('display_errors', 1); - ini_set('display_startup_errors', 1); - error_reporting(E_ALL); + ini_set('display_errors', 1); + ini_set('display_startup_errors', 1); + error_reporting(E_ALL); } else { - ini_set('display_errors', 0); - ini_set('display_startup_errors', 0); - error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); + ini_set('display_errors', 0); + ini_set('display_startup_errors', 0); + error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); } if ((!isset($config['installed']) || !$config['installed']) && file_exists(BASE . 'install')) { - header('Location: ' . BASE_URL . 'install/'); - throw new RuntimeException('Setup detected that install/ directory exists. Please visit this url to start MyAAC Installation.
Delete install/ directory if you already installed MyAAC.
Remember to REFRESH this page when you\'re done!'); + header('Location: ' . BASE_URL . 'install/'); + throw new RuntimeException( + 'Setup detected that install/ directory exists. Please visit this url to start MyAAC Installation.
Delete install/ directory if you already installed MyAAC.
Remember to REFRESH this page when you\'re done!' + ); } $found = false; if (empty($uri) || isset($_REQUEST['template'])) { - $_REQUEST['p'] = 'news'; - $found = true; + $_REQUEST['p'] = 'news'; + $found = true; } else { - $tmp = strtolower($uri); - if (!preg_match('/[^A-z0-9\-]/', $uri) && file_exists(SYSTEM . 'pages/' . $tmp . '.php')) { - $_REQUEST['p'] = $uri; - $found = true; - } else { - $rules = array( - '/^account\/manage\/?$/' => array('subtopic' => 'accountmanagement'), - '/^account\/create\/?$/' => array('subtopic' => 'createaccount'), - '/^account\/lost\/?$/' => array('subtopic' => 'lostaccount'), - '/^account\/logout\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'logout'), - '/^account\/password\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_password'), - '/^account\/register\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register'), - '/^account\/register\/new\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register_new'), - '/^account\/email\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_email'), - '/^account\/info\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_info'), - '/^account\/character\/create\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'create_character'), - '/^account\/character\/name\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_name'), - '/^account\/character\/sex\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_sex'), - '/^account\/character\/main\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_main'), - '/^account\/character\/delete\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'delete_character'), - '/^account\/character\/comment\/[A-Za-z0-9-_%+\']+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment', 'name' => '$3'), - '/^account\/character\/comment\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment'), - '/^account\/confirm_email\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'confirm_email', 'v' => '$2'), - '/^characters\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'characters', 'name' => '$1'), - '/^changelog\/[0-9]+\/?$/' => array('subtopic' => 'changelog', 'page' => '$1'), - '/^commands\/add\/?$/' => array('subtopic' => 'commands', 'action' => 'add'), - '/^commands\/edit\/?$/' => array('subtopic' => 'commands', 'action' => 'edit'), - '/^faq\/add\/?$/' => array('subtopic' => 'faq', 'action' => 'add'), - '/^faq\/edit\/?$/' => array('subtopic' => 'faq', 'action' => 'edit'), - '/^forum\/add_board\/?$/' => array('subtopic' => 'forum', 'action' => 'add_board'),# - '/^forum\/edit_board\/?$/' => array('subtopic' => 'forum', 'action' => 'edit_board'), - '/^forum\/board\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2'), - '/^forum\/board\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2', 'page' => '$3'), - '/^forum\/thread\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2'), - '/^forum\/thread\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2', 'page' => '$3'), - '/^gallery\/add\/?$/' => array('subtopic' => 'gallery', 'action' => 'add'), - '/^gallery\/edit\/?$/' => array('subtopic' => 'gallery', 'action' => 'edit'), - '/^gallery\/[0-9]+\/?$/' => array('subtopic' => 'gallery', 'image' => '$1'), - '/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'), - '/^guilds\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'guilds', 'action' => 'show', 'guild' => '$1'), - '/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2', 'page' => '$3'), - '/^highscores\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'page' => '$2'), - '/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2'), - '/^highscores\/[A-Za-z0-9-_\']+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1'), - '/^news\/add\/?$/' => array('subtopic' => 'news', 'action' => 'add'), - '/^news\/edit\/?$/' => array('subtopic' => 'news', 'action' => 'edit'), - '/^news\/archive\/?$/' => array('subtopic' => 'newsarchive'), - '/^news\/archive\/[0-9]+\/?$/' => array('subtopic' => 'newsarchive', 'id' => '$2'), - '/^polls\/[0-9]+\/?$/' => array('subtopic' => 'polls', 'id' => '$1'), - '/^spells\/[A-Za-z0-9-_%]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'spells', 'vocation' => '$1', 'order' => '$2'), - '/^houses\/view\/?$/' => array('subtopic' => 'houses', 'page' => 'view') - ); - - foreach ($rules as $rule => $redirect) { - if (preg_match($rule, $uri)) { - $tmp = explode('/', $uri); - /* @var $redirect array */ - foreach ($redirect as $key => $value) { - - if (strpos($value, '$') !== false) { - $value = str_replace('$' . $value[1], $tmp[$value[1]], $value); - } - - $_REQUEST[$key] = $value; - $_GET[$key] = $value; - } - - $found = true; - break; - } + $tmp = strtolower($uri); + if (!preg_match('/[^A-z0-9\-]/', $uri) && file_exists(SYSTEM . 'pages/' . $tmp . '.php')) { + $_REQUEST['p'] = $uri; + $found = true; + } else { + $rules = [ + '/^account\/manage\/?$/' => ['subtopic' => 'accountmanagement'], + '/^account\/create\/?$/' => ['subtopic' => 'createaccount'], + '/^account\/lost\/?$/' => ['subtopic' => 'lostaccount'], + '/^account\/logout\/?$/' => ['subtopic' => 'accountmanagement', 'action' => 'logout'], + '/^account\/password\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'change_password', + ], + '/^account\/register\/?$/' => ['subtopic' => 'accountmanagement', 'action' => 'register'], + '/^account\/register\/new\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'register_new', + ], + '/^account\/email\/?$/' => ['subtopic' => 'accountmanagement', 'action' => 'change_email'], + '/^account\/info\/?$/' => ['subtopic' => 'accountmanagement', 'action' => 'change_info'], + '/^account\/character\/create\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'create_character', + ], + '/^account\/character\/name\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'change_name', + ], + '/^account\/character\/sex\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'change_sex', + ], + '/^account\/character\/main\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'change_main', + ], + '/^account\/character\/delete\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'delete_character', + ], + '/^account\/character\/comment\/[A-Za-z0-9-_%+\']+\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'change_comment', + 'name' => '$3', + ], + '/^account\/character\/comment\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'change_comment', + ], + '/^account\/confirm_email\/[A-Za-z0-9-_]+\/?$/' => [ + 'subtopic' => 'accountmanagement', + 'action' => 'confirm_email', + 'v' => '$2', + ], + '/^characters\/[A-Za-z0-9-_%+\']+$/' => ['subtopic' => 'characters', 'name' => '$1'], + '/^changelog\/[0-9]+\/?$/' => ['subtopic' => 'changelog', 'page' => '$1'], + '/^commands\/add\/?$/' => ['subtopic' => 'commands', 'action' => 'add'], + '/^commands\/edit\/?$/' => ['subtopic' => 'commands', 'action' => 'edit'], + '/^faq\/add\/?$/' => ['subtopic' => 'faq', 'action' => 'add'], + '/^faq\/edit\/?$/' => ['subtopic' => 'faq', 'action' => 'edit'], + '/^forum\/add_board\/?$/' => ['subtopic' => 'forum', 'action' => 'add_board'], # + '/^forum\/edit_board\/?$/' => ['subtopic' => 'forum', 'action' => 'edit_board'], + '/^forum\/board\/[0-9]+\/?$/' => [ + 'subtopic' => 'forum', + 'action' => 'show_board', + 'id' => '$2', + ], + '/^forum\/board\/[0-9]+\/[0-9]+\/?$/' => [ + 'subtopic' => 'forum', + 'action' => 'show_board', + 'id' => '$2', + 'page' => '$3', + ], + '/^forum\/thread\/[0-9]+\/?$/' => [ + 'subtopic' => 'forum', + 'action' => 'show_thread', + 'id' => '$2', + ], + '/^forum\/thread\/[0-9]+\/[0-9]+\/?$/' => [ + 'subtopic' => 'forum', + 'action' => 'show_thread', + 'id' => '$2', + 'page' => '$3', + ], + '/^gallery\/add\/?$/' => ['subtopic' => 'gallery', 'action' => 'add'], + '/^gallery\/edit\/?$/' => ['subtopic' => 'gallery', 'action' => 'edit'], + '/^gallery\/[0-9]+\/?$/' => ['subtopic' => 'gallery', 'image' => '$1'], + '/^gifts\/history\/?$/' => ['subtopic' => 'gifts', 'action' => 'show_history'], + '/^guilds\/[A-Za-z0-9-_%+\']+$/' => [ + 'subtopic' => 'guilds', + 'action' => 'show', + 'guild' => '$1', + ], + '/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => [ + 'subtopic' => 'highscores', + 'list' => '$1', + 'vocation' => '$2', + 'page' => '$3', + ], + '/^highscores\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => [ + 'subtopic' => 'highscores', + 'list' => '$1', + 'page' => '$2', + ], + '/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/?$/' => [ + 'subtopic' => 'highscores', + 'list' => '$1', + 'vocation' => '$2', + ], + '/^highscores\/[A-Za-z0-9-_\']+\/?$/' => ['subtopic' => 'highscores', 'list' => '$1'], + '/^news\/add\/?$/' => ['subtopic' => 'news', 'action' => 'add'], + '/^news\/edit\/?$/' => ['subtopic' => 'news', 'action' => 'edit'], + '/^news\/archive\/?$/' => ['subtopic' => 'newsarchive'], + '/^news\/archive\/[0-9]+\/?$/' => ['subtopic' => 'newsarchive', 'id' => '$2'], + '/^polls\/[0-9]+\/?$/' => ['subtopic' => 'polls', 'id' => '$1'], + '/^spells\/[A-Za-z0-9-_%]+\/[A-Za-z0-9-_]+\/?$/' => [ + 'subtopic' => 'spells', + 'vocation' => '$1', + 'order' => '$2', + ], + '/^houses\/view\/?$/' => ['subtopic' => 'houses', 'page' => 'view'], + ]; + + foreach ($rules as $rule => $redirect) { + if (preg_match($rule, $uri)) { + $tmp = explode('/', $uri); + /* @var $redirect array */ + foreach ($redirect as $key => $value) { + if (strpos($value, '$') !== false) { + $value = str_replace('$' . $value[1], $tmp[$value[1]], $value); + } + + $_REQUEST[$key] = $value; + $_GET[$key] = $value; } + + $found = true; + break; + } } + } } // define page visited, so it can be used within events system $page = $_REQUEST['subtopic'] ?? ($_REQUEST['p'] ?? ''); if (empty($page) || !preg_match('/^[A-z0-9\-]+$/', $page)) { - $tmp = URI; - if (!empty($tmp)) { - $page = $tmp; + $tmp = URI; + if (!empty($tmp)) { + $page = $tmp; + } else { + if (!$found) { + $page = '404'; } else { - if (!$found) - $page = '404'; - else - $page = 'news'; + $page = 'news'; } + } } $page = strtolower($page); define('PAGE', $page); -$template_place_holders = array(); +$template_place_holders = []; require_once SYSTEM . 'init.php'; // verify myaac tables exists in database if (!$db->hasTable('myaac_account_actions')) { - throw new RuntimeException('Seems that the table myaac_account_actions of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting this url.'); + throw new RuntimeException( + 'Seems that the table myaac_account_actions of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting this url.' + ); } // event system @@ -193,149 +278,170 @@ $hooks->trigger(HOOK_STARTUP); -if ($config['views_counter']) - require_once SYSTEM . 'counter.php'; +if ($config['views_counter']) { + require_once SYSTEM . 'counter.php'; +} if ($config['visitors_counter']) { - require_once SYSTEM . 'libs/visitors.php'; - $visitors = new Visitors($config['visitors_counter_ttl']); + require_once SYSTEM . 'libs/visitors.php'; + $visitors = new Visitors($config['visitors_counter_ttl']); } // page content loading -if (!isset($content[0])) - $content = ''; +if (!isset($content[0])) { + $content = ''; +} $load_it = true; // check if site has been closed $site_closed = false; if (fetchDatabaseConfig('site_closed', $site_closed)) { - $site_closed = ($site_closed == 1); - if ($site_closed) { - if (!admin()) { - $title = getDatabaseConfig('site_closed_title'); - $content .= '

' . getDatabaseConfig('site_closed_message') . '


'; - $load_it = false; - } + $site_closed = $site_closed == 1; + if ($site_closed) { + if (!admin()) { + $title = getDatabaseConfig('site_closed_title'); + $content .= '

' . getDatabaseConfig('site_closed_message') . '


'; + $load_it = false; + } - if (!$logged) { - ob_start(); - require SYSTEM . 'pages/accountmanagement.php'; - $content .= ob_get_contents(); - ob_end_clean(); - $load_it = false; - } + if (!$logged) { + ob_start(); + require SYSTEM . 'pages/accountmanagement.php'; + $content .= ob_get_contents(); + ob_end_clean(); + $load_it = false; } + } } define('SITE_CLOSED', $site_closed); // backward support for gesior if ($config['backward_support']) { - define('INITIALIZED', true); - $SQL = $db; - $layout_header = template_header(); - $layout_name = $template_path; - $news_content = ''; - $tickers_content = ''; - $subtopic = PAGE; - $main_content = ''; - - $config['access_admin_panel'] = 2; - $group_id_of_acc_logged = 0; - if ($logged && $account_logged) - $group_id_of_acc_logged = $account_logged->getGroupId(); - - $config['site'] = &$config; - $config['server'] = &$config['lua']; - $config['site']['shop_system'] = $config['gifts_system']; - $config['site']['gallery_page'] = true; - - if (!isset($config['vdarkborder'])) - $config['vdarkborder'] = '#505050'; - if (!isset($config['darkborder'])) - $config['darkborder'] = '#D4C0A1'; - if (!isset($config['lightborder'])) - $config['lightborder'] = '#F1E0C6'; - - $config['site']['download_page'] = true; - $config['site']['serverinfo_page'] = true; - $config['site']['screenshot_page'] = true; - - if ($config['forum'] != '') - $config['forum_link'] = (strtolower($config['forum']) === 'site' ? getLink('forum') : $config['forum']); - - foreach ($status as $key => $value) - $config['status']['serverStatus_' . $key] = $value; + define('INITIALIZED', true); + $SQL = $db; + $layout_header = template_header(); + $layout_name = $template_path; + $news_content = ''; + $tickers_content = ''; + $subtopic = PAGE; + $main_content = ''; + + $config['access_admin_panel'] = 2; + $group_id_of_acc_logged = 0; + if ($logged && $account_logged) { + $group_id_of_acc_logged = $account_logged->getGroupId(); + } + + $config['site'] = &$config; + $config['server'] = &$config['lua']; + $config['site']['shop_system'] = $config['gifts_system']; + $config['site']['gallery_page'] = true; + + if (!isset($config['vdarkborder'])) { + $config['vdarkborder'] = '#505050'; + } + if (!isset($config['darkborder'])) { + $config['darkborder'] = '#D4C0A1'; + } + if (!isset($config['lightborder'])) { + $config['lightborder'] = '#F1E0C6'; + } + + $config['site']['download_page'] = true; + $config['site']['serverinfo_page'] = true; + $config['site']['screenshot_page'] = true; + + if ($config['forum'] != '') { + $config['forum_link'] = + strtolower($config['forum']) === 'site' ? getLink('forum') : $config['forum']; + } + + foreach ($status as $key => $value) { + $config['status']['serverStatus_' . $key] = $value; + } } if ($load_it) { - if (SITE_CLOSED && admin()) - $content .= '

Site is under maintenance (closed mode). Only privileged users can see it.

'; - - if ($config['backward_support']) { - require SYSTEM . 'compat/pages.php'; - require SYSTEM . 'compat/classes.php'; + if (SITE_CLOSED && admin()) { + $content .= + '

Site is under maintenance (closed mode). Only privileged users can see it.

'; + } + + if ($config['backward_support']) { + require SYSTEM . 'compat/pages.php'; + require SYSTEM . 'compat/classes.php'; + } + + $ignore = false; + + $logged_access = 1; + if ($logged && $account_logged && $account_logged->isLoaded()) { + $logged_access = $account_logged->getAccess(); + } + + $success = false; + $tmp_content = getCustomPage($page, $success); + if ($success) { + $content .= $tmp_content; + if (hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) { + $pageInfo = getCustomPageInfo($page); + $content = + $twig->render('admin.pages.links.html.twig', [ + 'page' => [ + 'id' => $pageInfo !== null ? $pageInfo['id'] : 0, + 'hidden' => $pageInfo !== null ? $pageInfo['hidden'] : '0', + ], + ]) . $content; } - - $ignore = false; - - $logged_access = 1; - if ($logged && $account_logged && $account_logged->isLoaded()) { - $logged_access = $account_logged->getAccess(); + } else { + $file = TEMPLATES . "$template_name/pages/$page.php"; + if (!@file_exists($file) || preg_match('/[^A-z0-9_\-]/', $page)) { + $file = SYSTEM . "pages/$page.php"; + if (!@file_exists($file) || preg_match('/[^A-z0-9_\-]/', $page)) { + $page = '404'; + $file = SYSTEM . 'pages/404.php'; + } } + } - $success = false; - $tmp_content = getCustomPage($page, $success); - if ($success) { - $content .= $tmp_content; - if (hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) { - $pageInfo = getCustomPageInfo($page); - $content = $twig->render('admin.pages.links.html.twig', array( - 'page' => array('id' => $pageInfo !== null ? $pageInfo['id'] : 0, 'hidden' => $pageInfo !== null ? $pageInfo['hidden'] : '0') - )) . $content; - } - } else { - $file = TEMPLATES . "$template_name/pages/$page.php"; - if (!@file_exists($file) || preg_match('/[^A-z0-9_\-]/', $page)) { - $file = SYSTEM . "pages/$page.php"; - if (!@file_exists($file) || preg_match('/[^A-z0-9_\-]/', $page)) { - $page = '404'; - $file = SYSTEM . 'pages/404.php'; - } - } + ob_start(); + if ($hooks->trigger(HOOK_BEFORE_PAGE)) { + if (!$ignore) { + require $file; } + } - ob_start(); - if ($hooks->trigger(HOOK_BEFORE_PAGE)) { - if (!$ignore) - require $file; - } + if ($config['backward_support'] && isset($main_content[0])) { + $content .= $main_content; + } - if ($config['backward_support'] && isset($main_content[0])) - $content .= $main_content; - - $content .= ob_get_contents(); - ob_end_clean(); - $hooks->trigger(HOOK_AFTER_PAGE); + $content .= ob_get_contents(); + ob_end_clean(); + $hooks->trigger(HOOK_AFTER_PAGE); } if ($config['backward_support']) { - $main_content = $content; - if (!isset($title)) - $title = ucfirst($page); + $main_content = $content; + if (!isset($title)) { + $title = ucfirst($page); + } - $topic = $title; + $topic = $title; } -$title_full = (isset($title) ? $title . $config['title_separator'] : '') . $config['lua']['serverName']; +$title_full = + (isset($title) ? $title . $config['title_separator'] : '') . $config['lua']['serverName']; require $template_path . '/' . $template_index; -echo base64_decode('PCEtLSBQb3dlcmVkIGJ5IE9wZW5UaWJpYUJSIE15QUFDIDo6IGh0dHBzOi8vZ2l0aHViLmNvbS9vcGVudGliaWFici9teWFhYyAtLT4=') . PHP_EOL; +echo base64_decode( + 'PCEtLSBQb3dlcmVkIGJ5IE9wZW5UaWJpYUJSIE15QUFDIDo6IGh0dHBzOi8vZ2l0aHViLmNvbS9vcGVudGliaWFici9teWFhYyAtLT4=' +) . PHP_EOL; if (superAdmin()) { - echo ''; - echo PHP_EOL . ''; - if (function_exists('memory_get_peak_usage')) { - echo PHP_EOL . ''; - } + echo ''; + echo PHP_EOL . ''; + if (function_exists('memory_get_peak_usage')) { + echo PHP_EOL . ''; + } } $hooks->trigger(HOOK_FINISH); diff --git a/workflow_test/style.css b/workflow_test/style.css index ae39a872a..fd6fdcd43 100644 --- a/workflow_test/style.css +++ b/workflow_test/style.css @@ -1,116 +1,70 @@ +/** @format */ + .slidecontainer { - width: 100%; + width: 100%; } .slider { - -webkit-appearance: none; - width: 100%; + -webkit-appearance: none; + width: 100%; - outline: none; - opacity: 0.7; - -webkit-transition: .2s; - transition: opacity .2s; + outline: none; + opacity: 0.7; + -webkit-transition: 0.2s; + transition: opacity 0.2s; } .slider:hover { - opacity: 1; + opacity: 1; } .slider::-webkit-slider-thumb { - -webkit-appearance: none; - appearance: none; - width: 15px; - height: 25px; - background: #3c8dbc; - cursor: pointer; + -webkit-appearance: none; + appearance: none; + width: 15px; + height: 25px; + background: #3c8dbc; + cursor: pointer; } .slider::-moz-range-thumb { - width: 25px; - height: 25px; - background: #3c8dbc; - cursor: pointer; + width: 25px; + height: 25px; + background: #3c8dbc; + cursor: pointer; } td.details-control { - text-align: center; - color: forestgreen; - cursor: pointer; + text-align: center; + color: forestgreen; + cursor: pointer; } tr.shown td.details-control { - text-align: center; - color: red; + text-align: center; + color: red; } - - - - - - - - - - - - - - - - - - - - - -.table{ - --bs-table-striped-color: #B8C7D0; +.table { + --bs-table-striped-color: #b8c7d0; } a { - text-decoration: none; + text-decoration: none; } -.skin-blue .main-header .navbar{ - padding-bottom: 0px; - padding-top: 0px; +.skin-blue .main-header .navbar { + padding-bottom: 0px; + padding-top: 0px; } tr { - color: #B8C7D0; + color: #b8c7d0; } -.nav-tabs .nav-link{ - color: #fff; - border-bottom: 1px solid #fff; - background: #202634; - border-radius: 5px 5px 0px 0px; +.nav-tabs .nav-link { + color: #fff; + border-bottom: 1px solid #fff; + background: #202634; + border-radius: 5px 5px 0px 0px; } -ul.nav.nav-tabs.nav-justified.control-sidebar-tabs{ - background: #202634; - padding: 20px; +ul.nav.nav-tabs.nav-justified.control-sidebar-tabs { + background: #202634; + padding: 20px; } - - - - - - - - - - - - - - - - - - - - - - - - - - -